Merge tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee139...

[karo-tx-linux.git] / arch / x86 / kernel / i387.c

diff --git a/arch/x86/kernel/i387.c b/arch/x86/kernel/i387.c
index 675a05012449d32ccaaa4abf0a0fb4abd095ed84..245a71db401af0e50be0deeba56d680c278ca2fc 100644 (file)
--- a/arch/x86/kernel/i387.c
+++ b/arch/x86/kernel/i387.c
@@ -175,7 +175,11 @@ void __cpuinit fpu_init(void)
                cr0 |= X86_CR0_EM;
        write_cr0(cr0);
 
-       if (!smp_processor_id())
+       /*
+        * init_thread_xstate is only called once to avoid overriding
+        * xstate_size during boot time or during CPU hotplug.
+        */
+       if (xstate_size == 0)
                init_thread_xstate();
 
        mxcsr_feature_mask_init();