Skip to content

Commit dd4a5c2

Browse files
committed
tools arch x86: Sync asm/cpufeatures.h with the kernel sources
To pick up the changes from: 85b23fb ("x86/cpufeatures: Add enumeration for SERIALIZE instruction") bd657aa ("x86/cpufeatures: Add Architectural LBRs feature bit") fbd5969 ("x86/cpufeatures: Mark two free bits in word 3") These should't cause any changes in tooling, it just gets rebuilt by including those headers: CC /tmp/build/perf/bench/mem-memcpy-x86-64-asm.o CC /tmp/build/perf/bench/mem-memset-x86-64-asm.o LD /tmp/build/perf/bench/perf-in.o LD /tmp/build/perf/perf-in.o LINK /tmp/build/perf/perf And 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 <[email protected]> Cc: Borislav Petkov <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: Jiri Olsa <[email protected]> Cc: Kan Liang <[email protected]> Cc: Namhyung Kim <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Ricardo Neri <[email protected]> Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
1 parent f815fe5 commit dd4a5c2

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

tools/arch/x86/include/asm/cpufeatures.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@
9696
#define X86_FEATURE_SYSCALL32 ( 3*32+14) /* "" syscall in IA32 userspace */
9797
#define X86_FEATURE_SYSENTER32 ( 3*32+15) /* "" sysenter in IA32 userspace */
9898
#define X86_FEATURE_REP_GOOD ( 3*32+16) /* REP microcode works well */
99+
/* free ( 3*32+17) */
99100
#define X86_FEATURE_LFENCE_RDTSC ( 3*32+18) /* "" LFENCE synchronizes RDTSC */
100101
#define X86_FEATURE_ACC_POWER ( 3*32+19) /* AMD Accumulated Power Mechanism */
101102
#define X86_FEATURE_NOPL ( 3*32+20) /* The NOPL (0F 1F) instructions */
@@ -107,6 +108,7 @@
107108
#define X86_FEATURE_EXTD_APICID ( 3*32+26) /* Extended APICID (8 bits) */
108109
#define X86_FEATURE_AMD_DCM ( 3*32+27) /* AMD multi-node processor */
109110
#define X86_FEATURE_APERFMPERF ( 3*32+28) /* P-State hardware coordination feedback capability (APERF/MPERF MSRs) */
111+
/* free ( 3*32+29) */
110112
#define X86_FEATURE_NONSTOP_TSC_S3 ( 3*32+30) /* TSC doesn't stop in S3 state */
111113
#define X86_FEATURE_TSC_KNOWN_FREQ ( 3*32+31) /* TSC has known frequency */
112114

@@ -365,7 +367,9 @@
365367
#define X86_FEATURE_SRBDS_CTRL (18*32+ 9) /* "" SRBDS mitigation MSR available */
366368
#define X86_FEATURE_MD_CLEAR (18*32+10) /* VERW clears CPU buffers */
367369
#define X86_FEATURE_TSX_FORCE_ABORT (18*32+13) /* "" TSX_FORCE_ABORT */
370+
#define X86_FEATURE_SERIALIZE (18*32+14) /* SERIALIZE instruction */
368371
#define X86_FEATURE_PCONFIG (18*32+18) /* Intel PCONFIG */
372+
#define X86_FEATURE_ARCH_LBR (18*32+19) /* Intel ARCH LBR */
369373
#define X86_FEATURE_SPEC_CTRL (18*32+26) /* "" Speculation Control (IBRS + IBPB) */
370374
#define X86_FEATURE_INTEL_STIBP (18*32+27) /* "" Single Thread Indirect Branch Predictors */
371375
#define X86_FEATURE_FLUSH_L1D (18*32+28) /* Flush L1D cache */

0 commit comments

Comments
 (0)