From f3de88a7a8806016ebb27af3f4be1fced172122e Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Sun, 24 Feb 2008 21:36:00 +0100 Subject: [PATCH 1/1] Move syslet/indirect bits into the OS specific directory Signed-off-by: Jens Axboe --- engines/syslet-rw.c | 2 -- indirect.h => os/indirect.h | 0 kcompat.h => os/kcompat.h | 0 os/os-linux.h | 2 ++ syslet.h => os/syslet.h | 6 +++--- 5 files changed, 5 insertions(+), 5 deletions(-) rename indirect.h => os/indirect.h (100%) rename kcompat.h => os/kcompat.h (100%) rename syslet.h => os/syslet.h (81%) diff --git a/engines/syslet-rw.c b/engines/syslet-rw.c index 7bb1be83..0fdf7522 100644 --- a/engines/syslet-rw.c +++ b/engines/syslet-rw.c @@ -14,8 +14,6 @@ #include #include "../fio.h" -#include "../indirect.h" -#include "../syslet.h" #include "../fls.h" #ifdef FIO_HAVE_SYSLET diff --git a/indirect.h b/os/indirect.h similarity index 100% rename from indirect.h rename to os/indirect.h diff --git a/kcompat.h b/os/kcompat.h similarity index 100% rename from kcompat.h rename to os/kcompat.h diff --git a/os/os-linux.h b/os/os-linux.h index ed195537..e7c0e47c 100644 --- a/os/os-linux.h +++ b/os/os-linux.h @@ -10,6 +10,8 @@ #include #include +#include "indirect.h" + #define FIO_HAVE_LIBAIO #define FIO_HAVE_POSIXAIO #define FIO_HAVE_FADVISE diff --git a/syslet.h b/os/syslet.h similarity index 81% rename from syslet.h rename to os/syslet.h index 16f81d2f..095cc134 100644 --- a/syslet.h +++ b/os/syslet.h @@ -37,9 +37,9 @@ struct syslet_ring { typedef void (*syslet_return_func_t)(void); -void fill_syslet_args(struct syslet_args *args, struct syslet_ring *ring, - uint64_t caller_data, syslet_return_func_t func, - void *stack) +static inline void fill_syslet_args(struct syslet_args *args, + struct syslet_ring *ring, uint64_t caller_data, + syslet_return_func_t func, void *stack) { args->ring_ptr = (u64)(unsigned long)ring; args->caller_data = caller_data; -- 2.25.1