diff options
Diffstat (limited to 'arch/x86/kernel/cpu')
-rw-r--r-- | arch/x86/kernel/cpu/amd.c | 3 | ||||
-rw-r--r-- | arch/x86/kernel/cpu/amd_64.c | 4 | ||||
-rw-r--r-- | arch/x86/kernel/cpu/cpu.h | 2 |
3 files changed, 0 insertions, 9 deletions
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index acc891ae5901..81a07ca65d44 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c | |||
@@ -266,9 +266,6 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c) | |||
266 | 266 | ||
267 | if (cpu_has_xmm2) | 267 | if (cpu_has_xmm2) |
268 | set_cpu_cap(c, X86_FEATURE_MFENCE_RDTSC); | 268 | set_cpu_cap(c, X86_FEATURE_MFENCE_RDTSC); |
269 | |||
270 | if (c->x86 == 0x10) | ||
271 | amd_enable_pci_ext_cfg(c); | ||
272 | } | 269 | } |
273 | 270 | ||
274 | static unsigned int __cpuinit amd_size_cache(struct cpuinfo_x86 *c, unsigned int size) | 271 | 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 f8d20588bde9..250bfe6064af 100644 --- a/arch/x86/kernel/cpu/amd_64.c +++ b/arch/x86/kernel/cpu/amd_64.c | |||
@@ -6,7 +6,6 @@ | |||
6 | #include <asm/cacheflush.h> | 6 | #include <asm/cacheflush.h> |
7 | 7 | ||
8 | #include <mach_apic.h> | 8 | #include <mach_apic.h> |
9 | #include "cpu.h" | ||
10 | 9 | ||
11 | extern int __cpuinit get_model_name(struct cpuinfo_x86 *c); | 10 | extern int __cpuinit get_model_name(struct cpuinfo_x86 *c); |
12 | extern void __cpuinit display_cacheinfo(struct cpuinfo_x86 *c); | 11 | extern void __cpuinit display_cacheinfo(struct cpuinfo_x86 *c); |
@@ -187,9 +186,6 @@ void __cpuinit init_amd(struct cpuinfo_x86 *c) | |||
187 | if (c->x86 == 0x10) | 186 | if (c->x86 == 0x10) |
188 | fam10h_check_enable_mmcfg(); | 187 | fam10h_check_enable_mmcfg(); |
189 | 188 | ||
190 | if (c->x86 == 0x10) | ||
191 | amd_enable_pci_ext_cfg(c); | ||
192 | |||
193 | if (c == &boot_cpu_data && c->x86 >= 0xf && c->x86 <= 0x11) { | 189 | if (c == &boot_cpu_data && c->x86 >= 0xf && c->x86 <= 0x11) { |
194 | unsigned long long tseg; | 190 | unsigned long long tseg; |
195 | 191 | ||
diff --git a/arch/x86/kernel/cpu/cpu.h b/arch/x86/kernel/cpu/cpu.h index f5d5bb1b5541..40ad1893fe87 100644 --- a/arch/x86/kernel/cpu/cpu.h +++ b/arch/x86/kernel/cpu/cpu.h | |||
@@ -39,5 +39,3 @@ extern int get_model_name(struct cpuinfo_x86 *c); | |||
39 | extern void display_cacheinfo(struct cpuinfo_x86 *c); | 39 | extern void display_cacheinfo(struct cpuinfo_x86 *c); |
40 | 40 | ||
41 | #endif /* CONFIG_X86_32 */ | 41 | #endif /* CONFIG_X86_32 */ |
42 | |||
43 | extern void __cpuinit amd_enable_pci_ext_cfg(struct cpuinfo_x86 *c); | ||