tools headers: Sync x86's cpufeatures.h
tip-bot for Arnaldo Carvalho de Melo
merge botCommit-ID: 4caea0574c5009901d1976980579ccd26dbf358a Gitweb: https://git.kernel.org/tip/4caea0574c5009901d1976980579ccd26dbf358a Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Mon, 5 Mar 2018 12:07:52 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 5 Mar 2018 12:07:52 -0300
tools headers: Sync x86's cpufeatures.h
The changes in dd84441a7971 ("x86/speculation: Use IBRS if available before calling into firmware") don't need any kind of special treatment in the current tools/perf/ codebase, so just update the copy to get rid of the perf build warning:
BUILD: Doing 'make -j4' parallel build
Warning: Kernel ABI header at 'tools/arch/x86/include/asm/cpufeatures.h' differs from latest version at 'arch/x86/include/asm/cpufeatures.h'
Cc Adrian Hunter <[email protected]>
Cc David Ahern <[email protected]>
Cc David Woodhouse <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Wang Nan <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/arch/x86/include/asm/cpufeatures.h | 1 + 1 file changed, 1 insertion(+)
tools/arch/x86/include/asm/cpufeatures.h +1 -0
@@ -213,6 +213,7 @@#define X86_FEATURE_SEV ( 7*32+20)/* AMD Secure Encrypted Virtualization */ #define X86_FEATURE_USE_IBPB ( 7*32+21)/* "" Indirect Branch Prediction Barrier enabled */ +#define X86_FEATURE_USE_IBRS_FW ( 7*32+22)/* "" Use IBRS during runtime firmware calls */ /* Virtualization flags: Linux defined, word 8 */ #define X86_FEATURE_TPR_SHADOW ( 8*32+ 0)/* Intel TPR Shadow */