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 /tools | |
| parent | x86/bugs: Rename CONFIG_CPU_SRSO => CONFIG_MITIGATION_SRSO (diff) | |
| download | wireguard-linux-0911b8c52c4d68c57d02f172daa55a42bce703f0.tar.xz wireguard-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 'tools')
| -rw-r--r-- | tools/arch/x86/include/asm/disabled-features.h | 2 | ||||
| -rw-r--r-- | tools/objtool/check.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/arch/x86/include/asm/disabled-features.h b/tools/arch/x86/include/asm/disabled-features.h index 151f0d50e7e0..36d0c1e05e60 100644 --- a/tools/arch/x86/include/asm/disabled-features.h +++ b/tools/arch/x86/include/asm/disabled-features.h @@ -57,7 +57,7 @@ (1 << (X86_FEATURE_RETPOLINE_LFENCE & 31))) #endif -#ifdef CONFIG_RETHUNK +#ifdef CONFIG_MITIGATION_RETHUNK # define DISABLE_RETHUNK 0 #else # define DISABLE_RETHUNK (1 << (X86_FEATURE_RETHUNK & 31)) diff --git a/tools/objtool/check.c b/tools/objtool/check.c index 84067f018f7e..8440b7bb343c 100644 --- a/tools/objtool/check.c +++ b/tools/objtool/check.c @@ -3980,7 +3980,7 @@ static int validate_retpoline(struct objtool_file *file) if (insn->type == INSN_RETURN) { if (opts.rethunk) { - WARN_INSN(insn, "'naked' return found in RETHUNK build"); + WARN_INSN(insn, "'naked' return found in MITIGATION_RETHUNK build"); } else continue; } else { |