* Re: linux-next: manual merge of the net tree with the net-current tree
From: David Miller @ 2011-09-28 5:36 UTC (permalink / raw)
To: sfr; +Cc: netdev, linux-next, linux-kernel, ordex, lindner_marek
In-Reply-To: <20110928125428.70d5cf10ea59f729135d5dff@canb.auug.org.au>
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 28 Sep 2011 12:54:28 +1000
> Today's linux-next merge of the net tree got a conflict in
> net/batman-adv/soft-interface.c between commit 8b267b312df9 ("batman-adv:
> do_bcast has to be true for broadcast packets only") from the net-current
> tree and commit 3d393e473210 ("batman-adv: implement AP-isolation on the
> sender side") from the net tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
Yep, I'll do a merge soon to fix this up for good, thanks Stephen!
^ permalink raw reply
* linux-next: manual merge of the moduleh tree with Linus' tree
From: Stephen Rothwell @ 2011-09-28 6:20 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linux-next, linux-kernel, Toshiharu Okada
Hi Paul,
Today's linux-next merge of the moduleh tree got a conflict in
drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c between commit
124d770a6459 ("pch_gbe: added the process of FIFO over run error") from
Linus' tree and commit c3c292bec445 ("drivers/net: Add module.h to
drivers who were implicitly using it") from the moduleh tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
index 5dc61b4,848dce1..0000000
--- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
+++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
@@@ -20,6 -20,8 +20,7 @@@
#include "pch_gbe.h"
#include "pch_gbe_api.h"
-#include <linux/prefetch.h>
+ #include <linux/module.h>
#define DRV_VERSION "1.00"
const char pch_driver_version[] = DRV_VERSION;
^ permalink raw reply
* linux-next: manual merge of the moduleh tree with the net tree
From: Stephen Rothwell @ 2011-09-28 6:34 UTC (permalink / raw)
To: Paul Gortmaker
Cc: linux-next, linux-kernel, Pavel Roskin, John W. Linville,
David Miller, netdev
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).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/net/wireless/ath/ath5k/debug.c
index fce8c90,1051ede..0000000
--- a/drivers/net/wireless/ath/ath5k/debug.c
+++ b/drivers/net/wireless/ath/ath5k/debug.c
@@@ -58,13 -58,9 +58,15 @@@
* THE POSSIBILITY OF SUCH DAMAGES.
*/
+#include <linux/module.h>
+ #include <linux/moduleparam.h>
-#include "base.h"
++#include <linux/export.h>
+#include <linux/seq_file.h>
+#include <linux/list.h>
#include "debug.h"
+#include "ath5k.h"
+#include "reg.h"
+#include "base.h"
static unsigned int ath5k_debug;
module_param_named(debug, ath5k_debug, uint, 0);
^ permalink raw reply
* Re: [PATCH -next] qdio: add missing export.h include
From: Heiko Carstens @ 2011-09-28 6:34 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linux-next, Frank Blaschka, Jan Glauber
In-Reply-To: <4E824F3A.6070302@windriver.com>
On Tue, Sep 27, 2011 at 06:33:30PM -0400, Paul Gortmaker wrote:
> On 11-09-22 03:21 AM, Heiko Carstens wrote:
> > Fix compile breakage caused by splitting module.h:
> >
> > drivers/s390/cio/qdio_setup.c:31:1:
> > warning: data definition has no type or storage class [enabled by default]
> > drivers/s390/cio/qdio_setup.c:31:1:
> > warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
>
> Now that I look at this, and the other patch, I'm not
> seeing how this is possible. Unless there is some
> convoluted CPP magic going on, I don't see any instances
> of EXPORT_SYMBOL in qdio_setup.c -- similarly I don't
> see any module_ or MODULE_ references in zfcp_qdio.c
>
> Am I missing something obvious here? The line numbers
> you quote dont match anything meaningful -- so I'm wondering
> if perhaps these changes are meant to be in advance of the
> s390 changes you've got queued in next -- which is fine, but
> it would be nice to have that called out.
Oh right, I should have mentioned this. Sorry!
he two patches fix compile breakages only in -next because of s390
related patches in the scsi and net git trees. Since it's not possible
to add the compile fixes (at least for the new export.h header file)
to the scsi or net trees I just sent these patches towards you...
Thanks,
Heiko
^ permalink raw reply
* linux-next: manual merge of the moduleh tree with the net tree
From: Stephen Rothwell @ 2011-09-28 6:36 UTC (permalink / raw)
To: Paul Gortmaker
Cc: linux-next, linux-kernel, Christian Lamparter, John W. Linville,
David Miller, netdev
Hi Paul,
Today's linux-next merge of the moduleh tree got a conflict in
drivers/net/wireless/p54/txrx.c between commit 1cda0fd60963 ("p54: Use
do_div for 64-bit division to fix 32-bit kernels") from the tree and
commit 9ec3f961e31a ("drivers/net: Add export.h to files using
EXPORT_SYMBOL/THIS_MODULE") from the moduleh tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/net/wireless/p54/txrx.c
index 2b97a89,d5c12bc..0000000
--- a/drivers/net/wireless/p54/txrx.c
+++ b/drivers/net/wireless/p54/txrx.c
@@@ -19,7 -19,7 +19,8 @@@
#include <linux/init.h>
#include <linux/firmware.h>
#include <linux/etherdevice.h>
+ #include <linux/export.h>
+#include <asm/div64.h>
#include <net/mac80211.h>
^ permalink raw reply
* linux-next: manual merge of the moduleh tree with the staging tree
From: Stephen Rothwell @ 2011-09-28 6:40 UTC (permalink / raw)
To: Paul Gortmaker
Cc: linux-next, linux-kernel, Franky Lin, Arend van Spriel, Greg KH
Hi Paul,
Today's linux-next merge of the moduleh tree got a conflict in
drivers/staging/brcm80211/brcmfmac/bcmsdh.c between commit 47b4c640b849
("staging: brcm80211: remove global var gInstance from brcmfmac") from
the staging tree and commit 15f310ea9641 ("staging: Add export.h for
THIS_MODULE/EXPORT_SYMBOL to drivers/staging users") from the moduleh
tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/staging/brcm80211/brcmfmac/bcmsdh.c
index 8448b8b,51f9335..0000000
--- a/drivers/staging/brcm80211/brcmfmac/bcmsdh.c
+++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh.c
@@@ -21,9 -22,7 +22,10 @@@
#include <linux/pci_ids.h>
#include <linux/sched.h>
#include <linux/completion.h>
+#include <linux/mmc/sdio.h>
+#include <linux/mmc/sdio_func.h>
+#include <linux/mmc/card.h>
+ #include <linux/export.h>
#include <defs.h>
#include <brcm_hw_ids.h>
^ permalink raw reply
* linux-next: manual merge of the moduleh tree with the staging tree
From: Stephen Rothwell @ 2011-09-28 6:44 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linux-next, linux-kernel, Jonathan Cameron, Greg KH
Hi Paul,
Today's linux-next merge of the moduleh tree got a conflict in
drivers/staging/iio/accel/adis16201_ring.c between commit 779921683e6d
("staging:iio:accel header housekeeping - remove unecessary includes")
from the staging tree and commit 15f310ea9641 ("staging: Add export.h for
THIS_MODULE/EXPORT_SYMBOL to drivers/staging users") from the moduleh
tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/staging/iio/accel/adis16201_ring.c
index 4b433c5,52ab4f0..0000000
--- a/drivers/staging/iio/accel/adis16201_ring.c
+++ b/drivers/staging/iio/accel/adis16201_ring.c
@@@ -3,10 -4,15 +3,11 @@@
#include <linux/kernel.h>
#include <linux/spi/spi.h>
#include <linux/slab.h>
-#include <linux/sysfs.h>
+ #include <linux/export.h>
#include "../iio.h"
-#include "../sysfs.h"
#include "../ring_sw.h"
-#include "accel.h"
-#include "../trigger.h"
+#include "../trigger_consumer.h"
#include "adis16201.h"
^ permalink raw reply
* Re: linux-next: manual merge of the moduleh tree with the staging tree
From: Stephen Rothwell @ 2011-09-28 6:48 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linux-next, linux-kernel, Jonathan Cameron, Greg KH
In-Reply-To: <20110928164419.372feaa0c5554687403a9af5@canb.auug.org.au>
Hi Paul,
On Wed, 28 Sep 2011 16:44:19 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the moduleh tree got a conflict in
> drivers/staging/iio/accel/adis16201_ring.c between commit 779921683e6d
> ("staging:iio:accel header housekeeping - remove unecessary includes")
> from the staging tree and commit 15f310ea9641 ("staging: Add export.h for
> THIS_MODULE/EXPORT_SYMBOL to drivers/staging users") from the moduleh
> tree.
Also drivers/staging/iio/accel/adis16203_ring.c,
drivers/staging/iio/accel/adis16204_ring.c,
drivers/staging/iio/accel/adis16209_ring.c,
drivers/staging/iio/accel/adis16240_ring.c,
drivers/staging/iio/gyro/adis16260_ring.c and
drivers/staging/iio/meter/ade7758_ring.c
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/staging/iio/accel/adis16203_ring.c
index 993e239,ce23f4a..0000000
--- a/drivers/staging/iio/accel/adis16203_ring.c
+++ b/drivers/staging/iio/accel/adis16203_ring.c
@@@ -3,10 -6,16 +3,11 @@@
#include <linux/kernel.h>
#include <linux/spi/spi.h>
#include <linux/slab.h>
-#include <linux/sysfs.h>
-#include <linux/list.h>
+ #include <linux/export.h>
#include "../iio.h"
-#include "../sysfs.h"
#include "../ring_sw.h"
-#include "accel.h"
-#include "../trigger.h"
+#include "../trigger_consumer.h"
#include "adis16203.h"
/**
diff --cc drivers/staging/iio/accel/adis16204_ring.c
index 847f438,0d0da0c..0000000
--- a/drivers/staging/iio/accel/adis16204_ring.c
+++ b/drivers/staging/iio/accel/adis16204_ring.c
@@@ -3,10 -6,16 +3,11 @@@
#include <linux/kernel.h>
#include <linux/spi/spi.h>
#include <linux/slab.h>
-#include <linux/sysfs.h>
-#include <linux/list.h>
+ #include <linux/export.h>
#include "../iio.h"
-#include "../sysfs.h"
#include "../ring_sw.h"
-#include "accel.h"
-#include "../trigger.h"
+#include "../trigger_consumer.h"
#include "adis16204.h"
/**
diff --cc drivers/staging/iio/accel/adis16209_ring.c
index f889fe7,c7f9d59..0000000
--- a/drivers/staging/iio/accel/adis16209_ring.c
+++ b/drivers/staging/iio/accel/adis16209_ring.c
@@@ -3,10 -6,16 +3,11 @@@
#include <linux/kernel.h>
#include <linux/spi/spi.h>
#include <linux/slab.h>
-#include <linux/sysfs.h>
-#include <linux/list.h>
+ #include <linux/export.h>
#include "../iio.h"
-#include "../sysfs.h"
#include "../ring_sw.h"
-#include "accel.h"
-#include "../trigger.h"
+#include "../trigger_consumer.h"
#include "adis16209.h"
/**
diff --cc drivers/staging/iio/accel/adis16240_ring.c
index 051ba64,a5033b9..0000000
--- a/drivers/staging/iio/accel/adis16240_ring.c
+++ b/drivers/staging/iio/accel/adis16240_ring.c
@@@ -3,10 -6,16 +3,11 @@@
#include <linux/kernel.h>
#include <linux/spi/spi.h>
#include <linux/slab.h>
-#include <linux/sysfs.h>
-#include <linux/list.h>
+ #include <linux/export.h>
#include "../iio.h"
-#include "../sysfs.h"
#include "../ring_sw.h"
-#include "accel.h"
-#include "../trigger.h"
+#include "../trigger_consumer.h"
#include "adis16240.h"
/**
diff --cc drivers/staging/iio/gyro/adis16260_ring.c
index 10f8a66,85e6fac..0000000
--- a/drivers/staging/iio/gyro/adis16260_ring.c
+++ b/drivers/staging/iio/gyro/adis16260_ring.c
@@@ -3,10 -6,16 +3,11 @@@
#include <linux/kernel.h>
#include <linux/spi/spi.h>
#include <linux/slab.h>
-#include <linux/sysfs.h>
-#include <linux/list.h>
+ #include <linux/export.h>
#include "../iio.h"
-#include "../sysfs.h"
#include "../ring_sw.h"
-#include "../accel/accel.h"
-#include "../trigger.h"
+#include "../trigger_consumer.h"
#include "adis16260.h"
/**
diff --cc drivers/staging/iio/meter/ade7758_ring.c
index 1e2a096,88805b2..0000000
--- a/drivers/staging/iio/meter/ade7758_ring.c
+++ b/drivers/staging/iio/meter/ade7758_ring.c
@@@ -9,6 -9,14 +9,7 @@@
#include <linux/kernel.h>
#include <linux/spi/spi.h>
#include <linux/slab.h>
-#include <linux/sysfs.h>
-#include <linux/list.h>
+ #include <linux/export.h>
#include <asm/unaligned.h>
#include "../iio.h"
^ permalink raw reply
* linux-next: manual merge of the moduleh tree with the tree
From: Stephen Rothwell @ 2011-09-28 6:53 UTC (permalink / raw)
To: Paul Gortmaker
Cc: linux-next, linux-kernel, Yogesh Ashok Powar, Amitkumar Karwar,
Bing Zhao, John W. Linville, David Miller, netdev
Hi Paul,
Today's linux-next merge of the moduleh tree got conflicts in
net/mac80211/util.c and net/wireless/util.c between commit 0879fa44b541
("cfg80211/mac80211: move information element parsing logic to cfg80211")
from the net tree and commit c1f5764979c5 ("net: Add export.h for
EXPORT_SYMBOL/THIS_MODULE to non-modules") from the moduleh tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc net/mac80211/util.c
index 2c9dc36,7a55c69..0000000
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@@ -19,6 -19,8 +19,7 @@@
#include <linux/etherdevice.h>
#include <linux/if_arp.h>
#include <linux/bitmap.h>
-#include <linux/crc32.h>
+ #include <linux/export.h>
#include <net/net_namespace.h>
#include <net/cfg80211.h>
#include <net/rtnetlink.h>
diff --cc net/wireless/util.c
index 6304ed6,3ba8eea..0000000
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
@@@ -6,7 -6,7 +6,8 @@@
#include <linux/bitops.h>
#include <linux/etherdevice.h>
#include <linux/slab.h>
+#include <linux/crc32.h>
+ #include <linux/export.h>
#include <net/cfg80211.h>
#include <net/ip.h>
#include "core.h"
^ permalink raw reply
* Re: [PATCH -next] x86: perf_event_amd.c needs <asm/apicdef.h>
From: Ingo Molnar @ 2011-09-28 6:58 UTC (permalink / raw)
To: Randy Dunlap
Cc: Stephen Rothwell, linux-next, LKML, Robert Richter,
Andre Przywara, Andrew Morton
In-Reply-To: <4E820138.90301@xenotime.net>
* Randy Dunlap <rdunlap@xenotime.net> wrote:
> From: Randy Dunlap <rdunlap@xenotime.net>
>
> Fix build error by adding <asm/apicdef.h> header file:
>
> arch/x86/kernel/cpu/perf_event_amd.c:350:2: error: 'BAD_APICID' undeclared (first use in this function)
>
> Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
> ---
>
> Found in linux-next and patch only applies cleanly to linux-next,
> but looks like mainline could use a similar patch (with more
> header files).
>
> arch/x86/kernel/cpu/perf_event_amd.c | 1 +
> 1 file changed, 1 insertion(+)
Applied to tip:perf/core, thanks Randy!
Ingo
^ permalink raw reply
* linux-next: manual merge of the moduleh tree with the net tree
From: Stephen Rothwell @ 2011-09-28 7:00 UTC (permalink / raw)
To: Paul Gortmaker
Cc: linux-next, linux-kernel, Kalle Valo, John W. Linville,
David Miller, netdev
[-- Attachment #1: Type: text/plain, Size: 466 bytes --]
Hi Paul,
Today's linux-next merge of the moduleh tree got a conflict in
drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c between commit
af2bf4b4ee58 ("staging: remove ath6kl") from the tree and commit
33cffa3526be ("staging: Add module.h to more drivers implicitly using
it") from the moduleh tree.
The former removed the file, so I did that.
--
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 sound tree
From: Stephen Rothwell @ 2011-09-28 7:03 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linux-next, linux-kernel, Liam Girdwood, Takashi Iwai
Hi Paul,
Today's linux-next merge of the moduleh tree got a conflict in
sound/soc/soc-io.c between commit be3ea3b9e8df ("ASoC: Use new register
map API for ASoC generic physical I/O") from the sound tree and commit
1aff9ab90466 ("sound: Add export.h for THIS_MODULE/EXPORT_SYMBOL where
needed") from the moduleh tree.
I fixed it up (see below) and can carry the fix as necessary.
[Mark Brown <broonie@opensource.wolfsonmicro.com> was left off the cc list
because his host is not reolving in the DNS currently.]
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc sound/soc/soc-io.c
index 66fcccd,963efe0..0000000
--- a/sound/soc/soc-io.c
+++ b/sound/soc/soc-io.c
@@@ -13,7 -13,7 +13,8 @@@
#include <linux/i2c.h>
#include <linux/spi/spi.h>
+#include <linux/regmap.h>
+ #include <linux/export.h>
#include <sound/soc.h>
#include <trace/events/asoc.h>
^ permalink raw reply
* linux-next: build failure after merge of the moduleh tree
From: Stephen Rothwell @ 2011-09-28 7:10 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linux-next, linux-kernel, Benjamin Herrenschmidt
Hi Paul,
After merging the moduleh tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
drivers/tty/hvc/hvc_opal.c:244:12: error: 'THIS_MODULE' undeclared here (not in a function)
Caused by commit daea1175a9f0 ("powerpc/powernv: Support for OPAL
console") from the powerpc tree interacting with the module.h split up.
I have applied the below patch for today (and will carry it as a merge
fix up as necessary).
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 28 Sep 2011 17:07:24 +1000
Subject: [PATCH] powerpc/powernv: include export.h in hvc_opal.h for
THIS_MODULE
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/tty/hvc/hvc_opal.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/tty/hvc/hvc_opal.c b/drivers/tty/hvc/hvc_opal.c
index 7b38512..ced26c8 100644
--- a/drivers/tty/hvc/hvc_opal.c
+++ b/drivers/tty/hvc/hvc_opal.c
@@ -28,6 +28,7 @@
#include <linux/console.h>
#include <linux/of.h>
#include <linux/of_platform.h>
+#include <linux/export.h>
#include <asm/hvconsole.h>
#include <asm/prom.h>
--
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: build warning after merge of the moduleh tree
From: Stephen Rothwell @ 2011-09-28 7:18 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linux-next, linux-kernel, Jean Pihet, Rafael J. Wysocki
Hi Paul,
After merging the moduleh tree, today's linux-next build (powerepc
ppc64_defconfig) produced this warning:
drivers/base/power/qos.c:256:1: warning: data definition has no type or storage class
drivers/base/power/qos.c:256:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
drivers/base/power/qos.c:256:1: warning: parameter names (without types) in function declaration
drivers/base/power/qos.c:301:1: warning: data definition has no type or storage class
drivers/base/power/qos.c:301:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
drivers/base/power/qos.c:301:1: warning: parameter names (without types) in function declaration
drivers/base/power/qos.c:342:1: warning: data definition has no type or storage class
drivers/base/power/qos.c:342:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
drivers/base/power/qos.c:342:1: warning: parameter names (without types) in function declaration
drivers/base/power/qos.c:369:1: warning: data definition has no type or storage class
drivers/base/power/qos.c:369:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
drivers/base/power/qos.c:369:1: warning: parameter names (without types) in function declaration
drivers/base/power/qos.c:397:1: warning: data definition has no type or storage class
drivers/base/power/qos.c:397:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
drivers/base/power/qos.c:397:1: warning: parameter names (without types) in function declaration
drivers/base/power/qos.c:412:1: warning: data definition has no type or storage class
drivers/base/power/qos.c:412:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
drivers/base/power/qos.c:412:1: warning: parameter names (without types) in function declaration
drivers/base/power/qos.c:427:1: warning: data definition has no type or storage class
drivers/base/power/qos.c:427:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
drivers/base/power/qos.c:427:1: warning: parameter names (without types) in function declaration
Caused by commits 91ff4cb803df ("PM QoS: Implement per-device PM QoS
constraints") and b66213cdb002 ("PM QoS: Add global notification
mechanism for device constraints") from the pm tree interacting with the
module.h split up.
I added the following merge fixup patch.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 28 Sep 2011 17:15:52 +1000
Subject: [PATCH] PM QoS: include export.h in qos.c for EXPORT_SYMBOL
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/base/power/qos.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/base/power/qos.c b/drivers/base/power/qos.c
index f9215e8..7f78682 100644
--- a/drivers/base/power/qos.c
+++ b/drivers/base/power/qos.c
@@ -39,6 +39,7 @@
#include <linux/slab.h>
#include <linux/device.h>
#include <linux/mutex.h>
+#include <linux/export.h>
static DEFINE_MUTEX(dev_pm_qos_mtx);
--
1.7.6.3
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
^ permalink raw reply related
* Re: linux-next: build warning after merge of the moduleh tree
From: Pihet-XID, Jean @ 2011-09-28 7:39 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Paul Gortmaker, linux-next, linux-kernel, Rafael J. Wysocki
In-Reply-To: <20110928171835.ba767809909ac049fc53bd40@canb.auug.org.au>
Hi Stephen,
On Wed, Sep 28, 2011 at 9:18 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Paul,
>
> After merging the moduleh tree, today's linux-next build (powerepc
> ppc64_defconfig) produced this warning:
>
> drivers/base/power/qos.c:256:1: warning: data definition has no type or storage class
> drivers/base/power/qos.c:256:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
> drivers/base/power/qos.c:256:1: warning: parameter names (without types) in function declaration
> drivers/base/power/qos.c:301:1: warning: data definition has no type or storage class
> drivers/base/power/qos.c:301:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
> drivers/base/power/qos.c:301:1: warning: parameter names (without types) in function declaration
> drivers/base/power/qos.c:342:1: warning: data definition has no type or storage class
> drivers/base/power/qos.c:342:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
> drivers/base/power/qos.c:342:1: warning: parameter names (without types) in function declaration
> drivers/base/power/qos.c:369:1: warning: data definition has no type or storage class
> drivers/base/power/qos.c:369:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
> drivers/base/power/qos.c:369:1: warning: parameter names (without types) in function declaration
> drivers/base/power/qos.c:397:1: warning: data definition has no type or storage class
> drivers/base/power/qos.c:397:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
> drivers/base/power/qos.c:397:1: warning: parameter names (without types) in function declaration
> drivers/base/power/qos.c:412:1: warning: data definition has no type or storage class
> drivers/base/power/qos.c:412:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
> drivers/base/power/qos.c:412:1: warning: parameter names (without types) in function declaration
> drivers/base/power/qos.c:427:1: warning: data definition has no type or storage class
> drivers/base/power/qos.c:427:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
> drivers/base/power/qos.c:427:1: warning: parameter names (without types) in function declaration
>
> Caused by commits 91ff4cb803df ("PM QoS: Implement per-device PM QoS
> constraints") and b66213cdb002 ("PM QoS: Add global notification
> mechanism for device constraints") from the pm tree interacting with the
> module.h split up.
>
> I added the following merge fixup patch.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 28 Sep 2011 17:15:52 +1000
> Subject: [PATCH] PM QoS: include export.h in qos.c for EXPORT_SYMBOL
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Thank you for fixing this. I am sorry the warning did not show up
during the OMAP and x86 builds, probably due to the different set of
includes for those platforms.
Regards,
Jean
> ---
> drivers/base/power/qos.c | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/base/power/qos.c b/drivers/base/power/qos.c
> index f9215e8..7f78682 100644
> --- a/drivers/base/power/qos.c
> +++ b/drivers/base/power/qos.c
> @@ -39,6 +39,7 @@
> #include <linux/slab.h>
> #include <linux/device.h>
> #include <linux/mutex.h>
> +#include <linux/export.h>
>
>
> static DEFINE_MUTEX(dev_pm_qos_mtx);
> --
> 1.7.6.3
>
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/
>
^ permalink raw reply
* linux-next: build failure after merge of the moduleh tree
From: Stephen Rothwell @ 2011-09-28 7:42 UTC (permalink / raw)
To: Paul Gortmaker
Cc: linux-next, linux-kernel, Borislav Petkov, Thomas Gleixner,
Ingo Molnar, H. Peter Anvin, Peter Zijlstra
Hi Paul,
After merging the moduleh tree, today's linux-next build (x86_64
allmodconfig) failed like this:
arch/x86/kernel/sys_x86_64.c:28:10: warning: 'enum align_flags' declared inside parameter list
arch/x86/kernel/sys_x86_64.c:28:10: warning: its scope is only this definition or declaration, which is probably not what you want
arch/x86/kernel/sys_x86_64.c:28:22: error: parameter 3 ('flags') has incomplete type
arch/x86/kernel/sys_x86_64.c:27:15: warning: function declaration isn't a prototype
arch/x86/kernel/sys_x86_64.c: In function 'align_addr':
arch/x86/kernel/sys_x86_64.c:33:6: error: 'va_align' undeclared (first use in this function)
arch/x86/kernel/sys_x86_64.c:33:6: note: each undeclared identifier is reported only once for each function it appears in
arch/x86/kernel/sys_x86_64.c:33:2: error: implicit declaration of function 'mmap_is_ia32'
arch/x86/kernel/sys_x86_64.c:39:17: error: 'ALIGN_VDSO' undeclared (first use in this function)
arch/x86/kernel/sys_x86_64.c:48:16: error: 'ALIGN_TOPDOWN' undeclared (first use in this function)
arch/x86/kernel/sys_x86_64.c: In function 'control_va_addr_alignment':
arch/x86/kernel/sys_x86_64.c:59:6: error: 'va_align' undeclared (first use in this function)
arch/x86/kernel/sys_x86_64.c:69:20: error: 'ALIGN_VA_32' undeclared (first use in this function)
arch/x86/kernel/sys_x86_64.c:71:20: error: 'ALIGN_VA_64' undeclared (first use in this function)
arch/x86/kernel/sys_x86_64.c: In function 'arch_get_unmapped_area_topdown':
arch/x86/kernel/sys_x86_64.c:231:11: error: 'ALIGN_TOPDOWN' undeclared (first use in this function)
Presumably caused by commit dfb09f9b7ab0 ("x86, amd: Avoid cache aliasing
penalties on AMD family 15h") from the tip tree interacting with the
module.h split up.
I applied the following patch (which could be applied to the tip
tree ...).
>From 6b1212311c0728a7e3054e1f187e7c3b9f464bd5 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 28 Sep 2011 17:28:50 +1000
Subject: [PATCH] x86, amd: include linux/elf.h since we use stuff from
asm/elf.h
The lack of this inclusion causes build erros after the module.h split up:
arch/x86/kernel/sys_x86_64.c:28:10: warning: 'enum align_flags' declared inside parameter list
arch/x86/kernel/sys_x86_64.c:28:10: warning: its scope is only this definition or declaration, which is probably not what you want
arch/x86/kernel/sys_x86_64.c:28:22: error: parameter 3 ('flags') has incomplete type
arch/x86/kernel/sys_x86_64.c:27:15: warning: function declaration isn't a prototype
arch/x86/kernel/sys_x86_64.c: In function 'align_addr':
arch/x86/kernel/sys_x86_64.c:33:6: error: 'va_align' undeclared (first use in this function)
arch/x86/kernel/sys_x86_64.c:33:6: note: each undeclared identifier is reported only once for each function it appears in
arch/x86/kernel/sys_x86_64.c:33:2: error: implicit declaration of function 'mmap_is_ia32'
arch/x86/kernel/sys_x86_64.c:39:17: error: 'ALIGN_VDSO' undeclared (first use in this function)
arch/x86/kernel/sys_x86_64.c:48:16: error: 'ALIGN_TOPDOWN' undeclared (first use in this function)
arch/x86/kernel/sys_x86_64.c: In function 'control_va_addr_alignment':
arch/x86/kernel/sys_x86_64.c:59:6: error: 'va_align' undeclared (first use in this function)
arch/x86/kernel/sys_x86_64.c:69:20: error: 'ALIGN_VA_32' undeclared (first use in this function)
arch/x86/kernel/sys_x86_64.c:71:20: error: 'ALIGN_VA_64' undeclared (first use in this function)
arch/x86/kernel/sys_x86_64.c: In function 'arch_get_unmapped_area_topdown':
arch/x86/kernel/sys_x86_64.c:231:11: error: 'ALIGN_TOPDOWN' undeclared (first use in this function)
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
arch/x86/kernel/sys_x86_64.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/arch/x86/kernel/sys_x86_64.c b/arch/x86/kernel/sys_x86_64.c
index fe7d2da..0514890 100644
--- a/arch/x86/kernel/sys_x86_64.c
+++ b/arch/x86/kernel/sys_x86_64.c
@@ -14,6 +14,7 @@
#include <linux/personality.h>
#include <linux/random.h>
#include <linux/uaccess.h>
+#include <linux/elf.h>
#include <asm/ia32.h>
#include <asm/syscalls.h>
--
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: build failure after merge of the moduleh tree
From: Stephen Rothwell @ 2011-09-28 7:50 UTC (permalink / raw)
To: Paul Gortmaker
Cc: linux-next, linux-kernel, Sam Bradshaw, Asai Thambi S P,
Jens Axboe
Hi Paul,
After merging the moduleh tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/block/mtip32xx/mtip32xx.c:3542:1: warning: data definition has no type or storage class
drivers/block/mtip32xx/mtip32xx.c:3542:1: warning: type defaults to 'int' in declaration of 'MODULE_DEVICE_TABLE'
drivers/block/mtip32xx/mtip32xx.c:3542:1: warning: parameter names (without types) in function declaration
drivers/block/mtip32xx/mtip32xx.c:3589:15: error: expected declaration specifiers or '...' before string constant
drivers/block/mtip32xx/mtip32xx.c:3589:1: warning: data definition has no type or storage class
drivers/block/mtip32xx/mtip32xx.c:3589:1: warning: type defaults to 'int' in declaration of 'MODULE_AUTHOR'
drivers/block/mtip32xx/mtip32xx.c:3589:15: warning: function declaration isn't a prototype
drivers/block/mtip32xx/mtip32xx.c:3590:20: error: expected declaration specifiers or '...' before string constant
drivers/block/mtip32xx/mtip32xx.c:3590:1: warning: data definition has no type or storage class
drivers/block/mtip32xx/mtip32xx.c:3590:1: warning: type defaults to 'int' in declaration of 'MODULE_DESCRIPTION'
drivers/block/mtip32xx/mtip32xx.c:3590:20: warning: function declaration isn't a prototype
drivers/block/mtip32xx/mtip32xx.c:3591:16: error: expected declaration specifiers or '...' before string constant
drivers/block/mtip32xx/mtip32xx.c:3591:1: warning: data definition has no type or storage class
drivers/block/mtip32xx/mtip32xx.c:3591:1: warning: type defaults to 'int' in declaration of 'MODULE_LICENSE'
drivers/block/mtip32xx/mtip32xx.c:3591:16: warning: function declaration isn't a prototype
drivers/block/mtip32xx/mtip32xx.c:3592:16: error: expected declaration specifiers or '...' before string constant
drivers/block/mtip32xx/mtip32xx.c:3592:1: warning: data definition has no type or storage class
drivers/block/mtip32xx/mtip32xx.c:3592:1: warning: type defaults to 'int' in declaration of 'MODULE_VERSION'
drivers/block/mtip32xx/mtip32xx.c:3592:16: warning: function declaration isn't a prototype
Casued by commit 49fdf3a7c4cf ("block: Add driver for Micron RealSSD pcie
flash cards") from the block tree interacting with the module.h split up.
I applied the following patch for today (whcih should be applied to the
block tree ...).
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 28 Sep 2011 17:47:05 +1000
Subject: [PATCH] block/mtip32xx: include module.h for its utilities
The module.h split up produced thses errors/warnings:
drivers/block/mtip32xx/mtip32xx.c:3542:1: warning: data definition has no type or storage class
drivers/block/mtip32xx/mtip32xx.c:3542:1: warning: type defaults to 'int' in declaration of 'MODULE_DEVICE_TABLE'
drivers/block/mtip32xx/mtip32xx.c:3542:1: warning: parameter names (without types) in function declaration
drivers/block/mtip32xx/mtip32xx.c:3589:15: error: expected declaration specifiers or '...' before string constant
drivers/block/mtip32xx/mtip32xx.c:3589:1: warning: data definition has no type or storage class
drivers/block/mtip32xx/mtip32xx.c:3589:1: warning: type defaults to 'int' in declaration of 'MODULE_AUTHOR'
drivers/block/mtip32xx/mtip32xx.c:3589:15: warning: function declaration isn't a prototype
drivers/block/mtip32xx/mtip32xx.c:3590:20: error: expected declaration specifiers or '...' before string constant
drivers/block/mtip32xx/mtip32xx.c:3590:1: warning: data definition has no type or storage class
drivers/block/mtip32xx/mtip32xx.c:3590:1: warning: type defaults to 'int' in declaration of 'MODULE_DESCRIPTION'
drivers/block/mtip32xx/mtip32xx.c:3590:20: warning: function declaration isn't a prototype
drivers/block/mtip32xx/mtip32xx.c:3591:16: error: expected declaration specifiers or '...' before string constant
drivers/block/mtip32xx/mtip32xx.c:3591:1: warning: data definition has no type or storage class
drivers/block/mtip32xx/mtip32xx.c:3591:1: warning: type defaults to 'int' in declaration of 'MODULE_LICENSE'
drivers/block/mtip32xx/mtip32xx.c:3591:16: warning: function declaration isn't a prototype
drivers/block/mtip32xx/mtip32xx.c:3592:16: error: expected declaration specifiers or '...' before string constant
drivers/block/mtip32xx/mtip32xx.c:3592:1: warning: data definition has no type or storage class
drivers/block/mtip32xx/mtip32xx.c:3592:1: warning: type defaults to 'int' in declaration of 'MODULE_VERSION'
drivers/block/mtip32xx/mtip32xx.c:3592:16: warning: function declaration isn't a prototype
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/block/mtip32xx/mtip32xx.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/block/mtip32xx/mtip32xx.c b/drivers/block/mtip32xx/mtip32xx.c
index 3ec3d34..0e19eb5 100644
--- a/drivers/block/mtip32xx/mtip32xx.c
+++ b/drivers/block/mtip32xx/mtip32xx.c
@@ -33,6 +33,7 @@
#include <linux/bio.h>
#include <linux/dma-mapping.h>
#include <linux/idr.h>
+#include <linux/module.h>
#include <../drivers/ata/ahci.h>
#include "mtip32xx.h"
--
1.7.6.3
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
^ permalink raw reply related
* Re: linux-next: build failure after merge of the moduleh tree
From: Borislav Petkov @ 2011-09-28 7:58 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Paul Gortmaker, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org, Petkov, Borislav, Thomas Gleixner,
Ingo Molnar, H. Peter Anvin, Peter Zijlstra
In-Reply-To: <20110928174214.17a58be15d84d67c185930e1@canb.auug.org.au>
On Wed, Sep 28, 2011 at 03:42:14AM -0400, Stephen Rothwell wrote:
> Hi Paul,
>
> After merging the moduleh tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> arch/x86/kernel/sys_x86_64.c:28:10: warning: 'enum align_flags' declared inside parameter list
> arch/x86/kernel/sys_x86_64.c:28:10: warning: its scope is only this definition or declaration, which is probably not what you want
> arch/x86/kernel/sys_x86_64.c:28:22: error: parameter 3 ('flags') has incomplete type
> arch/x86/kernel/sys_x86_64.c:27:15: warning: function declaration isn't a prototype
> arch/x86/kernel/sys_x86_64.c: In function 'align_addr':
> arch/x86/kernel/sys_x86_64.c:33:6: error: 'va_align' undeclared (first use in this function)
> arch/x86/kernel/sys_x86_64.c:33:6: note: each undeclared identifier is reported only once for each function it appears in
> arch/x86/kernel/sys_x86_64.c:33:2: error: implicit declaration of function 'mmap_is_ia32'
> arch/x86/kernel/sys_x86_64.c:39:17: error: 'ALIGN_VDSO' undeclared (first use in this function)
> arch/x86/kernel/sys_x86_64.c:48:16: error: 'ALIGN_TOPDOWN' undeclared (first use in this function)
> arch/x86/kernel/sys_x86_64.c: In function 'control_va_addr_alignment':
> arch/x86/kernel/sys_x86_64.c:59:6: error: 'va_align' undeclared (first use in this function)
> arch/x86/kernel/sys_x86_64.c:69:20: error: 'ALIGN_VA_32' undeclared (first use in this function)
> arch/x86/kernel/sys_x86_64.c:71:20: error: 'ALIGN_VA_64' undeclared (first use in this function)
> arch/x86/kernel/sys_x86_64.c: In function 'arch_get_unmapped_area_topdown':
> arch/x86/kernel/sys_x86_64.c:231:11: error: 'ALIGN_TOPDOWN' undeclared (first use in this function)
>
> Presumably caused by commit dfb09f9b7ab0 ("x86, amd: Avoid cache aliasing
> penalties on AMD family 15h") from the tip tree interacting with the
> module.h split up.
>
> I applied the following patch (which could be applied to the tip
> tree ...).
>
> From 6b1212311c0728a7e3054e1f187e7c3b9f464bd5 Mon Sep 17 00:00:00 2001
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 28 Sep 2011 17:28:50 +1000
> Subject: [PATCH] x86, amd: include linux/elf.h since we use stuff from
> asm/elf.h
>
> The lack of this inclusion causes build erros after the module.h split up:
>
> arch/x86/kernel/sys_x86_64.c:28:10: warning: 'enum align_flags' declared inside parameter list
> arch/x86/kernel/sys_x86_64.c:28:10: warning: its scope is only this definition or declaration, which is probably not what you want
> arch/x86/kernel/sys_x86_64.c:28:22: error: parameter 3 ('flags') has incomplete type
> arch/x86/kernel/sys_x86_64.c:27:15: warning: function declaration isn't a prototype
> arch/x86/kernel/sys_x86_64.c: In function 'align_addr':
> arch/x86/kernel/sys_x86_64.c:33:6: error: 'va_align' undeclared (first use in this function)
> arch/x86/kernel/sys_x86_64.c:33:6: note: each undeclared identifier is reported only once for each function it appears in
> arch/x86/kernel/sys_x86_64.c:33:2: error: implicit declaration of function 'mmap_is_ia32'
> arch/x86/kernel/sys_x86_64.c:39:17: error: 'ALIGN_VDSO' undeclared (first use in this function)
> arch/x86/kernel/sys_x86_64.c:48:16: error: 'ALIGN_TOPDOWN' undeclared (first use in this function)
> arch/x86/kernel/sys_x86_64.c: In function 'control_va_addr_alignment':
> arch/x86/kernel/sys_x86_64.c:59:6: error: 'va_align' undeclared (first use in this function)
> arch/x86/kernel/sys_x86_64.c:69:20: error: 'ALIGN_VA_32' undeclared (first use in this function)
> arch/x86/kernel/sys_x86_64.c:71:20: error: 'ALIGN_VA_64' undeclared (first use in this function)
> arch/x86/kernel/sys_x86_64.c: In function 'arch_get_unmapped_area_topdown':
> arch/x86/kernel/sys_x86_64.c:231:11: error: 'ALIGN_TOPDOWN' undeclared (first use in this function)
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> arch/x86/kernel/sys_x86_64.c | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/arch/x86/kernel/sys_x86_64.c b/arch/x86/kernel/sys_x86_64.c
> index fe7d2da..0514890 100644
> --- a/arch/x86/kernel/sys_x86_64.c
> +++ b/arch/x86/kernel/sys_x86_64.c
> @@ -14,6 +14,7 @@
> #include <linux/personality.h>
> #include <linux/random.h>
> #include <linux/uaccess.h>
> +#include <linux/elf.h>
>
> #include <asm/ia32.h>
> #include <asm/syscalls.h>
Yep, it looks good, thanks Stephen. Btw, this is the second time
something like that happens as a result from the module split tree,
here's the first one: http://marc.info/?l=linux-kernel&m=131296515915227
It's a good thing we have linux-next! :-)
Thanks.
--
Regards/Gruss,
Boris.
Advanced Micro Devices GmbH
Einsteinring 24, 85609 Dornach
GM: Alberto Bozzo
Reg: Dornach, Landkreis Muenchen
HRB Nr. 43632 WEEE Registernr: 129 19551
^ permalink raw reply
* linux-next: build failure after merge of the moduleh tree
From: Stephen Rothwell @ 2011-09-28 8:00 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linux-next, linux-kernel, Ilan Elias, John W. Linville
Hi Paul,
After merging the moduleh tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/nfc/nfcwilink.c:318:12: error: 'THIS_MODULE' undeclared here (not in a function)
drivers/nfc/nfcwilink.c:340:15: error: expected declaration specifiers or '...' before string constant
drivers/nfc/nfcwilink.c:340:1: warning: data definition has no type or storage class
drivers/nfc/nfcwilink.c:340:1: warning: type defaults to 'int' in declaration of 'MODULE_AUTHOR'
drivers/nfc/nfcwilink.c:340:15: warning: function declaration isn't a prototype
drivers/nfc/nfcwilink.c:341:20: error: expected declaration specifiers or '...' before string constant
drivers/nfc/nfcwilink.c:341:1: warning: data definition has no type or storage class
drivers/nfc/nfcwilink.c:341:1: warning: type defaults to 'int' in declaration of 'MODULE_DESCRIPTION'
drivers/nfc/nfcwilink.c:341:20: warning: function declaration isn't a prototype
drivers/nfc/nfcwilink.c:342:16: error: expected declaration specifiers or '...' before string constant
drivers/nfc/nfcwilink.c:342:1: warning: data definition has no type or storage class
drivers/nfc/nfcwilink.c:342:1: warning: type defaults to 'int' in declaration of 'MODULE_LICENSE'
drivers/nfc/nfcwilink.c:342:16: warning: function declaration isn't a prototype
Caused by commit 93aead46428d ("NFC: driver for TI shared transport")
from the wireless tree interacting with the module.h split up.
I applied the patch below for today (which should be applied to the
wireless tree).
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 28 Sep 2011 17:56:29 +1000
Subject: [PATCH] NFC: use of module facilities requires the inclusion of
module.h
Otherwise the module.h split up produces this build failure:
drivers/nfc/nfcwilink.c:318:12: error: 'THIS_MODULE' undeclared here (not in a function)
drivers/nfc/nfcwilink.c:340:15: error: expected declaration specifiers or '...' before string constant
drivers/nfc/nfcwilink.c:340:1: warning: data definition has no type or storage class
drivers/nfc/nfcwilink.c:340:1: warning: type defaults to 'int' in declaration of 'MODULE_AUTHOR'
drivers/nfc/nfcwilink.c:340:15: warning: function declaration isn't a prototype
drivers/nfc/nfcwilink.c:341:20: error: expected declaration specifiers or '...' before string constant
drivers/nfc/nfcwilink.c:341:1: warning: data definition has no type or storage class
drivers/nfc/nfcwilink.c:341:1: warning: type defaults to 'int' in declaration of 'MODULE_DESCRIPTION'
drivers/nfc/nfcwilink.c:341:20: warning: function declaration isn't a prototype
drivers/nfc/nfcwilink.c:342:16: error: expected declaration specifiers or '...' before string constant
drivers/nfc/nfcwilink.c:342:1: warning: data definition has no type or storage class
drivers/nfc/nfcwilink.c:342:1: warning: type defaults to 'int' in declaration of 'MODULE_LICENSE'
drivers/nfc/nfcwilink.c:342:16: warning: function declaration isn't a prototype
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/nfc/nfcwilink.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/nfc/nfcwilink.c b/drivers/nfc/nfcwilink.c
index 5b0f1ff..06c3642 100644
--- a/drivers/nfc/nfcwilink.c
+++ b/drivers/nfc/nfcwilink.c
@@ -27,6 +27,7 @@
*
*/
#include <linux/platform_device.h>
+#include <linux/module.h>
#include <linux/nfc.h>
#include <net/nfc/nci.h>
#include <net/nfc/nci_core.h>
--
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: build failure after merge of the moduleh tree
From: Stephen Rothwell @ 2011-09-28 8:18 UTC (permalink / raw)
To: Paul Gortmaker
Cc: linux-next, linux-kernel, Per Forlin, Chris Ball, Akinobu Mita
Hi Paul,
After merging the moduleh tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/mmc/core/debugfs.c:28:35: error: expected ')' before numeric constant
Caused by commit b5a62f8be3af ("mmc: add module param to set fault
injection attributes") from the mmc tree interacting with the module.h
split up.
I have applied the patch below for today (something similar could be
applied to the mmc tree).
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 28 Sep 2011 18:09:12 +1000
Subject: [PATCH] mmc: using mopdule_param requires the inclusion of
moduleparam.h
Otherwise the module.h split up produces this error:
drivers/mmc/core/debugfs.c:28:35: error: expected ')' before numeric constant
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/mmc/core/debugfs.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/mmc/core/debugfs.c b/drivers/mmc/core/debugfs.c
index 0a1e7cf..f9e9ff0 100644
--- a/drivers/mmc/core/debugfs.c
+++ b/drivers/mmc/core/debugfs.c
@@ -9,6 +9,7 @@
*/
#include <linux/debugfs.h>
#include <linux/fs.h>
+#include <linux/moduleparam.h>
#include <linux/export.h>
#include <linux/seq_file.h>
#include <linux/slab.h>
--
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: build failure after merge of the moduleh tree
From: Stephen Rothwell @ 2011-09-28 8:25 UTC (permalink / raw)
To: Paul Gortmaker
Cc: linux-next, linux-kernel, Stefan Assmann, Larry Finger,
John W. Linville, David Miller, netdev
Hi Paul,
After merging the moduleh tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/net/wireless/rtlwifi/debug.c:32:21: error: expected ')' before 'uint'
drivers/net/wireless/rtlwifi/debug.c:33:25: error: expected ')' before string constant
Caused by commit b5be7e4c8f7b ("rtlwifi: add module parameter to set
global debug level") from the net tree interacting with the module.h
split up.
I have applied the following patch for today (and it could be applied to
the net or wireless trees).
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 28 Sep 2011 18:21:47 +1000
Subject: [PATCH] rtlwifi: use of module_param requires the inclusion of
moduleparam.h
Otherwise the module.h split up will fail like this:
drivers/net/wireless/rtlwifi/debug.c:32:21: error: expected ')' before 'uint'
drivers/net/wireless/rtlwifi/debug.c:33:25: error: expected ')' before string constant
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/net/wireless/rtlwifi/debug.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/drivers/net/wireless/rtlwifi/debug.c b/drivers/net/wireless/rtlwifi/debug.c
index b2f897a..e69aba9 100644
--- a/drivers/net/wireless/rtlwifi/debug.c
+++ b/drivers/net/wireless/rtlwifi/debug.c
@@ -26,6 +26,8 @@
* Larry Finger <Larry.Finger@lwfinger.net>
*****************************************************************************/
+#include <linux/moduleparam.h>
+
#include "wifi.h"
static unsigned int debug = DBG_EMERG;
--
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: build failure after merge of the moduleh tree
From: Stephen Rothwell @ 2011-09-28 8:35 UTC (permalink / raw)
To: Paul Gortmaker
Cc: linux-next, linux-kernel, Kalle Valo, Vasanthakumar Thiagarajan,
Raja Mani, Vivek Natarajan, Suraj Sumangala, Joe Perches,
Jouni Malinen, John W. Linville, David Miller, netdev
Hi Paul,
After merging the moduleh tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/net/wireless/ath/ath6kl/init.c:27:26: error: expected ')' before 'uint'
Caused by commit bdcd81707973 ("Add ath6kl cleaned up driver") from the
net tree interacting with the module.h split up.
I have applied the following patch for today (which sould be applied to
the net or wireless trees).
>From 1875bfc8881cca3064c7d7fad024555fe1652926 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 28 Sep 2011 18:32:34 +1000
Subject: [PATCH] wireless/ath6kl: use of module_param requires the inclusion
of moduleparam.h
Otheriwse the module.h split up fails like this:
drivers/net/wireless/ath/ath6kl/init.c:27:26: error: expected ')' before 'uint'
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/net/wireless/ath/ath6kl/init.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/net/wireless/ath/ath6kl/init.c b/drivers/net/wireless/ath/ath6kl/init.c
index 9d10322..8552da0 100644
--- a/drivers/net/wireless/ath/ath6kl/init.c
+++ b/drivers/net/wireless/ath/ath6kl/init.c
@@ -15,6 +15,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+#include <linux/moduleparam.h>
#include <linux/mmc/sdio_func.h>
#include "core.h"
#include "cfg80211.h"
--
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: build failure after merge of the moduleh tree
From: Stephen Rothwell @ 2011-09-28 8:41 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 389 bytes --]
Hi Paul,
After merging the moduleh tree, today's linux-next build (x86_64
allmodconfig) went on producing more failures (beyond those reported
earlier). I have used the version of the moduleh tree from next-20110927
for today and will see if I have more stamina tomorrow.
--
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 akpm tree with the slab tree
From: Stephen Rothwell @ 2011-09-28 9:01 UTC (permalink / raw)
To: Andrew Morton
Cc: linux-next, linux-kernel, Vasiliy Kulikov, Pekka Enberg,
Christoph Lameter
[-- Attachment #1: Type: text/plain, Size: 477 bytes --]
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in mm/slab.c
between commit ab067e99d22e ("mm: restrict access to slab files under
procfs and sysfs") from the slab tree and commit ea14c46ee4d9 ("mm:
restrict access to /proc/slabinfo") from the akpm tree.
The former is a superset of the latter, so I dropped that patch from the
akpm tree.
--
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: linux-next: manual merge of the wireless tree with the wireless-current tree
From: Jouni Malinen @ 2011-09-28 9:10 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: John W. Linville, linux-next, linux-kernel
In-Reply-To: <20110928131917.fe58aa3efa5549a9b3a6e3da@canb.auug.org.au>
On Wed, Sep 28, 2011 at 01:19:17PM +1000, Stephen Rothwell wrote:
> Today's linux-next merge of the wireless tree got a conflict in
> net/wireless/nl80211.c between commit 1b9ca0272ffa ("cfg80211: Fix
> validation of AKM suites") from the wireless-current tree and commit
> 6d30240e3d68 ("cfg80211: Remove strict validation of AKM suites") from
> the wireless tree.
>
> The latter seems to make the former partly unneccessary, so I used that
> (see below).
The former was a semi-urgent bug fix which was the reason for pushing it
out more quickly. The latter does indeed remove half of the fix (the
wrong count used in the for loop), but the first part to validate
n_akm_suites is still needed. As long as you kept that from the former,
the latter one should indeed be used. These commits should apply cleanly
on top of each other when applied, but I'm not sure how that ends up
being handled for linux-next.
--
Jouni Malinen PGP id EFC895FA
^ 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