diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 16:50:34 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 16:50:34 -0400 |
| commit | a208f37a465e222218974ab20a31b42b7b4893b2 (patch) | |
| tree | 77c6acdd4be32024330a14f2618b814126ce7a20 /arch/x86/kernel/cpu/intel.c | |
| parent | 511d9d34183662aada3890883e860b151d707e22 (diff) | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
Merge branch 'linus' into x86/x2apic
Diffstat (limited to 'arch/x86/kernel/cpu/intel.c')
| -rw-r--r-- | arch/x86/kernel/cpu/intel.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c index fe9224c51d37..70609efdf1da 100644 --- a/arch/x86/kernel/cpu/intel.c +++ b/arch/x86/kernel/cpu/intel.c | |||
| @@ -226,6 +226,10 @@ static void __cpuinit init_intel(struct cpuinfo_x86 *c) | |||
| 226 | 226 | ||
| 227 | if (cpu_has_bts) | 227 | if (cpu_has_bts) |
| 228 | ds_init_intel(c); | 228 | ds_init_intel(c); |
| 229 | |||
| 230 | #ifdef CONFIG_X86_NUMAQ | ||
| 231 | numaq_tsc_disable(); | ||
| 232 | #endif | ||
| 229 | } | 233 | } |
| 230 | 234 | ||
| 231 | static unsigned int __cpuinit intel_size_cache(struct cpuinfo_x86 *c, unsigned int size) | 235 | static unsigned int __cpuinit intel_size_cache(struct cpuinfo_x86 *c, unsigned int size) |