Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-21 19:41:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

vdso: Remove timekeeper argument of __arch_update_vsyscall()

Browse Source 
No implementation of this hook uses the passed in timekeeper anymore.

This avoids including a non-VDSO header while building the VDSO, which can
lead to compilation errors.

Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Will Deacon <will@kernel.org>
Link: https://lore.kernel.org/all/20241010-vdso-generic-arch_update_vsyscall-v1-1-7fe5a3ea4382@linutronix.de
This commit is contained in:
Thomas Weißschuh 2024-10-10 17:44:44 +02:00 committed by Thomas Gleixner
parent 8cf0b93919
commit 39c089a01a
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm64/include/asm/vdso/vsyscall.h
View File

@ -6,7 +6,6 @@
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#include <linux/timekeeper_internal.h>
#include <vdso/datapage.h> #include <vdso/datapage.h>
enum vvar_pages { enum vvar_pages {
@ -37,7 +36,7 @@ struct vdso_rng_data *__arm64_get_k_vdso_rnd_data(void)
#define __arch_get_k_vdso_rng_data __arm64_get_k_vdso_rnd_data #define __arch_get_k_vdso_rng_data __arm64_get_k_vdso_rnd_data
static __always_inline static __always_inline
void __arm64_update_vsyscall(struct vdso_data *vdata, struct timekeeper *tk) void __arm64_update_vsyscall(struct vdso_data *vdata)
{ {
vdata[CS_HRES_COARSE].mask = VDSO_PRECISION_MASK; vdata[CS_HRES_COARSE].mask = VDSO_PRECISION_MASK;
vdata[CS_RAW].mask = VDSO_PRECISION_MASK; vdata[CS_RAW].mask = VDSO_PRECISION_MASK;

3
include/asm-generic/vdso/vsyscall.h
View File

@ -12,8 +12,7 @@ static __always_inline struct vdso_data *__arch_get_k_vdso_data(void)
#endif /* __arch_get_k_vdso_data */ #endif /* __arch_get_k_vdso_data */
#ifndef __arch_update_vsyscall #ifndef __arch_update_vsyscall
static __always_inline void __arch_update_vsyscall(struct vdso_data *vdata, static __always_inline void __arch_update_vsyscall(struct vdso_data *vdata)
struct timekeeper *tk)
{ {
} }
#endif /* __arch_update_vsyscall */ #endif /* __arch_update_vsyscall */

2
kernel/time/vsyscall.c
View File

@ -119,7 +119,7 @@ void update_vsyscall(struct timekeeper *tk)
if (clock_mode != VDSO_CLOCKMODE_NONE) if (clock_mode != VDSO_CLOCKMODE_NONE)
update_vdso_data(vdata, tk); update_vdso_data(vdata, tk);
__arch_update_vsyscall(vdata, tk); __arch_update_vsyscall(vdata);
vdso_write_end(vdata); vdso_write_end(vdata);