From: Jan Glauber <jan.glauber@de.ibm.com>
Date: Wed, 1 Feb 2006 11:06:33 +0000 (-0800)
Subject: [PATCH] s390: monotonic_clock interface
X-Git-Tag: v2.6.16-rc2~40
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=32f65f274602b43e8f48314e9769f254da1d8323;p=linux-2.6-omap-h63xx.git

[PATCH] s390: monotonic_clock interface

Add monotonic_clock interface, used by the hangcheck-timer.  On s390 this is
the same as sched_clock().

Signed-off-by: Jan Glauber <jan.glauber@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c
index efba91b015b..fea043b69b9 100644
--- a/arch/s390/kernel/time.c
+++ b/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;