diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-03-25 11:14:57 -0500 |
|---|---|---|
| committer | Rob Herring <rob.herring@calxeda.com> | 2013-04-11 15:11:14 -0500 |
| commit | f414f13f2fd0d8bb12a87268a55827cda771d42b (patch) | |
| tree | 6944f628cff3762c894dfd0bd02b14357556ea4f /arch/arm | |
| parent | 023796b9be3a77481cd5ee0b64a13a55bb0d5df4 (diff) | |
| download | blackbird-op-linux-f414f13f2fd0d8bb12a87268a55827cda771d42b.tar.gz blackbird-op-linux-f414f13f2fd0d8bb12a87268a55827cda771d42b.zip | |
ARM: make machine_desc->init_time default to clocksource_of_init
Originally from a default machine descriptor patch from Arnd, pull out
just the default call to clocksource_of_init part. This is needed so that
platforms can simply remove .init_time calls as they are converted to use
clocksource_of_init.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Nicolas Pitre <nico@linaro.org>
Acked-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/kernel/time.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/kernel/time.c b/arch/arm/kernel/time.c index 955d92d265e5..abff4e9aaee0 100644 --- a/arch/arm/kernel/time.c +++ b/arch/arm/kernel/time.c @@ -22,6 +22,7 @@ #include <linux/errno.h> #include <linux/profile.h> #include <linux/timer.h> +#include <linux/clocksource.h> #include <linux/irq.h> #include <asm/thread_info.h> @@ -115,6 +116,10 @@ int __init register_persistent_clock(clock_access_fn read_boot, void __init time_init(void) { - machine_desc->init_time(); + if (machine_desc->init_time) + machine_desc->init_time(); + else + clocksource_of_init(); + sched_clock_postinit(); } |
