asm-generic: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers
PATCH 1/1 asm-generic: 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.
---
Note: This has been split from an earlier bigger patch of mine into
this separate patch to ease reviewing
include/uapi/asm-generic/int-l64.h | 4 ++-- include/uapi/asm-generic/int-ll64.h | 4 ++-- include/uapi/asm-generic/signal-defs.h | 2 +- include/uapi/asm-generic/signal.h | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-)
include/uapi/asm-generic/int-l64.h +2 -2
@@ -11,7 +11,7 @@#include <asm/bitsperlong.h> -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__/* * __xx is ok: it doesn't pollute the POSIX namespace. Use these in the * header files exported to user space
@@ -29,7 +29,7 @@ typedef unsigned int __u32;typedef __signed__ long __s64 ;typedef unsigned long __u64 ; -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* _UAPI_ASM_GENERIC_INT_L64_H */
include/uapi/asm-generic/int-ll64.h +2 -2
@@ -11,7 +11,7 @@#include <asm/bitsperlong.h> -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__/* * __xx is ok: it doesn't pollute the POSIX namespace. Use these in the * header files exported to user space
@@ -34,7 +34,7 @@ typedef __signed__ long long __s64;typedef unsigned long long __u64 ;#endif -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* _UAPI_ASM_GENERIC_INT_LL64_H */
include/uapi/asm-generic/signal-defs.h +1 -1
@@ -78,7 +78,7 @@#define SIG_SETMASK 2/* for setting the signal mask */ #endif -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__typedef void __signalfn_t (int );typedef __signalfn_t __user *__sighandler_t ;
include/uapi/asm-generic/signal.h +2 -2
@@ -57,7 +57,7 @@#define SIGSTKSZ 8192#endif -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__typedef struct {unsigned long sig[_NSIG_WORDS]; }sigset_t ;
@@ -88,6 +88,6 @@ typedef struct sigaltstack {__kernel_size_t ss_size; } stack_t; -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* _UAPI__ASM_GENERIC_SIGNAL_H */
Signature · 1 line
2.55.0
Quoted 11 lines · Thomas Huth
__ASSEMBLY__is only defined by theMakefileof the kernel, so this is not really useful for uapi headers (unless the userspaceMakefiledefines it, too). Let's switch to__ASSEMBLER__which gets set automatically by the compiler when compiling assembly code.Signed-off-by Thomas Huth <[email protected]>---
Note: This has been split from an earlier bigger patch of mine into
this separate patch to ease reviewing
Quoted 5 lines
include/uapi/asm-generic/int-l64.h | 4 ++-- include/uapi/asm-generic/int-ll64.h | 4 ++-- include/uapi/asm-generic/signal-defs.h | 2 +- include/uapi/asm-generic/signal.h | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-)
Friendly ping?
Quoted 78 lines
include/uapi/asm-generic/int-l64.h +2
-2@@ -11,7 +11,7 @@#include <asm/bitsperlong.h> -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__/* * __xx is ok: it doesn't pollute the POSIX namespace. Use these in the * header files exported to user space @@ -29,7 +29,7 @@ typedef unsigned int __u32;typedef __signed__ long __s64 ;typedef unsigned long __u64 ; -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* _UAPI_ASM_GENERIC_INT_L64_H */ include/uapi/asm-generic/int-ll64.h +2
-2@@ -11,7 +11,7 @@#include <asm/bitsperlong.h> -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__/* * __xx is ok: it doesn't pollute the POSIX namespace. Use these in the * header files exported to user space @@ -34,7 +34,7 @@ typedef __signed__ long long __s64;typedef unsigned long long __u64 ;#endif -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* _UAPI_ASM_GENERIC_INT_LL64_H */ include/uapi/asm-generic/signal-defs.h +1
-1@@ -78,7 +78,7 @@#define SIG_SETMASK 2/* for setting the signal mask */ #endif -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__typedef void __signalfn_t (int );typedef __signalfn_t __user *__sighandler_t ;include/uapi/asm-generic/signal.h +2
-2@@ -57,7 +57,7 @@#define SIGSTKSZ 8192#endif -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__typedef struct {unsigned long sig[_NSIG_WORDS]; }sigset_t ;@@ -88,6 +88,6 @@ typedef struct sigaltstack {__kernel_size_t ss_size; } stack_t; -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* _UAPI__ASM_GENERIC_SIGNAL_H */