---

yaml --- r: 374188 b: refs/heads/master c: f414f13 h: refs/heads/master v: v3
git-mirror · Apr 11, 2013 · 70119a7 · 70119a7
1 parent e20e677
commit 70119a7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git 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
@@ -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();
 }