Skip to content

Commit 16eea8d

Browse files
huthgeertu
authored andcommitted
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: Thomas Huth <[email protected]> Acked-by: Greg Ungerer <[email protected]> Reviewed-by: Geert Uytterhoeven <[email protected]> Link: https://lore.kernel.org/[email protected] Signed-off-by: Geert Uytterhoeven <[email protected]>
1 parent 4fbdd56 commit 16eea8d

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#define VME_TYPE_BVME6000 0x6000 /* BVM Ltd. BVME6000 */
3434

3535

36-
#ifndef __ASSEMBLY__
36+
#ifndef __ASSEMBLER__
3737

3838
/*
3939
* Board ID data structure - pointer to this retrieved from Bug by head.S
@@ -56,7 +56,7 @@ typedef struct {
5656
__be32 option2;
5757
} t_bdid, *p_bdid;
5858

59-
#endif /* __ASSEMBLY__ */
59+
#endif /* __ASSEMBLER__ */
6060

6161

6262
/*

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include <linux/types.h>
1717

1818

19-
#ifndef __ASSEMBLY__
19+
#ifndef __ASSEMBLER__
2020

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

46-
#endif /* __ASSEMBLY__ */
46+
#endif /* __ASSEMBLER__ */
4747

4848

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

170-
#ifndef __ASSEMBLY__
170+
#ifndef __ASSEMBLER__
171171

172172
struct bootversion {
173173
__be16 branch;
@@ -178,7 +178,7 @@ struct bootversion {
178178
} machversions[];
179179
} __packed;
180180

181-
#endif /* __ASSEMBLY__ */
181+
#endif /* __ASSEMBLER__ */
182182

183183

184184
#endif /* _UAPI_ASM_M68K_BOOTINFO_H */

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#define PT_SR 17
2323
#define PT_PC 18
2424

25-
#ifndef __ASSEMBLY__
25+
#ifndef __ASSEMBLER__
2626

2727
/* this struct defines the way the registers are stored on the
2828
stack during a system call. */
@@ -81,5 +81,5 @@ struct switch_stack {
8181
#define PTRACE_GETFDPIC_EXEC 0
8282
#define PTRACE_GETFDPIC_INTERP 1
8383

84-
#endif /* __ASSEMBLY__ */
84+
#endif /* __ASSEMBLER__ */
8585
#endif /* _UAPI_M68K_PTRACE_H */

0 commit comments

Comments
 (0)