On Tue, Mar 26, 2024 at 11:41:45AM +0000, Jiaxun Yang wrote: > 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@xxxxxxxxxxxxxx> > Link: https://lore.kernel.org/linux-mips/8d78894-dd89-9f4d-52bb-1b873c50be9c@xxxxxxxxxxxxxx/ > Signed-off-by: Jiaxun Yang <jiaxun.yang@xxxxxxxxxxx> > --- > arch/mips/include/asm/asm.h | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/arch/mips/include/asm/asm.h b/arch/mips/include/asm/asm.h > index 2e99450f4228..87ff609b53fe 100644 > --- a/arch/mips/include/asm/asm.h > +++ b/arch/mips/include/asm/asm.h > @@ -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 > */ > > --- > base-commit: 084c8e315db34b59d38d06e684b1a0dd07d30287 > change-id: 20240326-asm-guard-dddeb2321d69 > > Best regards, > -- > Jiaxun Yang <jiaxun.yang@xxxxxxxxxxx> applied to mips-next. Thomas. -- Crap can work. Given enough thrust pigs will fly, but it's not necessarily a good idea. [ RFC1925, 2.3 ]
