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

Commit e2604b49 authored by Borislav Petkov's avatar Borislav Petkov Committed by H. Peter Anvin
Browse files

x86, cpu: Convert F00F bug detection 



... to using the new facility and drop the cpuinfo_x86 member.

Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Link: http://lkml.kernel.org/r/1363788448-31325-3-git-send-email-bp@alien8.de


Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 65fc985b

arch/x86/include/asm/cpufeature.h

+2 −0
Original line number Diff line number Diff line
@@ -222,6 +222,8 @@ 
 */

#define X86_BUG(x)		(NCAPINTS*32 + (x))



#define X86_BUG_F00F		X86_BUG(0) /* Intel F00F */



#if defined(__KERNEL__) && !defined(__ASSEMBLY__)



#include <asm/asm.h>

arch/x86/include/asm/processor.h

+0 −1
Original line number Diff line number Diff line
@@ -92,7 +92,6 @@ struct cpuinfo_x86 { 
	char			hard_math;

	char			rfu;

	char			fdiv_bug;

	char			f00f_bug;

	char			coma_bug;

	char			pad0;

#else

arch/x86/kernel/cpu/intel.c

+2 −2
Original line number Diff line number Diff line
@@ -209,11 +209,11 @@ static void __cpuinit intel_workarounds(struct cpuinfo_x86 *c) 
	 * system.

	 * Note that the workaround only should be initialized once...

	 */

	c->f00f_bug = 0;

	clear_cpu_bug(c, X86_BUG_F00F);

	if (!paravirt_enabled() && c->x86 == 5) {

		static int f00f_workaround_enabled;



		c->f00f_bug = 1;

		set_cpu_bug(c, X86_BUG_F00F);

		if (!f00f_workaround_enabled) {

			trap_init_f00f_bug();

			printk(KERN_NOTICE "Intel Pentium with F0 0F bug - workaround enabled.\n");

arch/x86/kernel/cpu/proc.c

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ static void show_cpuinfo_misc(struct seq_file *m, struct cpuinfo_x86 *c) 
		   "cpuid level\t: %d\n"

		   "wp\t\t: %s\n",

		   c->fdiv_bug ? "yes" : "no",

		   c->f00f_bug ? "yes" : "no",

		   static_cpu_has_bug(X86_BUG_F00F) ? "yes" : "no",

		   c->coma_bug ? "yes" : "no",

		   c->hard_math ? "yes" : "no",

		   c->hard_math ? "yes" : "no",

arch/x86/mm/fault.c

+1 −1
Original line number Diff line number Diff line
@@ -555,7 +555,7 @@ static int is_f00f_bug(struct pt_regs *regs, unsigned long address) 
	/*

	 * Pentium F0 0F C7 C8 bug workaround:

	 */

	if (boot_cpu_data.f00f_bug) {

	if (boot_cpu_has_bug(X86_BUG_F00F)) {

		nr = (address - idt_descr.address) >> 3;



		if (nr == 6) {