---

yaml --- r: 339133 b: refs/heads/master c: 6f5298c h: refs/heads/master i: 339131: 2ac2b1b v: v3
git-mirror · Nov 14, 2012 · df1722d · df1722d
1 parent 3feac0c
commit df1722d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8d966a04107e56993a051cd41ead0b4f23ba2414
+refs/heads/master: 6f5298c2139b06925037490367906f3d73955b86
diff --git a/trunk/arch/x86/kernel/i387.c b/trunk/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();