Commit 639f08fc authored by Thomas Huth's avatar Thomas Huth Committed by Catalin Marinas
Browse files

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: default avatarThomas Huth <thuth@redhat.com>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent 3a866087

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

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
#define KVM_SPSR_FIQ	4

#define KVM_NR_SPSR	5



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__

#include <linux/psci.h>

#include <linux/types.h>

#include <asm/ptrace.h>

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

+2 −2
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ 
#define PTRACE_PEEKMTETAGS	  33

#define PTRACE_POKEMTETAGS	  34



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__



/*

 * User structures for general purpose, floating point and debug registers.
@@ -332,6 +332,6 @@ struct user_gcs { 
	__u64 gcspr_el0;

};



#endif /* __ASSEMBLY__ */

#endif /* __ASSEMBLER__ */



#endif /* _UAPI__ASM_PTRACE_H */

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

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#ifndef _UAPI__ASM_SIGCONTEXT_H

#define _UAPI__ASM_SIGCONTEXT_H



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__



#include <linux/types.h>
@@ -192,7 +192,7 @@ struct gcs_context { 
	__u64 reserved;

};



#endif /* !__ASSEMBLY__ */

#endif /* !__ASSEMBLER__ */



#include <asm/sve_context.h>