1 files changed, 6 insertions, 3 deletions

diff --git a/arch/x86/include/asm/fpu-internal.h b/arch/x86/include/asm/fpu-internal.h
index cea1c76d49bf..6099c0e5b62e 100644
--- 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);
 }