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;