Recent changes (master)

[Jens Axboe <axboe@kernel.dk>]

The following changes since commit 09d0a62931df0bb7ed4ae92b83a245e35d04100a:

  Merge branch 'patch-1' of https://github.com/sweettea/fio (2021-10-19 16:09:21 -0600)

are available in the Git repository at:

  git://git.kernel.dk/fio.git master

for you to fetch changes up to 515418094c61cf135513a34651af6134a8794b5d:

  Merge branch 'master' of https://github.com/bvanassche/fio (2021-10-22 10:19:04 -0600)

----------------------------------------------------------------
Bart Van Assche (1):
      Android: Add io_uring support

Jens Axboe (1):
      Merge branch 'master' of https://github.com/bvanassche/fio

 Makefile        | 2 +-
 os/os-android.h | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

---

Diff of recent changes:

diff --git a/Makefile b/Makefile
index f28c130a..4ae5a371 100644
--- 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 18eb39ce..10c51b83 100644
--- 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