@@ -618,7 +618,7 @@ SYM_CODE_START_LOCAL_NOALIGN(el1_sync)
kernel_entry 1
mov x0, sp
bl el1_sync_handler
- kernel_exit 1
+ b ret_to_kernel
SYM_CODE_END(el1_sync)
.align 6
@@ -626,7 +626,7 @@ SYM_CODE_START_LOCAL_NOALIGN(el1_irq)
kernel_entry 1
mov x0, sp
bl el1_irq_handler
- kernel_exit 1
+ b ret_to_kernel
SYM_CODE_END(el1_irq)
.align 6
@@ -634,7 +634,7 @@ SYM_CODE_START_LOCAL_NOALIGN(el1_fiq)
kernel_entry 1
mov x0, sp
bl el1_fiq_handler
- kernel_exit 1
+ b ret_to_kernel
SYM_CODE_END(el1_fiq)
.align 6
@@ -642,9 +642,13 @@ SYM_CODE_START_LOCAL_NOALIGN(el1_error)
kernel_entry 1
mov x0, sp
bl el1_error_handler
- kernel_exit 1
+ b ret_to_kernel
SYM_CODE_END(el1_error)
+SYM_CODE_START_LOCAL(ret_to_kernel)
+ kernel_exit 1
+SYM_CODE_END(ret_to_kernel)
+
/*
* EL0 mode handlers.
*/
Following the example of ret_to_user, let's consolidate all the EL1 return paths with a ret_to_kernel helper, rather than each entry point having its own copy of the return code. There should be no functional change as a result of this patch. Signed-off-by: Mark Rutland <mark.rutland@arm.com> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: James Morse <james.morse@arm.com> Cc: Marc Zyngier <maz@kernel.org> Cc: Will Deacon <will@kernel.org> --- arch/arm64/kernel/entry.S | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)