diff options
Diffstat (limited to 'arch/arm/kernel/time.c')
-rw-r--r-- | arch/arm/kernel/time.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/kernel/time.c b/arch/arm/kernel/time.c index 38c261f9951c..3d76bf233734 100644 --- a/arch/arm/kernel/time.c +++ b/arch/arm/kernel/time.c | |||
@@ -29,13 +29,15 @@ | |||
29 | 29 | ||
30 | #include <asm/leds.h> | 30 | #include <asm/leds.h> |
31 | #include <asm/thread_info.h> | 31 | #include <asm/thread_info.h> |
32 | #include <asm/sched_clock.h> | ||
32 | #include <asm/stacktrace.h> | 33 | #include <asm/stacktrace.h> |
34 | #include <asm/mach/arch.h> | ||
33 | #include <asm/mach/time.h> | 35 | #include <asm/mach/time.h> |
34 | 36 | ||
35 | /* | 37 | /* |
36 | * Our system timer. | 38 | * Our system timer. |
37 | */ | 39 | */ |
38 | struct sys_timer *system_timer; | 40 | static struct sys_timer *system_timer; |
39 | 41 | ||
40 | #if defined(CONFIG_RTC_DRV_CMOS) || defined(CONFIG_RTC_DRV_CMOS_MODULE) | 42 | #if defined(CONFIG_RTC_DRV_CMOS) || defined(CONFIG_RTC_DRV_CMOS_MODULE) |
41 | /* this needs a better home */ | 43 | /* this needs a better home */ |
@@ -160,6 +162,10 @@ device_initcall(timer_init_sysfs); | |||
160 | 162 | ||
161 | void __init time_init(void) | 163 | void __init time_init(void) |
162 | { | 164 | { |
165 | system_timer = machine_desc->timer; | ||
163 | system_timer->init(); | 166 | system_timer->init(); |
167 | #ifdef CONFIG_HAVE_SCHED_CLOCK | ||
168 | sched_clock_postinit(); | ||
169 | #endif | ||
164 | } | 170 | } |
165 | 171 | ||