linuxmsm/laptops-kernel
0
0
Fork 0
mirror of https://github.com/linux-msm/laptops-kernel.git synced 2026-08-13 14:19:53 -07:00
Code Issues Packages Projects Releases Wiki Activity

vdso: Replace __ASSEMBLY__ with __ASSEMBLER__ in header files

Browse Source 
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.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Thomas Gleixner <tglx@kernel.org>
Reviewed-by: Vincenzo Frascino <vincenzo.frascino@arm.com>
Link: https://patch.msgid.link/20260619100600.121042-1-thuth@redhat.com
This commit is contained in:
Thomas Huth
2026-06-29 15:44:08 +02:00
committed by Thomas Gleixner
parent dc59e4fea9
commit 02475538be
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/asm-generic/vdso/vsyscall.h
+2 -2
View File
@@ -2,7 +2,7 @@
#ifndef __ASM_GENERIC_VSYSCALL_H #ifndef __ASM_GENERIC_VSYSCALL_H
#define __ASM_GENERIC_VSYSCALL_H #define __ASM_GENERIC_VSYSCALL_H
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#ifndef __arch_get_vdso_u_time_data #ifndef __arch_get_vdso_u_time_data
static __always_inline const struct vdso_time_data *__arch_get_vdso_u_time_data(void) 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 /* __arch_sync_vdso_time_data */
#endif /* !__ASSEMBLY__ */ #endif /* !__ASSEMBLER__ */
#endif /* __ASM_GENERIC_VSYSCALL_H */ #endif /* __ASM_GENERIC_VSYSCALL_H */
include/vdso/datapage.h
+3 -3
View File
@@ -2,7 +2,7 @@
#ifndef __VDSO_DATAPAGE_H #ifndef __VDSO_DATAPAGE_H
#define __VDSO_DATAPAGE_H #define __VDSO_DATAPAGE_H
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <linux/types.h> #include <linux/types.h>
@@ -176,7 +176,7 @@ enum vdso_pages {
VDSO_NR_PAGES VDSO_NR_PAGES
}; };
#else /* !__ASSEMBLY__ */ #else /* !__ASSEMBLER__ */
#ifdef CONFIG_VDSO_GETRANDOM #ifdef CONFIG_VDSO_GETRANDOM
#define __vdso_u_rng_data PROVIDE(vdso_u_rng_data = vdso_u_data + 2 * PAGE_SIZE); #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 \ __vdso_u_arch_data \
#endif /* !__ASSEMBLY__ */ #endif /* !__ASSEMBLER__ */
#endif /* __VDSO_DATAPAGE_H */ #endif /* __VDSO_DATAPAGE_H */
include/vdso/helpers.h
+2 -2
View File
@@ -2,7 +2,7 @@
#ifndef __VDSO_HELPERS_H #ifndef __VDSO_HELPERS_H
#define __VDSO_HELPERS_H #define __VDSO_HELPERS_H
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <asm/barrier.h> #include <asm/barrier.h>
#include <vdso/datapage.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]); vdso_write_seq_end(&vc[CS_RAW]);
} }
#endif /* !__ASSEMBLY__ */ #endif /* !__ASSEMBLER__ */
#endif /* __VDSO_HELPERS_H */ #endif /* __VDSO_HELPERS_H */
include/vdso/processor.h
+2 -2
View File
@@ -5,10 +5,10 @@
#ifndef __VDSO_PROCESSOR_H #ifndef __VDSO_PROCESSOR_H
#define __VDSO_PROCESSOR_H #define __VDSO_PROCESSOR_H
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <asm/vdso/processor.h> #include <asm/vdso/processor.h>
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
#endif /* __VDSO_PROCESSOR_H */ #endif /* __VDSO_PROCESSOR_H */
include/vdso/vsyscall.h
+2 -2
View File
@@ -2,13 +2,13 @@
#ifndef __VDSO_VSYSCALL_H #ifndef __VDSO_VSYSCALL_H
#define __VDSO_VSYSCALL_H #define __VDSO_VSYSCALL_H
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <asm/vdso/vsyscall.h> #include <asm/vdso/vsyscall.h>
unsigned long vdso_update_begin(void); unsigned long vdso_update_begin(void);
void vdso_update_end(unsigned long flags); void vdso_update_end(unsigned long flags);
#endif /* !__ASSEMBLY__ */ #endif /* !__ASSEMBLER__ */
#endif /* __VDSO_VSYSCALL_H */ #endif /* __VDSO_VSYSCALL_H */