Skip to content

Commit 639f08f

Browse files
huthctmarinas
authored andcommitted
arm64: 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. Signed-off-by: Thomas Huth <thuth@redhat.com> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
1 parent 3a86608 commit 639f08f

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

arch/arm64/include/uapi/asm/kvm.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#define KVM_SPSR_FIQ 4
3232
#define KVM_NR_SPSR 5
3333

34-
#ifndef __ASSEMBLY__
34+
#ifndef __ASSEMBLER__
3535
#include <linux/psci.h>
3636
#include <linux/types.h>
3737
#include <asm/ptrace.h>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
#define PTRACE_PEEKMTETAGS 33
8181
#define PTRACE_POKEMTETAGS 34
8282

83-
#ifndef __ASSEMBLY__
83+
#ifndef __ASSEMBLER__
8484

8585
/*
8686
* User structures for general purpose, floating point and debug registers.
@@ -332,6 +332,6 @@ struct user_gcs {
332332
__u64 gcspr_el0;
333333
};
334334

335-
#endif /* __ASSEMBLY__ */
335+
#endif /* __ASSEMBLER__ */
336336

337337
#endif /* _UAPI__ASM_PTRACE_H */

arch/arm64/include/uapi/asm/sigcontext.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#ifndef _UAPI__ASM_SIGCONTEXT_H
1818
#define _UAPI__ASM_SIGCONTEXT_H
1919

20-
#ifndef __ASSEMBLY__
20+
#ifndef __ASSEMBLER__
2121

2222
#include <linux/types.h>
2323

@@ -192,7 +192,7 @@ struct gcs_context {
192192
__u64 reserved;
193193
};
194194

195-
#endif /* !__ASSEMBLY__ */
195+
#endif /* !__ASSEMBLER__ */
196196

197197
#include <asm/sve_context.h>
198198

0 commit comments

Comments
 (0)