[PATCH RFC 03/28] ARM: entry: Skip ret_slow_syscall label
From: Linus Walleij
Date: Thu Oct 10 2024 - 07:34:19 EST
Don't introduce this extra label anymore now that we have
a clearly defined entry point for ret_to_user.
Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxx>
---
arch/arm/kernel/entry-common.S | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
index f379c852dcb7..2f93c2f6d5b8 100644
--- a/arch/arm/kernel/entry-common.S
+++ b/arch/arm/kernel/entry-common.S
@@ -102,7 +102,6 @@ ENDPROC(ret_fast_syscall)
* do_work_pending() will update this state if necessary.
*/
ENTRY(ret_to_user)
-ret_slow_syscall:
#if IS_ENABLED(CONFIG_DEBUG_RSEQ)
/* do_rseq_syscall needs interrupts enabled. */
enable_irq_notrace @ enable interrupts
@@ -136,7 +135,7 @@ ENTRY(ret_from_fork)
badrne lr, 1f
retne r5
1: get_thread_info tsk
- b ret_slow_syscall
+ b ret_to_user
ENDPROC(ret_from_fork)
/*=============================================================================
@@ -310,13 +309,13 @@ __sys_trace_return_nosave:
enable_irq_notrace
mov r0, sp
bl syscall_trace_exit
- b ret_slow_syscall
+ b ret_to_user
__sys_trace_return:
str r0, [sp, #S_R0 + S_OFF]! @ save returned r0
mov r0, sp
bl syscall_trace_exit
- b ret_slow_syscall
+ b ret_to_user
.macro syscall_table_start, sym
.equ __sys_nr, 0
--
2.46.2