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

Commit de82fbc3 authored by Borislav Petkov's avatar Borislav Petkov Committed by Ingo Molnar
Browse files

x86/fpu: Remove check_fpu() indirection 



Rename it to fpu__init_check_bugs() and do the CPU feature check at
entry, thus getting rid of the old fpu__init_check_bugs() wrapper.

Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1459837795-2588-6-git-send-email-bp@alien8.de


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent eff4677e

arch/x86/kernel/fpu/bugs.c

+5 −11
Original line number Diff line number Diff line
@@ -21,11 +21,15 @@ static double __initdata y = 3145727.0; 
 * We should really only care about bugs here

 * anyway. Not features.

 */

static void __init check_fpu(void)

void __init fpu__init_check_bugs(void)

{

	u32 cr0_saved;

	s32 fdiv_bug;



	/* kernel_fpu_begin/end() relies on patched alternative instructions. */

	if (!boot_cpu_has(X86_FEATURE_FPU))

		return;



	/* We might have CR0::TS set already, clear it: */

	cr0_saved = read_cr0();

	write_cr0(cr0_saved & ~X86_CR0_TS);
@@ -59,13 +63,3 @@ static void __init check_fpu(void) 
		pr_warn("Hmm, FPU with FDIV bug\n");

	}

}
 


void __init fpu__init_check_bugs(void)

{

	/*

	 * kernel_fpu_begin/end() in check_fpu() relies on the patched

	 * alternative instructions.

	 */

	if (boot_cpu_has(X86_FEATURE_FPU))

		check_fpu();

}