Commit 1ba2d6c0 authored by Heiko Carstens's avatar Heiko Carstens Committed by Vasily Gorbik
Browse files

s390/vdso: simplify __arch_get_hw_counter() 



Use the passed in vdso_data pointer instead of calculating it again.
This is also required as a prerequisite for vdso time namespaces: if a
process is part of a time namespace __arch_get_vdso_data() will return
a pointer to the time namespace data page instead of the vdso data
page, which is not what __arch_get_hw_counter() expects.

Reviewed-by: default avatarAlexander Gordeev <agordeev@linux.ibm.com>
Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
Signed-off-by: default avatarVasily Gorbik <gor@linux.ibm.com>
parent 214b3564

arch/s390/include/asm/vdso/gettimeofday.h

+2 −3
Original line number Diff line number Diff line
@@ -24,13 +24,12 @@ static __always_inline const struct vdso_data *__arch_get_vdso_data(void) 


static inline u64 __arch_get_hw_counter(s32 clock_mode, const struct vdso_data *vd)

{

	const struct vdso_data *vdso = __arch_get_vdso_data();

	u64 adj, now;



	now = get_tod_clock();

	adj = vdso->arch_data.tod_steering_end - now;

	adj = vd->arch_data.tod_steering_end - now;

	if (unlikely((s64) adj > 0))

		now += (vdso->arch_data.tod_steering_delta < 0) ? (adj >> 15) : -(adj >> 15);

		now += (vd->arch_data.tod_steering_delta < 0) ? (adj >> 15) : -(adj >> 15);

	return now;

}