linux-next: build failure after merge of the rr tree

linux-next: build failure after merge of the rr tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2662 bytes --]

Hi Rusty,

After merging the rr tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

net/dsa/dsa.c:432: error: two or more data types in declaration specifiers

Lines 431-433 of that file are:

MODULE_AUTHOR("Lennert Buytenhek <buytenh@wantstofly.org>")
MODULE_DESCRIPTION("Driver for Distributed Switch Architecture switch chips");
MODULE_LICENSE("GPL");

Presumably caused by commit b64781e8e2b0f480affb170460cbfb3b11fa9e5d
("param: add null statement to compiled-in module params").  I wonder how
many more build errors this change may provoke.  Please try to find them
and fix them before adding this change, thanks.

I used the version of the rr tree from next-20110118 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

P.S. (some of these may just be in linux-next)
$ git grep '^[ 	]*MODULE_.*)[ 	]*$'
drivers/media/dvb/dvb-core/dvbdev.h:	MODULE_PARM_DESC(adapter_nr, "DVB adapter numbers")
drivers/net/arm/ks8695net.c:MODULE_AUTHOR("Simtec Electronics")
drivers/platform/x86/thinkpad_acpi.c:	MODULE_ALIAS("dmi:bvnIBM:bvr" __type "ET??WW*")
drivers/usb/atm/xusbatm.c:	MODULE_PARM_DESC(name, desc)
drivers/usb/gadget/f_mass_storage.c:	MODULE_PARM_DESC(prefix ## name, desc)
drivers/usb/gadget/f_mass_storage.c:	MODULE_PARM_DESC(prefix ## name, desc)
include/linux/blkdev.h:	MODULE_ALIAS("block-major-" __stringify(major) "-" __stringify(minor))
include/linux/blkdev.h:	MODULE_ALIAS("block-major-" __stringify(major) "-*")
include/linux/device.h:	MODULE_ALIAS("char-major-" __stringify(major) "-" __stringify(minor))
include/linux/device.h:	MODULE_ALIAS("char-major-" __stringify(major) "-*")
include/linux/isapnp.h:		MODULE_GENERIC_TABLE(isapnp_card, name)
include/linux/module.h:  MODULE_GENERIC_TABLE(type##_device,name)
include/linux/net.h:	MODULE_ALIAS("net-pf-" __stringify(proto))
include/linux/net.h:	MODULE_ALIAS("net-pf-" __stringify(pf) "-proto-" __stringify(proto))
include/linux/netfilter/nfnetlink.h:	MODULE_ALIAS("nfnetlink-subsys-" __stringify(subsys))
include/linux/tty_ldisc.h:	MODULE_ALIAS("tty-ldisc-" __stringify(ldisc))
include/net/netfilter/nf_conntrack.h:        MODULE_ALIAS("nfct-helper-" helper)
include/net/xfrm.h:	MODULE_ALIAS("xfrm-mode-" __stringify(family) "-" __stringify(encap))
include/net/xfrm.h:	MODULE_ALIAS("xfrm-type-" __stringify(family) "-" __stringify(proto))
include/scsi/scsi_device.h:	MODULE_ALIAS("scsi:t-" __stringify(type) "*")
include/sound/minors.h:	MODULE_ALIAS("sound-service-?-" __stringify(type))
net/dsa/dsa.c:MODULE_AUTHOR("Lennert Buytenhek <buytenh@wantstofly.org>")

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

Re: linux-next: build failure after merge of the rr tree

[Rusty Russell]

On Wed, 19 Jan 2011 03:12:10 pm Stephen Rothwell wrote:
> Hi Rusty,
> 
> After merging the rr tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> net/dsa/dsa.c:432: error: two or more data types in declaration specifiers
> 
> Lines 431-433 of that file are:
> 
> MODULE_AUTHOR("Lennert Buytenhek <buytenh@wantstofly.org>")
> MODULE_DESCRIPTION("Driver for Distributed Switch Architecture switch chips");
> MODULE_LICENSE("GPL");
> 
> Presumably caused by commit b64781e8e2b0f480affb170460cbfb3b11fa9e5d
> ("param: add null statement to compiled-in module params").  I wonder how
> many more build errors this change may provoke.  Please try to find them
> and fix them before adding this change, thanks.

Sorry, I did a quick grep on MODULE_PARAM and found none, and didn't
realize the pervasiveness of the change.  A more thorough search has
revealed one other.

As such code won't compile as a module, it means we're only going to find
things in code which has these declarations and is only ever built-in.

I've updated my series, and patch FYI below.

Thanks,
Rusty.

module: fix missing semicolons in MODULE macro usage

You always needed them when you were a module, but the builtin versions
of the macros used to be more lenient.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
---
 drivers/net/arm/ks8695net.c |    2 +-
 net/dsa/dsa.c               |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/arm/ks8695net.c b/drivers/net/arm/ks8695net.c
--- a/drivers/net/arm/ks8695net.c
+++ b/drivers/net/arm/ks8695net.c
@@ -1644,7 +1644,7 @@ ks8695_cleanup(void)
 module_init(ks8695_init);
 module_exit(ks8695_cleanup);
 
-MODULE_AUTHOR("Simtec Electronics")
+MODULE_AUTHOR("Simtec Electronics");
 MODULE_DESCRIPTION("Micrel KS8695 (Centaur) Ethernet driver");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("platform:" MODULENAME);
diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
--- a/net/dsa/dsa.c
+++ b/net/dsa/dsa.c
@@ -428,7 +428,7 @@ static void __exit dsa_cleanup_module(vo
 }
 module_exit(dsa_cleanup_module);
 
-MODULE_AUTHOR("Lennert Buytenhek <buytenh@wantstofly.org>")
+MODULE_AUTHOR("Lennert Buytenhek <buytenh@wantstofly.org>");
 MODULE_DESCRIPTION("Driver for Distributed Switch Architecture switch chips");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("platform:dsa");

Re: linux-next: build failure after merge of the rr tree

[Linus Walleij]

On 01/19/2011 10:59 AM, Rusty Russell wrote:
> module: fix missing semicolons in MODULE macro usage

Man, you're too fast for me :-) Thanks for fixing the two violators.

Yours,
Linus Walleij

Re: linux-next: build failure after merge of the rr tree

[Linus Walleij]

On 01/19/2011 05:42 AM, Stephen Rothwell wrote:
> Presumably caused by commit b64781e8e2b0f480affb170460cbfb3b11fa9e5d
> ("param: add null statement to compiled-in module params").  I wonder how
> many more build errors this change may provoke.  Please try to find them
> and fix them before adding this change, thanks.
>    

It can provoke if I'm not mistaken, one more error. So two in total.

grep -r -E '^MODULE_.*\(.*\) *[^;]* *$' .
Yields a lot of false positives (enhancements welcome) that sifts down
to these two:

./net/dsa/dsa.c:MODULE_AUTHOR("Lennert Buytenhek <buytenh@wantstofly.org>")
./drivers/net/arm/ks8695net.c:MODULE_AUTHOR("Simtec Electronics")

I'll send patches for these two, so Rusty can apply them on
top of his next branch and be done with it.

> I used the version of the rr tree from next-20110118 for today.
>    

Couldn't find any more violators in the next tree.

There shouldn't be many: any file that is built as modules with
allmod will result in compile error even without this patch, the two above
must already be broken with allmodconfig, presumably they are
used in archs that do not enable loadable modules, so they don't
see the problem.

Yours,
Linus Walleij

linux-next: build failure after merge of the rr tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 927 bytes --]

Hi Rusty,

After merging the rr tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

drivers/infiniband/hw/ehca/ehca_main.c:68:6: error: conflicting types for 'ehca_use_hp_mr'
drivers/infiniband/hw/ehca/ehca_classes.h:382:12: note: previous declaration of 'ehca_use_hp_mr' was here
drivers/infiniband/hw/ehca/ehca_main.c:71:6: error: conflicting types for 'ehca_scaling_code'
drivers/infiniband/hw/ehca/ehca_classes.h:383:12: note: previous declaration of 'ehca_scaling_code' was here
drivers/pci/hotplug/rpaphp_core.c:40:6: error: conflicting types for 'rpaphp_debug'
drivers/pci/hotplug/rpaphp.h:49:12: note: previous declaration of 'rpaphp_debug' was here


Caused by commit 314332ce8f31 ("module_param: make bool parameters really
bool (drivers & misc)").

I have used the rr tree from next-20111219 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: build failure after merge of the rr tree

[Rusty Russell]

On Tue, 20 Dec 2011 13:39:27 +1100, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
Non-text part: multipart/signed
> Hi Rusty,
> 
> After merging the rr tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:

Thanks, I missed the header declaration.  Fixed.

Cheers,
Rusty.

linux-next: build failure after merge of the rr tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1309 bytes --]

Hi Rusty,

After merging the rr tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

In file included from include/linux/vhost.h:17:0,
                 from drivers/vhost/vhost.c:15:
include/linux/virtio_ring.h: In function 'vring_init':
include/linux/virtio_ring.h:138:69: error: '__16' undeclared (first use in this function)
In file included from include/linux/vhost.h:17:0,
                 from drivers/vhost/net.c:11:
include/linux/virtio_ring.h: In function 'vring_init':
include/linux/virtio_ring.h:138:69: error: '__16' undeclared (first use in this function)
In file included from drivers/virtio/virtio_ring.c:20:0:
include/linux/virtio_ring.h: In function 'vring_init':
include/linux/virtio_ring.h:138:69: error: '__16' undeclared (first use in this function)
In file included from drivers/virtio/virtio_pci.c:24:0:
include/linux/virtio_ring.h: In function 'vring_init':
include/linux/virtio_ring.h:138:69: error: '__16' undeclared (first use in this function)

Caused by commit 217391e3dedb ("virtio: modify vring_init and vring_size
to take account of the layout containing *_event_idx").

I have used the rr tree from next-20110829 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 --]

Re: linux-next: build failure after merge of the rr tree

[Rusty Russell]

On Tue, 30 Aug 2011 14:03:25 +1000, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Rusty,
> 
> After merging the rr tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:

Gah, I took a trivial replacement and didn't actually compile-check it
myself.

Fixed with the obvious addition, thanks.
Rusty.

linux-next: build failure after merge of the rr tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1143 bytes --]

Hi Rusty,

After merging the rr tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

drivers/net/myri10ge/myri10ge.c: In function 'myri10ge_select_firmware':
drivers/net/myri10ge/myri10ge.c:3341: error: request for member 'perm' in something not a structure or union
drivers/net/myri10ge/myri10ge.c:3341: error: request for member 'perm' in something not a structure or union
drivers/net/myri10ge/myri10ge.c:3341: error: request for member 'perm' in something not a structure or union
drivers/net/myri10ge/myri10ge.c:3349: error: request for member 'perm' in something not a structure or union
drivers/net/myri10ge/myri10ge.c:3349: error: request for member 'perm' in something not a structure or union
drivers/net/myri10ge/myri10ge.c:3349: error: request for member 'perm' in something not a structure or union

Caused by commit b3e402b450f954d0a8ec04e05433654d4a9df2a6 ("module: deal
with alignment issues in built-in module parameters") so I have used the
rr tree from next-20110208 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 --]

Re: linux-next: build failure after merge of the rr tree

[Rusty Russell]

On Wed, 9 Feb 2011 12:31:15 pm Stephen Rothwell wrote:
> Hi Rusty,
> 
> After merging the rr tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> drivers/net/myri10ge/myri10ge.c: In function 'myri10ge_select_firmware':
> drivers/net/myri10ge/myri10ge.c:3341: error: request for member 'perm' in something not a structure or union
> drivers/net/myri10ge/myri10ge.c:3341: error: request for member 'perm' in something not a structure or union
> drivers/net/myri10ge/myri10ge.c:3341: error: request for member 'perm' in something not a structure or union
> drivers/net/myri10ge/myri10ge.c:3349: error: request for member 'perm' in something not a structure or union
> drivers/net/myri10ge/myri10ge.c:3349: error: request for member 'perm' in something not a structure or union
> drivers/net/myri10ge/myri10ge.c:3349: error: request for member 'perm' in something not a structure or union
> 
> Caused by commit b3e402b450f954d0a8ec04e05433654d4a9df2a6 ("module: deal
> with alignment issues in built-in module parameters") so I have used the
> rr tree from next-20110208 for today.

Thanks!  Fix is obvious, I will write it now...

Cheers,
Rusty.

Re: linux-next: build failure after merge of the rr tree

[Dmitry Torokhov]

On Tue, Feb 08, 2011 at 06:13:46PM -0800, Rusty Russell wrote:
> On Wed, 9 Feb 2011 12:31:15 pm Stephen Rothwell wrote:
> > Hi Rusty,
> > 
> > After merging the rr tree, today's linux-next build (powerpc
> > ppc64_defconfig) failed like this:
> > 
> > drivers/net/myri10ge/myri10ge.c: In function 'myri10ge_select_firmware':
> > drivers/net/myri10ge/myri10ge.c:3341: error: request for member 'perm' in something not a structure or union
> > drivers/net/myri10ge/myri10ge.c:3341: error: request for member 'perm' in something not a structure or union
> > drivers/net/myri10ge/myri10ge.c:3341: error: request for member 'perm' in something not a structure or union
> > drivers/net/myri10ge/myri10ge.c:3349: error: request for member 'perm' in something not a structure or union
> > drivers/net/myri10ge/myri10ge.c:3349: error: request for member 'perm' in something not a structure or union
> > drivers/net/myri10ge/myri10ge.c:3349: error: request for member 'perm' in something not a structure or union
> > 
> > Caused by commit b3e402b450f954d0a8ec04e05433654d4a9df2a6 ("module: deal
> > with alignment issues in built-in module parameters") so I have used the
> > rr tree from next-20110208 for today.
> 
> Thanks!  Fix is obvious, I will write it now...
> 

Sorry about this. None of the drivers using kparam_block_sysfs_write()
happened to be enabled in my .config.

Thanks,
Dmitry

linux-next: build failure after merge of the rr tree

[Stephen Rothwell]

Hi Rusty,

After merging the rr tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

net/sunrpc/auth.c:74: error: 'param_ops_hashtbl_sz' undeclared here (not in a function)

Caused by commit 0685652df0929cec7d78efa85127f6eb34962132
("param:param_ops") interacting with commit
f8f853ab19fcc415b6eadd273373edc424916212 ("SUNRPC: Make the credential
cache hashtable size configurable") from the nfs tree.

I added the following merge fix patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 4 Aug 2010 12:11:22 +1000
Subject: [PATCH] nfs: update for module_param_named API change

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 net/sunrpc/auth.c |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/net/sunrpc/auth.c b/net/sunrpc/auth.c
index 880d0de..36cb660 100644
--- a/net/sunrpc/auth.c
+++ b/net/sunrpc/auth.c
@@ -39,7 +39,7 @@ static LIST_HEAD(cred_unused);
 static unsigned long number_cred_unused;
 
 #define MAX_HASHTABLE_BITS (10) 
-static int param_set_hashtbl_sz(const char *val, struct kernel_param *kp)
+static int param_set_hashtbl_sz(const char *val, const struct kernel_param *kp)
 {
 	unsigned long num;
 	unsigned int nbits;
@@ -61,7 +61,7 @@ out_inval:
 	return -EINVAL;
 }
 
-static int param_get_hashtbl_sz(char *buffer, struct kernel_param *kp)
+static int param_get_hashtbl_sz(char *buffer, const struct kernel_param *kp)
 {
 	unsigned int nbits;
 
@@ -71,6 +71,11 @@ static int param_get_hashtbl_sz(char *buffer, struct kernel_param *kp)
 
 #define param_check_hashtbl_sz(name, p) __param_check(name, p, unsigned int);
 
+static struct kernel_param_ops param_ops_hashtbl_sz = {
+	.set = param_set_hashtbl_sz,
+	.get = param_get_hashtbl_sz,
+};
+
 module_param_named(auth_hashtable_size, auth_hashbits, hashtbl_sz, 0644);
 MODULE_PARM_DESC(auth_hashtable_size, "RPC credential cache hashtable size");
 
-- 
1.7.1

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

linux-next: build failure after merge of the rr tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 538 bytes --]

Hi Rusty,

After merging the rr tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

kernel/debug/kdb/kdb_main.c: In function 'kdb_lsmod':
kernel/debug/kdb/kdb_main.c:1897: error: 'struct module' has no member named 'modules_which_use_me'
kernel/debug/kdb/kdb_main.c:1897: error: 'struct module' has no member named 'modules_which_use_me'

I have used the rr tree from next-20100531 again for today.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

Re: linux-next: build failure after merge of the rr tree

[Rusty Russell]

On Wed, 2 Jun 2010 11:33:45 am Stephen Rothwell wrote:
> Hi Rusty,
> 
> After merging the rr tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> kernel/debug/kdb/kdb_main.c: In function 'kdb_lsmod':
> kernel/debug/kdb/kdb_main.c:1897: error: 'struct module' has no member named 'modules_which_use_me'
> kernel/debug/kdb/kdb_main.c:1897: error: 'struct module' has no member named 'modules_which_use_me'

Thanks Stephen! I'm not surprised Linus (and I) missed this.

Jason/Martin, please don't do this again.  If you need a structure definition
from a file, pull it out into the header don't cut and paste it like
kernel/debug/kdb/kdb_main.c line 1859:

	#if defined(CONFIG_MODULES)
	/* modules using other modules */
	struct module_use {
		struct list_head list;
		struct module *module_which_uses;
	};

I've fixed this as part of the Linus-inspired module locking cleanup which
should hit linux-next tomorrow and -rc2 sometime.

Thanks,
Rusty.

linux-next: build failure after merge of the rr tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 485 bytes --]

Hi Rusty,

After merging the rr tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

kernel/module.c: In function 'SYSC_delete_module':
kernel/module.c:787: error: label 'out_stop' used but not defined

Caused by commit b50e0d273194c53851fbf6d119047a9b742c49c6
("module:reduce-locking").

I have used the rr tree from next-20100531 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]