Skip to content

Commit a1b7508

Browse files
FlyGoattsbogend
authored andcommitted
MIPS: Guard some macros with __ASSEMBLY__ in asm.h
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 <[email protected]> Link: https://lore.kernel.org/linux-mips/[email protected]/ Signed-off-by: Jiaxun Yang <[email protected]> Reviewed-by: Philippe Mathieu-Daudé <[email protected]> Signed-off-by: Thomas Bogendoerfer <[email protected]>
1 parent b796d04 commit a1b7508

File tree

1 file changed

+3
-0
lines changed
  • arch/mips/include/asm

1 file changed

+3
-0
lines changed

arch/mips/include/asm/asm.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
#define CFI_SECTIONS
3838
#endif
3939

40+
#ifdef __ASSEMBLY__
4041
/*
4142
* LEAF - declare leaf routine
4243
*/
@@ -122,6 +123,8 @@ symbol = value
122123
#define ASM_PRINT(string)
123124
#endif
124125

126+
#endif /* __ASSEMBLY__ */
127+
125128
/*
126129
* Stack alignment
127130
*/

0 commit comments

Comments
 (0)