Merge branch 'master' of https://github.com/bvanassche/fio

* 'master' of https://github.com/bvanassche/fio:
  Android: Add io_uring support

diff --git a/Makefile b/Makefile
index f28c130a1669cbe680edc1ae6b2d176e3d6634be..4ae5a371fe268d5c7d8117a89025874d864291d8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -233,7 +233,7 @@ endif
 endif
 ifeq ($(CONFIG_TARGET_OS), Android)
   SOURCE += diskutil.c fifo.c blktrace.c cgroup.c trim.c profiles/tiobench.c \
-               oslib/linux-dev-lookup.c
+               oslib/linux-dev-lookup.c engines/io_uring.c
 ifdef CONFIG_HAS_BLKZONED
   SOURCE += oslib/linux-blkzoned.c
 endif

diff --git a/os/os-android.h b/os/os-android.h
index 18eb39ce052884b58dedc2f8f7a256281ab8aa95..10c51b8318f87a4edb68f1fc4264ca5ea3835667 100644 (file)
--- a/os/os-android.h
+++ b/os/os-android.h
@@ -309,4 +309,8 @@ static inline int fio_set_sched_idle(void)
 }
 #endif
 
+#ifndef RWF_UNCACHED
+#define RWF_UNCACHED   0x00000040
+#endif
+
 #endif