Merge branch 'master' into gfio

[fio.git] / os / os.h

diff --git a/os/os.h b/os/os.h
index 28bb6319f216e095c04324163cd3bf90b65a2077..4416ae482fb46a176cccf252bea8307dbc24b0c8 100644 (file)
--- a/os/os.h
+++ b/os/os.h
@@ -58,7 +58,7 @@ typedef struct aiocb os_aiocb_t;
 #include <scsi/sg.h>
 #endif
 
-#ifdef CONFIG_STRSEP
+#ifndef CONFIG_STRSEP
 #include "../lib/strsep.h"
 #endif
 
@@ -127,7 +127,11 @@ typedef unsigned long os_cpu_mask_t;
 #endif
 
 #ifndef FIO_PREFERRED_CLOCK_SOURCE
+#ifdef CONFIG_CLOCK_GETTIME
 #define FIO_PREFERRED_CLOCK_SOURCE     CS_CGETTIME
+#else
+#define FIO_PREFERRED_CLOCK_SOURCE     CS_GTOD
+#endif
 #endif
 
 #ifndef FIO_MAX_JOBS