diff options
| author | Mark Brown <broonie@kernel.org> | 2014-11-03 15:13:33 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-11-03 15:13:33 +0000 |
| commit | ebc01f593b58e1896150fc2e3cbdd0116323c52c (patch) | |
| tree | 23e905a3fdbee3fc8a66ef760b9ed5ef5455e9dd /arch/x86/kernel/cpu/intel.c | |
| parent | 3f7256fe5fc64132a2dd19695255c990aa2188cf (diff) | |
| parent | 0df1f2487d2f0d04703f142813d53615d62a1da4 (diff) | |
Merge tag 'v3.18-rc3' into asoc-sgtl5000
Linux 3.18-rc3
Diffstat (limited to 'arch/x86/kernel/cpu/intel.c')
| -rw-r--r-- | arch/x86/kernel/cpu/intel.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c index 1ef456273172..9cc6b6f25f42 100644 --- a/arch/x86/kernel/cpu/intel.c +++ b/arch/x86/kernel/cpu/intel.c @@ -213,12 +213,13 @@ static void intel_workarounds(struct cpuinfo_x86 *c) { #ifdef CONFIG_X86_F00F_BUG /* - * All current models of Pentium and Pentium with MMX technology CPUs + * All models of Pentium and Pentium with MMX technology CPUs * have the F0 0F bug, which lets nonprivileged users lock up the * system. Announce that the fault handler will be checking for it. + * The Quark is also family 5, but does not have the same bug. */ clear_cpu_bug(c, X86_BUG_F00F); - if (!paravirt_enabled() && c->x86 == 5) { + if (!paravirt_enabled() && c->x86 == 5 && c->x86_model < 9) { static int f00f_workaround_enabled; set_cpu_bug(c, X86_BUG_F00F); |