From e57bd878b00ddbd09601de95956ec57cf551985c Mon Sep 17 00:00:00 2001
From: Jan Glauber <jan.glauber@de.ibm.com>
Date: Wed, 1 Feb 2006 03:06:33 -0800
Subject: [PATCH] --- yaml --- r: 19439 b: refs/heads/master c:
 32f65f274602b43e8f48314e9769f254da1d8323 h: refs/heads/master i:   19437:
 4383811d7a698d348b0c13e21f4529ddfff89856   19435:
 39c7adc43001baed9ddc81a923c0ffbc6f2083d2   19431:
 e999d92686d8345f4b8c95f4704230a7d07273d9   19423:
 ebcb45e1c0d9258ca5901459c7d8d7e3cec29b26 v: v3

---
 [refs]                        | 2 +-
 trunk/arch/s390/kernel/time.c | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 15cbbdd96d88..46defad7e6ee 100644
--- 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
index efba91b015be..fea043b69b91 100644
--- 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;