From 2074dfd0e9998e1086c373962f42960e0053f987 Mon Sep 17 00:00:00 2001 From: Ryan Moeller Date: Wed, 4 Nov 2020 21:43:30 +0000 Subject: [PATCH] FreeBSD: Move uio_prefaultpages def to uio.h Reviewed-by: Brian Behlendorf Reviewed-by: Matt Macy Reviewed-by: Alexander Motin Signed-off-by: Ryan Moeller Closes #11176 --- include/os/freebsd/spl/sys/uio.h | 1 + include/os/freebsd/zfs/sys/zfs_context_os.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/include/os/freebsd/spl/sys/uio.h b/include/os/freebsd/spl/sys/uio.h index 81c7ab64ca..11b2189cda 100644 --- a/include/os/freebsd/spl/sys/uio.h +++ b/include/os/freebsd/spl/sys/uio.h @@ -62,6 +62,7 @@ void uioskip(uio_t *uiop, size_t n); #define uio_iovlen(uio, idx) (uio)->uio_iov[(idx)].iov_len #define uio_iovbase(uio, idx) (uio)->uio_iov[(idx)].iov_base #define uio_fault_disable(uio, set) +#define uio_prefaultpages(size, uio) (0) static inline void uio_iov_at_index(uio_t *uio, uint_t idx, void **base, uint64_t *len) diff --git a/include/os/freebsd/zfs/sys/zfs_context_os.h b/include/os/freebsd/zfs/sys/zfs_context_os.h index f4c4a5f878..8dbe907d09 100644 --- a/include/os/freebsd/zfs/sys/zfs_context_os.h +++ b/include/os/freebsd/zfs/sys/zfs_context_os.h @@ -42,7 +42,6 @@ #include #define cond_resched() kern_yield(PRI_USER) -#define uio_prefaultpages(size, uio) (0) #define taskq_create_sysdc(a, b, d, e, p, dc, f) \ (taskq_create(a, b, maxclsyspri, d, e, f))