Skip to content

Commit da78701

Browse files
huthjcmvbkbc
authored andcommitted
xtensa: 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). Cc: Chris Zankel <[email protected]> Cc: Max Filippov <[email protected]> Signed-off-by: Thomas Huth <[email protected]> Message-Id: <[email protected]> Signed-off-by: Max Filippov <[email protected]>
1 parent 0ff41df commit da78701

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
#define PTRACE_GETFDPIC_EXEC 0
4343
#define PTRACE_GETFDPIC_INTERP 1
4444

45-
#ifndef __ASSEMBLY__
45+
#ifndef __ASSEMBLER__
4646

4747
struct user_pt_regs {
4848
__u32 pc;

arch/xtensa/include/uapi/asm/signal.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#define _NSIG_BPW 32
2020
#define _NSIG_WORDS (_NSIG / _NSIG_BPW)
2121

22-
#ifndef __ASSEMBLY__
22+
#ifndef __ASSEMBLER__
2323

2424
#include <linux/types.h>
2525

@@ -77,7 +77,7 @@ typedef struct {
7777
#define MINSIGSTKSZ 2048
7878
#define SIGSTKSZ 8192
7979

80-
#ifndef __ASSEMBLY__
80+
#ifndef __ASSEMBLER__
8181

8282
#include <asm-generic/signal-defs.h>
8383

@@ -106,5 +106,5 @@ typedef struct sigaltstack {
106106
__kernel_size_t ss_size;
107107
} stack_t;
108108

109-
#endif /* __ASSEMBLY__ */
109+
#endif /* __ASSEMBLER__ */
110110
#endif /* _UAPI_XTENSA_SIGNAL_H */

arch/xtensa/include/uapi/asm/types.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
#include <asm-generic/int-ll64.h>
1616

17-
#ifdef __ASSEMBLY__
17+
#ifdef __ASSEMBLER__
1818
# define __XTENSA_UL(x) (x)
1919
# define __XTENSA_UL_CONST(x) x
2020
#else
@@ -23,7 +23,7 @@
2323
# define __XTENSA_UL_CONST(x) ___XTENSA_UL_CONST(x)
2424
#endif
2525

26-
#ifndef __ASSEMBLY__
26+
#ifndef __ASSEMBLER__
2727

2828
#endif
2929

0 commit comments

Comments
 (0)