Commit 16eea8d2 authored by Thomas Huth's avatar Thomas Huth Committed by Geert Uytterhoeven
Browse files

m68k: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers 



__ASSEMBLY__ is only defined by the Makefile of the kernel, so
this is not really useful for uapi headers (unless the userspace
Makefile defines it, too). Let's switch to __ASSEMBLER__ which
gets set automatically by the compiler when compiling assembly
code.

This is a completely mechanical patch (done with a simple "sed -i"
statement).

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-2-thuth@redhat.com


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

arch/m68k/include/uapi/asm/bootinfo-vme.h

+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
#define VME_TYPE_BVME6000	0x6000	/* BVM Ltd. BVME6000 */





#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__



/*

 * Board ID data structure - pointer to this retrieved from Bug by head.S
@@ -56,7 +56,7 @@ typedef struct { 
	__be32	option2;

} t_bdid, *p_bdid;



#endif /* __ASSEMBLY__ */

#endif /* __ASSEMBLER__ */





    /*

arch/m68k/include/uapi/asm/bootinfo.h

+4 −4
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
#include <linux/types.h>





#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__



    /*

     *  Bootinfo definitions
@@ -43,7 +43,7 @@ struct mem_info { 
	__be32 size;			/* length of memory chunk (in bytes) */

};



#endif /* __ASSEMBLY__ */

#endif /* __ASSEMBLER__ */





    /*
@@ -167,7 +167,7 @@ struct mem_info { 
#define BI_VERSION_MAJOR(v)		(((v) >> 16) & 0xffff)

#define BI_VERSION_MINOR(v)		((v) & 0xffff)



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__



struct bootversion {

	__be16 branch;
@@ -178,7 +178,7 @@ struct bootversion { 
	} machversions[];

} __packed;



#endif /* __ASSEMBLY__ */

#endif /* __ASSEMBLER__ */





#endif /* _UAPI_ASM_M68K_BOOTINFO_H */

arch/m68k/include/uapi/asm/ptrace.h

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
#define PT_SR	   17

#define PT_PC	   18



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__



/* this struct defines the way the registers are stored on the

   stack during a system call. */
@@ -81,5 +81,5 @@ struct switch_stack { 
#define PTRACE_GETFDPIC_EXEC	0

#define PTRACE_GETFDPIC_INTERP	1



#endif /* __ASSEMBLY__ */

#endif /* __ASSEMBLER__ */

#endif /* _UAPI_M68K_PTRACE_H */