summaryrefslogtreecommitdiffstats
path: root/kernel/time
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2015-10-12 09:51:18 +0200
committerIngo Molnar <mingo@kernel.org>2015-10-12 09:51:18 +0200
commitb9f27c0f4f7db9e5a4ba59228442a75d3177470c (patch)
tree49ab61b7e06a5a592f3541e84d1b5908a1d8030f /kernel/time
parent9fc4468d546b6eb55b0aa5b04b0c36238ebf57e7 (diff)
parent25cb62b76430a91cc6195f902e61c2cb84ade622 (diff)
downloadlinux-stable-b9f27c0f4f7db9e5a4ba59228442a75d3177470c.tar.gz
linux-stable-b9f27c0f4f7db9e5a4ba59228442a75d3177470c.tar.bz2
linux-stable-b9f27c0f4f7db9e5a4ba59228442a75d3177470c.zip
Merge tag 'v4.3-rc5' into timers/core, to pick up fixes before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/time')
-rw-r--r--kernel/time/clocksource.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c
index de0ad66f2b21..0d8fe8b8f727 100644
--- a/kernel/time/clocksource.c
+++ b/kernel/time/clocksource.c
@@ -217,7 +217,7 @@ static void clocksource_watchdog(unsigned long data)
continue;
/* Check the deviation from the watchdog clocksource. */
- if ((abs(cs_nsec - wd_nsec) > WATCHDOG_THRESHOLD)) {
+ if (abs64(cs_nsec - wd_nsec) > WATCHDOG_THRESHOLD) {
pr_warn("timekeeping watchdog: Marking clocksource '%s' as unstable because the skew is too large:\n",
cs->name);
pr_warn(" '%s' wd_now: %llx wd_last: %llx mask: %llx\n",