Messages in this thread Patch in this message | | | From | Robert Richter <> | Date | Thu, 5 Jun 2008 19:32:55 +0200 | Subject | [PATCH] fix build bug in "x86: add PCI extended config space access for AMD Barcelona" |
| |
Signed-off-by: Robert Richter <robert.richter@amd.com> --- arch/x86/kernel/cpu/amd.c | 1 - arch/x86/kernel/cpu/amd_64.c | 1 + arch/x86/kernel/setup.c | 4 ++-- arch/x86/kernel/setup_64.c | 2 -- include/asm-x86/mmconfig.h | 6 ------ 5 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index 656b40a..99221f9 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c @@ -4,7 +4,6 @@ #include <asm/io.h> #include <asm/processor.h> #include <asm/apic.h> -#include <asm/mmconfig.h> #include <mach_apic.h> #include "../setup.h" diff --git a/arch/x86/kernel/cpu/amd_64.c b/arch/x86/kernel/cpu/amd_64.c index 180097e..6c63496 100644 --- a/arch/x86/kernel/cpu/amd_64.c +++ b/arch/x86/kernel/cpu/amd_64.c @@ -6,6 +6,7 @@ #include <asm/cacheflush.h> #include <mach_apic.h> +#include "../setup.h" extern int __cpuinit get_model_name(struct cpuinfo_x86 *c); extern void __cpuinit display_cacheinfo(struct cpuinfo_x86 *c); diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index d8f1712..f2dc414 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -136,6 +136,8 @@ void __init setup_per_cpu_areas(void) setup_cpumask_of_cpu(); } +#endif + #define ENABLE_CF8_EXT_CFG (1ULL << 46) void __cpuinit amd_enable_pci_ext_cfg(struct cpuinfo_x86 *c) @@ -148,5 +150,3 @@ void __cpuinit amd_enable_pci_ext_cfg(struct cpuinfo_x86 *c) } set_cpu_cap(c, X86_FEATURE_PCI_EXT_CFG); } - -#endif diff --git a/arch/x86/kernel/setup_64.c b/arch/x86/kernel/setup_64.c index 215bd67..25afdd8 100644 --- a/arch/x86/kernel/setup_64.c +++ b/arch/x86/kernel/setup_64.c @@ -73,8 +73,6 @@ #include <asm/pat.h> #include <asm/mmconfig.h> -#include "setup.h" - #include <mach_apic.h> #ifdef CONFIG_PARAVIRT #include <asm/paravirt.h> diff --git a/include/asm-x86/mmconfig.h b/include/asm-x86/mmconfig.h index 691798f..95beda0 100644 --- a/include/asm-x86/mmconfig.h +++ b/include/asm-x86/mmconfig.h @@ -9,10 +9,4 @@ static inline void fam10h_check_enable_mmcfg(void) { } static inline void check_enable_amd_mmconf_dmi(void) { } #endif -#if defined(CONFIG_SMP) && defined(CONFIG_X86_64) -extern void __cpuinit amd_enable_pci_ext_cfg(struct cpuinfo_x86 *c); -#else -static inline void amd_enable_pci_ext_cfg(struct cpuinfo_x86 *c) { } -#endif - #endif -- 1.5.5.3
| |