Commit f414f13f authored Mar 25, 2013 by Arnd Bergmann Committed by Rob Herring Apr 11, 2013

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>

parent 023796b9

arch/arm/kernel/time.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -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)
		{
		if (machine_desc->init_time)
		machine_desc->init_time();
		else
		clocksource_of_init();

		sched_clock_postinit();
		}

Admin message