diff --git a/[refs] b/[refs] index 2514dcd19a02..54a8ef92dbd7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b00296fb781acfafa93687000cdef72b8922bb40 +refs/heads/master: 0a765329ed656ef08915c8be4aba9031ba467ee4 diff --git a/trunk/arch/um/os-Linux/time.c b/trunk/arch/um/os-Linux/time.c index ef02d941c2ad..e49280599465 100644 --- a/trunk/arch/um/os-Linux/time.c +++ b/trunk/arch/um/os-Linux/time.c @@ -77,6 +77,7 @@ long long os_nsecs(void) #ifdef UML_CONFIG_NO_HZ static int after_sleep_interval(struct timespec *ts) { + return 0; } #else static inline long long timespec_to_us(const struct timespec *ts)