Merge branch 'x86-xsave-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

* 'x86-xsave-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, xsave: Make xstate_enable_boot_cpu() __init, protect on CPU 0
  x86, xsave: Add __init attribute to setup_xstate_features()
  x86, xsave: Make init_xstate_buf static
  x86, xsave: Check cpuid level for XSTATE_CPUID (0x0d)
  x86, xsave: Introduce xstate enable functions
  x86, xsave: Separate fpu and xsave initialization
  x86, xsave: Move boot cpu initialization to xsave_init()
  x86, xsave: 32/64 bit boot cpu check unification in initialization
  x86, xsave: Do not include asm/i387.h in asm/xsave.h
  x86, xsave: Use xsaveopt in context-switch path when supported
  x86, xsave: Sync xsave memory layout with its header for user handling
  x86, xsave: Track the offset, size of state in the xsave layout

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

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

diff --cc arch/x86/kernel/cpu/common.c
Simple merge

diff --cc arch/x86/kernel/i387.c
index c4444bc,e73c54e..1f11f5c
--- 1/arch/x86/kernel/i387.c
--- 2/arch/x86/kernel/i387.c
+++ b/arch/x86/kernel/i387.c
@@@ -105,9 -102,18 +102,18 @@@ void __cpuinit fpu_init(void
        current_thread_info()->status = 0;
        clear_used_math();
  }
- #endif        /* CONFIG_X86_64 */
+ 
+ #else /* CONFIG_X86_64 */
+ 
+ void __cpuinit fpu_init(void)
+ {
+       if (!smp_processor_id())
+               init_thread_xstate();
+ }
+ 
+ #endif        /* CONFIG_X86_32 */
  
 -static void fpu_finit(struct fpu *fpu)
 +void fpu_finit(struct fpu *fpu)
  {
  #ifdef CONFIG_X86_32
        if (!HAVE_HWFP) {

diff --cc arch/x86/kernel/xsave.c
Simple merge