X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=time.c;h=4af84bc7cc5b6a2e1f0be57f284e3e6c3d57f2c8;hp=6397f20e01dc8e2ce0cb0067311c155e9c7dce82;hb=a3ebe7e079847413458b9d80bd7a4acc924d108b;hpb=4580885d413c7bca742dc2a373b9afcd5f48d7f8

diff --git a/time.c b/time.c
index 6397f20e..4af84bc7 100644
--- a/time.c
+++ b/time.c
@@ -48,16 +48,13 @@ unsigned long mtime_since(struct timeval *s, struct timeval *e)
 		usec += 1000000;
 	}
 
+	if (sec < 0 || (sec == 0 && usec < 0))
+		return 0;
+
 	sec *= 1000UL;
 	usec /= 1000UL;
 	ret = sec + usec;
 
-	/*
-	 * time warp bug on some kernels?
-	 */
-	if (ret < 0)
-		ret = 0;
-
 	return ret;
 }
 
@@ -150,10 +147,12 @@ int ramp_time_over(struct thread_data *td)
 	return 0;
 }
 
-static void fio_init time_init(void)
+void fio_time_init(void)
 {
 	int i;
 
+	fio_clock_init();
+
 	/*
 	 * Check the granularity of the nanosleep function
 	 */