diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-06-14 19:45:40 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-06-14 19:45:40 +0900 |
| commit | 1d29ebebcb951ab6b04d22807cafb24b893310a2 (patch) | |
| tree | 079bbe643213dbb96a9e7933faf5a78010860adc /arch/sh/kernel/time.c | |
| parent | e09377bae410247f2ba35a2edc7ab637a5c79170 (diff) | |
sh: Bump the earlytimer bits back to time_init().
These were handled through late_time_init due to kmalloc() and friends
not being available earlier on previously. Now with slab caches being
available much earlier, this is no longer necessary, and we can move the
initialization up to an earlier point. One of the benefits with this is
that printk times are available a bit earlier!
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/kernel/time.c')
| -rw-r--r-- | arch/sh/kernel/time.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/arch/sh/kernel/time.c b/arch/sh/kernel/time.c index 2edde32c764b..0eecbe855f5c 100644 --- a/arch/sh/kernel/time.c +++ b/arch/sh/kernel/time.c @@ -96,16 +96,6 @@ unsigned long long sched_clock(void) return (jiffies_64 - INITIAL_JIFFIES) * (NSEC_PER_SEC / HZ); } -static void __init sh_late_time_init(void) -{ - /* - * Make sure all compiled-in early timers register themselves. - * Run probe() for one "earlytimer" device. - */ - early_platform_driver_register_all("earlytimer"); - early_platform_driver_probe("earlytimer", 1, 0); -} - void __init time_init(void) { if (board_time_init) @@ -121,5 +111,10 @@ void __init time_init(void) local_timer_setup(smp_processor_id()); #endif - late_time_init = sh_late_time_init; + /* + * Make sure all compiled-in early timers register themselves. + * Run probe() for one "earlytimer" device. + */ + early_platform_driver_register_all("earlytimer"); + early_platform_driver_probe("earlytimer", 1, 0); } |