Merge branch 'master' into gfio

[fio.git] / os / os.h

diff --git a/os/os.h b/os/os.h
index f33a7cdf5d631c5e0fd4f0be548dafa9a08477ce..28bb6319f216e095c04324163cd3bf90b65a2077 100644 (file)
--- a/os/os.h
+++ b/os/os.h
@@ -8,6 +8,8 @@
 #include <unistd.h>
 #include <stdlib.h>
 
 #include <unistd.h>
 #include <stdlib.h>
 

+#include "../arch/arch.h"
+

 enum {
        os_linux = 1,
        os_aix,
 enum {
        os_linux = 1,
        os_aix,


@@ -79,7 +81,7 @@ typedef unsigned long os_cpu_mask_t;
 #endif
 
 #ifndef FIO_HAVE_IOPRIO
 #endif
 
 #ifndef FIO_HAVE_IOPRIO

-#define ioprio_set(which, who, prio)   (0)
+#define ioprio_set(which, who, prioclass, prio)        (0)

 #endif
 
 #ifndef FIO_HAVE_ODIRECT
 #endif
 
 #ifndef FIO_HAVE_ODIRECT