MIPS: Guard some macros with __ASSEMBLY__ in asm.h
authorJiaxun Yang <jiaxun.yang@flygoat.com>
Tue, 26 Mar 2024 11:41:45 +0000 (11:41 +0000)
committerThomas Bogendoerfer <tsbogend@alpha.franken.de>
Mon, 15 Apr 2024 08:22:09 +0000 (10:22 +0200)
There are some assembly macros with very generic naming
being defined asm.h. They are clashing with other macros
from C code.

Guard them with __ASSEMBLY__ to prevent futher clashes.

Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
Link: https://lore.kernel.org/linux-mips/8d78894-dd89-9f4d-52bb-1b873c50be9c@linux-m68k.org/
Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
arch/mips/include/asm/asm.h

index 2e99450f42284b60168e525ee41b0a7b6c7b52ed..87ff609b53fe1fe090a7045375ca7d2dcdd7a8c5 100644 (file)
@@ -37,6 +37,7 @@
 #define CFI_SECTIONS
 #endif
 
+#ifdef __ASSEMBLY__
 /*
  * LEAF - declare leaf routine
  */
@@ -122,6 +123,8 @@ symbol              =       value
 #define ASM_PRINT(string)
 #endif
 
+#endif /* __ASSEMBLY__ */
+
 /*
  * Stack alignment
  */