When purging old-style annotations, MPU code was left unmodified. Fix
it.

Fixes: 221c66f4f2a4 ("Arm: purge ENTRY(), ENDPROC(), and ALIGN")
Signed-off-by: Michal Orzel <michal.orzel@amd.com>
---
I found the issue when applying Luca series to be commited enabling MPU on
Arm64 build. This patch is a prerequisite for it.
---
 xen/arch/arm/arm64/mpu/head.S | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xen/arch/arm/arm64/mpu/head.S b/xen/arch/arm/arm64/mpu/head.S
index 4d00de4869af..ed01993d8556 100644
--- a/xen/arch/arm/arm64/mpu/head.S
+++ b/xen/arch/arm/arm64/mpu/head.S
@@ -158,11 +158,11 @@ END(enable_boot_cpu_mm)
  * We don't yet support secondary CPUs bring-up. Implement a dummy helper to
  * please the common code.
  */
-ENTRY(enable_secondary_cpu_mm)
+FUNC(enable_secondary_cpu_mm)
     PRINT("- SMP not enabled yet -\r\n")
 1:  wfe
     b 1b
-ENDPROC(enable_secondary_cpu_mm)
+END(enable_secondary_cpu_mm)
 
 /*
  * Local variables:
-- 
2.25.1

On 02.04.2025 11:02, Michal Orzel wrote:
> When purging old-style annotations, MPU code was left unmodified. Fix
> it.
> 
> Fixes: 221c66f4f2a4 ("Arm: purge ENTRY(), ENDPROC(), and ALIGN")
> Signed-off-by: Michal Orzel <michal.orzel@amd.com>

Reviewed-by: Jan Beulich <jbeulich@suse.com>

I'm sorry for the oversight. I had meant to do a last-minute grep before
committing that patch, but then forgot. A tiny bit to my excuse: The
introduction of MPU post-dates the common-ized assembly annotations by
quite a bit. It should have used new-style annotations from the very
beginning imo.

Jan

Hi Michal,

On 02/04/2025 10:02, Michal Orzel wrote:
> When purging old-style annotations, MPU code was left unmodified. Fix
> it.
> 
> Fixes: 221c66f4f2a4 ("Arm: purge ENTRY(), ENDPROC(), and ALIGN")
> Signed-off-by: Michal Orzel <michal.orzel@amd.com>

Acked-by: Julien Grall <jgrall@amazon.com>

Cheers,

-- 
Julien Grall