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

[firefly-linux-kernel-4.4.55.git] / arch / x86 / include / asm / fpu-internal.h

diff --git a/arch/x86/include/asm/fpu-internal.h b/arch/x86/include/asm/fpu-internal.h
index e3b85422cf127d38806a903ba6c2d0e6f664bf2f..412ececa00b957014a535e0a36d15ae108a88ffa 100644 (file)
--- a/arch/x86/include/asm/fpu-internal.h
+++ b/arch/x86/include/asm/fpu-internal.h
@@ -508,9 +508,12 @@ static inline void user_fpu_begin(void)
 
 static inline void __save_fpu(struct task_struct *tsk)
 {
-       if (use_xsave())
-               xsave_state(&tsk->thread.fpu.state->xsave, -1);
-       else
+       if (use_xsave()) {
+               if (unlikely(system_state == SYSTEM_BOOTING))
+                       xsave_state_booting(&tsk->thread.fpu.state->xsave, -1);
+               else
+                       xsave_state(&tsk->thread.fpu.state->xsave, -1);
+       } else
                fpu_fxsave(&tsk->thread.fpu);
 }