[PATCH -mm] Fix dev_load() compilation again

[PATCH -mm] Fix dev_load() compilation again

[Alexey Dobriyan]

dev_load() doesn't exist if MODULES=n.

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
---

 include/linux/netdevice.h |    6 ++++++
 1 file changed, 6 insertions(+)

--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -1639,7 +1639,13 @@ 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;

Re: [PATCH -mm] Fix dev_load() compilation again

[Hiroshi Shimamoto]

Alexey Dobriyan wrote:
> dev_load() doesn't exist if MODULES=n.

Hi,

in -next tree, this patch fixes the compilation error instead of
my patch. So, there is a conflict.

commit 9b90dc7bc3079376567fc501e2e84751fa4040fd
Author: Stephen Rothwell <sfr@canb.auug.org.au>
Date:   Wed Aug 27 14:45:37 2008 +1000

    rr: build fix for remove CONFIG_KMOD from net

    Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

thanks,
Hiroshi Shimamoto

Re: [PATCH -mm] Fix dev_load() compilation again

[Stephen Rothwell]

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

Hi Hiroshi,

On Fri, 05 Sep 2008 12:54:51 -0700 Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com> wrote:
>
> Alexey Dobriyan wrote:
> > dev_load() doesn't exist if MODULES=n.
> 
> Hi,
> 
> in -next tree, this patch fixes the compilation error instead of
> my patch. So, there is a conflict.

My patch is a temporary work around and will be dropped if the fix turns
up in any of the trees that I merge.

-- 
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: [PATCH -mm] Fix dev_load() compilation again

[Andrew Morton]

On Fri, 05 Sep 2008 12:54:51 -0700
Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com> wrote:

> Alexey Dobriyan wrote:
> > dev_load() doesn't exist if MODULES=n.
> 
> Hi,
> 
> in -next tree, this patch fixes the compilation error instead of
> my patch. So, there is a conflict.
> 
> commit 9b90dc7bc3079376567fc501e2e84751fa4040fd
> Author: Stephen Rothwell <sfr@canb.auug.org.au>
> Date:   Wed Aug 27 14:45:37 2008 +1000
> 
>     rr: build fix for remove CONFIG_KMOD from net
> 
>     Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> 

Give that there's already a fix in linux-next, I can't do anything here.

Rusty, the regression was introduced by

commit 4cb9da6ecc2b0e25056b45981239475f8509d59d
Author:     Johannes Berg <johannes@sipsolutions.net>
AuthorDate: Wed Jul 9 10:28:42 2008 +0200
Commit:     Stephen Rothwell <sfr@canb.auug.org.au>
CommitDate: Tue Aug 26 10:19:47 2008 +1000

    remove CONFIG_KMOD from net
    
    Some code here depends on CONFIG_KMOD to not try to load
    protocol modules or similar, replace by CONFIG_MODULES
    where more than just request_module depends on CONFIG_KMOD
    and and also use try_then_request_module in ebtables.
    
    Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
    Cc: netdev@vger.kernel.org
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

Could you please take care of getting it fixed up?

Thanks.

Re: [PATCH -mm] Fix dev_load() compilation again

[Johannes Berg]

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

Hi,

On Mon, 2008-09-08 at 15:17 -0700, Andrew Morton wrote:
> On Fri, 05 Sep 2008 12:54:51 -0700
> Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com> wrote:

> > in -next tree, this patch fixes the compilation error instead of
> > my patch. So, there is a conflict.

I think I like this patch better than Stephen's, but despite causing the
problem I'm not sure what I can do at this point.

> Give that there's already a fix in linux-next, I can't do anything here.
> 
> Rusty, the regression was introduced by
> 
> commit 4cb9da6ecc2b0e25056b45981239475f8509d59d
> Author:     Johannes Berg <johannes@sipsolutions.net>
> AuthorDate: Wed Jul 9 10:28:42 2008 +0200
> Commit:     Stephen Rothwell <sfr@canb.auug.org.au>
> CommitDate: Tue Aug 26 10:19:47 2008 +1000
> 
>     remove CONFIG_KMOD from net

Rusty, can you take
http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.27-rc5/2.6.27-rc5-mm1/broken-out/net-fix-compilation-ng-when-config_module.patch

(although I'd rather see the blank line stay) and fold it into that
patch or put it into the tree that Stephen pulls?

johannes

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]