x86, xsave: Separate fpu and xsave initialization

[pandora-kernel.git] / arch / x86 / kernel / i387.c

diff --git a/arch/x86/kernel/i387.c b/arch/x86/kernel/i387.c
index 2f32ef0..e73c54e 100644 (file)
--- a/arch/x86/kernel/i387.c
+++ b/arch/x86/kernel/i387.c
@@ -59,18 +59,18 @@ void __cpuinit mxcsr_feature_mask_init(void)
        stts();
 }
 
-void __cpuinit init_thread_xstate(void)
+static void __cpuinit init_thread_xstate(void)
 {
+       /*
+        * Note that xstate_size might be overwriten later during
+        * xsave_init().
+        */
+
        if (!HAVE_HWFP) {
                xstate_size = sizeof(struct i387_soft_struct);
                return;
        }
 
-       if (cpu_has_xsave) {
-               xsave_cntxt_init();
-               return;
-       }
-
        if (cpu_has_fxsr)
                xstate_size = sizeof(struct i387_fxsave_struct);
 #ifdef CONFIG_X86_32
@@ -84,6 +84,7 @@ void __cpuinit init_thread_xstate(void)
  * Called at bootup to set up the initial FPU state that is later cloned
  * into all processes.
  */
+
 void __cpuinit fpu_init(void)
 {
        unsigned long oldcr0 = read_cr0();
@@ -93,14 +94,24 @@ void __cpuinit fpu_init(void)
 
        write_cr0(oldcr0 & ~(X86_CR0_TS|X86_CR0_EM)); /* clear TS and EM */
 
-       xsave_init();
+       if (!smp_processor_id())
+               init_thread_xstate();
 
        mxcsr_feature_mask_init();
        /* clean state in init */
        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)
 {