diff options
| author |  Breno Leitao <leitao@debian.org>
| 2023-11-21 08:07:37 -0800 |
|---|---|---|
| committer |  Ingo Molnar <mingo@kernel.org>
| 2024-01-10 10:52:29 +0100 |
| commit | 0911b8c52c4d68c57d02f172daa55a42bce703f0 (patch) | |
| tree | ddababa7d82c5cd9ec7f79d9a1b0e9942008d1c4 /arch/x86/kernel/alternative.c | |
| parent | x86/bugs: Rename CONFIG_CPU_SRSO => CONFIG_MITIGATION_SRSO (diff) | |
| download | linux-0911b8c52c4d68c57d02f172daa55a42bce703f0.tar.gz linux-0911b8c52c4d68c57d02f172daa55a42bce703f0.tar.bz2 linux-0911b8c52c4d68c57d02f172daa55a42bce703f0.zip | |
x86/bugs: Rename CONFIG_RETHUNK => CONFIG_MITIGATION_RETHUNK
Step 10/10 of the namespace unification of CPU mitigations related Kconfig options.
[ mingo: Added one more case. ]
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-11-leitao@debian.org
Diffstat (limited to 'arch/x86/kernel/alternative.c')
| -rw-r--r-- | arch/x86/kernel/alternative.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c index f5442d0d2ee9..df91abea3420 100644 --- a/arch/x86/kernel/alternative.c +++ b/arch/x86/kernel/alternative.c @@ -769,7 +769,7 @@ void __init_or_module noinline apply_retpolines(s32 *start, s32 *end) } } -#ifdef CONFIG_RETHUNK +#ifdef CONFIG_MITIGATION_RETHUNK /* * Rewrite the compiler generated return thunk tail-calls. @@ -842,7 +842,7 @@ void __init_or_module noinline apply_returns(s32 *start, s32 *end) } #else void __init_or_module noinline apply_returns(s32 *start, s32 *end) { } -#endif /* CONFIG_RETHUNK */ +#endif /* CONFIG_MITIGATION_RETHUNK */ #else /* !CONFIG_MITIGATION_RETPOLINE || !CONFIG_OBJTOOL */ |