ARM: s3c: Replace __ASSEMBLY__ with __ASSEMBLER__ in header files
Subsystems (3)
PATCH 1/1 ARM: s3c: Replace __ASSEMBLY__ with __ASSEMBLER__ in header files
From: Thomas Huth <[email protected]>
While the GCC and Clang compilers already define __ASSEMBLER__ automatically when compiling assembly code, __ASSEMBLY__ is a macro that only gets defined by the Makefiles in the kernel. This can be very confusing when switching between userspace and kernelspace coding, or when dealing with uapi headers that rather should use __ASSEMBLER__ instead. So let's standardize now on the __ASSEMBLER__ macro that is provided by the compilers.
This is a completely mechanical patch (done with a simple "sed -i" statement).
---
Note: This patch has been split from an earlier patch of mine to ease reviewing.
arch/arm/mach-s3c/map-base.h | 2 +- include/linux/serial_s3c.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/mach-s3c/map-base.h +1 -1
@@ -20,7 +20,7 @@#define S3C_ADDR_BASE 0xF6000000 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__#define S3C_ADDR (x) ((void __iomem __force *)S3C_ADDR_BASE + (x))#else #define S3C_ADDR (x) (S3C_ADDR_BASE + (x))
include/linux/serial_s3c.h +2 -2
@@ -269,7 +269,7 @@#define APPLE_S5L_UTRSTAT_RXTO BIT(9)#define APPLE_S5L_UTRSTAT_ALL_FLAGS GENMASK(9, 3) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__#include <linux/serial_core.h>
@@ -294,7 +294,7 @@ struct s3c2410_uartcfg {unsigned long ufcon;/* value of ufcon for port */ }; -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* __ASM_ARM_REGS_SERIAL_H */
Signature · 1 line
2.54.0
Quoted 9 lines · Thomas Huth
While the GCC and Clang compilers already define
__ASSEMBLER__automatically when compiling assembly code,__ASSEMBLY__is a macro that only gets defined by the Makefiles in the kernel. This can be very confusing when switching between userspace and kernelspace coding, or when dealing with uapi headers that rather should use__ASSEMBLER__instead. So let's standardize now on the__ASSEMBLER__macro that is provided by the compilers.[...]
Applied, thanks!
[1/1] ARM: s3c: Replace __ASSEMBLY__ with __ASSEMBLER__ in header files
https://git.kernel.org/krzk/linux/c/7b06ff772080919fdb194c95af6b1e3acb079b71
Best regards,
Signature · 1 line
Krzysztof Kozlowski <[email protected]>