Header guard is missing, and ret macro is not relevant for arm64.
Both fixed.
Signed-off-by: Jiaxun Yang jiaxun.yang@flygoat.com --- arch/arm/include/asm/assembler.h | 7 +++++++ 1 file changed, 7 insertions(+)
diff --git a/arch/arm/include/asm/assembler.h b/arch/arm/include/asm/assembler.h index 4fda483b8d8d..c3b8f34dd0af 100644 --- a/arch/arm/include/asm/assembler.h +++ b/arch/arm/include/asm/assembler.h @@ -14,6 +14,9 @@ * assembler source. */
+#ifndef __ASM_ARM_ASSEMBLER_H +#define __ASM_ARM_ASSEMBLER_H + #include <asm/unified.h>
/* @@ -56,6 +59,7 @@ #define PLD(code...) #endif
+#if !defined(__aarch64__) /* * Use 'bx lr' everywhere except ARMv4 (without 'T') where only 'mov pc, lr' * works @@ -75,6 +79,7 @@ #endif .endm .endr +#endif
/* * Cache aligned, used for optimized memcpy/memset @@ -87,3 +92,5 @@ #else #define CALGN(code...) code #endif + +#endif