aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/timer.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/timer.c')
-rw-r--r--kernel/timer.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/timer.c b/kernel/timer.c
index 440048acaea1..b22bd39740dd 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -505,6 +505,8 @@ out:
505 return ret; 505 return ret;
506} 506}
507 507
508EXPORT_SYMBOL(try_to_del_timer_sync);
509
508/** 510/**
509 * del_timer_sync - deactivate a timer and wait for the handler to finish. 511 * del_timer_sync - deactivate a timer and wait for the handler to finish.
510 * @timer: the timer to be deactivated 512 * @timer: the timer to be deactivated
@@ -1016,7 +1018,7 @@ static int timekeeping_resume(struct sys_device *dev)
1016 clockevents_notify(CLOCK_EVT_NOTIFY_RESUME, NULL); 1018 clockevents_notify(CLOCK_EVT_NOTIFY_RESUME, NULL);
1017 1019
1018 /* Resume hrtimers */ 1020 /* Resume hrtimers */
1019 clock_was_set(); 1021 hres_timers_resume();
1020 1022
1021 return 0; 1023 return 0;
1022} 1024}