lib/vdso: Only read hrtimer_res when needed in __cvdso_clock_getres() (49a101d7) · Commits · 戴 / test

lib/vdso/gettimeofday.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -312,7 +312,6 @@ static __maybe_unused
		int __cvdso_clock_getres_common(clockid_t clock, struct __kernel_timespec *res)
		{
		const struct vdso_data *vd = __arch_get_vdso_data();
		u64 hrtimer_res;
		u32 msk;
		u64 ns;

		@@ -323,7 +322,6 @@ int __cvdso_clock_getres_common(clockid_t clock, struct __kernel_timespec *res)
		if (IS_ENABLED(CONFIG_TIME_NS) && vd->clock_mode == VCLOCK_TIMENS)
		vd = __arch_get_timens_vdso_data();

		hrtimer_res = READ_ONCE(vd[CS_HRES_COARSE].hrtimer_res);
		/*
		* Convert the clockid to a bitmask and use it to check which
		* clocks are handled in the VDSO directly.
		@@ -333,7 +331,7 @@ int __cvdso_clock_getres_common(clockid_t clock, struct __kernel_timespec *res)
		/*
		* Preserves the behaviour of posix_get_hrtimer_res().
		*/
		ns = hrtimer_res;
		ns = READ_ONCE(vd[CS_HRES_COARSE].hrtimer_res);
		} else if (msk & VDSO_COARSE) {
		/*
		* Preserves the behaviour of posix_get_coarse_res().