aboutsummaryrefslogtreecommitdiff
path: root/arch/x86/lib
diff options
context:
space:
mode:
authorGravatar Josh Poimboeuf <jpoimboe@kernel.org> 2023-09-04 22:05:04 -0700
committerGravatar Borislav Petkov (AMD) <bp@alien8.de> 2023-10-20 12:45:48 +0200
commit99ee56c7657f939eecc4e8ac96e0aa0cd6ea7cbd (patch)
tree23c213439e433d86ec3d63cd3193c944d667c41f /arch/x86/lib
parentx86/nospec: Refactor UNTRAIN_RET[_*] (diff)
downloadlinux-99ee56c7657f939eecc4e8ac96e0aa0cd6ea7cbd.tar.gz
linux-99ee56c7657f939eecc4e8ac96e0aa0cd6ea7cbd.tar.bz2
linux-99ee56c7657f939eecc4e8ac96e0aa0cd6ea7cbd.zip
x86/calldepth: Rename __x86_return_skl() to call_depth_return_thunk()
For consistency with the other return thunks, rename __x86_return_skl() to call_depth_return_thunk(). Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org> Signed-off-by: Ingo Molnar <mingo@kernel.org> Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de> Acked-by: Borislav Petkov (AMD) <bp@alien8.de> Link: https://lore.kernel.org/r/ae44e9f9976934e3b5b47a458d523ccb15867561.1693889988.git.jpoimboe@kernel.org
Diffstat (limited to 'arch/x86/lib')
-rw-r--r--arch/x86/lib/retpoline.S4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/lib/retpoline.S b/arch/x86/lib/retpoline.S
index 415521dbe15e..d410abacbf88 100644
--- a/arch/x86/lib/retpoline.S
+++ b/arch/x86/lib/retpoline.S
@@ -323,7 +323,7 @@ __EXPORT_THUNK(entry_untrain_ret)
#ifdef CONFIG_CALL_DEPTH_TRACKING
.align 64
-SYM_FUNC_START(__x86_return_skl)
+SYM_FUNC_START(call_depth_return_thunk)
ANNOTATE_NOENDBR
/*
* Keep the hotpath in a 16byte I-fetch for the non-debug
@@ -350,7 +350,7 @@ SYM_FUNC_START(__x86_return_skl)
ANNOTATE_UNRET_SAFE
ret
int3
-SYM_FUNC_END(__x86_return_skl)
+SYM_FUNC_END(call_depth_return_thunk)
#endif /* CONFIG_CALL_DEPTH_TRACKING */