diff options
Diffstat (limited to 'kernel/timer.c')
-rw-r--r-- | kernel/timer.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/timer.c b/kernel/timer.c index 7d522bdf8265..f058e6cfd50c 100644 --- a/kernel/timer.c +++ b/kernel/timer.c | |||
@@ -34,7 +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 | #include <linux/tick.h> |
38 | 38 | ||
39 | #include <asm/uaccess.h> | 39 | #include <asm/uaccess.h> |
40 | #include <asm/unistd.h> | 40 | #include <asm/unistd.h> |
@@ -874,6 +874,8 @@ static void change_clocksource(void) | |||
874 | clock->xtime_nsec = 0; | 874 | clock->xtime_nsec = 0; |
875 | clocksource_calculate_interval(clock, NTP_INTERVAL_LENGTH); | 875 | clocksource_calculate_interval(clock, NTP_INTERVAL_LENGTH); |
876 | 876 | ||
877 | tick_clock_notify(); | ||
878 | |||
877 | printk(KERN_INFO "Time: %s clocksource has been installed.\n", | 879 | printk(KERN_INFO "Time: %s clocksource has been installed.\n", |
878 | clock->name); | 880 | clock->name); |
879 | } | 881 | } |
@@ -937,7 +939,6 @@ void __init timekeeping_init(void) | |||
937 | write_sequnlock_irqrestore(&xtime_lock, flags); | 939 | write_sequnlock_irqrestore(&xtime_lock, flags); |
938 | } | 940 | } |
939 | 941 | ||
940 | |||
941 | /* flag for if timekeeping is suspended */ | 942 | /* flag for if timekeeping is suspended */ |
942 | static int timekeeping_suspended; | 943 | static int timekeeping_suspended; |
943 | /* time in seconds when suspend began */ | 944 | /* time in seconds when suspend began */ |