xen/arm: Replace __ASSEMBLY__ with __ASSEMBLER__ in interface.h
PATCH 1/1 xen/arm: Replace __ASSEMBLY__ with __ASSEMBLER__ in interface.h
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/xen/arm/interface.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/xen/arm/interface.h +1 -1
@@ -30,7 +30,7 @@#define __HYPERVISOR_platform_op_raw __HYPERVISOR_platform_op -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__/* Explicitly size integers that represent pfns in the interface with * Xen so that we can have one ABI that works for 32 and 64 bit guests. * Note that this means that the xen_pfn_t type may be capable of
Signature · 1 line
2.53.0
Stefano Stabellini
maintainerQuoted 11 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.Signed-off-by Thomas Huth <[email protected]>
I haven't been closely following the __ASSEMBLER__ vs __ASSEMBLY__ discussion. If there is general agreement to use __ASSEMBLER__ in headers, I am happy to go along with that. Currently, I see more than 140 uses of __ASSEMBLY__ compared to fewer than 20 uses of __ASSEMBLER__, but I'll defer to your judgment if the project is moving in that direction.
Quoted 23 lines
---
Note: This patch has been split from an earlier patch series of mine to ease reviewing.include/xen/arm/interface.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)include/xen/arm/interface.h +1
-1@@ -30,7 +30,7 @@#define __HYPERVISOR_platform_op_raw __HYPERVISOR_platform_op -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__/* Explicitly size integers that represent pfns in the interface with * Xen so that we can have one ABI that works for 32 and 64 bit guests. * Note that this means that the xen_pfn_t type may be capable of Signature · 1 line
2.53.0
Quoted 11 lines · Stefano Stabellini
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 8 lines
Quoted 1 line
Signed-off-by Thomas Huth <[email protected]>I haven't been closely following the
__ASSEMBLER__vs__ASSEMBLY__discussion. If there is general agreement to use__ASSEMBLER__in headers, I am happy to go along with that. Currently, I see more than 140 uses of__ASSEMBLY__compared to fewer than 20 uses of__ASSEMBLER__, but I'll defer to your judgment if the project is moving in that direction.
I assume you only counted the occurrences in the main include/ folder? Please also take the arch/*/include/ folders into account:
thuth:~/devel/linux$ grep -r __ASSEMBLER__ arch/*/include/ | wc -l 1492 thuth:~/devel/linux$ grep -r __ASSEMBLY__ arch/*/include/ | wc -l 120
So most spots have been converted already. It would be great if you could help with the xen header!
Thanks,
Thomas
Quoted 11 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.Signed-off-by Thomas Huth <[email protected]>
Juergen