Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Arnd Bergmann and committed by
Rob Herring
f414f13f 023796b9

+6 -1
+6 -1
arch/arm/kernel/time.c
··· 22 22 #include <linux/errno.h> 23 23 #include <linux/profile.h> 24 24 #include <linux/timer.h> 25 + #include <linux/clocksource.h> 25 26 #include <linux/irq.h> 26 27 27 28 #include <asm/thread_info.h> ··· 116 115 117 116 void __init time_init(void) 118 117 { 119 - machine_desc->init_time(); 118 + if (machine_desc->init_time) 119 + machine_desc->init_time(); 120 + else 121 + clocksource_of_init(); 122 + 120 123 sched_clock_postinit(); 121 124 }