Commit 7164aacf authored by Thomas Huth's avatar Thomas Huth Committed by Geert Uytterhoeven
Browse files

m68k: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers 



While the GCC and Clang compilers already define __ASSEMBLER__
automatically when compiling assembly code, __ASSEMBLY__ is a
macro that only gets defined by the Makefiles in the kernel.
This can be very confusing when switching between userspace
and kernelspace coding, or when dealing with uapi headers that
rather should use __ASSEMBLER__ instead. So let's standardize on
the __ASSEMBLER__ macro that is provided by the compilers now.

This is almost a completely mechanical patch (done with a simple
"sed -i" statement), with one comment tweaked manually in
arch/m68k/include/asm/mac_baboon.h (which was missing underscores).

Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
Acked-by: default avatarGreg Ungerer <gerg@linux-m68k.org>
Reviewed-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Link: https://lore.kernel.org/20250611114056.118309-3-thuth@redhat.com


Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent 16eea8d2

arch/m68k/include/asm/adb_iop.h

+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
#define ADB_IOP_SRQ		0x04	/* SRQ detected                */

#define ADB_IOP_TIMEOUT		0x02	/* nonzero if timeout          */



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__



struct adb_iopmsg {

	__u8 flags;		/* ADB flags         */
@@ -43,4 +43,4 @@ struct adb_iopmsg { 
	__u8 spare[21];		/* spare             */

};



#endif /* __ASSEMBLY__ */
 
#endif /* __ASSEMBLER__ */

arch/m68k/include/asm/bootinfo.h

+2 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
#include <uapi/asm/bootinfo.h>





#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__



#ifdef CONFIG_BOOTINFO_PROC

extern void save_bootinfo(const struct bi_record *bi);
@@ -28,7 +28,7 @@ void process_uboot_commandline(char *commandp, int size); 
static inline void process_uboot_commandline(char *commandp, int size) {}

#endif



#endif /* __ASSEMBLY__ */

#endif /* __ASSEMBLER__ */





#endif /* _M68K_BOOTINFO_H */

arch/m68k/include/asm/entry.h

+2 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


#include <asm/setup.h>

#include <asm/page.h>

#ifdef __ASSEMBLY__

#ifdef __ASSEMBLER__

#include <asm/thread_info.h>

#endif
@@ -41,7 +41,7 @@ 
#define ALLOWINT	(~0x700)

#endif /* machine compilation types */



#ifdef __ASSEMBLY__

#ifdef __ASSEMBLER__

/*

 * This defines the normal kernel pt-regs layout.

 *

arch/m68k/include/asm/kexec.h

+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 


#define KEXEC_ARCH KEXEC_ARCH_68K



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__



static inline void crash_setup_regs(struct pt_regs *newregs,

				    struct pt_regs *oldregs)
@@ -23,7 +23,7 @@ static inline void crash_setup_regs(struct pt_regs *newregs, 
	/* Dummy implementation for now */

}



#endif /* __ASSEMBLY__ */

#endif /* __ASSEMBLER__ */



#endif /* CONFIG_KEXEC_CORE */

arch/m68k/include/asm/mac_baboon.h

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 


#define BABOON_BASE (0x50F1A000)	/* same as IDE controller base */



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__



struct baboon {

	char	pad1[208];	/* generic IDE registers, not used here */
@@ -36,4 +36,4 @@ extern void baboon_register_interrupts(void); 
extern void baboon_irq_enable(int);

extern void baboon_irq_disable(int);



#endif /* __ASSEMBLY **/
 
#endif /* __ASSEMBLER__ */