Skip to content

Commit 73d6890

Browse files
brooniewilldeacon
authored andcommitted
arm64: kernel: Correct annotation of end of el0_sync
Commit 582f958 ("arm64: entry: convert el0_sync to C") caused the ENDPROC() annotating the end of el0_sync to be placed after the code for el0_sync_compat. This replaced the previous annotation where it was located after all the cases that are now converted to C, including after the currently unannotated el0_irq_compat and el0_error_compat. Move the annotation to the end of the function and add separate annotations for the _compat ones. Fixes: 582f958 (arm64: entry: convert el0_sync to C) Signed-off-by: Mark Brown <[email protected]> Signed-off-by: Will Deacon <[email protected]>
1 parent b6a5c58 commit 73d6890

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

arch/arm64/kernel/entry.S

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -653,6 +653,7 @@ el0_sync:
653653
mov x0, sp
654654
bl el0_sync_handler
655655
b ret_to_user
656+
ENDPROC(el0_sync)
656657

657658
#ifdef CONFIG_COMPAT
658659
.align 6
@@ -661,16 +662,18 @@ el0_sync_compat:
661662
mov x0, sp
662663
bl el0_sync_compat_handler
663664
b ret_to_user
664-
ENDPROC(el0_sync)
665+
ENDPROC(el0_sync_compat)
665666

666667
.align 6
667668
el0_irq_compat:
668669
kernel_entry 0, 32
669670
b el0_irq_naked
671+
ENDPROC(el0_irq_compat)
670672

671673
el0_error_compat:
672674
kernel_entry 0, 32
673675
b el0_error_naked
676+
ENDPROC(el0_error_compat)
674677
#endif
675678

676679
.align 6

0 commit comments

Comments
 (0)