---

yaml --- r: 19439 b: refs/heads/master c: 32f65f2 h: refs/heads/master i: 19437: 4383811 19435: 39c7adc 19431: e999d92 19423: ebcb45e v: v3
git-mirror · Feb 1, 2006 · e57bd87 · e57bd87
1 parent 772c95a
commit e57bd87
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9dbafa5368c2b7467bd2ce034b56c54908ceb39e
+refs/heads/master: 32f65f274602b43e8f48314e9769f254da1d8323
diff --git a/trunk/arch/s390/kernel/time.c b/trunk/arch/s390/kernel/time.c
@@ -64,6 +64,15 @@ unsigned long long sched_clock(void)
 	return ((get_clock() - jiffies_timer_cc) * 125) >> 9;
 }
 
+/*
+ * Monotonic_clock - returns # of nanoseconds passed since time_init()
+ */
+unsigned long long monotonic_clock(void)
+{
+	return sched_clock();
+}
+EXPORT_SYMBOL(monotonic_clock);
+
 void tod_to_timeval(__u64 todval, struct timespec *xtime)
 {
 	unsigned long long sec;