diff options
Diffstat (limited to 'release/4.18.45/tools-arch-x86-Sync-asm-cpufeatures.h-with-the-with0.patch')
| -rw-r--r-- | release/4.18.45/tools-arch-x86-Sync-asm-cpufeatures.h-with-the-with0.patch | 57 |
1 files changed, 57 insertions, 0 deletions
diff --git a/release/4.18.45/tools-arch-x86-Sync-asm-cpufeatures.h-with-the-with0.patch b/release/4.18.45/tools-arch-x86-Sync-asm-cpufeatures.h-with-the-with0.patch new file mode 100644 index 0000000..6a7b82f --- /dev/null +++ b/release/4.18.45/tools-arch-x86-Sync-asm-cpufeatures.h-with-the-with0.patch @@ -0,0 +1,57 @@ +From 0325926cb659a95435043b97031bda52b4f6e8eb 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> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> + +diff --git a/tools/arch/x86/include/asm/cpufeatures.h b/tools/arch/x86/include/asm/cpufeatures.h +index 64aaa3f5f36c..117a0bc5c958 100644 +--- a/tools/arch/x86/include/asm/cpufeatures.h ++++ b/tools/arch/x86/include/asm/cpufeatures.h +@@ -339,6 +339,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_PCONFIG (18*32+18) /* Intel PCONFIG */ + #define X86_FEATURE_SPEC_CTRL (18*32+26) /* "" Speculation Control (IBRS + IBPB) */ + #define X86_FEATURE_INTEL_STIBP (18*32+27) /* "" Single Thread Indirect Branch Predictors */ +@@ -376,5 +377,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 + |