Skip to contentSkip to conversation

linux-next: Tree for October 25

PATCH Applied Stephen Rothwell 4 participants 15 messages Oct 25, 2010 – Oct 26, 2010

Subsystems (9)
lore
Share & tools
lore
#0 lore raw

Hi all,

Reminder: do not add 2.6.38 destined stuff to linux-next until after 2.6.37-rc1 is released.

Changes since 20101022:

The net-current tree gained a build failure for which I applied a patch.

The tegra tree lost its conflicts.

The powerpc tree lost its conflict.

The kvm tree lost its conflict.

The net tree lost its conflicts.

The crypto tree lost its conflict.

The block tree lost its conflict.

The mmc tree gained a build failure so I used the version from 20101022.

The slab tree lost its conflict.

The trivial lost its conflict.

The i7core_edac lost its conflict.

The tip tree lost its conflicts.

The xen tree lost its complex conflict against the tip tree, but gained a build failure, so I used the version from next-20101021.

The percpu tree lost its conflicts.

The workqueue tree lost its conflict.

The bkl-trivial tree lost its conflicts.

The bkl-llseek tree lost its conflicts.

The bkl-vfs tree lost its conflicts.

The bkl-config tree lost its conflict.

----------------------------------------------------------------------------

I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/v2.6/next/ ). If you are tracking the linux-next tree using git, you should not use "git pull" to do so as that will try to merge the new linux-next release with the old one. You should use "git fetch" as mentioned in the FAQ on the wiki (see below).

You can see which trees have been included by looking in the Next/Trees file in the source. There are also quilt-import.log and merge.log files in the Next directory. Between each merge, the tree was built with a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the final fixups (if any), it is also built with powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig and allyesconfig (minus CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc and sparc64 defconfig. These builds also have CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and CONFIG_DEBUG_INFO disabled when necessary.

Below is a summary of the state of the merge.

We are up to 177 trees (counting Linus' and 22 trees of patches pending for Linus' tree), more are welcome (even if they are currently empty). Thanks to those who have contributed, and to those who haven't, please do.

Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give advice about cross compilers/configs that work, we are always open to add more builds.

Thanks to Randy Dunlap for doing many randconfig builds.

There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel.

Signature · 3 lines
Cheers,
Stephen Rothwell                    [email protected]
http://www.canb.auug.org.au/~sfr/
#1 lore raw
Quoted 2 lines · On Mon, 25 Oct 2010 14:58:34 +1100 Stephen Rothwell <[email protected]>…

Below is a summary of the state of the merge.

Signature · 244 lines
Cheers,
Stephen Rothwell                    [email protected]

$ git checkout master
$ git reset --hard stable
Merging origin/master
Merging fixes/fixes
Merging arm-current/master
Merging m68k-current/for-linus
Merging powerpc-merge/merge
Merging sparc-current/master
Merging scsi-rc-fixes/master
Merging net-current/master
Merging sound-current/for-linus
Merging pci-current/for-linus
Merging wireless-current/master
Merging kbuild-current/rc-fixes
Merging quilt/driver-core.current
Merging quilt/tty.current
Merging quilt/usb.current
Merging quilt/staging.current
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging md-current/for-linus
Merging audit-current/for-linus
Merging crypto-current/master
Merging ide-curent/master
Merging dwmw2/master
Merging gcl-current/merge
Merging arm/devel
Merging davinci/davinci-next
Merging i.MX/for-next
Merging msm/for-next
Merging omap/for-next
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-zoom-peripherals.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/devices.c
Merging pxa/for-next
Merging samsung/next-samsung
Merging s5p/for-next
Merging tegra/for-next
Merging avr32/avr32-arch
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
Merging m68knommu/for-next
Merging microblaze/next
Merging mips/mips-for-linux-next
CONFLICT (content): Merge conflict in drivers/usb/host/Kconfig
CONFLICT (content): Merge conflict in drivers/usb/host/Makefile
Merging parisc/next
Merging powerpc/next
Merging 4xx/next
Merging 52xx-and-virtex/next
Merging galak/next
Merging s390/features
CONFLICT (content): Merge conflict in drivers/s390/kvm/kvm_virtio.c
Merging sh/master
CONFLICT (content): Merge conflict in arch/sh/kernel/perf_event.c
Merging genesis/master
Merging sparc/master
Merging tile/master
Merging xtensa/master
CONFLICT (content): Merge conflict in arch/xtensa/configs/iss_defconfig
Merging ceph/for-next
Merging cifs/master
Merging configfs/linux-next
Merging ecryptfs/next
Merging ext3/for_next
Merging ext4/next
CONFLICT (content): Merge conflict in fs/ext4/mballoc.c
Applying: ext4: merge fix for blkdev_issue_zeroout API change
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
Merging hfsplus/for-next
Merging jfs/next
Merging logfs/master
CONFLICT (content): Merge conflict in fs/logfs/logfs.h
Merging nfs/linux-next
Merging nfsd/nfsd-next
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
Merging nilfs2/for-next
Merging ocfs2/linux-next
Merging omfs/for-next
Merging squashfs/master
Merging udf/for_next
Merging v9fs/for-next
Merging ubifs/linux-next
Merging xfs/master
Merging vfs/for-next
Merging pci/linux-next
Merging hid/for-next
CONFLICT (content): Merge conflict in drivers/hid/hid-ids.h
Merging quilt/i2c
CONFLICT (content): Merge conflict in drivers/i2c/algos/Kconfig
Merging bjdooks-i2c/next-i2c
Merging quilt/jdelvare-hwmon
Merging hwmon-staging/hwmon-next
Merging quilt/kernel-doc
Merging v4l-dvb/master
Merging kbuild/for-next
Merging kconfig/for-next
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
Merging idle-test/idle-test
Merging ieee1394/for-next
CONFLICT (delete/modify): drivers/ieee1394/eth1394.c deleted in ieee1394/for-next and modified in HEAD. Version HEAD of drivers/ieee1394/eth1394.c left in tree.
$ git rm -f drivers/ieee1394/eth1394.c
Merging ubi/linux-next
Merging kvm/linux-next
Merging dlm/next
Merging swiotlb/master
Merging ibft/master
Merging scsi/master
Merging async_tx/next
Merging net/master
Merging wireless/master
Merging bluetooth/master
Merging mtd/master
Merging crypto/master
Merging sound/for-next
CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/dev-audio.c
CONFLICT (content): Merge conflict in drivers/video/sh_mobile_hdmi.c
Merging sound-asoc/for-next
Merging cpufreq/next
Merging quilt/rr
Merging input/next
CONFLICT (content): Merge conflict in drivers/input/keyboard/Kconfig
Merging lsm/for-next
Merging block/for-next
CONFLICT (content): Merge conflict in fs/ocfs2/file.c
Merging quilt/device-mapper
Merging embedded/master
Merging firmware/master
Merging pcmcia/master
Merging battery/master
Merging leds/for-mm
Merging backlight/for-mm
Merging mmc/mmc-next
$ git reset --hard HEAD^
Merging refs/next/20101022/mmc
CONFLICT (content): Merge conflict in drivers/mmc/card/block.c
[master f0fd311] Merge commit 'refs/next/20101022/mmc'
Merging kgdb/kgdb-next
CONFLICT (content): Merge conflict in drivers/char/sysrq.c
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
CONFLICT (content): Merge conflict in drivers/mfd/sh_mobile_sdhi.c
CONFLICT (content): Merge conflict in drivers/misc/Makefile
Merging hdlc/hdlc-next
Merging drm/drm-next
CONFLICT (content): Merge conflict in drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
Merging viafb/viafb-next
Merging voltage/for-next
Merging security-testing/next
Merging lblnet/master
Merging agp/agp-next
Merging uwb/for-upstream
Merging watchdog/master
Merging bdev/master
Merging dwmw2-iommu/master
Merging cputime/cputime
Merging osd/linux-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
Merging audit/for-next
Merging quilt/aoe
Merging suspend/linux-next
Merging fsnotify/for-next
Merging irda/for-next
Merging catalin/for-next
CONFLICT (content): Merge conflict in arch/arm/kernel/Makefile
CONFLICT (content): Merge conflict in arch/arm/mach-vexpress/ct-ca9x4.c
CONFLICT (content): Merge conflict in arch/arm/mm/flush.c
Merging alacrity/linux-next
CONFLICT (content): Merge conflict in include/linux/Kbuild
CONFLICT (content): Merge conflict in lib/Kconfig
Merging i7core_edac/linux_next
Merging i7300_edac/linux_next
Merging devicetree/next-devicetree
Merging spi/next-spi
Merging omap_dss2/for-next
Merging tip/auto-latest
Merging rcu/rcu/next
Merging oprofile/for-next
Merging xen/upstream/xen
$ git reset --hard HEAD^
Merging refs/next/20101021/xen
CONFLICT (content): Merge conflict in arch/x86/mm/fault.c
[master 04af380] Merge commit 'refs/next/20101021/xen'
Merging swiotlb-xen/master
CONFLICT (content): Merge conflict in drivers/pci/Makefile
Merging xen-pvhvm/linux-next
Merging edac-amd/for-next
Merging percpu/for-next
Merging workqueues/for-next
Merging sfi/sfi-test
Merging asm-generic/next
Merging drivers-x86/linux-next
Merging hwpoison/hwpoison
Merging sysctl/master
Merging quilt/driver-core
CONFLICT (content): Merge conflict in drivers/misc/Makefile
Merging quilt/tty
Merging quilt/usb
CONFLICT (content): Merge conflict in arch/powerpc/sysdev/fsl_soc.c
CONFLICT (content): Merge conflict in drivers/scsi/sd.c
CONFLICT (content): Merge conflict in drivers/usb/gadget/rndis.c
CONFLICT (content): Merge conflict in drivers/usb/host/Kconfig
CONFLICT (content): Merge conflict in drivers/usb/host/Makefile
Merging staging-next/staging-next
CONFLICT (rename/modify): Merge conflict in drivers/misc/ti-st/st_core.c
CONFLICT (rename/modify): Merge conflict in drivers/misc/ti-st/st_kim.c
CONFLICT (content): Merge conflict in arch/arm/plat-omap/devices.c
CONFLICT (content): Merge conflict in drivers/misc/Makefile
CONFLICT (content): Merge conflict in drivers/staging/Makefile
CONFLICT (content): Merge conflict in drivers/staging/batman-adv/hard-interface.c
CONFLICT (content): Merge conflict in drivers/staging/cx25821/cx25821-audio-upstream.c
CONFLICT (content): Merge conflict in drivers/staging/cx25821/cx25821-audio.h
CONFLICT (delete/modify): drivers/staging/mrst-touchscreen/Makefile deleted in HEAD and modified in staging-next/staging-next. Version staging-next/staging-next of drivers/staging/mrst-touchscreen/Makefile left in tree.
CONFLICT (delete/modify): drivers/staging/mrst-touchscreen/intel-mid-touch.c deleted in HEAD and modified in staging-next/staging-next. Version staging-next/staging-next of drivers/staging/mrst-touchscreen/intel-mid-touch.c left in tree.
CONFLICT (delete/modify): drivers/staging/ti-st/st.h deleted in staging-next/staging-next and modified in HEAD. Version HEAD of drivers/staging/ti-st/st.h left in tree.
CONFLICT (delete/modify): drivers/staging/ti-st/st_core.h deleted in staging-next/staging-next and modified in HEAD. Version HEAD of drivers/staging/ti-st/st_core.h left in tree.
CONFLICT (content): Merge conflict in fs/compat_ioctl.c
$ git rm -f drivers/staging/mrst-touchscreen/Makefile drivers/staging/mrst-touchscreen/intel-mid-touch.c
$ git rm -f drivers/staging/ti-st/st.h drivers/staging/ti-st/st_core.h
Applying: staging: ath6kl: Fixing the driver to use modified mmc_host structure
Merging slabh/slabh
Merging bkl-trivial/trivial
Merging bkl-llseek/llseek
Merging bkl-vfs/vfs
Merging bkl-config/config
Merging irqflags/master
Merging cleancache/linux-next
CONFLICT (content): Merge conflict in include/linux/fs.h
CONFLICT (content): Merge conflict in mm/Kconfig
Merging scsi-post-merge/merge-base:master
Applying: l2tp: static functions should not be exported
#2 lore raw

PATCH 1/1 pch_can: depends on PCI

In reply to Stephen Rothwell

From: Randy Dunlap <[email protected]>

Fix pch_can build when CONFIG_PCI is not enabled. It uses pci interfaces and data structures, so it should depend on PCI.

drivers/net/can/pch_can.c:1044: error: implicit declaration of function 'pci_enable_msi' drivers/net/can/pch_can.c:1079: error: implicit declaration of function 'pci_disable_msi'

---
 drivers/net/can/Kconfig |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/can/Kconfig +1 -1
@@ -84,7 +84,7 @@ config CAN_FLEXCAN
 
 config PCH_CAN
 	tristate "PCH CAN"
-	depends on  CAN_DEV
+	depends on CAN_DEV && PCI
 	---help---
 	  This driver is for PCH CAN of Topcliff which is an IOH for x86
 	  embedded processor.
maintainer Applied
#3 lore raw

Re: [PATCH -next] pch_can: depends on PCI

From: Randy Dunlap <[email protected]>
Date: Mon, 25 Oct 2010 16:25:24 -0700

Quoted 9 lines

From: Randy Dunlap <[email protected]>

Fix pch_can build when CONFIG_PCI is not enabled. It uses pci interfaces and data structures, so it should depend on PCI.

drivers/net/can/pch_can.c:1044: error: implicit declaration of function 'pci_enable_msi' drivers/net/can/pch_can.c:1079: error: implicit declaration of function 'pci_disable_msi'

Applied, thanks Randy.

#4 lore raw

Re: linux-next: Tree for October 25 (coda)

In reply to Stephen Rothwell
Quoted 1 line · On Mon, 25 Oct 2010 14:58:34 +1100 Stephen Rothwell wrote:

Hi all,

The coda BKL fixes (git tree) are not in here yet, right?

fs/coda/* currently has 12 warnings like these:

fs/coda/psdev.c:140: error: implicit declaration of function 'lock_kernel' fs/coda/psdev.c:142: error: implicit declaration of function 'unlock_kernel'

---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***

#5 lore raw

Re: linux-next: Tree for October 25 (coda)

Hi Randy,

Quoted 2 lines · On Mon, 25 Oct 2010 16:33:39 -0700 Randy Dunlap <[email protected]> wrote:

The coda BKL fixes (git tree) are not in here yet, right?

I have no coda tree in linux-next (hint, hint :-)). However, there were a few coda patches went into Linus' tree overnight (my time).

Quoted 4 lines

fs/coda/* currently has 12 warnings like these:

fs/coda/psdev.c:140: error: implicit declaration of function 'lock_kernel' fs/coda/psdev.c:142: error: implicit declaration of function 'unlock_kernel'

Hopefully these are fixed today by the above commits?

Signature · 3 lines
Cheers,
Stephen Rothwell                    [email protected]
http://www.canb.auug.org.au/~sfr/
#6 lore raw

Re: linux-next: Tree for October 25 (acpi/apei-related)

In reply to Stephen Rothwell
Quoted 1 line · On Mon, 25 Oct 2010 14:58:34 +1100 Stephen Rothwell wrote:

Hi all,

drivers/built-in.o: In function `herr_record_init':
(.text+0x85149): undefined reference to trace_clock_local' drivers/built-in.o: In function herr_record_alloc':
(.text+0x851ab): undefined reference to trace_clock_local' drivers/built-in.o: In function herr_record_alloc':
(.text+0x8521c): undefined reference to `trace_clock_local'

config ACPI_APEI
bool "ACPI Platform Error Interface (APEI)" depends on X86
select HERR_DEV_CORE

but kernel/trace/trace_clock is not built unless one of these symbols is enabled:

obj-$(CONFIG_FUNCTION_TRACER) += trace/
obj-$(CONFIG_TRACING) += trace/
obj-$(CONFIG_X86_DS) += trace/
obj-$(CONFIG_RING_BUFFER) += trace/

and in this case, none of these is enabled.

---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***

#7 lore raw

Re: linux-next: Tree for October 25 (netfilter/xt_socket)

In reply to Stephen Rothwell
Quoted 4 lines · On Mon, 25 Oct 2010 14:58:34 +1100 Stephen Rothwell wrote:

Hi all,

Reminder: do not add 2.6.38 destined stuff to linux-next until after 2.6.37-rc1 is released.

xt_socket.c:(.text+0x39ff8): undefined reference to ipv6_find_hdr' xt_socket.c:(.init.text+0x1703): undefined reference to nf_defrag_ipv6_enable'

config file is attached.

---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***

maintainer
#8 lore raw

Re: linux-next: Tree for October 25 (netfilter/xt_socket)

From: Randy Dunlap <[email protected]>
Date: Mon, 25 Oct 2010 16:54:07 -0700

Quoted 2 lines

xt_socket.c:(.text+0x39ff8): undefined reference to ipv6_find_hdr' xt_socket.c:(.init.text+0x1703): undefined reference to nf_defrag_ipv6_enable'

This ought to be fixed in net-2.6 already, by:

commit f6318e558806c925029dc101f14874be9f9fa78f

Author: KOVACS Krisztian <[email protected]>
Date:   Sun Oct 24 23:38:32 2010 +0000

netfilter: fix module dependency issues with IPv6 defragmentation, ip6tables and xt_TPROXY

One of the previous tproxy related patches split IPv6 defragmentation and connection tracking, but did not correctly add Kconfig stanzas to handle the new dependencies correctly. This patch fixes that by making the config options mirror the setup we have for IPv4: a distinct config option for defragmentation that is automatically selected by both connection tracking and xt_TPROXY/xt_socket.

The patch also changes the #ifdefs enclosing IPv6 specific code in xt_socket and xt_TPROXY: we only compile these in case we have ip6tables support enabled.

#9 lore raw

Re: linux-next: Tree for October 25 (netfilter/nf_conntrack_reasm)

In reply to Stephen Rothwell
Quoted 4 lines · On Mon, 25 Oct 2010 14:58:34 +1100 Stephen Rothwell wrote:

Hi all,

Reminder: do not add 2.6.38 destined stuff to linux-next until after 2.6.37-rc1 is released.

net/ipv6/netfilter/nf_conntrack_reasm.c:628: error: 'nf_ct_frag6_sysctl_header' undeclared (first use in this function) net/ipv6/netfilter/nf_conntrack_reasm.c:628: error: 'nf_net_netfilter_sysctl_path' undeclared (first use in this function) net/ipv6/netfilter/nf_conntrack_reasm.c:629: error: 'nf_ct_frag6_sysctl_table' undeclared (first use in this function) net/ipv6/netfilter/nf_conntrack_reasm.c:640: error: 'nf_ct_frag6_sysctl_header' undeclared (first use in this function)

config file is attached.

---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***

maintainer
#10 lore raw

Re: linux-next: Tree for October 25 (netfilter/nf_conntrack_reasm)

From: Randy Dunlap <[email protected]>
Date: Mon, 25 Oct 2010 16:55:29 -0700

Quoted 7 lines · On Mon, 25 Oct 2010 14:58:34 +1100 Stephen Rothwell wrote:
Quoted 5 lines

Hi all,

Reminder: do not add 2.6.38 destined stuff to linux-next until after 2.6.37-rc1 is released.

Quoted 7 lines

net/ipv6/netfilter/nf_conntrack_reasm.c:628: error: 'nf_ct_frag6_sysctl_header' undeclared (first use in this function) net/ipv6/netfilter/nf_conntrack_reasm.c:628: error: 'nf_net_netfilter_sysctl_path' undeclared (first use in this function) net/ipv6/netfilter/nf_conntrack_reasm.c:629: error: 'nf_ct_frag6_sysctl_table' undeclared (first use in this function) net/ipv6/netfilter/nf_conntrack_reasm.c:640: error: 'nf_ct_frag6_sysctl_header' undeclared (first use in this function)

config file is attached.

Should also be fixed by the commit I just pointed you to.

maintainer
#11 lore raw

Re: linux-next: Tree for October 25 (netfilter/nf_conntrack_reasm)

From: David Miller <[email protected]>
Date: Mon, 25 Oct 2010 22:03:16 -0700 (PDT)

Quoted 16 lines

From: Randy Dunlap <[email protected]>
Date: Mon, 25 Oct 2010 16:55:29 -0700

Quoted 13 lines · On Mon, 25 Oct 2010 14:58:34 +1100 Stephen Rothwell wrote:
Quoted 5 lines

Hi all,

Reminder: do not add 2.6.38 destined stuff to linux-next until after 2.6.37-rc1 is released.

net/ipv6/netfilter/nf_conntrack_reasm.c:628: error: 'nf_ct_frag6_sysctl_header' undeclared (first use in this function) net/ipv6/netfilter/nf_conntrack_reasm.c:628: error: 'nf_net_netfilter_sysctl_path' undeclared (first use in this function) net/ipv6/netfilter/nf_conntrack_reasm.c:629: error: 'nf_ct_frag6_sysctl_table' undeclared (first use in this function) net/ipv6/netfilter/nf_conntrack_reasm.c:640: error: 'nf_ct_frag6_sysctl_header' undeclared (first use in this function)

Quoted 3 lines
Quoted 1 line

config file is attached.

Should also be fixed by the commit I just pointed you to.

Actually it isn't :-) I'll commit the following to fix this, thanks!

--------------------
netfilter: Add missing CONFIG_SYSCTL checks in ipv6's nf_conntrack_reasm.c

---
 net/ipv6/netfilter/nf_conntrack_reasm.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
net/ipv6/netfilter/nf_conntrack_reasm.c +4 -1
index 489d71b..3a3f129 100644
@@ -625,21 +625,24 @@ int nf_ct_frag6_init(void)
 	inet_frags_init_net(&nf_init_frags);
 	inet_frags_init(&nf_frags);
 
+#ifdef CONFIG_SYSCTL
 	nf_ct_frag6_sysctl_header = register_sysctl_paths(nf_net_netfilter_sysctl_path,
 							  nf_ct_frag6_sysctl_table);
 	if (!nf_ct_frag6_sysctl_header) {
 		inet_frags_fini(&nf_frags);
 		return -ENOMEM;
 	}
+#endif
 
 	return 0;
 }
 
 void nf_ct_frag6_cleanup(void)
 {
+#ifdef CONFIG_SYSCTL
 	unregister_sysctl_table(nf_ct_frag6_sysctl_header);
 	nf_ct_frag6_sysctl_header = NULL;
-
+#endif
 	inet_frags_fini(&nf_frags);
 
 	nf_init_frags.low_thresh = 0;
Signature · 1 line
1.7.3.2
#12 lore raw

Re: linux-next: Tree for October 25 (acpi_video)

In reply to Stephen Rothwell
Quoted 4 lines · On Mon, 25 Oct 2010 14:58:34 +1100 Stephen Rothwell wrote:

Hi all,

Reminder: do not add 2.6.38 destined stuff to linux-next until after 2.6.37-rc1 is released.

drivers/built-in.o: In function `acpi_video_bus_put_one_device':
video.c:(.text+0x7b716): undefined reference to video_output_unregister' drivers/built-in.o: In function acpi_video_device_find_cap':
video.c:(.text+0x7c615): undefined reference to `video_output_register'

config file is attached.

---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***

#13 lore raw

Re: linux-next: Tree for October 25 (nouveau_pm)

In reply to Stephen Rothwell
Quoted 4 lines · On Mon, 25 Oct 2010 14:58:34 +1100 Stephen Rothwell wrote:

Hi all,

Reminder: do not add 2.6.38 destined stuff to linux-next until after 2.6.37-rc1 is released.

drivers/built-in.o: In function `nouveau_hwmon_init':
nouveau_pm.c:(.text+0x179825): undefined reference to hwmon_device_register' nouveau_pm.c:(.text+0x1798b9): undefined reference to hwmon_device_unregister'

config file is attached.

---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***

#14 lore raw

Re: linux-next: Tree for October 25 (nouveau_pm)

Quoted 7 lines · Randy Dunlap
Quoted 4 lines · On Mon, 25 Oct 2010 14:58:34 +1100 Stephen Rothwell wrote:

Hi all,

Reminder: do not add 2.6.38 destined stuff to linux-next until after 2.6.37-rc1 is released.

Quoted 6 lines

drivers/built-in.o: In function `nouveau_hwmon_init':
nouveau_pm.c:(.text+0x179825): undefined reference to hwmon_device_register' nouveau_pm.c:(.text+0x1798b9): undefined reference to hwmon_device_unregister'

config file is attached.

Thanks, this compiles fine with the attached patch.

I'm ready to rework it if needed.

Martin

Quoted 1 line

From 4f4af7ac5be0f418a3c0cbca1b44ab4f93216060 Mon Sep 17 00:00:00 2001

From: Martin Peres <[email protected]>
Date: Tue, 26 Oct 2010 12:48:28 +0200
Subject: [PATCH] Fix compilation issues in nouveau_pm when CONFIG_HWMON is not set

---
 drivers/gpu/drm/nouveau/nouveau_pm.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)
drivers/gpu/drm/nouveau/nouveau_pm.c +8 -0
index 8ef1d5b..f691661 100644
@@ -405,12 +405,15 @@ nouveau_hwmon_init(struct drm_device *dev)
 {
 	struct drm_nouveau_private *dev_priv = dev->dev_private;
 	struct nouveau_pm_engine *pm = &dev_priv->engine.pm;
+#ifdef CONFIG_HWMON
 	struct device *hwmon_dev;
 	int ret;
+#endif
 
 	if (!pm->temp_get)
 		return -ENODEV;
 
+#ifdef CONFIG_HWMON
 	hwmon_dev = hwmon_device_register(&dev->pdev->dev);
 	if (IS_ERR(hwmon_dev)) {
 		ret = PTR_ERR(hwmon_dev);
@@ -429,6 +432,9 @@ nouveau_hwmon_init(struct drm_device *dev)
 	}
 
 	pm->hwmon = hwmon_dev;
+#else
+	pm->hwmon = NULL;
+#endif
 
 	return 0;
 }
@@ -436,6 +442,7 @@ nouveau_hwmon_init(struct drm_device *dev)
 static void
 nouveau_hwmon_fini(struct drm_device *dev)
 {
+#ifdef CONFIG_HWMON
 	struct drm_nouveau_private *dev_priv = dev->dev_private;
 	struct nouveau_pm_engine *pm = &dev_priv->engine.pm;
 
@@ -443,6 +450,7 @@ nouveau_hwmon_fini(struct drm_device *dev)
 		sysfs_remove_group(&pm->hwmon->kobj, &hwmon_attrgroup);
 		hwmon_device_unregister(pm->hwmon);
 	}
+#endif
 }
 
 #ifdef CONFIG_ACPI
Signature · 1 line
1.7.3.2

_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel