diff options
| author | Ingo Molnar <mingo@kernel.org> | 2025-12-11 08:06:45 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2025-12-11 08:06:45 +0100 |
| commit | 097fc16ddca68365737826ec8c9b38899ce2b259 (patch) | |
| tree | 39b126bb34cd3adb37f0e5d58a7b5e5e368146b7 | |
| parent | 0c7b005611cfbc1cd7b50291cdc2bb3f952570f2 (diff) | |
| parent | c8161e5304abb26e6c0bec6efc947992500fa6c5 (diff) | |
| download | tip-097fc16ddca68365737826ec8c9b38899ce2b259.tar.gz | |
Merge branch into tip/master: 'x86/urgent'tip/urgent
# New commits in x86/urgent:
c8161e5304ab ("x86/fpu: Fix FPU state core dump truncation on CPUs with no extended xfeatures")
5288176a5412 ("x86/boot/Documentation: Fix htmldocs build warning due to malformed table in boot.rst")
Signed-off-by: Ingo Molnar <mingo@kernel.org>
| -rw-r--r-- | Documentation/arch/x86/boot.rst | 4 | ||||
| -rw-r--r-- | arch/x86/kernel/fpu/xstate.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/arch/x86/boot.rst b/Documentation/arch/x86/boot.rst index 6d36ce86fd8ec0..18574f010d46cd 100644 --- a/Documentation/arch/x86/boot.rst +++ b/Documentation/arch/x86/boot.rst @@ -433,7 +433,7 @@ Protocol: 2.00+ Assigned boot loader IDs: - == ======================================= + ==== ======================================= 0x0 LILO (0x00 reserved for pre-2.00 bootloader) 0x1 Loadlin @@ -456,7 +456,7 @@ Protocol: 2.00+ <http://sebastian-plotz.blogspot.de> 0x12 OVMF UEFI virtualization stack 0x13 barebox - == ======================================= + ==== ======================================= Please contact <hpa@zytor.com> if you need a bootloader ID value assigned. diff --git a/arch/x86/kernel/fpu/xstate.c b/arch/x86/kernel/fpu/xstate.c index 48113c5193aa3c..76153dfb58c9d0 100644 --- a/arch/x86/kernel/fpu/xstate.c +++ b/arch/x86/kernel/fpu/xstate.c @@ -1946,7 +1946,7 @@ static int dump_xsave_layout_desc(struct coredump_params *cprm) }; if (!dump_emit(cprm, &xc, sizeof(xc))) - return 0; + return -1; num_records++; } @@ -1984,7 +1984,7 @@ int elf_coredump_extra_notes_write(struct coredump_params *cprm) return 1; num_records = dump_xsave_layout_desc(cprm); - if (!num_records) + if (num_records < 0) return 1; /* Total size should be equal to the number of records */ |