Merge tag 'mfd-next-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd

[linux.git] / kernel / time / vsyscall.c

diff --git a/kernel/time/vsyscall.c b/kernel/time/vsyscall.c
index a808931808261eeeabed43c9b6df69917fbdc204..8cf3596a4ce677ca787e214d6f33b32a6d6b4088 100644 (file)
--- a/kernel/time/vsyscall.c
+++ b/kernel/time/vsyscall.c
@@ -104,11 +104,7 @@ void update_vsyscall(struct timekeeper *tk)
        vdso_ts->sec    = tk->xtime_sec + tk->wall_to_monotonic.tv_sec;
        nsec            = tk->tkr_mono.xtime_nsec >> tk->tkr_mono.shift;
        nsec            = nsec + tk->wall_to_monotonic.tv_nsec;
-       while (nsec >= NSEC_PER_SEC) {
-               nsec = nsec - NSEC_PER_SEC;
-               vdso_ts->sec++;
-       }
-       vdso_ts->nsec   = nsec;
+       vdso_ts->sec    += __iter_div_u64_rem(nsec, NSEC_PER_SEC, &vdso_ts->nsec);
 
        if (__arch_use_vsyscall(vdata))
                update_vdso_data(vdata, tk);