diff options
| author | Ingo Molnar <mingo@kernel.org> | 2024-05-01 19:51:17 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2024-05-01 19:51:17 +0200 |
| commit | d48915e655124777bf5790d9d6bfe1d570aaf493 (patch) | |
| tree | 0b01b2ba31e9b173842b013e0de78a8936ee6a75 | |
| parent | 23a99b742c16f521399aaed165683102aad8ad70 (diff) | |
| parent | af813acf8c06db58c6e21d89d9e45e8cd1512965 (diff) | |
| download | tip-d48915e655124777bf5790d9d6bfe1d570aaf493.tar.gz | |
Merge branch into tip/master: 'x86/fpu'
Notice: this object is not reachable from any branch.
# New commits in x86/fpu:
af813acf8c06 ("x86/fpu: Update fpu_swap_kvm_fpu() uses in comments as well")
5ca28d24aecd ("x86/vm86: Make sure the free_vm86(task) definition uses its parameter even in the !CONFIG_VM86 case")
5d31174f3c8c ("x86/fpu: Fix AMD X86_BUG_FXSAVE_LEAK fixup")
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Notice: this object is not reachable from any branch.
| -rw-r--r-- | arch/x86/include/asm/vm86.h | 2 | ||||
| -rw-r--r-- | arch/x86/kernel/fpu/core.c | 4 | ||||
| -rw-r--r-- | arch/x86/kernel/fpu/xstate.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/arch/x86/include/asm/vm86.h b/arch/x86/include/asm/vm86.h index 9e8ac5073ecb8..62ee199099038 100644 --- a/arch/x86/include/asm/vm86.h +++ b/arch/x86/include/asm/vm86.h @@ -84,7 +84,7 @@ static inline int handle_vm86_trap(struct kernel_vm86_regs *a, long b, int c) static inline void save_v86_state(struct kernel_vm86_regs *a, int b) { } -#define free_vm86(t) do { } while(0) +#define free_vm86(task) do { (void)(task); } while(0) #endif /* CONFIG_VM86 */ diff --git a/arch/x86/kernel/fpu/core.c b/arch/x86/kernel/fpu/core.c index 520deb411a702..1209c7aebb211 100644 --- a/arch/x86/kernel/fpu/core.c +++ b/arch/x86/kernel/fpu/core.c @@ -145,8 +145,8 @@ void restore_fpregs_from_fpstate(struct fpstate *fpstate, u64 mask) asm volatile( "fnclex\n\t" "emms\n\t" - "fildl %P[addr]" /* set F?P to defined value */ - : : [addr] "m" (fpstate)); + "fildl %[addr]" /* set F?P to defined value */ + : : [addr] "m" (*fpstate)); } if (use_xsave()) { diff --git a/arch/x86/kernel/fpu/xstate.c b/arch/x86/kernel/fpu/xstate.c index 33a214b1a4cec..6276329f5e660 100644 --- a/arch/x86/kernel/fpu/xstate.c +++ b/arch/x86/kernel/fpu/xstate.c @@ -1434,8 +1434,8 @@ static bool xstate_op_valid(struct fpstate *fpstate, u64 mask, bool rstor) 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() */ /* |