* Re: linux-next: build failure after merge of the pm tree
From: Ming Lei @ 2011-09-29 1:32 UTC (permalink / raw)
To: Rafael J. Wysocki; +Cc: Stephen Rothwell, linux-next, linux-kernel
In-Reply-To: <201109282132.46887.rjw@sisk.pl>
On Thu, Sep 29, 2011 at 3:32 AM, Rafael J. Wysocki <rjw@sisk.pl> wrote:
> On Wednesday, September 28, 2011, Ming Lei wrote:
>> Hi,
>>
>> 2011/9/28 Rafael J. Wysocki <rjw@sisk.pl>:
>> > On Wednesday, September 28, 2011, Ming Lei wrote:
>> >> Hi Stephen and Rafael,
>> >>
>> >> Sorry, the attachment patch can fix the build failure, which is
>> >> caused by unset CONFIG_RUNTIME_PM.
>> >
>> > First off, that's CONFIG_PM_RUNTIME. Second, why do you want to build
>> > rpm-traces.c at all if CONFIG_PM_RUNTIME is unset?
>> >
>>
>> Yes, you are right, follows the correct fix:
>>
>> diff --git a/kernel/trace/Makefile b/kernel/trace/Makefile
>> index 56bdab5..f49405f 100644
>> --- a/kernel/trace/Makefile
>> +++ b/kernel/trace/Makefile
>> @@ -53,7 +53,9 @@ endif
>> obj-$(CONFIG_EVENT_TRACING) += trace_events_filter.o
>> obj-$(CONFIG_KPROBE_EVENT) += trace_kprobe.o
>> obj-$(CONFIG_TRACEPOINTS) += power-traces.o
>> +ifeq ($(CONFIG_PM_RUNTIME),y)
>> obj-$(CONFIG_TRACEPOINTS) += rpm-traces.o
>> +endif
>> ifeq ($(CONFIG_TRACING),y)
>> obj-$(CONFIG_KGDB_KDB) += trace_kdb.o
>> endif
>
> Well, this still is kind of ugly. I'd prefer my patch sent in this thread.
Both are doable, :-)
But I don't think it is ugly, and this way is taken by BLOCK/PERF_EVENTS/
KGDB_KDB in kernel/trace/Makefile. Also this one is a simple fix and
don't introduce any new config option, which is unnecessary.
thanks,
--
Ming Lei
^ permalink raw reply
* linux-next: build failure after merge of the regmap tree
From: Stephen Rothwell @ 2011-09-29 5:18 UTC (permalink / raw)
To: Mark Brown; +Cc: linux-next, linux-kernel, Dimitris Papastamos
[-- Attachment #1: Type: text/plain, Size: 623 bytes --]
Hi Mark,
After merging the regmap tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/base/regmap/regcache.c: In function 'regcache_cache_only':
drivers/base/regmap/regcache.c:276:2: error: 'struct regmap' has no member named 'sync_lock'
drivers/base/regmap/regcache.c:278:19: error: 'struct regmap' has no member named 'sync_lock'
Caused by commit 38f6916976f9 ("regmap: Grab the lock in
regcache_cache_only()").
I have used the regmap tree from next-20110928 for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* linux-next: manual merge of the moduleh tree with the staging tree
From: Stephen Rothwell @ 2011-09-29 5:55 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linux-next, linux-kernel, Jonathan Cameron, Greg KH
[-- Attachment #1: Type: text/plain, Size: 686 bytes --]
Hi Paul,
Today's linux-next merge of the moduleh tree got a conflict in
drivers/staging/iio/accel/adis16220_core.c between commits 7991029a55fa
("staging:iio:accel:adis16220 iio_chan_spec conversion") and 6f4ebab56870
("staging: iio: adis16220_core.c: add module.h") from the staging tree
and commit 6eee8b750254 ("staging: Add module.h to more drivers
implicitly using it") from the moduleh tree.
The staging commits are a superset of the part of the moduleh commit that
affects this file, so I dropped the moduleh change (module.h was added in
different places).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* linux-next: build failure after merge of the final tree (moduleh tree related)
From: Stephen Rothwell @ 2011-09-29 6:40 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linux-next, linux-kernel
Hi all,
After merging the final tree, today's linux-next build (powerpc
allyesconfig) failed like this:
drivers/staging/cxt1e1/linux.c:113:32: error: expected ')' before 'int'
drivers/staging/cxt1e1/linux.c:117:30: error: expected ')' before 'int'
drivers/staging/cxt1e1/linux.c:121:30: error: expected ')' before 'int'
drivers/staging/cxt1e1/linux.c:125:31: error: expected ')' before 'int'
drivers/staging/cxt1e1/linux.c:129:31: error: expected ')' before 'int'
Caused by the module split. The fix in the moduleh tree (commit
6eee8b750254 ("staging: Add module.h to more drivers implicitly using
i")) is incorrect in that module.h has been included too late.
I have applied the following patch for today.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 29 Sep 2011 16:36:21 +1000
Subject: [PATCH] staging: move the module.h include in cxt1e1/linux.c
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/staging/cxt1e1/linux.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/staging/cxt1e1/linux.c b/drivers/staging/cxt1e1/linux.c
index e7029af..6e574fe 100644
--- a/drivers/staging/cxt1e1/linux.c
+++ b/drivers/staging/cxt1e1/linux.c
@@ -15,6 +15,7 @@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/types.h>
+#include <linux/module.h>
#include <linux/netdevice.h>
#include <linux/hdlc.h>
#include <linux/if_arp.h>
@@ -163,7 +164,6 @@ mkret (int bsd)
/***************************************************************************/
#include <linux/workqueue.h>
-#include <linux/module.h>
/***
* One workqueue (wq) per port (since musycc allows simultaneous group
--
1.7.6.3
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
^ permalink raw reply related
* linux-next: Tree for Sept 29
From: Stephen Rothwell @ 2011-09-29 6:57 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 33005 bytes --]
Hi all,
The linux-next tree is now available from
git://github.com/sfrothwell/linux-next.git as a temporary measure while
the kernel.org servers are unavailable.
Changes since 20110928:
The pm tree lost its build failure.
The wireless tree lost a conflict.
The regmap tree gained a build failure so I used the version from
next-20110928.
The moduleh tree lost build failures but gained another for which I
applied a patch. It also lost 15 conflicts but gained another.
The akpm tree lost its build failure. Also, I dropped another patch
that turned up elsewhere.
----------------------------------------------------------------------------
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 199 trees (counting Linus' and 27 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.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
$ git checkout master
$ git reset --hard stable
Merging origin/master
Merging fixes/fixes
Merging kbuild-current/rc-fixes
Merging arm-current/fixes
Merging m68k-current/for-linus
Merging powerpc-merge/merge
Merging 52xx-and-virtex-current/powerpc/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 driver-core.current/driver-core-linus
Merging tty.current/tty-linus
Merging usb.current/usb-linus
Merging staging.current/staging-linus
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 sh-current/sh-fixes-for-linus
Merging rmobile-current/rmobile-fixes-for-linus
Merging devicetree-current/devicetree/merge
Merging spi-current/spi/merge
Merging arm/for-next
Merging arm-lpae/for-next
CONFLICT (content): Merge conflict in arch/arm/include/asm/page.h
CONFLICT (content): Merge conflict in arch/arm/include/asm/pgalloc.h
CONFLICT (content): Merge conflict in arch/arm/include/asm/pgtable-hwdef.h
CONFLICT (content): Merge conflict in arch/arm/include/asm/pgtable.h
CONFLICT (content): Merge conflict in arch/arm/include/asm/tlb.h
CONFLICT (content): Merge conflict in arch/arm/kernel/head.S
CONFLICT (content): Merge conflict in arch/arm/mm/mmu.c
Merging arm-soc/for-next
CONFLICT (add/add): Merge conflict in Documentation/devicetree/bindings/arm/l2cc.txt
CONFLICT (delete/modify): arch/arm/mach-at91/board-usb-a9260.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-at91/board-usb-a9260.c left in tree.
CONFLICT (content): Merge conflict in arch/arm/mach-msm/board-msm7x30.c
CONFLICT (content): Merge conflict in arch/arm/mach-msm/board-msm8x60.c
CONFLICT (content): Merge conflict in arch/arm/mach-mxs/include/mach/gpio.h
CONFLICT (delete/modify): arch/arm/mach-nuc93x/Makefile.boot deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-nuc93x/Makefile.boot left in tree.
CONFLICT (content): Merge conflict in arch/arm/mach-u300/Makefile.boot
CONFLICT (content): Merge conflict in arch/arm/mm/cache-l2x0.c
CONFLICT (content): Merge conflict in arch/arm/mm/dma-mapping.c
CONFLICT (content): Merge conflict in arch/arm/plat-mxc/include/mach/gpio.h
$ git rm -f arch/arm/mach-at91/board-usb-a9260.c arch/arm/mach-nuc93x/Makefile.boot
Applying: arm-soc: merge fixup for fixup/reserve being added to MACHINE descriptions
Merging at91/at91-next
Merging davinci/davinci-next
Merging i.MX/for-next
CONFLICT (content): Merge conflict in arch/arm/mach-imx/Makefile
Merging linux-spec/for-next
Merging omap/for-next
Merging pxa/for-next
Merging samsung/next-samsung
Merging s5p/for-next
CONFLICT (content): Merge conflict in drivers/gpio/Makefile
Merging tegra/for-next
Merging xilinx/arm-next
Merging blackfin/for-linus
Merging cris/for-next
Merging quilt/hexagon
Merging ia64/test
Merging m68k/for-next
Merging m68knommu/for-next
Merging microblaze/next
Merging mips/mips-for-linux-next
Merging openrisc/for-upstream
Merging parisc/for-next
Merging powerpc/next
Merging 4xx/next
Merging 52xx-and-virtex/powerpc/next
Merging galak/next
Merging s390/features
Merging sh/sh-latest
Merging rmobile/rmobile-latest
Merging sparc/master
Merging tile/master
Merging unicore32/unicore32
Merging xtensa/master
Merging ceph/for-next
Merging cifs/master
Merging configfs/linux-next
Merging ecryptfs/next
Merging ext3/for_next
Merging ext4/dev
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
Merging hfsplus/for-next
Merging jfs/next
Merging logfs/master
Merging nfs/linux-next
Merging nfsd/nfsd-next
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
CONFLICT (content): Merge conflict in fs/xfs/xfs_aops.c
CONFLICT (content): Merge conflict in fs/xfs/xfs_super.c
Merging vfs/for-next
Merging vfs-scale/vfs-scale-working
Merging pci/linux-next
Merging hid/for-next
Merging quilt/i2c
Merging bjdooks-i2c/next-i2c
Merging quilt/jdelvare-hwmon
Merging hwmon-staging/hwmon-next
Merging quilt/kernel-doc
Merging docs/docs-move
Merging v4l-dvb/master
Merging kbuild/for-next
Merging kconfig/for-next
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/acpi
Merging idle-test/idle-test
Merging powertools/tools-test
Merging cpupowerutils/master
Merging ieee1394/for-next
Merging ubi/linux-next
Merging dlm/next
Merging swiotlb/master
Merging ibft/master
Merging scsi/master
Merging iscsi-target/for-next
Merging slave-dma/next
Merging async_tx/next
Merging net/master
CONFLICT (delete/modify): arch/powerpc/configs/40x/hcu4_defconfig deleted in HEAD and modified in net/master. Version net/master of arch/powerpc/configs/40x/hcu4_defconfig left in tree.
CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-scan.c
CONFLICT (content): Merge conflict in drivers/s390/cio/qdio_main.c
CONFLICT (content): Merge conflict in net/batman-adv/soft-interface.c
$ git rm -f arch/powerpc/configs/40x/hcu4_defconfig
Merging wireless/master
CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-pci.c
CONFLICT (content): Merge conflict in drivers/net/wireless/wl12xx/main.c
Merging bluetooth/master
CONFLICT (content): Merge conflict in net/bluetooth/hci_core.c
CONFLICT (content): Merge conflict in net/bluetooth/l2cap_core.c
CONFLICT (content): Merge conflict in net/bluetooth/mgmt.c
CONFLICT (content): Merge conflict in net/bluetooth/smp.c
Merging mtd/master
Merging l2-mtd/master
CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-afeb-9260v1.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-neocore926.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-rm9200dk.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-sam9g20ek.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-sam9m10g45ek.c
CONFLICT (delete/modify): arch/arm/mach-at91/board-usb-a9260.c deleted in HEAD and modified in l2-mtd/master. Version l2-mtd/master of arch/arm/mach-at91/board-usb-a9260.c left in tree.
$ git rm -f arch/arm/mach-at91/board-usb-a9260.c
Merging crypto/master
Merging sound/for-next
CONFLICT (content): Merge conflict in arch/mips/alchemy/devboards/db1x00/platform.c
CONFLICT (content): Merge conflict in sound/mips/Kconfig
Merging sound-asoc/for-next
Merging cpufreq/next
Merging quilt/rr
Merging input/next
Merging input-mt/next
Merging lsm/for-next
Merging block/for-next
Merging quilt/device-mapper
Merging embedded/master
Merging firmware/master
Merging pcmcia/master
Merging battery/master
Merging leds/for-mm
CONFLICT (content): Merge conflict in drivers/leds/Kconfig
Merging backlight/for-mm
Merging mmc/mmc-next
CONFLICT (content): Merge conflict in drivers/mmc/core/core.c
CONFLICT (content): Merge conflict in drivers/mmc/core/sd.c
Merging kgdb/kgdb-next
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
CONFLICT (content): Merge conflict in arch/arm/mach-u300/include/mach/irqs.h
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging fbdev/fbdev-next
CONFLICT (content): Merge conflict in drivers/video/Kconfig
Merging viafb/viafb-next
Merging omap_dss2/for-next
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-4430sdp.c
CONFLICT (delete/modify): drivers/video/omap/lcd_apollon.c deleted in omap_dss2/for-next and modified in HEAD. Version HEAD of drivers/video/omap/lcd_apollon.c left in tree.
CONFLICT (delete/modify): drivers/video/omap/lcd_ldp.c deleted in omap_dss2/for-next and modified in HEAD. Version HEAD of drivers/video/omap/lcd_ldp.c left in tree.
CONFLICT (delete/modify): drivers/video/omap/lcd_overo.c deleted in omap_dss2/for-next and modified in HEAD. Version HEAD of drivers/video/omap/lcd_overo.c left in tree.
$ git rm -f drivers/video/omap/lcd_apollon.c drivers/video/omap/lcd_ldp.c drivers/video/omap/lcd_overo.c
Merging voltage/for-next
Merging security/next
CONFLICT (content): Merge conflict in fs/ocfs2/xattr.c
Merging selinux/master
Merging lblnet/master
Merging agp/agp-next
Merging watchdog/master
Merging bdev/master
Merging dwmw2-iommu/master
Merging iommu/next
Merging cputime/cputime
Merging osd/linux-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
CONFLICT (content): Merge conflict in Documentation/PCI/pci.txt
CONFLICT (delete/modify): arch/arm/mach-nuc93x/time.c deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of arch/arm/mach-nuc93x/time.c left in tree.
CONFLICT (content): Merge conflict in drivers/net/Kconfig
$ git rm -f arch/arm/mach-nuc93x/time.c
Merging audit/for-next
Merging pm/linux-next
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/board-ap4evb.c
Merging apm/for-next
Merging fsnotify/for-next
Merging irda/for-next
Merging edac/linux_next
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/mcheck/mce.c
Merging edac-amd/for-next
Merging devicetree/devicetree/next
Merging spi/spi/next
Merging gpio/gpio/next
Merging tip/auto-latest
CONFLICT (content): Merge conflict in drivers/iommu/Makefile
Merging rcu/rcu/next
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/mcheck/mce.c
CONFLICT (content): Merge conflict in arch/x86/kernel/process_64.c
Merging kvm/kvm-updates/3.2
Merging oprofile/for-next
Merging ptrace/ptrace
Merging xen/upstream/xen
Merging xen-two/linux-next
CONFLICT (content): Merge conflict in arch/x86/xen/Kconfig
Merging xen-pvhvm/linux-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 namespace/master
Merging regmap/for-next
CONFLICT (content): Merge conflict in drivers/mfd/wm831x-spi.c
$ git reset --hard HEAD^
Merging refs/next/20110928/regmap
CONFLICT (content): Merge conflict in drivers/mfd/wm831x-spi.c
[master feb9ae8] Merge commit 'refs/next/20110928/regmap'
Merging driver-core/driver-core-next
CONFLICT (content): Merge conflict in arch/arm/plat-mxc/devices.c
Merging tty/tty-next
CONFLICT (content): Merge conflict in arch/powerpc/include/asm/udbg.h
CONFLICT (content): Merge conflict in arch/powerpc/kernel/udbg.c
CONFLICT (content): Merge conflict in drivers/tty/serial/8250.c
Merging usb/usb-next
Merging staging/staging-next
CONFLICT (content): Merge conflict in drivers/misc/altera-stapl/altera.c
CONFLICT (content): Merge conflict in drivers/staging/comedi/drivers/ni_labpc.c
CONFLICT (delete/modify): drivers/staging/rtl8192e/r8192E_core.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/rtl8192e/r8192E_core.c left in tree.
CONFLICT (content): Merge conflict in drivers/staging/xgifb/XGI_main_26.c
$ git rm -f drivers/staging/rtl8192e/r8192E_core.c
Merging bkl-config/config
Merging tmem/tmem
Merging writeback/next
Merging arm-dt/devicetree/arm-next
Merging hwspinlock/linux-next
Merging moduleh/for-sfr
CONFLICT (content): Merge conflict in arch/arm/mach-bcmring/mm.c
CONFLICT (content): Merge conflict in drivers/media/dvb/frontends/dibx000_common.c
CONFLICT (content): Merge conflict in drivers/misc/altera-stapl/altera.c
CONFLICT (content): Merge conflict in drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
CONFLICT (content): Merge conflict in drivers/scsi/libfc/fc_lport.c
CONFLICT (content): Merge conflict in drivers/staging/iio/accel/adis16220_core.c
CONFLICT (content): Merge conflict in include/linux/dmaengine.h
CONFLICT (content): Merge conflict in sound/soc/soc-io.c
Applying: drivers/md: change module.h -> export.h in persistent-data/dm-*
Applying: block/bsg-lib.c: change module.h -> export.h in power/common.c
Applying: drivers/base: change module.h -> export.h in power/common.c
Applying: wireless/ath6kl: use of module_param requires the inclusion of moduleparam.h
Applying: rtlwifi: use of module_param requires the inclusion of moduleparam.h
Applying: mmc: using mopdule_param requires the inclusion of moduleparam.h
Applying: NFC: use of module facilities requires the inclusion of module.h
Applying: block/mtip32xx: include module.h for its utilities
Applying: x86, amd: include linux/elf.h since we use stuff from asm/elf.h
Applying: powerpc/powernv: include export.h in hvc_opal.h for THIS_MODULE
Applying: PM QoS: include export.h in qos.c for EXPORT_SYMBOL
Applying: net: Add export.h to nfc/nci/core.c
Applying: scsi: Add export.h to drivers/scsi/libsas/sas_host_smp.c
Applying: drivers/net: Add module.h to wireless/ath/ath6kl/sdio.c
Applying: drivers/bcma: driver_chipcommon_pmu.c needs export.h for EXPORT_SYMBOL
Applying: drivers/base: Add export.h to regmap/regcache.c
Applying: drivers/usb: Add module.h to dwc3/dwc3-omap.c
Applying: drivers/usb: Add module.h to dwc3/core.c
Applying: staging: fix implicit stat.h use in impedance-analyzer/ad5933.c
Applying: staging: add module.h to impedance-analyzer/ad5933.c
Applying: staging: fix implicit stat.h use in iio/adc/ad7280a.c
Applying: staging: add module.h to iio/adc/ad7280a.c
Applying: staging: Add export.h to rts5139/rts51x_scsi.c
Merging kvmtool/master
CONFLICT (content): Merge conflict in include/net/9p/9p.h
Merging scsi-post-merge/merge-base:master
$ git checkout akpm
Applying: include/linux/dmar.h: forward-declare struct acpi_dmar_header
Applying: arch/x86/kernel/cpu/perf_event_amd.c needs asm/apicdef.h
Applying: drivers/net/ethernet/i825xx/3c505.c: fix build with dynamic debug
Applying: drm: fix kconfig unmet dependency warning
Applying: net/netfilter/nf_conntrack_netlink.c: fix Oops on container destroy
Applying: readlinkat: ensure we return ENOENT for the empty pathname for normal lookups
Applying: acerhdf: add support for Aspire 1410 BIOS v1.3314
Applying: arch/x86/platform/iris/iris.c: register a platform device and a platform driver
Applying: hp_accel: Add a new PNP id
Applying: hp_accel: Add axis-mapping for HP ProBook / EliteBook
Applying: x86: fix mmap random address range
Applying: arch/x86/kernel/e820.c: eliminate bubble sort from sanitize_e820_map
Applying: vrtc: change its year offset from 1960 to 1972
Applying: x86: rtc: don't register a platform RTC device for Intel MID platforms
Applying: mrst: battery fixes
Applying: drivers/power/intel_mid_battery.c: fix build
Applying: x86,mrst: add mapping for bma023
Applying: arch/x86/kernel/e820.c: quiet sparse noise about plain integer as NULL pointer
Applying: arch/x86/kernel/ptrace.c: quiet sparse noise
Applying: arch/x86/mm/pageattr.c: quiet sparse noise; local functions should be static
Applying: x86: tlb flush avoid superflous leave_mm()
Applying: arch/arm/mach-ux500/mbox-db5500.c: world-writable sysfs fifo file
Applying: arm, exec: remove redundant set_fs(USER_DS)
Applying: audit: always follow va_copy() with va_end()
Applying: btrfs: don't dereference extent_mapping if NULL
Applying: drivers/edac/mpc85xx_edac.c: fix memory controller compatible for edac
Applying: drivers/gpu/vga/vgaarb.c: add missing kfree
Applying: ia64, exec: remove redundant set_fs(USER_DS)
Applying: unicore32, exec: remove redundant set_fs(USER_DS)
Applying: debugobjects: extend debugobjects to assert that an object is initialized
Applying: kernel/timer.c: use debugobjects to catch deletion of uninitialized timers
Applying: ext4: use proper little-endian bitops
Applying: ocfs2: avoid unaligned access to dqc_bitmap
Applying: parisc, exec: remove redundant set_fs(USER_DS)
Applying: drivers/firmware/dmi_scan.c: make dmi_name_in_vendors more focused
Applying: scsi: fix a header to include linux/types.h
Applying: drivers/scsi/megaraid.c: fix sparse warnings
Applying: drivers/scsi/aacraid/commctrl.c: fix mem leak in aac_send_raw_srb()
Applying: drivers/scsi/sd.c: use ida_simple_get() and ida_simple_remove() in place of boilerplate code
Applying: drivers/scsi/osd/osd_uld.c: use ida_simple_get() to handle id
Applying: drivers/scsi/sg.c: convert to kstrtoul_from_user()
Applying: drivers/scsi/mpt2sas/mpt2sas_base.c: fix mismatch in mpt2sas_base_hard_reset_handler() mutex lock-unlock
Applying: drivers/message/fusion/mptbase.c: ensure NUL-termination of MptCallbacksName elements
Applying: loop: prevent information leak after failed read
Applying: loop: cleanup set_status interface
Applying: loop-cleanup-set_status-interface-checkpatch-fixes
Applying: drivers/block/mtip32xx/mtip32xx.c needs compat.h
Applying: sparc, exec: remove redundant addr_limit assignment
Applying: slab: add taint flag outputting to debug paths.
Applying: slub: add taint flag outputting to debug paths
Applying: drivers/tty/serial/pch_uart.c: add console support
Applying: Cross Memory Attach
Applying: cross-memory-attach-update
Applying: cross-memory-attach-v4
Applying: mm: compaction: trivial clean up in acct_isolated()
Applying: mm: change isolate mode from #define to bitwise type
Applying: mm-change-isolate-mode-from-define-to-bitwise-type-fix
Applying: mm: compaction: make isolate_lru_page() filter-aware
Applying: mm-compaction-make-isolate_lru_page-filter-aware-fix
Applying: mm: zone_reclaim: make isolate_lru_page() filter-aware
Applying: mm-zone_reclaim-make-isolate_lru_page-filter-aware-fix
Applying: mm: migration: clean up unmap_and_move()
Applying: radix_tree: clean away saw_unset_tag leftovers
Applying: vmscan: add block plug for page reclaim
Applying: mm/page-writeback.c: make determine_dirtyable_memory static again
Applying: mm/page-writeback.c: document bdi_min_ratio
Applying: oom: avoid killing kthreads if they assume the oom killed thread's mm
Applying: oom: remove oom_disable_count
Applying: oom: fix race while temporarily setting current's oom_score_adj
Applying: tmpfs: add "tmpfs" to the Kconfig prompt to make it obvious.
Applying: mm: output a list of loaded modules when we hit bad_page()
Applying: mm: vmscan: drop nr_force_scan[] from get_scan_count
Applying: mm: distinguish between mlocked and pinned pages
Applying: mm: add comments to explain mm_struct fields
Applying: mm-add-comments-to-explain-mm_struct-fields-fix
Applying: mm: vmscan: do not writeback filesystem pages in direct reclaim
Applying: mm: vmscan: remove dead code related to lumpy reclaim waiting on pages under writeback
Applying: xfs: warn if direct reclaim tries to writeback pages
Applying: ext4: warn if direct reclaim tries to writeback pages
Applying: mm: vmscan: do not writeback filesystem pages in kswapd except in high priority
Applying: mm: vmscan: throttle reclaim if encountering too many dirty pages under writeback
Applying: mm-vmscan-throttle-reclaim-if-encountering-too-many-dirty-pages-under-writeback-update
Applying: mm: vmscan: immediately reclaim end-of-LRU dirty pages when writeback completes
Applying: vmscan: count pages into balanced for zone with good watermark
Applying: mm/debug-pagealloc.c: use plain __ratelimit() instead of printk_ratelimit()
Applying: lib/string.c: introduce memchr_inv()
Applying: lib-stringc-introduce-memchr_inv-fix-kernel-doc-for-memchr_inv
Applying: mm/debug-pagealloc.c: use memchr_inv
Applying: vmscan: fix initial shrinker size handling
Applying: vmscan: use atomic-long for shrinker batching
Applying: vmscan-use-atomic-long-for-shrinker-batching-fix
Applying: mm: avoid null pointer access in vm_struct via /proc/vmallocinfo
Applying: vmscan: promote shared file mapped pages
Applying: vmscan: activate executable pages after first usage
Applying: memblock: add memblock_start_of_DRAM()
Applying: memblock: add NO_BOOTMEM config symbol
Applying: mremap: check for overflow using deltas
Applying: mremap: avoid sending one IPI per page
Applying: thp: mremap support and TLB optimization
Applying: thp-mremap-support-and-tlb-optimization-fix
Applying: thp-mremap-support-and-tlb-optimization-fix-fix
Applying: thp-mremap-support-and-tlb-optimization-fix-fix-fix
Applying: include/asm-generic/page.h: calculate virt_to_page and page_to_virt via predefined macro
Applying: mm: iov_iter: have iov_iter_advance() decrement nr_segs appropriately
Applying: mm: neaten warn_alloc_failed
Applying: mm-neaten-warn_alloc_failed-fix
Applying: debug-pagealloc: add support for highmem pages
Applying: debug-pagealloc-add-support-for-highmem-pages-fix
Applying: kswapd: avoid unnecessary rebalance after an unsuccessful balancing
Applying: mm: add free_hot_cold_page_list() helper
Applying: mm/memblock.c: small function definition fixes
Applying: mm: compaction: compact unevictable pages
Applying: mm-compaction-compact-unevictable-pages-checkpatch-fixes
Applying: mm: compaction: accounting fix
Applying: kswapd: assign new_order and new_classzone_idx after wakeup in sleeping
Applying: mm: fix page-faults detection in swap-token logic
Applying: mm/vmalloc.c: report more vmalloc failures
Applying: mm: add extra free kbytes tunable
Applying: mm-add-extra-free-kbytes-tunable-update
Applying: mm-add-extra-free-kbytes-tunable-update-checkpatch-fixes
Applying: mm: thp: tail page refcounting fix
Applying: thp-tail-page-refcounting-fix-6
Applying: ksm: fix the comment of try_to_unmap_one()
Applying: mm-add-comment-explaining-task-state-setting-in-bdi_forker_thread-fix
Applying: vmscan: fix shrinker callback bug in fs/super.c
Applying: mm/mmap.c: eliminate the ret variable from mm_take_all_locks()
Applying: mm-mmapc-eliminate-the-ret-variable-from-mm_take_all_locks-fix
Applying: fs/buffer.c: add device information for error output in __find_get_block_slow()
Applying: HWPOISON: convert pr_debug()s to pr_info()s
Applying: mm: compaction: make compact_zone_order() static
Applying: mm: fix kunmap_high() comment
Applying: vmscan.c: fix invalid strict_strtoul() check in write_scan_unevictable_node()
Applying: selinuxfs: remove custom hex_to_bin()
Applying: include/linux/security.h: fix security_inode_init_security() arg
Applying: hpet: factor timer allocate from open
Applying: alpha: wire up accept4 syscall
Applying: alpha: wire up sendmmsg syscall
Applying: intel_idle: fix API misuse
Applying: intel_idle: disable auto_demotion for hotplugged CPUs
Applying: cris: lower the printk level in cris serial driver
Applying: kprobes: silence DEBUG_STRICT_USER_COPY_CHECKS=y warning
Applying: x86: implement strict user copy checks for x86_64
Applying: Consolidate CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
Applying: consolidate-config_debug_strict_user_copy_checks-fix
Applying: fs/pipe.c: add ->statfs callback for pipefs
Applying: lib/Kconfig.debug: fix help message for DEFAULT_HUNG_TASK_TIMEOUT
Applying: hwmon: convert idr to ida and use ida_simple interface
Applying: drivers/hwmon/hwmon.c: convert idr to ida and use ida_simple_get()
Applying: lis3lv02d: avoid divide by zero due to unchecked
Applying: lis3: update maintainer information
Applying: lis3: add support for HP EliteBook 2730p
Applying: lis3: add support for HP EliteBook 8540w
Applying: hp_accel: add HP ProBook 655x
Applying: lis3: free regulators if probe() fails
Applying: lis3: use consistent naming of variables
Applying: lis3: change exported function to use passed parameter
Applying: lis3: remove the references to the global variable in core driver
Applying: lis3-remove-the-references-to-the-global-variable-in-core-driver-fix
Applying: lis3lv02d: make regulator API usage unconditional
Applying: driver/misc/fsa9480.c fix potential null-pointer dereference
Applying: dynamic_debug: consolidate repetitive struct _ddebug descriptor definitions
Applying: dynamic_debug: remove num_enabled accounting
Applying: dynamic_debug: use a single printk() to emit messages
Applying: dynamic_debug: fix undefined reference to `__netdev_printk'
Applying: printk: add module parameter ignore_loglevel to control ignore_loglevel
Applying: printk: add ignore_loglevel as module parameter
Applying: printk: add console_suspend module parameter
Applying: printk: fix bounds checking for log_prefix
Applying: printk: remove bounds checking for log_prefix
Applying: treewide: use __printf not __attribute__((format(printf,...)))
Applying: treewide-use-__printf-not-__attribute__formatprintf-checkpatch-fixes
Applying: fs/namei.c: remove unused getname_flags()
Applying: poll: add poll_requested_events() function
Applying: MAINTAINERS: add new entry for ideapad-laptop
Applying: video/backlight: remove obsolete cleanup for clientdata
Applying: backlight: fix broken regulator API usage in l4f00242t03
Applying: drivers/video/backlight/l4f00242t03.c: use gpio_request_one() to simplify error handling
Applying: leds: Renesas TPU LED driver
Applying: leds-renesas-tpu-led-driver-v2-fix
Applying: drivers/leds/led-triggers.c: fix memory leak
Applying: drivers/leds/leds-lm3530.c: remove obsolete cleanup for clientdata
Applying: drivers/leds/leds-renesas-tpu.c: update driver to use workqueue
Applying: drivers/leds/leds-renesas-tpu.c: move Renesas TPU LED driver platform data
Applying: drivers/leds/leds-gpio.c: use gpio_get_value_cansleep() when initializing
Applying: lib/kstrtox: common code between kstrto*() and simple_strto*() functions
Applying: lib/spinlock_debug.c: print owner on spinlock lockup
Applying: lib/bitmap.c: quiet sparse noise about address space
Applying: lib-bitmapc-quiet-sparse-noise-about-address-space-fix
Applying: lib/percpu_counter.c: enclose hotplug only variables in hotplug ifdef
Applying: lib/idr.c: fix comment for ida_get_new_above()
Applying: llist: make all llist functions inline
Applying: llist: define macro to check NMI safe cmpxchg
Applying: llist: move cpu_relax after cmpxchg
Applying: llist: return whether list is empty before adding in llist_add
Applying: llist-return-whether-list-is-empty-before-adding-in-llist_add-fix
Applying: kernel/irq_work.c: use llist
Applying: kernel.h/checkpatch: mark strict_strto<foo> and simple_strto<foo> as obsolete
Applying: lib/crc: add slice by 8 algorithm to crc32.c
Applying: lib-crc-add-slice-by-8-algorithm-to-crc32c-fix
Applying: epoll: fix spurious lockdep warnings
Applying: epoll: limit paths
Applying: init/do_mounts_rd.c: fix ramdisk identification for padded cramfs
Applying: oprofilefs: handle zero-length writes
Applying: drivers/rtc/class.c: convert idr to ida and use ida_simple_get()
Applying: rtc: add initial support for mcp7941x parts
Applying: drivers/rtc/rtc-mc13xxx.c: move probe and remove callbacks to .init.text and .exit.text
Applying: minix: describe usage of different magic numbers
Applying: cgroups: more safe tasklist locking in cgroup_attach_proc
Applying: cgroups: don't attach task to subsystem if migration failed
Applying: memcg: rename mem variable to memcg
Applying: memcg: fix oom schedule_timeout()
Applying: memcg: replace ss->id_lock with a rwlock
Applying: memcg: do not expose uninitialized mem_cgroup_per_node to world
Applying: memcg: skip scanning active lists based on individual size
Applying: memcg-skip-scanning-active-lists-based-on-individual-size-fix
Applying: memcg: close race between charge and putback
Applying: memcg: Fix race condition in memcg_check_events() with this_cpu usage
Applying: cpusets: avoid looping when storing to mems_allowed if one node remains set
Applying: procfs: report EISDIR when reading sysctl dirs in proc
Applying: proc: fix races against execve() of /proc/PID/fd**
Applying: proc-fix-races-against-execve-of-proc-pid-fd-fix
Applying: proc: force dcache drop on unauthorized access
Applying: ipc-introduce-shm_rmid_forced-sysctl-testing
Applying: init: add root=PARTUUID=UUID/PARTNROFF=%d support
Applying: init-add-root=partuuid=uuid-partnroff=%d-support-fix
Applying: drivers/rapidio/rio-scan.c: use discovered bit to test if enumeration is complete
Applying: arch/powerpc/sysdev/fsl_rio.c: release rapidio port I/O region resource if port failed to initialize
Applying: RapidIO: add mport driver for Tsi721 bridge
Applying: RapidIO: Tsi721 driver - fixes for the initial release
Applying: RapidIO: fix potential null deref in rio_setup_device()
Applying: drivers/net/rionet.c: fix ethernet address macros for LE platforms
Applying: sysctl: add support for poll()
Applying: sysctl-add-support-for-poll-fix
Applying: sysctl: make CONFIG_SYSCTL_SYSCALL default to n
Applying: pps: default echo function
Applying: pps: new client driver using GPIO
Applying: pps-new-client-driver-using-gpio-fix
Applying: pps gpio client: add missing dependency
Applying: w1: ds2760 and ds2780, use ida for id and ida_simple_get() to get it
Applying: drivers/power/ds2780_battery.c: create central point for calling w1 interface
Applying: drivers/power/ds2780_battery.c: add a nolock function to w1 interface
Applying: drivers/power/ds2780_battery.c: fix deadlock upon insertion and removal
Applying: drivers/w1/w1_int.c: multiple masters used same init_name
Applying: fs/direct-io.c: salcuate fs_count correctly in get_more_blocks()
Applying: dio: separate fields only used in the submission path from struct dio
Applying: dio-separate-fields-only-used-in-the-submission-path-from-struct-dio-checkpatch-fixes
Applying: dio: fix a wrong comment
Applying: dio: rearrange fields in dio/dio_submit to avoid holes
Applying: dio: use a slab cache for struct dio
Applying: dio: separate map_bh from dio
Applying: dio: inline the complete submission path
Applying: dio-inline-the-complete-submission-path-v2-checkpatch-fixes
Applying: dio: merge direct_io_walker() into __blockdev_direct_IO()
Applying: dio-merge-direct_io_walker-into-__blockdev_direct_io-checkpatch-fixes
Applying: dio: remove unnecessary dio argument from dio_pages_present()
Applying: dio: remove unused dio parameter from dio_bio_add_page()
Applying: vfs: cache request_queue in struct block_device
Applying: dio: optimize cache misses in the submission path
Applying: dio-optimize-cache-misses-in-the-submission-path-v2-checkpatch-fixes
Applying: treewide-use-__printf-not-__attribute__formatprintf-fix
Applying: llist: using in_nmi requires including hardirq.h
Applying: dio: using prefetch requires including prefetch.h
Merging akpm
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* Re: linux-next: build failure after merge of the pm tree
From: Rafael J. Wysocki @ 2011-09-29 9:26 UTC (permalink / raw)
To: Ming Lei; +Cc: Stephen Rothwell, linux-next, linux-kernel
In-Reply-To: <CACVXFVM6CjZacbbvn0VzM78SNDa6geHSw1dsrCL1bbTBU=pH1g@mail.gmail.com>
On Thursday, September 29, 2011, Ming Lei wrote:
> On Thu, Sep 29, 2011 at 3:32 AM, Rafael J. Wysocki <rjw@sisk.pl> wrote:
> > On Wednesday, September 28, 2011, Ming Lei wrote:
> >> Hi,
> >>
> >> 2011/9/28 Rafael J. Wysocki <rjw@sisk.pl>:
> >> > On Wednesday, September 28, 2011, Ming Lei wrote:
> >> >> Hi Stephen and Rafael,
> >> >>
> >> >> Sorry, the attachment patch can fix the build failure, which is
> >> >> caused by unset CONFIG_RUNTIME_PM.
> >> >
> >> > First off, that's CONFIG_PM_RUNTIME. Second, why do you want to build
> >> > rpm-traces.c at all if CONFIG_PM_RUNTIME is unset?
> >> >
> >>
> >> Yes, you are right, follows the correct fix:
> >>
> >> diff --git a/kernel/trace/Makefile b/kernel/trace/Makefile
> >> index 56bdab5..f49405f 100644
> >> --- a/kernel/trace/Makefile
> >> +++ b/kernel/trace/Makefile
> >> @@ -53,7 +53,9 @@ endif
> >> obj-$(CONFIG_EVENT_TRACING) += trace_events_filter.o
> >> obj-$(CONFIG_KPROBE_EVENT) += trace_kprobe.o
> >> obj-$(CONFIG_TRACEPOINTS) += power-traces.o
> >> +ifeq ($(CONFIG_PM_RUNTIME),y)
> >> obj-$(CONFIG_TRACEPOINTS) += rpm-traces.o
> >> +endif
> >> ifeq ($(CONFIG_TRACING),y)
> >> obj-$(CONFIG_KGDB_KDB) += trace_kdb.o
> >> endif
> >
> > Well, this still is kind of ugly. I'd prefer my patch sent in this thread.
>
> Both are doable, :-)
>
> But I don't think it is ugly, and this way is taken by BLOCK/PERF_EVENTS/
> KGDB_KDB in kernel/trace/Makefile.
You're right about this.
> Also this one is a simple fix and don't introduce any new config option,
> which is unnecessary.
OK, I'll use your last patch. Care to resend it with a sign-off?
Rafael
^ permalink raw reply
* Re: linux-next: build failure after merge of the pm tree
From: Ming Lei @ 2011-09-29 9:32 UTC (permalink / raw)
To: Rafael J. Wysocki; +Cc: Stephen Rothwell, linux-next, linux-kernel
In-Reply-To: <201109291126.18470.rjw@sisk.pl>
[-- Attachment #1: Type: text/plain, Size: 455 bytes --]
On Thu, Sep 29, 2011 at 5:26 PM, Rafael J. Wysocki <rjw@sisk.pl> wrote:
>> But I don't think it is ugly, and this way is taken by BLOCK/PERF_EVENTS/
>> KGDB_KDB in kernel/trace/Makefile.
>
> You're right about this.
>
>> Also this one is a simple fix and don't introduce any new config option,
>> which is unnecessary.
>
> OK, I'll use your last patch. Care to resend it with a sign-off?
OK, thanks, see attachment.
thanks,
--
Ming Lei
[-- Attachment #2: 0001-kernel-trace-Makefile-build-rpm-traces.c-only-if-CON.patch --]
[-- Type: text/x-patch, Size: 856 bytes --]
From a5a34ac175e0223148b9fe8089c99e27882cf024 Mon Sep 17 00:00:00 2001
From: Ming Lei <ming.lei@canonical.com>
Date: Wed, 28 Sep 2011 22:40:06 +0800
Subject: [PATCH] kernel/trace/Makefile: build rpm-traces.c only if
CONFIG_PM_RUNTIME
Signed-off-by: Ming Lei <ming.lei@canonical.com>
---
kernel/trace/Makefile | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/kernel/trace/Makefile b/kernel/trace/Makefile
index 56bdab5..f49405f 100644
--- a/kernel/trace/Makefile
+++ b/kernel/trace/Makefile
@@ -53,7 +53,9 @@ endif
obj-$(CONFIG_EVENT_TRACING) += trace_events_filter.o
obj-$(CONFIG_KPROBE_EVENT) += trace_kprobe.o
obj-$(CONFIG_TRACEPOINTS) += power-traces.o
+ifeq ($(CONFIG_PM_RUNTIME),y)
obj-$(CONFIG_TRACEPOINTS) += rpm-traces.o
+endif
ifeq ($(CONFIG_TRACING),y)
obj-$(CONFIG_KGDB_KDB) += trace_kdb.o
endif
--
1.7.5.4
^ permalink raw reply related
* Re: linux-next: build failure after merge of the regmap tree
From: Mark Brown @ 2011-09-29 9:43 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Dimitris Papastamos
In-Reply-To: <20110929151841.1ee572099f6bc4db67138825@canb.auug.org.au>
On Thu, Sep 29, 2011 at 03:18:41PM +1000, Stephen Rothwell wrote:
> After merging the regmap tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
Fixed now, thanks for reporting.
^ permalink raw reply
* Please include pin control subsystem in linux-next
From: Linus Walleij @ 2011-09-29 12:57 UTC (permalink / raw)
To: Stephen Rothwell, linux-next; +Cc: linux-kernel, linaro-dev
Hi Stephen,
my pin control subsystem is maturing, so could you please
include this in linux-next:
git://git.linaro.org/people/triad/linux-pinctrl.git for-next
Yours,
Linus Walleij
^ permalink raw reply
* Re: linux-next: build failure after merge of the final tree (moduleh tree related)
From: Paul Gortmaker @ 2011-09-29 13:20 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel
In-Reply-To: <20110929164028.912fba5b3fd2c4d12663de04@canb.auug.org.au>
On Thu, Sep 29, 2011 at 2:40 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> After merging the final tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
>
> drivers/staging/cxt1e1/linux.c:113:32: error: expected ')' before 'int'
> drivers/staging/cxt1e1/linux.c:117:30: error: expected ')' before 'int'
> drivers/staging/cxt1e1/linux.c:121:30: error: expected ')' before 'int'
> drivers/staging/cxt1e1/linux.c:125:31: error: expected ')' before 'int'
> drivers/staging/cxt1e1/linux.c:129:31: error: expected ')' before 'int'
>
> Caused by the module split. The fix in the moduleh tree (commit
> 6eee8b750254 ("staging: Add module.h to more drivers implicitly using
> i")) is incorrect in that module.h has been included too late.
Thanks, I've fixed the mislocation in the original.
Paul.
>
> I have applied the following patch for today.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 29 Sep 2011 16:36:21 +1000
> Subject: [PATCH] staging: move the module.h include in cxt1e1/linux.c
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/staging/cxt1e1/linux.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/staging/cxt1e1/linux.c b/drivers/staging/cxt1e1/linux.c
> index e7029af..6e574fe 100644
> --- a/drivers/staging/cxt1e1/linux.c
> +++ b/drivers/staging/cxt1e1/linux.c
> @@ -15,6 +15,7 @@
> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
>
> #include <linux/types.h>
> +#include <linux/module.h>
> #include <linux/netdevice.h>
> #include <linux/hdlc.h>
> #include <linux/if_arp.h>
> @@ -163,7 +164,6 @@ mkret (int bsd)
>
> /***************************************************************************/
> #include <linux/workqueue.h>
> -#include <linux/module.h>
>
> /***
> * One workqueue (wq) per port (since musycc allows simultaneous group
> --
> 1.7.6.3
>
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/
> --
> To unsubscribe from this list: send the line "unsubscribe linux-next" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply
* Re: linux-next: manual merge of the moduleh tree with the staging tree
From: Paul Gortmaker @ 2011-09-29 15:15 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Jonathan Cameron, Greg KH
In-Reply-To: <20110929155557.1baa18a46e6dc142a97cf1d0@canb.auug.org.au>
On Thu, Sep 29, 2011 at 1:55 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Paul,
>
> Today's linux-next merge of the moduleh tree got a conflict in
> drivers/staging/iio/accel/adis16220_core.c between commits 7991029a55fa
> ("staging:iio:accel:adis16220 iio_chan_spec conversion") and 6f4ebab56870
> ("staging: iio: adis16220_core.c: add module.h") from the staging tree
> and commit 6eee8b750254 ("staging: Add module.h to more drivers
> implicitly using it") from the moduleh tree.
>
> The staging commits are a superset of the part of the moduleh commit that
> affects this file, so I dropped the moduleh change (module.h was added in
> different places).
Yep, I'll drop that change; it got re-added when I re-did build testing on the
baseline v3.1-rc6+module.h and saw a build failure. I didn't clue into that
even when I got the same conflict on my test merge with -next content...
Thanks,
Paul.
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/
>
^ permalink raw reply
* Re: linux-next: Tree for Sept 29 (kvm)
From: Randy Dunlap @ 2011-09-29 19:50 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML, kvm@vger.kernel.org
In-Reply-To: <20110929165730.661cf28c9bb27b8a85432cd2@canb.auug.org.au>
On 09/28/11 23:57, Stephen Rothwell wrote:
> Hi all,
>
> The linux-next tree is now available from
> git://github.com/sfrothwell/linux-next.git as a temporary measure while
> the kernel.org servers are unavailable.
kvm build on i386 says:
ERROR: "__udivdi3" [arch/x86/kvm/kvm.ko] undefined!
which is used in somewhere in start_apic_timer() (probably the divide :).
--
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
^ permalink raw reply
* [PATCH] olpc: olpc-xo1-sci.c is an input driver, depends on INPUT
From: Randy Dunlap @ 2011-09-29 20:17 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, LKML, Andrew Morton, Andres Salomon, x86 maintainers
In-Reply-To: <20110929165730.661cf28c9bb27b8a85432cd2@canb.auug.org.au>
From: Randy Dunlap <rdunlap@xenotime.net>
Fix build errors when CONFIG_INPUT is disabled (shortened list):
olpc-xo1-sci.c:(.text+0x1aee6): undefined reference to `input_event'
olpc-xo1-sci.c:(.text+0x1b077): undefined reference to `input_unregister_device'
olpc-xo1-sci.c:(.text+0x1b081): undefined reference to `input_free_device'
arch/x86/built-in.o:olpc-xo1-sci.c:(.text+0x1b270): more undefined references to `input_event' follow
olpc-xo1-sci.c:(.devinit.text+0x155): undefined reference to `input_allocate_device'
olpc-xo1-sci.c:(.devinit.text+0x1a4): undefined reference to `input_register_device'
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Cc: Andres Salomon <dilinger@debian.org>
---
Found in linux-next but also applies to mainline.
arch/x86/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- next-2011-0929.orig/arch/x86/Kconfig
+++ next-2011-0929/arch/x86/Kconfig
@@ -2052,7 +2052,7 @@ config OLPC_XO1_RTC
config OLPC_XO1_SCI
bool "OLPC XO-1 SCI extras"
- depends on OLPC && OLPC_XO1_PM
+ depends on OLPC && OLPC_XO1_PM && INPUT
select POWER_SUPPLY
select GPIO_CS5535
select MFD_CORE
^ permalink raw reply
* Re: linux-next: build failure after merge of the pm tree
From: Rafael J. Wysocki @ 2011-09-29 20:25 UTC (permalink / raw)
To: Ming Lei; +Cc: Stephen Rothwell, linux-next, linux-kernel
In-Reply-To: <CACVXFVOA486EvvymPchHB9V1WBLhsdFQRtr_zuOOo4HTbE0OKA@mail.gmail.com>
On Thursday, September 29, 2011, Ming Lei wrote:
> On Thu, Sep 29, 2011 at 5:26 PM, Rafael J. Wysocki <rjw@sisk.pl> wrote:
> >> But I don't think it is ugly, and this way is taken by BLOCK/PERF_EVENTS/
> >> KGDB_KDB in kernel/trace/Makefile.
> >
> > You're right about this.
> >
> >> Also this one is a simple fix and don't introduce any new config option,
> >> which is unnecessary.
> >
> > OK, I'll use your last patch. Care to resend it with a sign-off?
>
> OK, thanks, see attachment.
Applied.
Thanks,
Rafael
^ permalink raw reply
* Re: [PATCH] olpc: olpc-xo1-sci.c is an input driver, depends on INPUT
From: Andres Salomon @ 2011-09-29 20:34 UTC (permalink / raw)
To: Randy Dunlap
Cc: Stephen Rothwell, linux-next, LKML, Andrew Morton,
x86 maintainers, dsd
In-Reply-To: <4E84D259.5020008@xenotime.net>
On Thu, 29 Sep 2011 13:17:29 -0700
Randy Dunlap <rdunlap@xenotime.net> wrote:
> From: Randy Dunlap <rdunlap@xenotime.net>
>
> Fix build errors when CONFIG_INPUT is disabled (shortened list):
>
> olpc-xo1-sci.c:(.text+0x1aee6): undefined reference to `input_event'
> olpc-xo1-sci.c:(.text+0x1b077): undefined reference to
> `input_unregister_device' olpc-xo1-sci.c:(.text+0x1b081): undefined
> reference to `input_free_device'
> arch/x86/built-in.o:olpc-xo1-sci.c:(.text+0x1b270): more undefined
> references to `input_event' follow
> olpc-xo1-sci.c:(.devinit.text+0x155): undefined reference to
> `input_allocate_device' olpc-xo1-sci.c:(.devinit.text+0x1a4):
> undefined reference to `input_register_device'
>
> Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
> Cc: Andres Salomon <dilinger@debian.org>
> ---
> Found in linux-next but also applies to mainline.
>
> arch/x86/Kconfig | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> --- next-2011-0929.orig/arch/x86/Kconfig
> +++ next-2011-0929/arch/x86/Kconfig
> @@ -2052,7 +2052,7 @@ config OLPC_XO1_RTC
>
> config OLPC_XO1_SCI
> bool "OLPC XO-1 SCI extras"
> - depends on OLPC && OLPC_XO1_PM
> + depends on OLPC && OLPC_XO1_PM && INPUT
> select POWER_SUPPLY
> select GPIO_CS5535
> select MFD_CORE
Thanks!
Hm. This might actually need a 'select INPUT' though, since
OLPC_XO1_SCI is bool while INPUT is tristate. Sigh, bool..
^ permalink raw reply
* [PATCH -next] x86 mrst: fix build error when X86_MRST is not enabled
From: Randy Dunlap @ 2011-09-29 20:35 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, LKML, Andrew Morton, x86 maintainers, Alan Cox
In-Reply-To: <20110929165730.661cf28c9bb27b8a85432cd2@canb.auug.org.au>
From: Randy Dunlap <rdunlap@xenotime.net>
Fix build when CONFIG_X86_INTEL_MID is enabled but
CONFIG_X86_MRST is not enabled. Fixes this build error:
rtc.c:(.init.text+0x2fbb): undefined reference to `__mrst_cpu_chip'
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
---
arch/x86/include/asm/mrst.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- next-2011-0929.orig/arch/x86/include/asm/mrst.h
+++ next-2011-0929/arch/x86/include/asm/mrst.h
@@ -32,18 +32,18 @@ enum mrst_cpu_type {
extern enum mrst_cpu_type __mrst_cpu_chip;
-#ifdef CONFIG_X86_INTEL_MID
+#ifdef CONFIG_X86_MRST
static inline enum mrst_cpu_type mrst_identify_cpu(void)
{
return __mrst_cpu_chip;
}
-#else /* !CONFIG_X86_INTEL_MID */
+#else /* !CONFIG_X86_MRST */
#define mrst_identify_cpu() (0)
-#endif /* !CONFIG_X86_INTEL_MID */
+#endif /* !CONFIG_X86_MRST */
enum mrst_timer_options {
MRST_TIMER_DEFAULT,
^ permalink raw reply
* Re: [PATCH] olpc: olpc-xo1-sci.c is an input driver, depends on INPUT
From: Randy Dunlap @ 2011-09-29 20:36 UTC (permalink / raw)
To: Andres Salomon
Cc: Stephen Rothwell, linux-next, LKML, Andrew Morton,
x86 maintainers, dsd
In-Reply-To: <20110929133446.40ff3250@queued.net>
On 09/29/11 13:34, Andres Salomon wrote:
> On Thu, 29 Sep 2011 13:17:29 -0700
> Randy Dunlap <rdunlap@xenotime.net> wrote:
>
>> From: Randy Dunlap <rdunlap@xenotime.net>
>>
>> Fix build errors when CONFIG_INPUT is disabled (shortened list):
>>
>> olpc-xo1-sci.c:(.text+0x1aee6): undefined reference to `input_event'
>> olpc-xo1-sci.c:(.text+0x1b077): undefined reference to
>> `input_unregister_device' olpc-xo1-sci.c:(.text+0x1b081): undefined
>> reference to `input_free_device'
>> arch/x86/built-in.o:olpc-xo1-sci.c:(.text+0x1b270): more undefined
>> references to `input_event' follow
>> olpc-xo1-sci.c:(.devinit.text+0x155): undefined reference to
>> `input_allocate_device' olpc-xo1-sci.c:(.devinit.text+0x1a4):
>> undefined reference to `input_register_device'
>>
>> Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
>> Cc: Andres Salomon <dilinger@debian.org>
>> ---
>> Found in linux-next but also applies to mainline.
>>
>> arch/x86/Kconfig | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> --- next-2011-0929.orig/arch/x86/Kconfig
>> +++ next-2011-0929/arch/x86/Kconfig
>> @@ -2052,7 +2052,7 @@ config OLPC_XO1_RTC
>>
>> config OLPC_XO1_SCI
>> bool "OLPC XO-1 SCI extras"
>> - depends on OLPC && OLPC_XO1_PM
>> + depends on OLPC && OLPC_XO1_PM && INPUT
>> select POWER_SUPPLY
>> select GPIO_CS5535
>> select MFD_CORE
>
> Thanks!
>
> Hm. This might actually need a 'select INPUT' though, since
> OLPC_XO1_SCI is bool while INPUT is tristate. Sigh, bool..
I try to avoid using "select", but you can resubmit the patch
to do that if you must.
--
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
^ permalink raw reply
* Re: linux-next: manual merge of the moduleh tree with the net tree
From: Paul Gortmaker @ 2011-09-29 20:47 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Pavel Roskin, John W. Linville,
David Miller, netdev
In-Reply-To: <20110928163406.843e4be56b42dca280d85489@canb.auug.org.au>
[linux-next: manual merge of the moduleh tree with the net tree] On 28/09/2011 (Wed 16:34) Stephen Rothwell wrote:
> Hi Paul,
>
> Today's linux-next merge of the moduleh tree got a conflict in
> drivers/net/wireless/ath/ath5k/debug.c between commit 931be260ed54
> ("ath5k: clean up base.h and its use") from the net tree and commits
> 9ec3f961e31a ("drivers/net: Add export.h to files using
> EXPORT_SYMBOL/THIS_MODULE") and 0cccb17382f1 ("drivers/net: Add
> moduleparam.h to drivers as required") from the moduleh tree.
>
> I fixed it up (see below) and can carry the fix as necessary. (I am
> pretty sure that this file doesn't need module.h, but not completely).
The conflict is gone, but you were correct in your original assessment
that the module.h was no longer needed. I've added this to the
post-merge queue of patches.
Thanks,
Paul.
>From 13a6768b382b3d2f96b9caa9fa6df1f2f7f3aeb6 Mon Sep 17 00:00:00 2001
From: Paul Gortmaker <paul.gortmaker@windriver.com>
Date: Thu, 29 Sep 2011 16:37:30 -0400
Subject: [PATCH] drivers/net: wireless/ath/ath5k/debug.c does not need
module.h
It only has module_param and EXPORT_SYMBOL, so now that export.h
is in scope at the same time as the recent ath5k update, we can
delete this module.h include.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/net/wireless/ath/ath5k/debug.c b/drivers/net/wireless/ath/ath5k/debug.c
index d2bdd90..f542b41 100644
--- a/drivers/net/wireless/ath/ath5k/debug.c
+++ b/drivers/net/wireless/ath/ath5k/debug.c
@@ -59,8 +59,6 @@
*/
#include <linux/export.h>
#include <linux/moduleparam.h>
-
-#include <linux/module.h>
#include <linux/seq_file.h>
#include <linux/list.h>
#include "debug.h"
--
1.7.6
^ permalink raw reply related
* Re: linux-next: Tree for Sept 29 (kvm)
From: Stephen Rothwell @ 2011-09-29 22:58 UTC (permalink / raw)
To: Randy Dunlap
Cc: linux-next, LKML, kvm@vger.kernel.org, Avi Kivity,
Marcelo Tosatti
In-Reply-To: <4E84CC00.8090702@xenotime.net>
[-- Attachment #1: Type: text/plain, Size: 743 bytes --]
[Just cc'ing the kvm guys ]
On Thu, 29 Sep 2011 12:50:24 -0700 Randy Dunlap <rdunlap@xenotime.net> wrote:
>
> On 09/28/11 23:57, Stephen Rothwell wrote:
> > Hi all,
> >
> > The linux-next tree is now available from
> > git://github.com/sfrothwell/linux-next.git as a temporary measure while
> > the kernel.org servers are unavailable.
>
>
> kvm build on i386 says:
>
> ERROR: "__udivdi3" [arch/x86/kvm/kvm.ko] undefined!
>
> which is used in somewhere in start_apic_timer() (probably the divide :).
>
>
> --
> ~Randy
> *** Remember to use Documentation/SubmitChecklist when testing your code ***
>
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* Re: [PATCH -next] x86 mrst: fix build error when X86_MRST is not enabled
From: Alan Cox @ 2011-09-29 22:57 UTC (permalink / raw)
To: Randy Dunlap
Cc: Stephen Rothwell, linux-next, LKML, Andrew Morton,
x86 maintainers
In-Reply-To: <4E84D684.107@xenotime.net>
On Thu, 29 Sep 2011 13:35:16 -0700
Randy Dunlap <rdunlap@xenotime.net> wrote:
> From: Randy Dunlap <rdunlap@xenotime.net>
>
> Fix build when CONFIG_X86_INTEL_MID is enabled but
> CONFIG_X86_MRST is not enabled. Fixes this build error:
This looks wrong. Unfortunately until we get kernel.org back its hard to
do much about it and see what is in all the trees.
> -#ifdef CONFIG_X86_INTEL_MID
> +#ifdef CONFIG_X86_MRST
>
> static inline enum mrst_cpu_type mrst_identify_cpu(void)
> {
> return __mrst_cpu_chip;
> }
>
> -#else /* !CONFIG_X86_INTEL_MID */
> +#else /* !CONFIG_X86_MRST */
>
> #define mrst_identify_cpu() (0)
>
> -#endif /* !CONFIG_X86_INTEL_MID */
> +#endif /* !CONFIG_X86_MRST */
This breaks Medfield so NAK
The correct behaviour should be
INTEL_MID defined -> mrst_cpu_chip has meaning
INTEL_MID not defined -> mrst_identify_chip is 0
your change makes it 0 for Medfield which means it will crash on boot.
^ permalink raw reply
* Re: Please include pin control subsystem in linux-next
From: Stephen Rothwell @ 2011-09-29 23:02 UTC (permalink / raw)
To: Linus Walleij; +Cc: linux-next, linux-kernel, linaro-dev
In-Reply-To: <CACRpkdZcQU6pGrsZ684GvK9T8jD0qVKx6wx8kwdT=Qd7+1QwCw@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1841 bytes --]
Hi Linus,
On Thu, 29 Sep 2011 14:57:41 +0200 Linus Walleij <linus.walleij@linaro.org> wrote:
>
> my pin control subsystem is maturing, so could you please
> include this in linux-next:
>
> git://git.linaro.org/people/triad/linux-pinctrl.git for-next
I have added your tree from today.
Thanks for adding your subsystem tree as a participant of linux-next. As
you may know, this is not a judgment of your code. The purpose of
linux-next is for integration testing and to lower the impact of
conflicts between subsystems in the next merge window.
You will need to ensure that the patches/commits in your tree/series have
been:
* submitted under GPL v2 (or later) and include the Contributor's
Signed-off-by,
* posted to the relevant mailing list,
* reviewed by you (or another maintainer of your subsystem tree),
* successfully unit tested, and
* destined for the current or next Linux merge window.
Basically, this should be just what you would send to Linus (or ask him
to fetch). It is allowed to be rebased if you deem it necessary.
--
Cheers,
Stephen Rothwell
sfr@canb.auug.org.au
Legal Stuff:
By participating in linux-next, your subsystem tree contributions are
public and will be included in the linux-next trees. You may be sent
e-mail messages indicating errors or other issues when the
patches/commits from your subsystem tree are merged and tested in
linux-next. These messages may also be cross-posted to the linux-next
mailing list, the linux-kernel mailing list, etc. The linux-next tree
project and IBM (my employer) make no warranties regarding the linux-next
project, the testing procedures, the results, the e-mails, etc. If you
don't agree to these ground rules, let me know and I'll remove your tree
from participation in linux-next.
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* Re: [PATCH -next] x86 mrst: fix build error when X86_MRST is not enabled
From: Andrew Morton @ 2011-09-29 23:10 UTC (permalink / raw)
To: Alan Cox
Cc: Randy Dunlap, Stephen Rothwell, linux-next, LKML, x86 maintainers,
Andrew Morton, Mathias Nyman
In-Reply-To: <20110929235708.1bbd1166@lxorguk.ukuu.org.uk>
On Thu, 29 Sep 2011 23:57:08 +0100
Alan Cox <alan@lxorguk.ukuu.org.uk> wrote:
> On Thu, 29 Sep 2011 13:35:16 -0700
> Randy Dunlap <rdunlap@xenotime.net> wrote:
>
> > From: Randy Dunlap <rdunlap@xenotime.net>
> >
> > Fix build when CONFIG_X86_INTEL_MID is enabled but
> > CONFIG_X86_MRST is not enabled. Fixes this build error:
>
> This looks wrong. Unfortunately until we get kernel.org back its hard to
> do much about it and see what is in all the trees.
>
> > -#ifdef CONFIG_X86_INTEL_MID
> > +#ifdef CONFIG_X86_MRST
> >
> > static inline enum mrst_cpu_type mrst_identify_cpu(void)
> > {
> > return __mrst_cpu_chip;
> > }
> >
> > -#else /* !CONFIG_X86_INTEL_MID */
> > +#else /* !CONFIG_X86_MRST */
> >
> > #define mrst_identify_cpu() (0)
> >
> > -#endif /* !CONFIG_X86_INTEL_MID */
> > +#endif /* !CONFIG_X86_MRST */
>
> This breaks Medfield so NAK
>
> The correct behaviour should be
>
> INTEL_MID defined -> mrst_cpu_chip has meaning
> INTEL_MID not defined -> mrst_identify_chip is 0
>
> your change makes it 0 for Medfield which means it will crash on boot.
Randy's patch is an attempt to fix Mathias's "x86: rtc: don't register
a platform RTC device for Intel MID platforms".
I'm tempted to do a mass droppage, but then some of the patches might
get forever lost.
I am presently babysitting these x86 patches:
x86-fix-mmap-random-address-range.patch
arch-x86-kernel-e820c-eliminate-bubble-sort-from-sanitize_e820_map.patch
vrtc-change-its-year-offset-from-1960-to-1972.patch
x86-rtc-dont-register-a-platform-rtc-device-for-intel-mid-platforms.patch
x86-rtc-dont-register-a-platform-rtc-device-for-intel-mid-platforms-fix.patch
mrst-battery-fixes.patch
mrst-battery-fixes-fix.patch
x86mrst-add-mapping-for-bma023.patch
arch-x86-kernel-e820c-quiet-sparse-noise-about-plain-integer-as-null-pointer.patch
arch-x86-kernel-ptracec-quiet-sparse-noise.patch
arch-x86-mm-pageattrc-quiet-sparse-noise-local-functions-should-be-static.patch
x86-tlb-flush-avoid-superflous-leave_mm.patch
Could we please get some x86 maintainers on deck??
^ permalink raw reply
* Re: [PATCH -next] x86 mrst: fix build error when X86_MRST is not enabled
From: Randy Dunlap @ 2011-09-29 23:16 UTC (permalink / raw)
To: Alan Cox; +Cc: Stephen Rothwell, linux-next, LKML, Andrew Morton,
x86 maintainers
In-Reply-To: <20110929235708.1bbd1166@lxorguk.ukuu.org.uk>
On 09/29/11 15:57, Alan Cox wrote:
> On Thu, 29 Sep 2011 13:35:16 -0700
> Randy Dunlap <rdunlap@xenotime.net> wrote:
>
>> From: Randy Dunlap <rdunlap@xenotime.net>
>>
>> Fix build when CONFIG_X86_INTEL_MID is enabled but
>> CONFIG_X86_MRST is not enabled. Fixes this build error:
>
> This looks wrong. Unfortunately until we get kernel.org back its hard to
> do much about it and see what is in all the trees.
>
>> -#ifdef CONFIG_X86_INTEL_MID
>> +#ifdef CONFIG_X86_MRST
>>
>> static inline enum mrst_cpu_type mrst_identify_cpu(void)
>> {
>> return __mrst_cpu_chip;
>> }
>>
>> -#else /* !CONFIG_X86_INTEL_MID */
>> +#else /* !CONFIG_X86_MRST */
>>
>> #define mrst_identify_cpu() (0)
>>
>> -#endif /* !CONFIG_X86_INTEL_MID */
>> +#endif /* !CONFIG_X86_MRST */
>
> This breaks Medfield so NAK
>
> The correct behaviour should be
>
> INTEL_MID defined -> mrst_cpu_chip has meaning
> INTEL_MID not defined -> mrst_identify_chip is 0
>
> your change makes it 0 for Medfield which means it will crash on boot.
arch/x86/platform/mrst/mrst.c -- where __mrst_cpu_chip lives --
is only built when CONFIG_X86_MRST is enabled. You make it sound like
__mrst_cpu_chip needs to live any time that CONFIG_X86_INTEL_MID
is enabled, which sounds reasonable to me.
caveat: given the current linux-next merge trees (as you mentioned).
Does anyone care? If so, please help fix this muck.
--
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
^ permalink raw reply
* linux-next: build failure after merge of the final tree
From: Stephen Rothwell @ 2011-09-30 1:05 UTC (permalink / raw)
To: Martin Schwidefsky, Heiko Carstens
Cc: linux-next, linux-kernel, Paul Gortmaker
[-- Attachment #1: Type: text/plain, Size: 1497 bytes --]
Hi all,
After merging the final tree, the next-20110929 build (s390x allmodconfig)
failed like this:
drivers/s390/char/zcore.c:393: error: 'THIS_MODULE' undeclared here (not in a function)
drivers/s390/char/zcore.c:741: error: expected declaration specifiers or '...' before string constant
drivers/s390/char/zcore.c:741: warning: data definition has no type or storage class
drivers/s390/char/zcore.c:741: warning: type defaults to 'int' in declaration of 'MODULE_AUTHOR'
drivers/s390/char/zcore.c:741: warning: function declaration isn't a prototype
drivers/s390/char/zcore.c:742: error: expected declaration specifiers or '...' before string constant
drivers/s390/char/zcore.c:742: warning: data definition has no type or storage class
drivers/s390/char/zcore.c:742: warning: type defaults to 'int' in declaration of 'MODULE_DESCRIPTION'
drivers/s390/char/zcore.c:742: warning: function declaration isn't a prototype
drivers/s390/char/zcore.c:743: error: expected declaration specifiers or '...' before string constant
drivers/s390/char/zcore.c:743: warning: data definition has no type or storage class
drivers/s390/char/zcore.c:743: warning: type defaults to 'int' in declaration of 'MODULE_LICENSE'
drivers/s390/char/zcore.c:743: warning: function declaration isn't a prototype
Probably revealed by the module.h split up.
This file needs to include module.h
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* linux-next: build failure after merge of the final tree
From: Stephen Rothwell @ 2011-09-30 1:12 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 452 bytes --]
Hi all,
After merging the final tree, today's linux-next build (avr32 allnoconfig)
failed like this:
arch/avr32/mach-at32ap/pio.c: In function 'pio_probe':
arch/avr32/mach-at32ap/pio.c:401: error: 'THIS_MODULE' undeclared (first use in this function)
Probably revealed by the module.h split up. I guess it needs export.h
included.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox