diff options
Diffstat (limited to 'kernel/time/timekeeping.c')
-rw-r--r-- | kernel/time/timekeeping.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index c3fcff06d30a..5b12292b343a 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c | |||
@@ -1389,9 +1389,7 @@ void timekeeping_resume(void) | |||
1389 | 1389 | ||
1390 | touch_softlockup_watchdog(); | 1390 | touch_softlockup_watchdog(); |
1391 | 1391 | ||
1392 | clockevents_notify(CLOCK_EVT_NOTIFY_RESUME, NULL); | 1392 | tick_resume(); |
1393 | |||
1394 | /* Resume hrtimers */ | ||
1395 | hrtimers_resume(); | 1393 | hrtimers_resume(); |
1396 | } | 1394 | } |
1397 | 1395 | ||
@@ -1444,7 +1442,7 @@ int timekeeping_suspend(void) | |||
1444 | write_seqcount_end(&tk_core.seq); | 1442 | write_seqcount_end(&tk_core.seq); |
1445 | raw_spin_unlock_irqrestore(&timekeeper_lock, flags); | 1443 | raw_spin_unlock_irqrestore(&timekeeper_lock, flags); |
1446 | 1444 | ||
1447 | clockevents_notify(CLOCK_EVT_NOTIFY_SUSPEND, NULL); | 1445 | tick_suspend(); |
1448 | clocksource_suspend(); | 1446 | clocksource_suspend(); |
1449 | clockevents_suspend(); | 1447 | clockevents_suspend(); |
1450 | 1448 | ||