ARM: imx: Replace __ASSEMBLY__ with __ASSEMBLER__
Subsystems (3)
PATCH 1/1 ARM: imx: Replace __ASSEMBLY__ with __ASSEMBLER__
While the GCC and Clang compilers already define __ASSEMBLER__ auto- matically 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. Let's standardize now on the __ASSEMBLER__ macro to avoid this confusion.
---
Note: This has been split from an earlier bigger patch of mine into
a separate patch to ease reviewing
arch/arm/mach-imx/hardware.h | 2 +- arch/arm/mach-imx/mxc.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-imx/hardware.h +1 -1
@@ -7,7 +7,7 @@#ifndef __ASM_ARCH_MXC_HARDWARE_H__#define __ASM_ARCH_MXC_HARDWARE_H__ -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__#include <asm/io.h> #include <soc/imx/revision.h> #endif
arch/arm/mach-imx/mxc.h +1 -1
@@ -16,7 +16,7 @@#define IMX_DDR_TYPE_LPDDR2 1 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__#ifdef CONFIG_SOC_IMX6SL static inline bool cpu_is_imx6sl (void )
Signature · 1 line
2.55.0
[email protected]
AppliedFrom: Frank Li <[email protected]>
Quoted 9 lines · Thomas Huth
While the GCC and Clang compilers already define
__ASSEMBLER__auto- matically 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. Let's standardize now on the__ASSEMBLER__macro to avoid this confusion.[...]
Applied, thanks!
[1/1] ARM: imx: Replace __ASSEMBLY__ with __ASSEMBLER__
commit: dc5bfc682b4df23b105ceacd387865a42099aba9
Best regards,
Signature · 1 line
Frank Li <[email protected]>