From 70119a7d97ac2ee76037555c882ad5f8ed800d7d Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 25 Mar 2013 11:14:57 -0500
Subject: [PATCH] --- yaml --- r: 374188 b: refs/heads/master c:
 f414f13f2fd0d8bb12a87268a55827cda771d42b h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/arch/arm/kernel/time.c | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 755df24140b7..3ac81770fb8a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 023796b9be3a77481cd5ee0b64a13a55bb0d5df4
+refs/heads/master: f414f13f2fd0d8bb12a87268a55827cda771d42b
diff --git a/trunk/arch/arm/kernel/time.c b/trunk/arch/arm/kernel/time.c
index 955d92d265e5..abff4e9aaee0 100644
--- a/trunk/arch/arm/kernel/time.c
+++ b/trunk/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();
 }