headers: add previous cpufeatures re-sync commit.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

2 files changed, 57 insertions, 0 deletions

diff --git a/queue/series b/queue/series
index f7956db..bbe70d1 100644
--- a/queue/series
+++ b/queue/series
@@ -7,6 +7,7 @@ x86-speculation-Enable-Spectre-v1-swapgs-mitigations.patch
 x86-entry-64-Use-JMP-instead-of-JMPQ.patch
 x86-speculation-swapgs-Exclude-ATOMs-from-speculatio.patch
 Documentation-Add-swapgs-description-to-the-Spectre-.patch
+tools-arch-x86-Sync-asm-cpufeatures.h-with-the-with0.patch
 tools-arch-x86-Sync-asm-cpufeatures.h-with-the-with-.patch
 powerpc-tm-Fix-FP-VMX-unavailable-exceptions-inside-.patch
 powerpc-tm-Fix-restoring-FP-VMX-facility-incorrectly.patch
diff --git a/queue/tools-arch-x86-Sync-asm-cpufeatures.h-with-the-with0.patch b/queue/tools-arch-x86-Sync-asm-cpufeatures.h-with-the-with0.patch
new file mode 100644
index 0000000..6243f5c
--- /dev/null
+++ b/queue/tools-arch-x86-Sync-asm-cpufeatures.h-with-the-with0.patch
@@ -0,0 +1,56 @@
+From b979540a7522617e190636621e7c5ffae469f8f0 Mon Sep 17 00:00:00 2001
+From: Arnaldo Carvalho de Melo <acme@redhat.com>
+Date: Tue, 21 May 2019 16:39:42 -0300
+Subject: [PATCH] tools arch x86: Sync asm/cpufeatures.h with the with the
+ kernel
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+commit b979540a7522617e190636621e7c5ffae469f8f0 upstream.
+
+To pick up the changes in:
+
+  ed5194c2732c ("x86/speculation/mds: Add basic bug infrastructure for MDS")
+  e261f209c366 ("x86/speculation/mds: Add BUG_MSBDS_ONLY")
+
+That don't affect anything in tools/.
+
+This silences this perf build warning:
+
+  Warning: Kernel ABI header at 'tools/arch/x86/include/asm/cpufeatures.h' differs from latest version at 'arch/x86/include/asm/cpufeatures.h'
+  diff -u tools/arch/x86/include/asm/cpufeatures.h arch/x86/include/asm/cpufeatures.h
+
+Cc: Adrian Hunter <adrian.hunter@intel.com>
+Cc: Andi Kleen <ak@linux.intel.com>
+Cc: Brendan Gregg <brendan.d.gregg@gmail.com>
+Cc: Jiri Olsa <jolsa@kernel.org>
+Cc: Luis Cláudio Gonçalves <lclaudio@redhat.com>
+Cc: Namhyung Kim <namhyung@kernel.org>
+Cc: Thomas Gleixner <tglx@linutronix.de>
+Link: https://lkml.kernel.org/n/tip-jp1afecx3ql1jkuirpgkqfad@git.kernel.org
+Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
+
+diff --git a/tools/arch/x86/include/asm/cpufeatures.h b/tools/arch/x86/include/asm/cpufeatures.h
+index 981ff9479648..75f27ee2c263 100644
+--- a/tools/arch/x86/include/asm/cpufeatures.h
++++ b/tools/arch/x86/include/asm/cpufeatures.h
+@@ -344,6 +344,7 @@
+ /* Intel-defined CPU features, CPUID level 0x00000007:0 (EDX), word 18 */
+ #define X86_FEATURE_AVX512_4VNNIW	(18*32+ 2) /* AVX-512 Neural Network Instructions */
+ #define X86_FEATURE_AVX512_4FMAPS	(18*32+ 3) /* AVX-512 Multiply Accumulation Single precision */
++#define X86_FEATURE_MD_CLEAR		(18*32+10) /* VERW clears CPU buffers */
+ #define X86_FEATURE_TSX_FORCE_ABORT	(18*32+13) /* "" TSX_FORCE_ABORT */
+ #define X86_FEATURE_PCONFIG		(18*32+18) /* Intel PCONFIG */
+ #define X86_FEATURE_SPEC_CTRL		(18*32+26) /* "" Speculation Control (IBRS + IBPB) */
+@@ -382,5 +383,7 @@
+ #define X86_BUG_SPECTRE_V2		X86_BUG(16) /* CPU is affected by Spectre variant 2 attack with indirect branches */
+ #define X86_BUG_SPEC_STORE_BYPASS	X86_BUG(17) /* CPU is affected by speculative store bypass attack */
+ #define X86_BUG_L1TF			X86_BUG(18) /* CPU is affected by L1 Terminal Fault */
++#define X86_BUG_MDS			X86_BUG(19) /* CPU is affected by Microarchitectural data sampling */
++#define X86_BUG_MSBDS_ONLY		X86_BUG(20) /* CPU is only affected by the  MSDBS variant of BUG_MDS */
+ 
+ #endif /* _ASM_X86_CPUFEATURES_H */
+-- 
+2.7.4
+