vdso: Replace __ASSEMBLY__ with __ASSEMBLER__ in header files
Subsystems (2)
PATCH 1/1 vdso: 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 bigger patch of mine
to ease reviewing.
include/asm-generic/vdso/vsyscall.h | 4 ++-- include/vdso/datapage.h | 6 +++--- include/vdso/helpers.h | 4 ++-- include/vdso/processor.h | 4 ++-- include/vdso/vsyscall.h | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-)
include/asm-generic/vdso/vsyscall.h +2 -2
@@ -2,7 +2,7 @@#ifndef __ASM_GENERIC_VSYSCALL_H#define __ASM_GENERIC_VSYSCALL_H -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__#ifndef __arch_get_vdso_u_time_data static __always_inline const struct vdso_time_data *__arch_get_vdso_u_time_data(void)
@@ -30,6 +30,6 @@ static __always_inline void __arch_sync_vdso_time_data(struct vdso_time_data *vd }#endif /* __arch_sync_vdso_time_data */ -#endif /* !__ASSEMBLY__ */ +#endif /* !__ASSEMBLER__ */ #endif /* __ASM_GENERIC_VSYSCALL_H */
include/vdso/datapage.h +3 -3
@@ -2,7 +2,7 @@#ifndef __VDSO_DATAPAGE_H#define __VDSO_DATAPAGE_H -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__#include <linux/types.h>
@@ -176,7 +176,7 @@ enum vdso_pages {VDSO_NR_PAGES }; -#else /* !__ASSEMBLY__ */ +#else /* !__ASSEMBLER__ */ #ifdef CONFIG_VDSO_GETRANDOM #define __vdso_u_rng_data PROVIDE(vdso_u_rng_data = vdso_u_data + 2 * PAGE_SIZE);
@@ -197,6 +197,6 @@ enum vdso_pages { __vdso_u_arch_data \ -#endif /* !__ASSEMBLY__ */ +#endif /* !__ASSEMBLER__ */ #endif /* __VDSO_DATAPAGE_H */
include/vdso/helpers.h +2 -2
@@ -2,7 +2,7 @@#ifndef __VDSO_HELPERS_H#define __VDSO_HELPERS_H -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__#include <asm/barrier.h> #include <vdso/datapage.h>
@@ -111,6 +111,6 @@ static __always_inline void vdso_write_end(struct vdso_time_data *vd)vdso_write_seq_end (&vc[CS_RAW ]); } -#endif /* !__ASSEMBLY__ */ +#endif /* !__ASSEMBLER__ */ #endif /* __VDSO_HELPERS_H */
include/vdso/processor.h +2 -2
@@ -5,10 +5,10 @@#ifndef __VDSO_PROCESSOR_H#define __VDSO_PROCESSOR_H -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__#include <asm/vdso/processor.h> -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* __VDSO_PROCESSOR_H */
include/vdso/vsyscall.h +2 -2
@@ -2,13 +2,13 @@#ifndef __VDSO_VSYSCALL_H#define __VDSO_VSYSCALL_H -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__#include <asm/vdso/vsyscall.h> unsigned long vdso_update_begin (void );void vdso_update_end (unsigned long flags); -#endif /* !__ASSEMBLY__ */ +#endif /* !__ASSEMBLER__ */ #endif /* __VDSO_VSYSCALL_H */
Signature · 1 line
2.54.0
Hi Thomas,
thank you for your patch.
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 4 lines
This is a completely mechanical patch (done with a simple "sed -i" statement).
Signed-off-by Thomas Huth <[email protected]>
Quoted 120 lines
---
Note: This patch has been split from an earlier bigger patch of mine
to ease reviewing.include/asm-generic/vdso/vsyscall.h | 4 ++-- include/vdso/datapage.h | 6 +++--- include/vdso/helpers.h | 4 ++-- include/vdso/processor.h | 4 ++-- include/vdso/vsyscall.h | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-)include/asm-generic/vdso/vsyscall.h +2
-2@@ -2,7 +2,7 @@#ifndef __ASM_GENERIC_VSYSCALL_H#define __ASM_GENERIC_VSYSCALL_H -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__#ifndef __arch_get_vdso_u_time_data static __always_inline const struct vdso_time_data *__arch_get_vdso_u_time_data(void)@@ -30,6 +30,6 @@ static __always_inline void __arch_sync_vdso_time_data(struct vdso_time_data *vd }#endif /* __arch_sync_vdso_time_data */ -#endif /* !__ASSEMBLY__ */ +#endif /* !__ASSEMBLER__ */ #endif /* __ASM_GENERIC_VSYSCALL_H */ include/vdso/datapage.h +3
-3@@ -2,7 +2,7 @@#ifndef __VDSO_DATAPAGE_H#define __VDSO_DATAPAGE_H -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__#include <linux/types.h> @@ -176,7 +176,7 @@ enum vdso_pages {VDSO_NR_PAGES }; -#else /* !__ASSEMBLY__ */ +#else /* !__ASSEMBLER__ */ #ifdef CONFIG_VDSO_GETRANDOM #define __vdso_u_rng_data PROVIDE(vdso_u_rng_data = vdso_u_data + 2 * PAGE_SIZE);@@ -197,6 +197,6 @@ enum vdso_pages { __vdso_u_arch_data \ -#endif /* !__ASSEMBLY__ */ +#endif /* !__ASSEMBLER__ */ #endif /* __VDSO_DATAPAGE_H */ include/vdso/helpers.h +2
-2@@ -2,7 +2,7 @@#ifndef __VDSO_HELPERS_H#define __VDSO_HELPERS_H -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__#include <asm/barrier.h> #include <vdso/datapage.h> @@ -111,6 +111,6 @@ static __always_inline void vdso_write_end(struct vdso_time_data *vd)vdso_write_seq_end (&vc[CS_RAW ]); } -#endif /* !__ASSEMBLY__ */ +#endif /* !__ASSEMBLER__ */ #endif /* __VDSO_HELPERS_H */ include/vdso/processor.h +2
-2@@ -5,10 +5,10 @@#ifndef __VDSO_PROCESSOR_H#define __VDSO_PROCESSOR_H -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__#include <asm/vdso/processor.h> -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* __VDSO_PROCESSOR_H */ include/vdso/vsyscall.h +2
-2@@ -2,13 +2,13 @@#ifndef __VDSO_VSYSCALL_H#define __VDSO_VSYSCALL_H -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__#include <asm/vdso/vsyscall.h> unsigned long vdso_update_begin (void );void vdso_update_end (unsigned long flags); -#endif /* !__ASSEMBLY__ */ +#endif /* !__ASSEMBLER__ */ #endif /* __VDSO_VSYSCALL_H */
Signature · 2 lines
Regards, Vincenzo
The following commit has been merged into the timers/vdso branch of tip:
The following commit has been merged into the timers/vdso branch of tip:
Commit-ID: 02475538bec2c47d1cce1211823c0453175af6a9 Gitweb: https://git.kernel.org/tip/02475538bec2c47d1cce1211823c0453175af6a9 Author: Thomas Huth <[email protected]> AuthorDate: Fri, 19 Jun 2026 12:06:00 +02:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Mon, 29 Jun 2026 15:44:08 +02:00
vdso: Replace __ASSEMBLY__ with __ASSEMBLER__ in header files
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 standardize now on the __ASSEMBLER__ macro that is provided by the compilers.
--- include/asm-generic/vdso/vsyscall.h | 4 ++-- include/vdso/datapage.h | 6 +++--- include/vdso/helpers.h | 4 ++-- include/vdso/processor.h | 4 ++-- include/vdso/vsyscall.h | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-)
include/asm-generic/vdso/vsyscall.h +2 -2
@@ -2,7 +2,7 @@#ifndef __ASM_GENERIC_VSYSCALL_H#define __ASM_GENERIC_VSYSCALL_H -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__#ifndef __arch_get_vdso_u_time_data static __always_inline const struct vdso_time_data *__arch_get_vdso_u_time_data(void)
@@ -30,6 +30,6 @@ static __always_inline void __arch_sync_vdso_time_data(struct vdso_time_data *vd }#endif /* __arch_sync_vdso_time_data */ -#endif /* !__ASSEMBLY__ */ +#endif /* !__ASSEMBLER__ */ #endif /* __ASM_GENERIC_VSYSCALL_H */
include/vdso/datapage.h +3 -3
@@ -2,7 +2,7 @@#ifndef __VDSO_DATAPAGE_H#define __VDSO_DATAPAGE_H -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__#include <linux/types.h>
@@ -176,7 +176,7 @@ enum vdso_pages {VDSO_NR_PAGES }; -#else /* !__ASSEMBLY__ */ +#else /* !__ASSEMBLER__ */ #ifdef CONFIG_VDSO_GETRANDOM #define __vdso_u_rng_data PROVIDE(vdso_u_rng_data = vdso_u_data + 2 * PAGE_SIZE);
@@ -197,6 +197,6 @@ enum vdso_pages { __vdso_u_arch_data \ -#endif /* !__ASSEMBLY__ */ +#endif /* !__ASSEMBLER__ */ #endif /* __VDSO_DATAPAGE_H */
include/vdso/helpers.h +2 -2
@@ -2,7 +2,7 @@#ifndef __VDSO_HELPERS_H#define __VDSO_HELPERS_H -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__#include <asm/barrier.h> #include <vdso/datapage.h>
@@ -111,6 +111,6 @@ static __always_inline void vdso_write_end(struct vdso_time_data *vd)vdso_write_seq_end (&vc[CS_RAW ]); } -#endif /* !__ASSEMBLY__ */ +#endif /* !__ASSEMBLER__ */ #endif /* __VDSO_HELPERS_H */
include/vdso/processor.h +2 -2
@@ -5,10 +5,10 @@#ifndef __VDSO_PROCESSOR_H#define __VDSO_PROCESSOR_H -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__#include <asm/vdso/processor.h> -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* __VDSO_PROCESSOR_H */
include/vdso/vsyscall.h +2 -2
@@ -2,13 +2,13 @@#ifndef __VDSO_VSYSCALL_H#define __VDSO_VSYSCALL_H -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__#include <asm/vdso/vsyscall.h> unsigned long vdso_update_begin (void );void vdso_update_end (unsigned long flags); -#endif /* !__ASSEMBLY__ */ +#endif /* !__ASSEMBLER__ */ #endif /* __VDSO_VSYSCALL_H */