linux-next: build failure

linux-next: build failure

[Stephen Rothwell]

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

Hi all,

next-20080826 build (powerpc mpc885_ads_defconfig) failed like this:

net/core/dev.c:1000: error: redefinition of 'dev_load'
include/linux/netdevice.h:1645: error: previous definition of 'dev_load' was here

This also failed for several other builds where CONFIG_MODULES is off.

Introduced by commit 4cb9da6ecc2b0e25056b45981239475f8509d59d ("remove
CONFIG_KMOD from net") which added a !CONFIG_MODULES (static inline)
version of dev_load() to include/linux/netdevice.h but the copy in
net/core/dev.c is not protected by CONFIG_MODULES.

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

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

Re: linux-next: build failure

[Rusty Russell]

On Wednesday 27 August 2008 10:06:56 Stephen Rothwell wrote:
> Introduced by commit 4cb9da6ecc2b0e25056b45981239475f8509d59d ("remove
> CONFIG_KMOD from net") which added a !CONFIG_MODULES (static inline)
> version of dev_load() to include/linux/netdevice.h but the copy in
> net/core/dev.c is not protected by CONFIG_MODULES.

Thanks.  I've fixed this the simplest way: remove the change to the header.

Rusty.

Re: linux-next: build failure

[Stephen Rothwell]

Hi Rusty,

On Wed, 27 Aug 2008 12:55:22 +1000 Rusty Russell <rusty@rustcorp.com.au> wrote:
>
> On Wednesday 27 August 2008 10:06:56 Stephen Rothwell wrote:
> > Introduced by commit 4cb9da6ecc2b0e25056b45981239475f8509d59d ("remove
> > CONFIG_KMOD from net") which added a !CONFIG_MODULES (static inline)
> > version of dev_load() to include/linux/netdevice.h but the copy in
> > net/core/dev.c is not protected by CONFIG_MODULES.
> 
> Thanks.  I've fixed this the simplest way: remove the change to the header.

So, for today, I have applied the following patch after importing the rr
tree:

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

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 27 Aug 2008 14:45:37 +1000
Subject: [PATCH] rr: build fix for remove CONFIG_KMOD from net

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 include/linux/netdevice.h |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index b215744..2254eb8 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -1639,11 +1639,7 @@ extern int		dev_set_allmulti(struct net_device *dev, int inc);
 extern void		netdev_state_change(struct net_device *dev);
 extern void		netdev_bonding_change(struct net_device *dev);
 extern void		netdev_features_change(struct net_device *dev);
-#ifdef CONFIG_MODULES
 extern void		dev_load(struct net *net, const char *name);
-#else
-static inline void	dev_load(struct net *net, const char *name) {};
-#endif
 extern void		dev_mcast_init(void);
 extern int		netdev_max_backlog;
 extern int		weight_p;
-- 
1.5.6.5