summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/vmlinux.lds.S
diff options
context:
space:
mode:
authorPeter Zijlstra <peterz@infradead.org>2023-08-14 13:44:32 +0200
committerBorislav Petkov (AMD) <bp@alien8.de>2023-08-16 21:47:53 +0200
commitd025b7bac07a6e90b6b98b487f88854ad9247c39 (patch)
tree3df922056f90520f3bdff0e6efc02bb83f257eeb /arch/x86/kernel/vmlinux.lds.S
parentd43490d0ab824023e11d0b57d0aeec17a6e0ca13 (diff)
downloadlinux-stable-d025b7bac07a6e90b6b98b487f88854ad9247c39.tar.gz
linux-stable-d025b7bac07a6e90b6b98b487f88854ad9247c39.tar.bz2
linux-stable-d025b7bac07a6e90b6b98b487f88854ad9247c39.zip
x86/cpu: Rename original retbleed methods
Rename the original retbleed return thunk and untrain_ret to retbleed_return_thunk() and retbleed_untrain_ret(). No functional changes. Suggested-by: Josh Poimboeuf <jpoimboe@kernel.org> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de> Link: https://lore.kernel.org/r/20230814121148.909378169@infradead.org
Diffstat (limited to 'arch/x86/kernel/vmlinux.lds.S')
-rw-r--r--arch/x86/kernel/vmlinux.lds.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
index d3b02d67321b..7c0e2b4fc344 100644
--- a/arch/x86/kernel/vmlinux.lds.S
+++ b/arch/x86/kernel/vmlinux.lds.S
@@ -521,7 +521,7 @@ INIT_PER_CPU(irq_stack_backing_store);
#endif
#ifdef CONFIG_RETHUNK
-. = ASSERT((zen_return_thunk & 0x3f) == 0, "zen_return_thunk not cacheline-aligned");
+. = ASSERT((retbleed_return_thunk & 0x3f) == 0, "retbleed_return_thunk not cacheline-aligned");
. = ASSERT((srso_safe_ret & 0x3f) == 0, "srso_safe_ret not cacheline-aligned");
#endif