From: Julien Grall <jgrall@amazon.com>
Date: Tue, 1 Mar 2022 19:56:15 +0000 (+0000)
Subject: xen/arm32: head: Mark the end of subroutines with ENDPROC (take two)
X-Git-Tag: archive/raspbian/4.17.0-1+rpi1^2~33^2~876
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=84c3eb3a9c104a9ee5095d2420d5dd137a381a37;p=xen.git

xen/arm32: head: Mark the end of subroutines with ENDPROC (take two)

Commit 2ac705a59ef5 ("xen/arm32: head: Mark the end of subroutines
with ENDPROC") intended to mark all the subroutines with ENDPROC.

Unfortunately, I missed fail(), switch_ttbr(), init_uart() and
__lookup_processor_type(). Add ENDPROC for the benefits of
static analysis tools and the reader.

Signed-off-by: Julien Grall <jgrall@amazon.com>
Reviewed-by: Michal Orzel <michal.orzel@arm.com>
Reviewed-by: Bertrand Marquis <bertrand.marquis@arm.com>
---

diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S
index b1d209ea28..13cfc837d3 100644
--- a/xen/arch/arm/arm32/head.S
+++ b/xen/arch/arm/arm32/head.S
@@ -661,6 +661,7 @@ ENDPROC(launch)
 fail:   PRINT("- Boot failed -\r\n")
 1:      wfe
         b     1b
+ENDPROC(fail)
 
 GLOBAL(_end_boot)
 
@@ -694,6 +695,7 @@ ENTRY(switch_ttbr)
         isb
 
         mov pc, lr
+ENDPROC(switch_ttbr)
 
 #ifdef CONFIG_EARLY_PRINTK
 /*
@@ -711,6 +713,7 @@ init_uart:
 #endif
         PRINT("- UART enabled -\r\n")
         mov   pc, lr
+ENDPROC(init_uart)
 
 /*
  * Print early debug messages.
@@ -798,6 +801,7 @@ __lookup_processor_type:
         mov   r1, #0
 2:
         mov   pc, lr
+ENDPROC(__lookup_processor_type)
 
 /*
  * Local variables: