diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-03 10:51:41 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-03 10:51:41 -0400 |
| commit | 37cc7ab1d2c317cc989b8aa0224cfc5f0478ccbd (patch) | |
| tree | 3db756ca12b5ab24fab1b7b5cb99ef7635cd370a /kernel/time | |
| parent | a758379b031f50b9def094aad071ef547a5cb335 (diff) | |
| parent | 67dfae0cd72fec5cd158b6e5fb1647b7dbe0834c (diff) | |
| download | op-kernel-dev-37cc7ab1d2c317cc989b8aa0224cfc5f0478ccbd.zip op-kernel-dev-37cc7ab1d2c317cc989b8aa0224cfc5f0478ccbd.tar.gz | |
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fixes from Ingo Molnar:
"An abs64() fix in the watchdog driver, and two clocksource driver
NO_IRQ assumption fixes"
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
clocksource: Fix abs() usage w/ 64bit values
clocksource/drivers/keystone: Fix bad NO_IRQ usage
clocksource/drivers/rockchip: Fix bad NO_IRQ usage
Diffstat (limited to 'kernel/time')
| -rw-r--r-- | kernel/time/clocksource.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c index 841b72f..3a38775 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", |
