diff options
Diffstat (limited to 'arch/x86/kernel/cpu/bugs.c')
| -rw-r--r-- | arch/x86/kernel/cpu/bugs.c | 7 | 
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index c97bb7b5a9f..d0e910da16c 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -165,10 +165,15 @@ void __init check_bugs(void)  	print_cpu_info(&boot_cpu_data);  #endif  	check_config(); -	check_fpu();  	check_hlt();  	check_popad();  	init_utsname()->machine[1] =  		'0' + (boot_cpu_data.x86 > 6 ? 6 : boot_cpu_data.x86);  	alternative_instructions(); + +	/* +	 * kernel_fpu_begin/end() in check_fpu() relies on the patched +	 * alternative instructions. +	 */ +	check_fpu();  }  |