Merge tag 'x86-fpu-2024-05-13' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 fpu updates from Ingo Molnar:

 - Fix asm() constraints & modifiers in restore_fpregs_from_fpstate()

 - Update comments

 - Robustify the free_vm86() definition

* tag 'x86-fpu-2024-05-13' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/fpu: Update fpu_swap_kvm_fpu() uses in comments as well
  x86/vm86: Make sure the free_vm86(task) definition uses its parameter even in the !CONFIG_VM86 case
  x86/fpu: Fix AMD X86_BUG_FXSAVE_LEAK fixup

diff --combined arch/x86/kernel/fpu/xstate.c
index 33a214b1a4cec1fc2d1840968668f3a1f2d4ac94,d978251496b8a6eb3b3b7533e53858dea92e2edb..6276329f5e660fdc8d4e8fb74520601bc490d8bc
--- 1/arch/x86/kernel/fpu/xstate.c
--- 2/arch/x86/kernel/fpu/xstate.c
+++ b/arch/x86/kernel/fpu/xstate.c
@@@ -178,11 -178,10 +178,11 @@@ void fpu__init_cpu_xstate(void
         * Must happen after CR4 setup and before xsetbv() to allow KVM
         * lazy passthrough.  Write independent of the dynamic state static
         * key as that does not work on the boot CPU. This also ensures
 -       * that any stale state is wiped out from XFD.
 +       * that any stale state is wiped out from XFD. Reset the per CPU
 +       * xfd cache too.
         */
        if (cpu_feature_enabled(X86_FEATURE_XFD))
 -              wrmsrl(MSR_IA32_XFD, init_fpstate.xfd);
 +              xfd_set_state(init_fpstate.xfd);
  
        /*
         * XCR_XFEATURE_ENABLED_MASK (aka. XCR0) sets user features
@@@ -1434,8 -1433,8 +1434,8 @@@ static bool xstate_op_valid(struct fpst
                return rstor;
  
        /*
-        * XSAVE(S): clone(), fpu_swap_kvm_fpu()
-        * XRSTORS(S): fpu_swap_kvm_fpu()
+        * XSAVE(S): clone(), fpu_swap_kvm_fpstate()
+        * XRSTORS(S): fpu_swap_kvm_fpstate()
         */
  
        /*