lkml.org 
[lkml]   [2009]   [Apr]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
DateThu, 02 Apr 2009 08:29:41 -0700
FromRandy Dunlap <>
Subject[PATCH] x86: fix build error when CONFIG_K8_NB=n
From: Randy Dunlap <randy.dunlap@oracle.com>

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 <randy.dunlap@oracle.com>
---
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);

\
 
 \ /
  Last update: 2009-04-02 17:35    [from the cache]
©2003-2010