summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBorislav Petkov (AMD) <bp@alien8.de>2023-07-08 10:21:35 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-08-08 20:04:51 +0200
commitd351cc7c14a6e2af73bfea4aa5ee093321f4c307 (patch)
tree8142d6dfa9b53033af8432aaa68e24d1cc459e1e
parent7be4a6b1128c2d6136c591b055b834d81198749e (diff)
downloadlinux-stable-d351cc7c14a6e2af73bfea4aa5ee093321f4c307.tar.gz
linux-stable-d351cc7c14a6e2af73bfea4aa5ee093321f4c307.tar.bz2
linux-stable-d351cc7c14a6e2af73bfea4aa5ee093321f4c307.zip
x86/bugs: Increase the x86 bugs vector size to two u32s
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@alien8.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--arch/x86/include/asm/cpufeatures.h2
-rw-r--r--tools/arch/x86/include/asm/cpufeatures.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/include/asm/cpufeatures.h b/arch/x86/include/asm/cpufeatures.h
index 8d6b34726033..5baeba325daa 100644
--- 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 21 /* 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
diff --git a/tools/arch/x86/include/asm/cpufeatures.h b/tools/arch/x86/include/asm/cpufeatures.h
index cb8ca46213be..1f6d904c6481 100644
--- 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 21 /* 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