This is a note to let you know that I've just added the patch titled
x86/bugs: Increase the x86 bugs vector size to two u32s
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
x86-bugs-increase-the-x86-bugs-vector-size-to-two-u32s.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 9f1e4b82d3cdbbedf38548c403c38352c9490fc4 Mon Sep 17 00:00:00 2001
From: "Borislav Petkov (AMD)" <bp@xxxxxxxxx>
Date: Sat, 8 Jul 2023 10:21:35 +0200
Subject: x86/bugs: Increase the x86 bugs vector size to two u32s
From: "Borislav Petkov (AMD)" <bp@xxxxxxxxx>
Upstream commit: 0e52740ffd10c6c316837c6c128f460f1aaba1ea
There was never a doubt in my mind that they would not fit into a single
u32 eventually.
Signed-off-by: Borislav Petkov (AMD) <bp@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
arch/x86/include/asm/cpufeatures.h | 2 +-
tools/arch/x86/include/asm/cpufeatures.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--- a/arch/x86/include/asm/cpufeatures.h
+++ b/arch/x86/include/asm/cpufeatures.h
@@ -14,7 +14,7 @@
* Defines x86 CPU feature bits
*/
#define NCAPINTS 20 /* N 32-bit words worth of info */
-#define NBUGINTS 1 /* N 32-bit bug flags */
+#define NBUGINTS 2 /* N 32-bit bug flags */
/*
* Note: If the comment begins with a quoted string, that string is used
--- a/tools/arch/x86/include/asm/cpufeatures.h
+++ b/tools/arch/x86/include/asm/cpufeatures.h
@@ -14,7 +14,7 @@
* Defines x86 CPU feature bits
*/
#define NCAPINTS 20 /* N 32-bit words worth of info */
-#define NBUGINTS 1 /* N 32-bit bug flags */
+#define NBUGINTS 2 /* N 32-bit bug flags */
/*
* Note: If the comment begins with a quoted string, that string is used
Patches currently in stable-queue which might be from bp@xxxxxxxxx are
queue-6.1/x86-cpu-switch-to-arch_cpu_finalize_init.patch
queue-6.1/x86-srso-add-ibpb_brtype-support.patch
queue-6.1/x86-cpu-kvm-add-support-for-cpuid_80000021_eax.patch
queue-6.1/x86-srso-tie-sbpb-bit-setting-to-microcode-patch-detection.patch
queue-6.1/x86-bugs-increase-the-x86-bugs-vector-size-to-two-u32s.patch
queue-6.1/x86-srso-add-a-forgotten-noendbr-annotation.patch
queue-6.1/x86-srso-add-ibpb-on-vmexit.patch
queue-6.1/x86-xen-fix-secondary-processors-fpu-initialization.patch
queue-6.1/x86-srso-add-ibpb.patch
queue-6.1/x86-srso-fix-return-thunks-in-generated-code.patch
queue-6.1/x86-srso-add-a-speculative-ras-overflow-mitigation.patch
queue-6.1/x86-srso-add-srso_no-support.patch
