smccc: Replace __ASSEMBLY__ with __ASSEMBLER__
PATCH 1/1 smccc: Replace __ASSEMBLY__ with __ASSEMBLER__
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.
---
Note: This patch has been split from an earlier patch series of mine to ease reviewing
include/linux/arm-smccc.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
include/linux/arm-smccc.h +5 -5
@@ -8,7 +8,7 @@#include <linux/args.h> #include <linux/init.h> -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__#include <linux/uuid.h> #endif
@@ -302,7 +302,7 @@#define SMCCC_RET_NOT_REQUIRED -2#define SMCCC_RET_INVALID_PARAMETER -3 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__#include <linux/linkage.h> #include <linux/types.h>
@@ -353,7 +353,7 @@ s32 arm_smccc_get_soc_id_version(void);*/ s32 arm_smccc_get_soc_id_revision (void ); -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__/* * Returns whether a specific hypervisor UUID is advertised for the
@@ -402,7 +402,7 @@ static inline u32 smccc_uuid_to_reg(const uuid_t *uuid, int reg) return val; } -#endif /* !__ASSEMBLY__ */ +#endif /* !__ASSEMBLER__ */ /** * struct arm_smccc_res - Result from SMC/HVC call
@@ -750,5 +750,5 @@ asmlinkage void __arm_smccc_hvc(unsigned long a0, unsigned long a1, })#endif /*CONFIG_ARM64*/ -#endif /*__ASSEMBLY__*/ +#endif /*__ASSEMBLER__*/ #endif /*__LINUX_ARM_SMCCC_H*/
Signature · 1 line
2.53.0
Quoted 10 lines · Thomas Huth
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.
Quoted 7 lines
Signed-off-by Thomas Huth <[email protected]>---
Note: This patch has been split from an earlier patch series of mine to ease reviewinginclude/linux/arm-smccc.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
Friendly ping!
Could anybody please pick this up? Thanks!
Thomas
Quoted 47 lines
include/linux/arm-smccc.h +5
-5@@ -8,7 +8,7 @@#include <linux/args.h> #include <linux/init.h> -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__#include <linux/uuid.h> #endif @@ -302,7 +302,7 @@#define SMCCC_RET_NOT_REQUIRED -2#define SMCCC_RET_INVALID_PARAMETER -3 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__#include <linux/linkage.h> #include <linux/types.h> @@ -353,7 +353,7 @@ s32 arm_smccc_get_soc_id_version(void);*/ s32 arm_smccc_get_soc_id_revision (void ); -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__/* * Returns whether a specific hypervisor UUID is advertised for the @@ -402,7 +402,7 @@ static inline u32 smccc_uuid_to_reg(const uuid_t *uuid, int reg) return val; } -#endif /* !__ASSEMBLY__ */ +#endif /* !__ASSEMBLER__ */ /** * struct arm_smccc_res - Result from SMC/HVC call @@ -750,5 +750,5 @@ asmlinkage void __arm_smccc_hvc(unsigned long a0, unsigned long a1, })#endif /*CONFIG_ARM64*/ -#endif /*__ASSEMBLY__*/ +#endif /*__ASSEMBLER__*/ #endif /*__LINUX_ARM_SMCCC_H*/