diff options
author | Jan Glauber <jan.glauber@de.ibm.com> | 2006-02-01 06:06:33 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-01 11:53:24 -0500 |
commit | 32f65f274602b43e8f48314e9769f254da1d8323 (patch) | |
tree | 143535f6bf1d8c537f3ecb08d81d105720b1cd83 | |
parent | 9dbafa5368c2b7467bd2ce034b56c54908ceb39e (diff) |
[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>
-rw-r--r-- | arch/s390/kernel/time.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c index efba91b015be..fea043b69b91 100644 --- a/arch/s390/kernel/time.c +++ b/arch/s390/kernel/time.c | |||
@@ -64,6 +64,15 @@ unsigned long long sched_clock(void) | |||
64 | return ((get_clock() - jiffies_timer_cc) * 125) >> 9; | 64 | return ((get_clock() - jiffies_timer_cc) * 125) >> 9; |
65 | } | 65 | } |
66 | 66 | ||
67 | /* | ||
68 | * Monotonic_clock - returns # of nanoseconds passed since time_init() | ||
69 | */ | ||
70 | unsigned long long monotonic_clock(void) | ||
71 | { | ||
72 | return sched_clock(); | ||
73 | } | ||
74 | EXPORT_SYMBOL(monotonic_clock); | ||
75 | |||
67 | void tod_to_timeval(__u64 todval, struct timespec *xtime) | 76 | void tod_to_timeval(__u64 todval, struct timespec *xtime) |
68 | { | 77 | { |
69 | unsigned long long sec; | 78 | unsigned long long sec; |