Merge branch 'x86/fpu'

diff --cc arch/x86/include/asm/fpu/internal.h
Simple merge

diff --cc arch/x86/kernel/traps.c
index 410e8e2700c5813c99975125ce3906efc0f828a3,36a9c017540e408bea31b6d80dd077d9ccbfd973..1e630d1b7ad9c1ce08be101aaa3e14d68951906a
--- 1/arch/x86/kernel/traps.c
--- 2/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
@@@ -741,13 -750,12 +741,12 @@@ dotraplinkage voi
  do_device_not_available(struct pt_regs *regs, long error_code)
  {
        RCU_LOCKDEP_WARN(!rcu_is_watching(), "entry code didn't wake RCU");
-       BUG_ON(use_eager_fpu());
  
  #ifdef CONFIG_MATH_EMULATION
-       if (read_cr0() & X86_CR0_EM) {
+       if (!boot_cpu_has(X86_FEATURE_FPU) && (read_cr0() & X86_CR0_EM)) {
                struct math_emu_info info = { };
  
 -              conditional_sti(regs);
 +              cond_local_irq_enable(regs);
  
                info.regs = regs;
                math_emulate(&info);