summaryrefslogtreecommitdiffstats
path: root/kernel/time/timekeeping_internal.h
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2014-07-16 23:05:10 +0200
committerJohn Stultz <john.stultz@linaro.org>2014-07-24 00:01:51 +0200
commit3a97837784acbf9fed699fc04d1799b0eb742fdf (patch)
tree12297634077b24bcc6a01b779205043fc2a2a1f1 /kernel/time/timekeeping_internal.h
parentwireless: ath9k: Get rid of timespec conversions (diff)
downloadlinux-3a97837784acbf9fed699fc04d1799b0eb742fdf.tar.xz
linux-3a97837784acbf9fed699fc04d1799b0eb742fdf.zip
clocksource: Make delta calculation a function
We want to move the TSC sanity check into core code to make NMI safe accessors to clock monotonic[_raw] possible. For this we need to sanity check the delta calculation. Create a helper function and convert all sites to use it. [ Build fix from jstultz ] Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'kernel/time/timekeeping_internal.h')
-rw-r--r--kernel/time/timekeeping_internal.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/kernel/time/timekeeping_internal.h b/kernel/time/timekeeping_internal.h
index e3d28ad236f9..05dfa6b25dc4 100644
--- a/kernel/time/timekeeping_internal.h
+++ b/kernel/time/timekeeping_internal.h
@@ -3,6 +3,7 @@
/*
* timekeeping debug functions
*/
+#include <linux/clocksource.h>
#include <linux/time.h>
#ifdef CONFIG_DEBUG_FS
@@ -11,4 +12,9 @@ extern void tk_debug_account_sleep_time(struct timespec64 *t);
#define tk_debug_account_sleep_time(x)
#endif
+static inline cycle_t clocksource_delta(cycle_t now, cycle_t last, cycle_t mask)
+{
+ return (now - last) & mask;
+}
+
#endif /* _TIMEKEEPING_INTERNAL_H */