summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/disabled-features.h
diff options
context:
space:
mode:
authorDavid Woodhouse2018-01-25 17:14:09 +0100
committerThomas Gleixner2018-01-26 15:53:16 +0100
commit95ca0ee8636059ea2800dfbac9ecac6212d6b38f (patch)
treeec91e299bf08e4541ceccd19ef64b44cd8350989 /arch/x86/include/asm/disabled-features.h
parentmodule/retpoline: Warn about missing retpoline in module (diff)
downloadkernel-qcow2-linux-95ca0ee8636059ea2800dfbac9ecac6212d6b38f.tar.gz
kernel-qcow2-linux-95ca0ee8636059ea2800dfbac9ecac6212d6b38f.tar.xz
kernel-qcow2-linux-95ca0ee8636059ea2800dfbac9ecac6212d6b38f.zip
x86/cpufeatures: Add CPUID_7_EDX CPUID leaf
This is a pure feature bits leaf. There are two AVX512 feature bits in it already which were handled as scattered bits, and three more from this leaf are going to be added for speculation control features. Signed-off-by: David Woodhouse <dwmw@amazon.co.uk> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Reviewed-by: Borislav Petkov <bp@suse.de> Cc: gnomes@lxorguk.ukuu.org.uk Cc: ak@linux.intel.com Cc: ashok.raj@intel.com Cc: dave.hansen@intel.com Cc: karahmed@amazon.de Cc: arjan@linux.intel.com Cc: torvalds@linux-foundation.org Cc: peterz@infradead.org Cc: bp@alien8.de Cc: pbonzini@redhat.com Cc: tim.c.chen@linux.intel.com Cc: gregkh@linux-foundation.org Link: https://lkml.kernel.org/r/1516896855-7642-2-git-send-email-dwmw@amazon.co.uk
Diffstat (limited to 'arch/x86/include/asm/disabled-features.h')
-rw-r--r--arch/x86/include/asm/disabled-features.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/include/asm/disabled-features.h b/arch/x86/include/asm/disabled-features.h
index e428e16dd822..c6a3af198294 100644
--- a/arch/x86/include/asm/disabled-features.h
+++ b/arch/x86/include/asm/disabled-features.h
@@ -71,6 +71,7 @@
#define DISABLED_MASK15 0
#define DISABLED_MASK16 (DISABLE_PKU|DISABLE_OSPKE|DISABLE_LA57)
#define DISABLED_MASK17 0
-#define DISABLED_MASK_CHECK BUILD_BUG_ON_ZERO(NCAPINTS != 18)
+#define DISABLED_MASK18 0
+#define DISABLED_MASK_CHECK BUILD_BUG_ON_ZERO(NCAPINTS != 19)
#endif /* _ASM_X86_DISABLED_FEATURES_H */