diff options
Diffstat (limited to 'kernel/time/clocksource.c')
-rw-r--r-- | kernel/time/clocksource.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c index f1508019bfb4..f18c9a6bdcf4 100644 --- a/kernel/time/clocksource.c +++ b/kernel/time/clocksource.c | |||
@@ -177,7 +177,8 @@ static void clocksource_watchdog(unsigned long data) | |||
177 | goto out; | 177 | goto out; |
178 | 178 | ||
179 | wdnow = watchdog->read(watchdog); | 179 | wdnow = watchdog->read(watchdog); |
180 | wd_nsec = cyc2ns(watchdog, (wdnow - watchdog_last) & watchdog->mask); | 180 | wd_nsec = clocksource_cyc2ns((wdnow - watchdog_last) & watchdog->mask, |
181 | watchdog->mult, watchdog->shift); | ||
181 | watchdog_last = wdnow; | 182 | watchdog_last = wdnow; |
182 | 183 | ||
183 | list_for_each_entry(cs, &watchdog_list, wd_list) { | 184 | list_for_each_entry(cs, &watchdog_list, wd_list) { |
@@ -196,7 +197,8 @@ static void clocksource_watchdog(unsigned long data) | |||
196 | } | 197 | } |
197 | 198 | ||
198 | /* Check the deviation from the watchdog clocksource. */ | 199 | /* Check the deviation from the watchdog clocksource. */ |
199 | cs_nsec = cyc2ns(cs, (csnow - cs->wd_last) & cs->mask); | 200 | cs_nsec = clocksource_cyc2ns((csnow - cs->wd_last) & |
201 | cs->mask, cs->mult, cs->shift); | ||
200 | cs->wd_last = csnow; | 202 | cs->wd_last = csnow; |
201 | if (abs(cs_nsec - wd_nsec) > WATCHDOG_THRESHOLD) { | 203 | if (abs(cs_nsec - wd_nsec) > WATCHDOG_THRESHOLD) { |
202 | clocksource_unstable(cs, cs_nsec - wd_nsec); | 204 | clocksource_unstable(cs, cs_nsec - wd_nsec); |