From: Konrad Rzeszutek Wilk <konrad@kernel.org>
Date: Thu, 4 Jan 2018 17:26:58 +0000 (-0500)
Subject: kABI: Make the boot_cpu_data look normal.
X-Git-Tag: v4.1.12-124.31.3~1386
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a1e528888130f4146a9d45660e1482a69dd511eb;p=users%2Fjedix%2Flinux-maple.git

kABI: Make the boot_cpu_data look normal.

It is statically allocated and we only grow it - so having an
GENKSYMS around it is fine. This fixes
aff7641cb9f37c7aa6897a7b51faa6e20b08013f
"x86/cpu/AMD: Add speculative control support for AMD" breaking the kABI

Orabug: 27344012
CVE: CVE-2017-5715


Signed-off-by: Konrad Rzeszutek Wilk <konrad@kernel.org>
Reviewed-by: John Haxby <john.haxby@oracle.com>
Signed-off-by: Kirtikar Kashyap <kirtikar.kashyap@oracle.com>
---

diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h
index 5ffc01e9d027..e42510d0bb18 100644
--- a/arch/x86/include/asm/cpufeature.h
+++ b/arch/x86/include/asm/cpufeature.h
@@ -12,7 +12,12 @@
 #include <asm/disabled-features.h>
 #endif
 
+#ifdef __GENKSYMS__
+/* Make it look like we didn't change it. */
+#define NCAPINTS	13	/* N 32-bit words worth of info */
+#else
 #define NCAPINTS	14	/* N 32-bit words worth of info */
+#endif
 #define NBUGINTS	1	/* N 32-bit bug flags */
 
 /*