Merge 5.17-rc6 into char-misc-next

[linux-2.6-microblaze.git] / arch / x86 / kernel / fpu / xstate.c

diff --git a/arch/x86/kernel/fpu/xstate.c b/arch/x86/kernel/fpu/xstate.c
index 02b3dda..7c7824a 100644 (file)
--- a/arch/x86/kernel/fpu/xstate.c
+++ b/arch/x86/kernel/fpu/xstate.c
@@ -1558,7 +1558,10 @@ static int fpstate_realloc(u64 xfeatures, unsigned int ksize,
                fpregs_restore_userregs();
 
        newfps->xfeatures = curfps->xfeatures | xfeatures;
-       newfps->user_xfeatures = curfps->user_xfeatures | xfeatures;
+
+       if (!guest_fpu)
+               newfps->user_xfeatures = curfps->user_xfeatures | xfeatures;
+
        newfps->xfd = curfps->xfd & ~xfeatures;
 
        /* Do the final updates within the locked region */