From patchwork Mon Sep 22 21:50:35 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 952 X-Patchwork-Delegate: davem@davemloft.net Return-Path: 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]) by ozlabs.org (Postfix) with ESMTP id 755FCDDF3A for ; Tue, 23 Sep 2008 07:51:27 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753425AbYIVVvL (ORCPT ); Mon, 22 Sep 2008 17:51:11 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753448AbYIVVvK (ORCPT ); Mon, 22 Sep 2008 17:51:10 -0400 Received: from smtp1.linux-foundation.org ([140.211.169.13]:36871 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753387AbYIVVvJ (ORCPT ); Mon, 22 Sep 2008 17:51:09 -0400 Received: from imap1.linux-foundation.org (imap1.linux-foundation.org [140.211.169.55]) by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id m8MLoa1C018138 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 22 Sep 2008 14:50:37 -0700 Received: from localhost.localdomain (localhost [127.0.0.1]) by imap1.linux-foundation.org (8.13.5.20060308/8.13.5/Debian-3ubuntu1.1) with ESMTP id m8MLoZdf031857; 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, h-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, OSDL_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: X-Mailing-List: netdev@vger.kernel.org From: Hiroshi Shimamoto 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 Signed-off-by: Andrew Morton --- 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 @@ -997,7 +997,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; @@ -1009,6 +1009,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.