diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2022-08-01 08:59:31 -0300 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2022-08-01 08:59:31 -0300 |
commit | 18808564aa3bc9ae3309fd8a5c0a93f7f9a23f9a (patch) | |
tree | 4c1732a2dddb246f0d39a492cbf8e6db31f3af3e /tools/arch/x86 | |
parent | 9a0b36266f7a83912592052035b84f13b12e30da (diff) | |
parent | 3d7cb6b04c3f3115719235cc6866b10326de34cd (diff) | |
download | linux-stable-18808564aa3bc9ae3309fd8a5c0a93f7f9a23f9a.tar.gz linux-stable-18808564aa3bc9ae3309fd8a5c0a93f7f9a23f9a.tar.bz2 linux-stable-18808564aa3bc9ae3309fd8a5c0a93f7f9a23f9a.zip |
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up the fixes that went upstream via acme/perf/urgent and to get
to v5.19.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/arch/x86')
-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 00f5227c8459..a77b915d36a8 100644 --- a/tools/arch/x86/include/asm/cpufeatures.h +++ b/tools/arch/x86/include/asm/cpufeatures.h @@ -302,6 +302,7 @@ #define X86_FEATURE_RETPOLINE_LFENCE (11*32+13) /* "" Use LFENCE for Spectre variant 2 */ #define X86_FEATURE_RETHUNK (11*32+14) /* "" Use REturn THUNK */ #define X86_FEATURE_UNRET (11*32+15) /* "" AMD BTB untrain return */ +#define X86_FEATURE_USE_IBPB_FW (11*32+16) /* "" Use IBPB during runtime firmware calls */ /* Intel-defined CPU features, CPUID level 0x00000007:1 (EAX), word 12 */ #define X86_FEATURE_AVX_VNNI (12*32+ 4) /* AVX VNNI instructions */ |