diff options
| author | Ingo Molnar <mingo@kernel.org> | 2025-05-13 11:37:29 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2025-05-13 11:37:29 +0300 |
| commit | ec8f353f5262acff120a0dc83b714d899ee94b7f (patch) | |
| tree | a5eab4c8ced9b7ea467da00aa5166a8c59d813d0 /arch/x86/mm | |
| parent | 2fb8414e644b133a9c3250f408232af99da256a4 (diff) | |
| parent | 32d5fa804dc9bd7cf6651a1378ba616d332e7444 (diff) | |
| download | linux-ec8f353f5262acff120a0dc83b714d899ee94b7f.tar.xz | |
Merge branch 'x86/fpu' into x86/core, to merge dependent commits
Prepare to resolve conflicts with an upstream series of fixes that conflict
with pending x86 changes:
6f5bf947bab0 Merge tag 'its-for-linus-20250509' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/mm')
| -rw-r--r-- | arch/x86/mm/extable.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mm/extable.c b/arch/x86/mm/extable.c index 51986e8a9d35..bf8dab18be97 100644 --- a/arch/x86/mm/extable.c +++ b/arch/x86/mm/extable.c @@ -111,7 +111,7 @@ static bool ex_handler_sgx(const struct exception_table_entry *fixup, /* * Handler for when we fail to restore a task's FPU state. We should never get - * here because the FPU state of a task using the FPU (task->thread.fpu.state) + * here because the FPU state of a task using the FPU (struct fpu::fpstate) * should always be valid. However, past bugs have allowed userspace to set * reserved bits in the XSAVE area using PTRACE_SETREGSET or sys_rt_sigreturn(). * These caused XRSTOR to fail when switching to the task, leaking the FPU |