The patch titled
net: fix compilation NG when !CONFIG_MODULE
has been added to the -mm tree. Its filename is
net-fix-compilation-ng-when-config_module.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: net: fix compilation NG when !CONFIG_MODULE
From: Hiroshi Shimamoto <h-shimamoto@xxxxxxxxxxxxx>
CC net/core/dev.o
net/core/dev.c:1001: error: redefinition of 'dev_load'
include/linux/netdevice.h:1645: error: previous definition of 'dev_load' was here
make[2]: *** [net/core/dev.o] Error 1
dev_load() is not used when CONFIG_MODULE disabled.
Signed-off-by: Hiroshi Shimamoto <h-shimamoto@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
net/core/dev.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff -puN net/core/dev.c~net-fix-compilation-ng-when-config_module net/core/dev.c
--- a/net/core/dev.c~net-fix-compilation-ng-when-config_module
+++ a/net/core/dev.c
@@ -996,7 +996,7 @@ EXPORT_SYMBOL(netdev_bonding_change);
* privileges this function loads the module. If module loading is not
* available in this kernel then it becomes a nop.
*/
-
+#ifdef CONFIG_MODULES
void dev_load(struct net *net, const char *name)
{
struct net_device *dev;
@@ -1008,6 +1008,7 @@ void dev_load(struct net *net, const cha
if (!dev && capable(CAP_SYS_MODULE))
request_module("%s", name);
}
+#endif
/**
* dev_open - prepare an interface for use.
_
Patches currently in -mm which might be from h-shimamoto@xxxxxxxxxxxxx are
linux-next.patch
net-fix-compilation-ng-when-config_module.patch
rcu-spinlocks-take-an-unsigned-long-flags.patch
unevictable-lru-page-statistics.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
