summaryrefslogtreecommitdiffstats
path: root/kernel/time/sched_clock.c
diff options
context:
space:
mode:
authorJohn Stultz <john.stultz@linaro.org>2015-03-12 05:16:31 +0100
committerIngo Molnar <mingo@kernel.org>2015-03-12 10:16:38 +0100
commitfb82fe2fe8588745edd73aa3a6229facac5c1e15 (patch)
tree1ab7c25dfa0e89f83f07fad2a04467d8c7864ebb /kernel/time/sched_clock.c
parentclocksource: Simplify the logic around clocksource wrapping safety margins (diff)
downloadlinux-fb82fe2fe8588745edd73aa3a6229facac5c1e15.tar.xz
linux-fb82fe2fe8588745edd73aa3a6229facac5c1e15.zip
clocksource: Add 'max_cycles' to 'struct clocksource'
In order to facilitate clocksource validation, add a 'max_cycles' field to the clocksource structure which will hold the maximum cycle value that can safely be multiplied without potentially causing an overflow. Signed-off-by: John Stultz <john.stultz@linaro.org> Cc: Dave Jones <davej@codemonkey.org.uk> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Prarit Bhargava <prarit@redhat.com> Cc: Richard Cochran <richardcochran@gmail.com> Cc: Stephen Boyd <sboyd@codeaurora.org> Cc: Thomas Gleixner <tglx@linutronix.de> Link: http://lkml.kernel.org/r/1426133800-29329-4-git-send-email-john.stultz@linaro.org Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/time/sched_clock.c')
-rw-r--r--kernel/time/sched_clock.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/time/sched_clock.c b/kernel/time/sched_clock.c
index 3b8ae45020c1..ca3bc5c7027c 100644
--- a/kernel/time/sched_clock.c
+++ b/kernel/time/sched_clock.c
@@ -126,7 +126,7 @@ void __init sched_clock_register(u64 (*read)(void), int bits,
new_mask = CLOCKSOURCE_MASK(bits);
/* calculate how many nanosecs until we risk wrapping */
- wrap = clocks_calc_max_nsecs(new_mult, new_shift, 0, new_mask);
+ 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*/