Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 32f65f274602b43e8f48314e9769f254da1d8323

Authored by Jan Glauber
Committed by Linus Torvalds
1 parent 9dbafa5368
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

[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>

Showing 1 changed file with 9 additions and 0 deletions Side-by-side Diff

arch/s390/kernel/time.c
Diff comments   View file @ 32f65f2
... ... @@ -64,6 +64,15 @@
64 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 76 void tod_to_timeval(__u64 todval, struct timespec *xtime)
68 77 {
69 78 unsigned long long sec;