Skip to contentSkip to conversation

tools arch x86: Sync asm/cpufeatures.h with the kernel sources

tip:perf/urgent tip-bot for Arnaldo Carvalho de Melo 1 participant 1 message Mar 29, 2019

lore
Share & tools
lore
#0 lore raw
Commit-ID:  949af89af02c2d66db973c5bca01b7858e1ce0ba
Gitweb:     https://git.kernel.org/tip/949af89af02c2d66db973c5bca01b7858e1ce0ba
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Mon, 25 Mar 2019 14:25:33 -0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Thu, 28 Mar 2019 14:31:56 -0300

tools arch x86: Sync asm/cpufeatures.h with the kernel sources

To get the changes from:

52f64909409c ("x86: Add TSX Force Abort CPUID/MSR")

That don't cause any changes in the generated perf binaries.

And silence 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

---
 tools/arch/x86/include/asm/cpufeatures.h | 1 +
 1 file changed, 1 insertion(+)
tools/arch/x86/include/asm/cpufeatures.h +1 -0
index 6d6122524711..981ff9479648 100644
@@ -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_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) */
 #define X86_FEATURE_INTEL_STIBP		(18*32+27) /* "" Single Thread Indirect Branch Predictors */