The following commit has been merged into the x86/cleanups branch of tip: Commit-ID: 8c3223a50faf1d173e0159eff10a9de902407135 Gitweb: https://git.kernel.org/tip/8c3223a50faf1d173e0159eff10a9de902407135 Author: Jingyu Wang <jingyuwang_vip@xxxxxxx> AuthorDate: Sat, 18 Jun 2022 23:42:38 +08:00 Committer: Borislav Petkov (AMD) <bp@xxxxxxxxx> CommitterDate: Mon, 06 Mar 2023 08:04:03 +01:00 x86/entry: Change stale function name in comment to error_return() Correct old function name error_exit() in the comment to what it is now called: error_return(). [ bp: Provide a commit message and massage. ] Signed-off-by: Jingyu Wang <jingyuwang_vip@xxxxxxx> Signed-off-by: Borislav Petkov (AMD) <bp@xxxxxxxxx> Link: https://lore.kernel.org/r/20220618154238.27749-1-jingyuwang_vip@xxxxxxx --- arch/x86/entry/entry_64.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S index eccc343..048866c 100644 --- a/arch/x86/entry/entry_64.S +++ b/arch/x86/entry/entry_64.S @@ -1027,7 +1027,7 @@ SYM_CODE_START_LOCAL(paranoid_exit) * * NB to anyone to try to optimize this code: this code does * not execute at all for exceptions from user mode. Those - * exceptions go through error_exit instead. + * exceptions go through error_return instead. */ RESTORE_CR3 scratch_reg=%rax save_reg=%r14