Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d4e1a0af authored by Dave Jones's avatar Dave Jones Committed by Ingo Molnar
Browse files

x86: Don't enable F00F workaround on Intel Quark processors 



The Intel Quark processor is a part of family 5, but does not have the
F00F bug present in Pentiums of the same family.

Pentiums were models 0 through 8, Quark is model 9.

Signed-off-by: default avatarDave Jones <davej@redhat.com>
Cc: Bryan O'Donoghue <pure.logic@nexus-software.ie>
Link: http://lkml.kernel.org/r/20141028175753.GA12743@redhat.com


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 60e684f0

arch/x86/kernel/cpu/intel.c

+3 −2
Original line number Diff line number Diff line
@@ -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);