Merge branch 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 10 Jun 2009 22:55:04 +0000 (15:55 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 10 Jun 2009 22:55:04 +0000 (15:55 -0700)
* 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86_64: fix incorrect comments
  x86: unify restore_fpu_checking
  x86_32: introduce restore_fpu_checking()

1  2 
arch/x86/kernel/traps.c

diff --combined arch/x86/kernel/traps.c
index 2310700faca5f2f491f56c7a82aefc378f9b254c,d696145855b51a310b9e4fa82686f5944119c16b..ede024531f8facbc53fdfd4c82b687ee2050ac72
@@@ -839,9 -839,6 +839,6 @@@ asmlinkage void math_state_restore(void
        }
  
        clts();                         /* Allow maths ops (or we recurse) */
- #ifdef CONFIG_X86_32
-       restore_fpu(tsk);
- #else
        /*
         * Paranoid restore. send a SIGSEGV if we fail to restore the state.
         */
                force_sig(SIGSEGV, tsk);
                return;
        }
- #endif
        thread->status |= TS_USEDFPU;   /* So we fnsave on switch_to() */
        tsk->fpu_counter++;
  }
@@@ -969,8 -966,11 +966,8 @@@ void __init trap_init(void
        for (i = 0; i < FIRST_EXTERNAL_VECTOR; i++)
                set_bit(i, used_vectors);
  
 -#ifdef CONFIG_X86_64
        set_bit(IA32_SYSCALL_VECTOR, used_vectors);
 -#else
 -      set_bit(SYSCALL_VECTOR, used_vectors);
 -#endif
 +
        /*
         * Should be a barrier for any external CPU state:
         */