X-Git-Url: http://git.cascardo.info/?a=blobdiff_plain;f=kernel%2Ftime%2Fsched_clock.c;h=ca3bc5c7027ca8214b85c3c1e546a66275c83000;hb=fb82fe2fe8588745edd73aa3a6229facac5c1e15;hp=01d2d15aa66233dc62db43f8e988a0f5519a729b;hpb=172bfe09dc52aef29f9c5c0bd9f77a558120faf4;p=cascardo%2Flinux.git

diff --git a/kernel/time/sched_clock.c b/kernel/time/sched_clock.c
index 01d2d15aa662..ca3bc5c7027c 100644
--- a/kernel/time/sched_clock.c
+++ b/kernel/time/sched_clock.c
@@ -125,9 +125,9 @@ void __init sched_clock_register(u64 (*read)(void), int bits,
 
 	new_mask = CLOCKSOURCE_MASK(bits);
 
-	/* calculate how many ns until we wrap */
-	wrap = clocks_calc_max_nsecs(new_mult, new_shift, 0, new_mask);
-	new_wrap_kt = ns_to_ktime(wrap - (wrap >> 3));
+	/* calculate how many nanosecs until we risk wrapping */
+	wrap = clocks_calc_max_nsecs(new_mult, new_shift, 0, new_mask, NULL);
+	new_wrap_kt = ns_to_ktime(wrap);
 
 	/* update epoch for new counter and update epoch_ns from old counter*/
 	new_epoch = read();