diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-03-07 09:23:12 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-03-07 09:23:12 +0100 |
| commit | 3f986eefc89c528bf2d398a6dc3637b743a7139e (patch) | |
| tree | 8a0b4ccffa3502b7907f6ce5ed50b7ca0092e5ee /tools/arch | |
| parent | 55b4ce61a2a1608881ef7eab8a4e3fab3718dc4d (diff) | |
| parent | 629ae2ee73e225fa7dcce581c005d773b0190dcc (diff) | |
| download | linux-stable-3f986eefc89c528bf2d398a6dc3637b743a7139e.tar.gz linux-stable-3f986eefc89c528bf2d398a6dc3637b743a7139e.tar.bz2 linux-stable-3f986eefc89c528bf2d398a6dc3637b743a7139e.zip | |
Merge branch 'perf/urgent' into perf/core, to resolve conflict
Conflicts:
tools/perf/perf.h
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/arch')
| -rw-r--r-- | tools/arch/x86/include/asm/cpufeatures.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/arch/x86/include/asm/cpufeatures.h b/tools/arch/x86/include/asm/cpufeatures.h index 0dfe4d3f74e2..f41079da38c5 100644 --- a/tools/arch/x86/include/asm/cpufeatures.h +++ b/tools/arch/x86/include/asm/cpufeatures.h @@ -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 */ |