diff options
Diffstat (limited to 'kernel/timer.c')
-rw-r--r-- | kernel/timer.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/timer.c b/kernel/timer.c index 6d843e100e75..7d522bdf8265 100644 --- a/kernel/timer.c +++ b/kernel/timer.c | |||
@@ -34,6 +34,7 @@ | |||
34 | #include <linux/cpu.h> | 34 | #include <linux/cpu.h> |
35 | #include <linux/syscalls.h> | 35 | #include <linux/syscalls.h> |
36 | #include <linux/delay.h> | 36 | #include <linux/delay.h> |
37 | #include <linux/clockchips.h> | ||
37 | 38 | ||
38 | #include <asm/uaccess.h> | 39 | #include <asm/uaccess.h> |
39 | #include <asm/unistd.h> | 40 | #include <asm/unistd.h> |
@@ -970,7 +971,8 @@ static int timekeeping_resume(struct sys_device *dev) | |||
970 | write_sequnlock_irqrestore(&xtime_lock, flags); | 971 | write_sequnlock_irqrestore(&xtime_lock, flags); |
971 | 972 | ||
972 | touch_softlockup_watchdog(); | 973 | touch_softlockup_watchdog(); |
973 | hrtimer_notify_resume(); | 974 | /* Resume hrtimers */ |
975 | clock_was_set(); | ||
974 | 976 | ||
975 | return 0; | 977 | return 0; |
976 | } | 978 | } |