{"id":952,"url":"http://patchwork.ozlabs.org/api/1.0/patches/952/?format=json","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/1.0/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null},"msgid":"<200809222150.m8MLoZdf031857@imap1.linux-foundation.org>","date":"2008-09-22T21:50:35","name":"[1/8] net: fix compilation NG when !CONFIG_MODULE","commit_ref":null,"pull_url":null,"state":"not-applicable","archived":true,"hash":"51f34784905eda09dfd7110664437f5e4db3fb9e","submitter":{"id":107,"url":"http://patchwork.ozlabs.org/api/1.0/people/107/?format=json","name":"Andrew Morton","email":"akpm@linux-foundation.org"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/1.0/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/200809222150.m8MLoZdf031857@imap1.linux-foundation.org/mbox/","series":[],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/952/checks/","tags":{},"headers":{"Return-Path":"<netdev-owner@vger.kernel.org>","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Received":["from vger.kernel.org (vger.kernel.org [209.132.176.167])\n\tby ozlabs.org (Postfix) with ESMTP id 755FCDDF3A\n\tfor <patchwork-incoming@ozlabs.org>;\n\tTue, 23 Sep 2008 07:51:27 +1000 (EST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1753425AbYIVVvL (ORCPT <rfc822;patchwork-incoming@ozlabs.org>);\n\tMon, 22 Sep 2008 17:51:11 -0400","(majordomo@vger.kernel.org) by vger.kernel.org id S1753448AbYIVVvK\n\t(ORCPT <rfc822; netdev-outgoing>); Mon, 22 Sep 2008 17:51:10 -0400","from smtp1.linux-foundation.org ([140.211.169.13]:36871 \"EHLO\n\tsmtp1.linux-foundation.org\" rhost-flags-OK-OK-OK-OK)\n\tby vger.kernel.org with ESMTP id S1753387AbYIVVvJ (ORCPT\n\t<rfc822;netdev@vger.kernel.org>); Mon, 22 Sep 2008 17:51:09 -0400","from imap1.linux-foundation.org (imap1.linux-foundation.org\n\t[140.211.169.55])\n\tby smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with\n\tESMTP id m8MLoa1C018138\n\t(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);\n\tMon, 22 Sep 2008 14:50:37 -0700","from localhost.localdomain (localhost [127.0.0.1])\n\tby imap1.linux-foundation.org\n\t(8.13.5.20060308/8.13.5/Debian-3ubuntu1.1) with ESMTP id\n\tm8MLoZdf031857; Mon, 22 Sep 2008 14:50:36 -0700"],"Message-Id":"<200809222150.m8MLoZdf031857@imap1.linux-foundation.org>","Subject":"[patch 1/8] net: fix compilation NG when !CONFIG_MODULE","To":"davem@davemloft.net","Cc":"netdev@vger.kernel.org, akpm@linux-foundation.org,\n\th-shimamoto@ct.jp.nec.com","From":"akpm@linux-foundation.org","Date":"Mon, 22 Sep 2008 14:50:35 -0700","X-Spam-Status":"No, hits=-3.359 required=5 tests=AWL, BAYES_00,\n\tOSDL_HEADER_SUBJECT_BRACKETED","X-Spam-Checker-Version":"SpamAssassin 3.2.4-osdl_revision__1.47__","X-MIMEDefang-Filter":"lf$Revision: 1.188 $","X-Scanned-By":"MIMEDefang 2.63 on 140.211.169.13","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"<netdev.vger.kernel.org>","X-Mailing-List":"netdev@vger.kernel.org"},"content":"From: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>\n\n  CC      net/core/dev.o\nnet/core/dev.c:1001: error: redefinition of 'dev_load'\ninclude/linux/netdevice.h:1645: error: previous definition of 'dev_load' was here\nmake[2]: *** [net/core/dev.o] Error 1\n\ndev_load() is not used when CONFIG_MODULE disabled.\n\nSigned-off-by: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>\nSigned-off-by: Andrew Morton <akpm@linux-foundation.org>\n---\n\n net/core/dev.c |    3 ++-\n 1 file changed, 2 insertions(+), 1 deletion(-)","diff":"diff -puN net/core/dev.c~net-fix-compilation-ng-when-config_module net/core/dev.c\n--- a/net/core/dev.c~net-fix-compilation-ng-when-config_module\n+++ a/net/core/dev.c\n@@ -997,7 +997,7 @@ EXPORT_SYMBOL(netdev_bonding_change);\n  *\tprivileges this function loads the module. If module loading is not\n  *\tavailable in this kernel then it becomes a nop.\n  */\n-\n+#ifdef CONFIG_MODULES\n void dev_load(struct net *net, const char *name)\n {\n \tstruct net_device *dev;\n@@ -1009,6 +1009,7 @@ void dev_load(struct net *net, const cha\n \tif (!dev && capable(CAP_SYS_MODULE))\n \t\trequest_module(\"%s\", name);\n }\n+#endif\n \n /**\n  *\tdev_open\t- prepare an interface for use.\n","prefixes":["1/8"]}