diff options
| author | Breno Leitao <leitao@debian.org> | 2023-11-21 08:07:29 -0800 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2024-01-10 10:52:28 +0100 |
| commit | e0b8fcfa3cfac171d589ad6085a00c584d571f08 (patch) | |
| tree | dbb55a4f8089c454a495916e0300ff2e19258985 /arch/x86/include | |
| parent | be83e809ca67bca98fde97ad6b9344237963220b (diff) | |
| download | lwn-e0b8fcfa3cfac171d589ad6085a00c584d571f08.tar.gz lwn-e0b8fcfa3cfac171d589ad6085a00c584d571f08.zip | |
x86/bugs: Rename CONFIG_CPU_IBPB_ENTRY => CONFIG_MITIGATION_IBPB_ENTRY
Step 2/10 of the namespace unification of CPU mitigations related Kconfig options.
Suggested-by: Josh Poimboeuf <jpoimboe@kernel.org>
Signed-off-by: Breno Leitao <leitao@debian.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Acked-by: Josh Poimboeuf <jpoimboe@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Link: https://lore.kernel.org/r/20231121160740.1249350-3-leitao@debian.org
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/nospec-branch.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/nospec-branch.h b/arch/x86/include/asm/nospec-branch.h index 262e65539f83..7341fd945698 100644 --- a/arch/x86/include/asm/nospec-branch.h +++ b/arch/x86/include/asm/nospec-branch.h @@ -289,7 +289,7 @@ * where we have a stack but before any RET instruction. */ .macro __UNTRAIN_RET ibpb_feature, call_depth_insns -#if defined(CONFIG_RETHUNK) || defined(CONFIG_CPU_IBPB_ENTRY) +#if defined(CONFIG_RETHUNK) || defined(CONFIG_MITIGATION_IBPB_ENTRY) VALIDATE_UNRET_END ALTERNATIVE_3 "", \ CALL_UNTRAIN_RET, X86_FEATURE_UNRET, \ |