diff options
Diffstat (limited to 'arch/x86/kernel/setup_64.c')
-rw-r--r-- | arch/x86/kernel/setup_64.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/setup_64.c b/arch/x86/kernel/setup_64.c index 02409100f456..2139aa6ac469 100644 --- a/arch/x86/kernel/setup_64.c +++ b/arch/x86/kernel/setup_64.c | |||
@@ -746,8 +746,8 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c) | |||
746 | if (c->x86 == 0xf || c->x86 == 0x10 || c->x86 == 0x11) | 746 | if (c->x86 == 0xf || c->x86 == 0x10 || c->x86 == 0x11) |
747 | set_cpu_cap(c, X86_FEATURE_K8); | 747 | set_cpu_cap(c, X86_FEATURE_K8); |
748 | 748 | ||
749 | /* RDTSC can be speculated around */ | 749 | /* MFENCE stops RDTSC speculation */ |
750 | clear_cpu_cap(c, X86_FEATURE_SYNC_RDTSC); | 750 | set_cpu_cap(c, X86_FEATURE_MFENCE_RDTSC); |
751 | 751 | ||
752 | /* Family 10 doesn't support C states in MWAIT so don't use it */ | 752 | /* Family 10 doesn't support C states in MWAIT so don't use it */ |
753 | if (c->x86 == 0x10 && !force_mwait) | 753 | if (c->x86 == 0x10 && !force_mwait) |