From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752978AbZDBPbU (ORCPT ); Thu, 2 Apr 2009 11:31:20 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751345AbZDBPbE (ORCPT ); Thu, 2 Apr 2009 11:31:04 -0400 Received: from rcsinet13.oracle.com ([148.87.113.125]:48801 "EHLO rgminet13.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750991AbZDBPbD (ORCPT ); Thu, 2 Apr 2009 11:31:03 -0400 Message-ID: <49D4D9E5.2060705@oracle.com> Date: Thu, 02 Apr 2009 08:29:41 -0700 From: Randy Dunlap Organization: Oracle Linux Engineering User-Agent: Thunderbird 2.0.0.6 (X11/20070801) MIME-Version: 1.0 To: Stephen Rothwell CC: linux-next@vger.kernel.org, LKML , x86@kernel.org Subject: [PATCH] x86: fix build error when CONFIG_K8_NB=n References: <20090402170432.9bc4fbf8.sfr@canb.auug.org.au> In-Reply-To: <20090402170432.9bc4fbf8.sfr@canb.auug.org.au> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Source-IP: acsmt702.oracle.com [141.146.40.80] X-Auth-Type: Internal IP X-CT-RefId: str=0001.0A09020A.49D4D9EA.01E9:SCFMA4539814,ss=1,fgs=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Randy Dunlap Fix build error when CONFIG_K8_NB=n: arch/x86/mm/built-in.o:(.bss+0x5c0): multiple definition of `k8_northbridges' arch/x86/kernel/built-in.o:(.bss+0x18c8): first defined here Signed-off-by: Randy Dunlap --- arch/x86/include/asm/k8.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- linux-next-20090402.orig/arch/x86/include/asm/k8.h +++ linux-next-20090402/arch/x86/include/asm/k8.h @@ -9,7 +9,7 @@ extern int early_is_k8_nb(u32 value); #ifdef CONFIG_K8_NB extern struct pci_dev **k8_northbridges; #else -struct pci_dev **k8_northbridges; +static struct pci_dev **k8_northbridges; #endif extern int num_k8_northbridges; extern int cache_k8_northbridges(void);