diff options
Diffstat (limited to 'module')
29 files changed, 45 insertions, 4 deletions
diff --git a/module/Makefile.bsd b/module/Makefile.bsd index 6fd00f474..517054b0e 100644 --- a/module/Makefile.bsd +++ b/module/Makefile.bsd @@ -32,7 +32,7 @@ CFLAGS+= -DHAVE_UIO_ZEROCOPY -DWITHOUT_NETDUMP -D__KERNEL -D_SYS_CONDVAR_H_ CFLAGS+= -D_SYS_VMEM_H_ -D_MACHINE_ENDIAN_H_ -DKDTRACE_HOOKS -DSMP .if ${MACHINE_ARCH} == "amd64" -CFLAGS+= -DHAVE_AVX2 -DHAVE_AVX -D__x86_64 -DHAVE_SSE2 -DHAVE_AVX512F +CFLAGS+= -DHAVE_AVX2 -DHAVE_AVX -D__x86_64 -DHAVE_SSE2 -DHAVE_AVX512F -DHAVE_SSSE3 .endif .if defined(WITH_DEBUG) && ${WITH_DEBUG} == "true" @@ -310,7 +310,7 @@ CFLAGS.lcompat.c= -Wno-cast-qual CFLAGS.lobject.c= -Wno-cast-qual CFLAGS.ltable.c= -Wno-cast-qual CFLAGS.lvm.c= -Wno-cast-qual -CFLAGS.nvpair.c= -Wno-cast-qual +CFLAGS.nvpair.c= -DHAVE_RPC_TYPES -Wno-cast-qual CFLAGS.spl_string.c= -Wno-cast-qual CFLAGS.spl_vm.c= -Wno-cast-qual CFLAGS.spl_zlib.c= -Wno-cast-qual diff --git a/module/nvpair/nvpair.c b/module/nvpair/nvpair.c index 8691aaf2c..6c0261f08 100644 --- a/module/nvpair/nvpair.c +++ b/module/nvpair/nvpair.c @@ -30,6 +30,7 @@ #include <sys/nvpair.h> #include <sys/nvpair_impl.h> #include <sys/types.h> +#include <sys/param.h> #include <sys/strings.h> #include <rpc/xdr.h> #include <sys/mod.h> diff --git a/module/os/freebsd/spl/callb.c b/module/os/freebsd/spl/callb.c index 633e85bc0..fffa85b6b 100644 --- a/module/os/freebsd/spl/callb.c +++ b/module/os/freebsd/spl/callb.c @@ -23,8 +23,8 @@ * Use is subject to license terms. */ -#include <sys/param.h> #include <sys/types.h> +#include <sys/param.h> #include <sys/time.h> #include <sys/sysmacros.h> #include <sys/systm.h> diff --git a/module/os/freebsd/spl/spl_acl.c b/module/os/freebsd/spl/spl_acl.c index bb4c30728..18188ca0a 100644 --- a/module/os/freebsd/spl/spl_acl.c +++ b/module/os/freebsd/spl/spl_acl.c @@ -27,6 +27,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include <sys/types.h> #include <sys/param.h> #include <sys/systm.h> #include <sys/types.h> diff --git a/module/os/freebsd/spl/spl_cmn_err.c b/module/os/freebsd/spl/spl_cmn_err.c index 23566603f..22c7338b7 100644 --- a/module/os/freebsd/spl/spl_cmn_err.c +++ b/module/os/freebsd/spl/spl_cmn_err.c @@ -25,6 +25,9 @@ * Copyright 2012 Martin Matuska <[email protected]>. All rights reserved. */ +#include <sys/cdefs.h> +#include <sys/param.h> +#include <sys/systm.h> #include <sys/cmn_err.h> void diff --git a/module/os/freebsd/spl/spl_dtrace.c b/module/os/freebsd/spl/spl_dtrace.c index e7b2ff823..6b2872bcc 100644 --- a/module/os/freebsd/spl/spl_dtrace.c +++ b/module/os/freebsd/spl/spl_dtrace.c @@ -29,6 +29,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include <sys/types.h> #include <sys/param.h> #include <sys/queue.h> #include <sys/sdt.h> diff --git a/module/os/freebsd/spl/spl_kmem.c b/module/os/freebsd/spl/spl_kmem.c index af3747c27..cfc61dd7f 100644 --- a/module/os/freebsd/spl/spl_kmem.c +++ b/module/os/freebsd/spl/spl_kmem.c @@ -27,6 +27,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include <sys/types.h> #include <sys/param.h> #include <sys/byteorder.h> #include <sys/kernel.h> diff --git a/module/os/freebsd/spl/spl_kstat.c b/module/os/freebsd/spl/spl_kstat.c index 234b56a49..756667045 100644 --- a/module/os/freebsd/spl/spl_kstat.c +++ b/module/os/freebsd/spl/spl_kstat.c @@ -27,6 +27,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include <sys/types.h> #include <sys/param.h> #include <sys/kernel.h> #include <sys/systm.h> diff --git a/module/os/freebsd/spl/spl_misc.c b/module/os/freebsd/spl/spl_misc.c index 8d33916d8..0354b986c 100644 --- a/module/os/freebsd/spl/spl_misc.c +++ b/module/os/freebsd/spl/spl_misc.c @@ -27,6 +27,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include <sys/types.h> #include <sys/param.h> #include <sys/jail.h> #include <sys/kernel.h> diff --git a/module/os/freebsd/spl/spl_policy.c b/module/os/freebsd/spl/spl_policy.c index 8ef4ca88b..5cd5c69ef 100644 --- a/module/os/freebsd/spl/spl_policy.c +++ b/module/os/freebsd/spl/spl_policy.c @@ -27,6 +27,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include <sys/types.h> #include <sys/param.h> #include <sys/priv.h> #include <sys/vnode.h> diff --git a/module/os/freebsd/spl/spl_string.c b/module/os/freebsd/spl/spl_string.c index 14d816b5c..d13b64b4c 100644 --- a/module/os/freebsd/spl/spl_string.c +++ b/module/os/freebsd/spl/spl_string.c @@ -25,6 +25,7 @@ * Use is subject to license terms. */ +#include <sys/types.h> #include <sys/param.h> #include <sys/string.h> #include <sys/kmem.h> diff --git a/module/os/freebsd/spl/spl_sunddi.c b/module/os/freebsd/spl/spl_sunddi.c index 1fa4f56f1..ebec77bdb 100644 --- a/module/os/freebsd/spl/spl_sunddi.c +++ b/module/os/freebsd/spl/spl_sunddi.c @@ -27,6 +27,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include <sys/types.h> #include <sys/param.h> #include <sys/jail.h> #include <sys/kernel.h> diff --git a/module/os/freebsd/spl/spl_sysevent.c b/module/os/freebsd/spl/spl_sysevent.c index 4bb0658c8..53520eeaf 100644 --- a/module/os/freebsd/spl/spl_sysevent.c +++ b/module/os/freebsd/spl/spl_sysevent.c @@ -28,6 +28,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include <sys/types.h> #include <sys/param.h> #include <sys/kernel.h> #include <sys/systm.h> diff --git a/module/os/freebsd/spl/spl_taskq.c b/module/os/freebsd/spl/spl_taskq.c index f32dad2a2..9cdf93ea9 100644 --- a/module/os/freebsd/spl/spl_taskq.c +++ b/module/os/freebsd/spl/spl_taskq.c @@ -29,6 +29,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include <sys/types.h> #include <sys/param.h> #include <sys/kernel.h> #include <sys/kmem.h> diff --git a/module/os/freebsd/spl/spl_uio.c b/module/os/freebsd/spl/spl_uio.c index 05dbfd06d..c6b610394 100644 --- a/module/os/freebsd/spl/spl_uio.c +++ b/module/os/freebsd/spl/spl_uio.c @@ -40,7 +40,7 @@ * $FreeBSD$ */ -#include <sys/types.h> +#include <sys/param.h> #include <sys/uio.h> #include <sys/vnode.h> diff --git a/module/os/freebsd/spl/spl_vfs.c b/module/os/freebsd/spl/spl_vfs.c index 99da8c976..d42835c20 100644 --- a/module/os/freebsd/spl/spl_vfs.c +++ b/module/os/freebsd/spl/spl_vfs.c @@ -27,6 +27,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include <sys/types.h> #include <sys/param.h> #include <sys/kernel.h> #include <sys/systm.h> @@ -40,6 +41,8 @@ __FBSDID("$FreeBSD$"); #include <sys/mutex.h> #include <sys/vnode.h> +#include <sys/ccompat.h> + MALLOC_DECLARE(M_MOUNT); void diff --git a/module/os/freebsd/spl/spl_vm.c b/module/os/freebsd/spl/spl_vm.c index 9f7acab74..b5649d519 100644 --- a/module/os/freebsd/spl/spl_vm.c +++ b/module/os/freebsd/spl/spl_vm.c @@ -27,6 +27,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include <sys/types.h> #include <sys/param.h> #include <sys/byteorder.h> #include <sys/lock.h> diff --git a/module/os/freebsd/spl/spl_zlib.c b/module/os/freebsd/spl/spl_zlib.c index 4d53f42d3..079801f2d 100644 --- a/module/os/freebsd/spl/spl_zlib.c +++ b/module/os/freebsd/spl/spl_zlib.c @@ -28,6 +28,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include <sys/types.h> #include <sys/kmem.h> #include <sys/kmem_cache.h> #include <sys/zmod.h> diff --git a/module/os/freebsd/spl/spl_zone.c b/module/os/freebsd/spl/spl_zone.c index 40f21934e..0b3b04d2a 100644 --- a/module/os/freebsd/spl/spl_zone.c +++ b/module/os/freebsd/spl/spl_zone.c @@ -27,6 +27,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include <sys/types.h> #include <sys/param.h> #include <sys/kernel.h> #include <sys/systm.h> diff --git a/module/os/freebsd/zfs/abd_os.c b/module/os/freebsd/zfs/abd_os.c index b4d43b96a..6b325affa 100644 --- a/module/os/freebsd/zfs/abd_os.c +++ b/module/os/freebsd/zfs/abd_os.c @@ -28,6 +28,7 @@ #include <sys/abd_impl.h> #include <sys/param.h> +#include <sys/types.h> #include <sys/zio.h> #include <sys/zfs_context.h> #include <sys/zfs_znode.h> diff --git a/module/os/freebsd/zfs/dmu_os.c b/module/os/freebsd/zfs/dmu_os.c index 4d367af31..8e412d9c1 100644 --- a/module/os/freebsd/zfs/dmu_os.c +++ b/module/os/freebsd/zfs/dmu_os.c @@ -28,6 +28,8 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include <sys/types.h> +#include <sys/param.h> #include <sys/dmu.h> #include <sys/dmu_impl.h> #include <sys/dmu_tx.h> @@ -55,6 +57,7 @@ __FBSDID("$FreeBSD$"); #include <sys/zfs_znode.h> #include <sys/zfs_vnops.h> +#include <sys/ccompat.h> #ifndef IDX_TO_OFF #define IDX_TO_OFF(idx) (((vm_ooffset_t)(idx)) << PAGE_SHIFT) diff --git a/module/os/freebsd/zfs/zfs_ctldir.c b/module/os/freebsd/zfs/zfs_ctldir.c index 2738f5399..8481a9d75 100644 --- a/module/os/freebsd/zfs/zfs_ctldir.c +++ b/module/os/freebsd/zfs/zfs_ctldir.c @@ -65,6 +65,9 @@ * so that it cannot be freed until all snapshots have been unmounted. */ +#include <sys/types.h> +#include <sys/param.h> +#include <sys/libkern.h> #include <sys/dirent.h> #include <sys/zfs_context.h> #include <sys/zfs_ctldir.h> @@ -83,6 +86,7 @@ #include "zfs_namecheck.h" #include <sys/kernel.h> +#include <sys/ccompat.h> /* Common access mode for all virtual directories under the ctldir */ const uint16_t zfsctl_ctldir_mode = S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP | diff --git a/module/os/freebsd/zfs/zfs_dir.c b/module/os/freebsd/zfs/zfs_dir.c index 5aa4cd525..4b1f4a883 100644 --- a/module/os/freebsd/zfs/zfs_dir.c +++ b/module/os/freebsd/zfs/zfs_dir.c @@ -60,6 +60,8 @@ #include <sys/dmu_objset.h> #include <sys/dsl_dir.h> +#include <sys/ccompat.h> + /* * zfs_match_find() is used by zfs_dirent_lookup() to perform zap lookups * of names after deciding which is the appropriate lookup interface. diff --git a/module/zcommon/zfeature_common.c b/module/zcommon/zfeature_common.c index 302d48570..ed7967dc1 100644 --- a/module/zcommon/zfeature_common.c +++ b/module/zcommon/zfeature_common.c @@ -36,6 +36,7 @@ #include <sys/fs/zfs.h> #include <sys/inttypes.h> #include <sys/types.h> +#include <sys/param.h> #include <sys/zfs_sysfs.h> #include "zfeature_common.h" diff --git a/module/zcommon/zfs_fletcher_avx512.c b/module/zcommon/zfs_fletcher_avx512.c index d33d2dc33..300ec4c1f 100644 --- a/module/zcommon/zfs_fletcher_avx512.c +++ b/module/zcommon/zfs_fletcher_avx512.c @@ -31,7 +31,9 @@ #include <sys/simd.h> #include <zfs_fletcher.h> +#ifdef __linux__ #define __asm __asm__ __volatile__ +#endif static void fletcher_4_avx512f_init(fletcher_4_ctx_t *ctx) diff --git a/module/zcommon/zfs_fletcher_superscalar.c b/module/zcommon/zfs_fletcher_superscalar.c index fbbbf8060..153f5c7d7 100644 --- a/module/zcommon/zfs_fletcher_superscalar.c +++ b/module/zcommon/zfs_fletcher_superscalar.c @@ -41,6 +41,7 @@ * SOFTWARE. */ +#include <sys/param.h> #include <sys/byteorder.h> #include <sys/spa_checksum.h> #include <sys/strings.h> diff --git a/module/zcommon/zfs_fletcher_superscalar4.c b/module/zcommon/zfs_fletcher_superscalar4.c index 97fdb7b7d..75e6a3baf 100644 --- a/module/zcommon/zfs_fletcher_superscalar4.c +++ b/module/zcommon/zfs_fletcher_superscalar4.c @@ -41,6 +41,7 @@ * SOFTWARE. */ +#include <sys/param.h> #include <sys/byteorder.h> #include <sys/spa_checksum.h> #include <sys/strings.h> diff --git a/module/zfs/vdev_raidz_math_avx512bw.c b/module/zfs/vdev_raidz_math_avx512bw.c index 38cdbedf7..f06b46902 100644 --- a/module/zfs/vdev_raidz_math_avx512bw.c +++ b/module/zfs/vdev_raidz_math_avx512bw.c @@ -27,10 +27,14 @@ #if defined(__x86_64) && defined(HAVE_AVX512BW) +#include <sys/param.h> #include <sys/types.h> #include <sys/simd.h> + +#ifdef __linux__ #define __asm __asm__ __volatile__ +#endif #define _REG_CNT(_0, _1, _2, _3, _4, _5, _6, _7, N, ...) N #define REG_CNT(r...) _REG_CNT(r, 8, 7, 6, 5, 4, 3, 2, 1) diff --git a/module/zfs/vdev_raidz_math_ssse3.c b/module/zfs/vdev_raidz_math_ssse3.c index d5776a38a..5ddc079a4 100644 --- a/module/zfs/vdev_raidz_math_ssse3.c +++ b/module/zfs/vdev_raidz_math_ssse3.c @@ -29,7 +29,9 @@ #include <sys/types.h> #include <sys/simd.h> +#ifdef __linux__ #define __asm __asm__ __volatile__ +#endif #define _REG_CNT(_0, _1, _2, _3, _4, _5, _6, _7, N, ...) N #define REG_CNT(r...) _REG_CNT(r, 8, 7, 6, 5, 4, 3, 2, 1) |