diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-06-02 06:21:36 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-06-02 06:26:21 -0400 |
commit | 1a5726528a70bb239bdd149aef7f2155cd2b1699 (patch) | |
tree | 90b7eedfdfb6d9f312d3510b7222604af319bf8d | |
parent | 6fc92866a4a6778a9732a14b61f70cb9014b2a1a (diff) |
fix build bug in "x86: add PCI extended config space access for AMD Barcelona"
-rw-r--r-- | arch/x86/kernel/cpu/amd.c | 1 | ||||
-rw-r--r-- | include/asm-x86/mmconfig.h | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index 99221f9834e4..656b40aed647 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c | |||
@@ -4,6 +4,7 @@ | |||
4 | #include <asm/io.h> | 4 | #include <asm/io.h> |
5 | #include <asm/processor.h> | 5 | #include <asm/processor.h> |
6 | #include <asm/apic.h> | 6 | #include <asm/apic.h> |
7 | #include <asm/mmconfig.h> | ||
7 | 8 | ||
8 | #include <mach_apic.h> | 9 | #include <mach_apic.h> |
9 | #include "../setup.h" | 10 | #include "../setup.h" |
diff --git a/include/asm-x86/mmconfig.h b/include/asm-x86/mmconfig.h index 46d6bb135df4..691798fbee10 100644 --- a/include/asm-x86/mmconfig.h +++ b/include/asm-x86/mmconfig.h | |||
@@ -9,6 +9,10 @@ static inline void fam10h_check_enable_mmcfg(void) { } | |||
9 | static inline void check_enable_amd_mmconf_dmi(void) { } | 9 | static inline void check_enable_amd_mmconf_dmi(void) { } |
10 | #endif | 10 | #endif |
11 | 11 | ||
12 | #if defined(CONFIG_SMP) && defined(CONFIG_X86_64) | ||
12 | extern void __cpuinit amd_enable_pci_ext_cfg(struct cpuinfo_x86 *c); | 13 | extern void __cpuinit amd_enable_pci_ext_cfg(struct cpuinfo_x86 *c); |
14 | #else | ||
15 | static inline void amd_enable_pci_ext_cfg(struct cpuinfo_x86 *c) { } | ||
16 | #endif | ||
13 | 17 | ||
14 | #endif | 18 | #endif |