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 19:58:33 +0200
commit236dd7133394bfe30275191e3aefcc6b3b09962b (patch)
treee3146ea87fad59b18c087c1dbc60e4668ab69692
parent0242a8bdef560523b5d81f5979854266092ab0a6 (diff)
downloadlinux-stable-236dd7133394bfe30275191e3aefcc6b3b09962b.tar.gz
linux-stable-236dd7133394bfe30275191e3aefcc6b3b09962b.tar.bz2
linux-stable-236dd7133394bfe30275191e3aefcc6b3b09962b.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 6afec5442a95..1dd57d0151f7 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 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
diff --git a/tools/arch/x86/include/asm/cpufeatures.h b/tools/arch/x86/include/asm/cpufeatures.h
index bcaedfe60572..861451839cf2 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 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