The following commit has been merged into the timers/core branch of tip: Commit-ID: 7239ae7f8349fba53c74b559b2059b1c20e8966d Gitweb: https://git.kernel.org/tip/7239ae7f8349fba53c74b559b2059b1c20e8966d Author: Anna-Maria Behnsen <anna-maria@xxxxxxxxxxxxx> AuthorDate: Mon, 01 Jul 2024 16:47:56 +02:00 Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx> CommitterDate: Wed, 03 Jul 2024 21:27:04 +02:00 x86/vdso: Fix function reference in comment Replace the reference to the non-existent function arch_vdso_cycles_valid() by the proper function arch_vdso_cycles_ok(). Signed-off-by: Anna-Maria Behnsen <anna-maria@xxxxxxxxxxxxx> Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Reviewed-by: Vincenzo Frascino <vincenzo.frascino@xxxxxxx> Link: https://lore.kernel.org/r/20240701-vdso-cleanup-v1-3-36eb64e7ece2@xxxxxxxxxxxxx --- arch/x86/include/asm/vdso/gettimeofday.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/x86/include/asm/vdso/gettimeofday.h b/arch/x86/include/asm/vdso/gettimeofday.h index 0ef3619..b2d2df0 100644 --- a/arch/x86/include/asm/vdso/gettimeofday.h +++ b/arch/x86/include/asm/vdso/gettimeofday.h @@ -328,9 +328,8 @@ static __always_inline u64 vdso_calc_ns(const struct vdso_data *vd, u64 cycles, * due to unsigned comparison. * * Due to the MSB/Sign-bit being used as invalid marker (see - * arch_vdso_cycles_valid() above), the effective mask is S64_MAX, - * but that case is also unlikely and will also take the unlikely path - * here. + * arch_vdso_cycles_ok() above), the effective mask is S64_MAX, but that + * case is also unlikely and will also take the unlikely path here. */ if (unlikely(delta > vd->max_cycles)) { /*