arm64: kernel: Correct annotation of end of el0_sync
PATCH 1/1 arm64: kernel: Correct annotation of end of el0_sync
Commit 582f95835a8fc812c (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.
--- arch/arm64/kernel/entry.S | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
arch/arm64/kernel/entry.S +4 -1
@@ -653,6 +653,7 @@ el0_sync: mov x0, sp bl el0_sync_handler b ret_to_user +ENDPROC(el0_sync) #ifdef CONFIG_COMPAT .align 6
@@ -661,16 +662,18 @@ el0_sync_compat: mov x0, sp bl el0_sync_compat_handler b ret_to_user -ENDPROC(el0_sync) +ENDPROC(el0_sync_compat) .align 6 el0_irq_compat: kernel_entry 0, 32 b el0_irq_naked +ENDPROC(el0_irq_compat) el0_error_compat: kernel_entry 0, 32 b el0_error_naked +ENDPROC(el0_error_compat) #endif .align 6
Signature · 7 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoted 7 lines · Mark Brown
Commit
582f95835a8fc812c(arm64: entry: convertel0_syncto C) caused theENDPROC()annotating the end ofel0_syncto be placed after the code forel0_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 unannotatedel0_irq_compatandel0_error_compat. Move the annotation to the end of the function and add separate annotations for the_compatones.
Sorry, just realized that a variant of this is in the series that Mark posted earlier this week - please ignore this.
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Mark Rutland
reviewerQuoted 11 lines · Mark Brown
Quoted 7 lines · Mark Brown
Commit
582f95835a8fc812c(arm64: entry: convertel0_syncto C) caused theENDPROC()annotating the end ofel0_syncto be placed after the code forel0_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 unannotatedel0_irq_compatandel0_error_compat. Move the annotation to the end of the function and add separate annotations for the_compatones.Sorry, just realized that a variant of this is in the series that Mark posted earlier this week - please ignore this.
I'm happy to rebase my entry rework atop of this patch if it gets queued now, so I'll leave it to Catalin and Will to choose.
Thanks,
Mark.
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoted 10 lines · Mark Brown
Commit
582f95835a8fc812c(arm64: entry: convertel0_syncto C) caused theENDPROC()annotating the end ofel0_syncto be placed after the code forel0_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 unannotatedel0_irq_compatandel0_error_compat. Move the annotation to the end of the function and add separate annotations for the_compatones.Fixes 582f95835a8fc812c (arm64: entry: convert el0_sync to C)Signed-off-by Mark Brown <[email protected]>
Looks sane to me; I can rebase my entry rework atop.
Mark.
Quoted 39 lines
--- arch/arm64/kernel/entry.S | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)arch/arm64/kernel/entry.S +4
-1@@ -653,6 +653,7 @@ el0_sync: mov x0, sp bl el0_sync_handler b ret_to_user +ENDPROC(el0_sync) #ifdef CONFIG_COMPAT .align 6@@ -661,16 +662,18 @@ el0_sync_compat: mov x0, sp bl el0_sync_compat_handler b ret_to_user -ENDPROC(el0_sync) +ENDPROC(el0_sync_compat) .align 6 el0_irq_compat: kernel_entry 0, 32 b el0_irq_naked +ENDPROC(el0_irq_compat) el0_error_compat: kernel_entry 0, 32 b el0_error_naked +ENDPROC(el0_error_compat) #endif .align 6Signature · 1 line
2.20.1
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel