diff options
| author | Breno Leitao <leitao@debian.org> | 2023-11-21 08:07:36 -0800 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2024-01-10 10:52:29 +0100 |
| commit | a033eec9a06ce25388e71fa1e888792a718b9c17 (patch) | |
| tree | d8e102215e0a0c330f7ffc578b53e1d77eb38942 /arch/x86/kernel/vmlinux.lds.S | |
| parent | 1da8d2172ce5175118929363fe568e41f24ad3d6 (diff) | |
| download | linux-stable-a033eec9a06ce25388e71fa1e888792a718b9c17.tar.gz linux-stable-a033eec9a06ce25388e71fa1e888792a718b9c17.tar.bz2 linux-stable-a033eec9a06ce25388e71fa1e888792a718b9c17.zip | |
x86/bugs: Rename CONFIG_CPU_SRSO => CONFIG_MITIGATION_SRSO
Step 9/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-10-leitao@debian.org
Diffstat (limited to 'arch/x86/kernel/vmlinux.lds.S')
| -rw-r--r-- | arch/x86/kernel/vmlinux.lds.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S index 9c5cca50a36f..6716fccd59ce 100644 --- a/arch/x86/kernel/vmlinux.lds.S +++ b/arch/x86/kernel/vmlinux.lds.S @@ -142,7 +142,7 @@ SECTIONS *(.text..__x86.rethunk_untrain) ENTRY_TEXT -#ifdef CONFIG_CPU_SRSO +#ifdef CONFIG_MITIGATION_SRSO /* * See the comment above srso_alias_untrain_ret()'s * definition. @@ -508,7 +508,7 @@ INIT_PER_CPU(irq_stack_backing_store); . = ASSERT((retbleed_return_thunk & 0x3f) == 0, "retbleed_return_thunk not cacheline-aligned"); #endif -#ifdef CONFIG_CPU_SRSO +#ifdef CONFIG_MITIGATION_SRSO . = ASSERT((srso_safe_ret & 0x3f) == 0, "srso_safe_ret not cacheline-aligned"); /* * GNU ld cannot do XOR until 2.41. |