diff options
Diffstat (limited to 'arch/x86/kernel/cpu')
-rw-r--r-- | arch/x86/kernel/cpu/amd.c | 4 | ||||
-rw-r--r-- | arch/x86/kernel/cpu/amd_64.c | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index 24586682829..99221f9834e 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c | |||
@@ -6,6 +6,7 @@ | |||
6 | #include <asm/apic.h> | 6 | #include <asm/apic.h> |
7 | 7 | ||
8 | #include <mach_apic.h> | 8 | #include <mach_apic.h> |
9 | #include "../setup.h" | ||
9 | #include "cpu.h" | 10 | #include "cpu.h" |
10 | 11 | ||
11 | /* | 12 | /* |
@@ -308,6 +309,9 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c) | |||
308 | 309 | ||
309 | if (cpu_has_xmm2) | 310 | if (cpu_has_xmm2) |
310 | set_cpu_cap(c, X86_FEATURE_MFENCE_RDTSC); | 311 | set_cpu_cap(c, X86_FEATURE_MFENCE_RDTSC); |
312 | |||
313 | if (c->x86 == 0x10) | ||
314 | amd_enable_pci_ext_cfg(c); | ||
311 | } | 315 | } |
312 | 316 | ||
313 | static unsigned int __cpuinit amd_size_cache(struct cpuinfo_x86 *c, unsigned int size) | 317 | static unsigned int __cpuinit amd_size_cache(struct cpuinfo_x86 *c, unsigned int size) |
diff --git a/arch/x86/kernel/cpu/amd_64.c b/arch/x86/kernel/cpu/amd_64.c index c815c2c0484..180097e9921 100644 --- a/arch/x86/kernel/cpu/amd_64.c +++ b/arch/x86/kernel/cpu/amd_64.c | |||
@@ -217,6 +217,9 @@ void __cpuinit init_amd(struct cpuinfo_x86 *c) | |||
217 | if (c->x86 == 0x10) | 217 | if (c->x86 == 0x10) |
218 | fam10h_check_enable_mmcfg(); | 218 | fam10h_check_enable_mmcfg(); |
219 | 219 | ||
220 | if (c->x86 == 0x10) | ||
221 | amd_enable_pci_ext_cfg(c); | ||
222 | |||
220 | if (amd_apic_timer_broken()) | 223 | if (amd_apic_timer_broken()) |
221 | disable_apic_timer = 1; | 224 | disable_apic_timer = 1; |
222 | 225 | ||