From 22858c3185e8b1de5edce903fb7db577ae4b6695 Mon Sep 17 00:00:00 2001 From: Ryan Moeller Date: Thu, 11 Jun 2020 22:31:52 -0400 Subject: [PATCH] FreeBSD: Kernel module should depend on xdr not krpc after 1300092 Closes #10442 Since https://reviews.freebsd.org/D24408 FreeBSD provides XDR functions in the xdr module instead of krpc. For FreeBSD 13, the MODULE_DEPEND should be changed to xdr Signed-off-by: Ryan Moeller --- module/os/freebsd/zfs/kmod_core.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/module/os/freebsd/zfs/kmod_core.c b/module/os/freebsd/zfs/kmod_core.c index 2e16cf123122..17e9e8dff2b8 100644 --- a/module/os/freebsd/zfs/kmod_core.c +++ b/module/os/freebsd/zfs/kmod_core.c @@ -398,7 +398,11 @@ EVENTHANDLER_DEFINE(mountroot, spa_boot_init, NULL, 0); DECLARE_MODULE(zfsctrl, zfs_mod, SI_SUB_CLOCKS, SI_ORDER_ANY); MODULE_VERSION(zfsctrl, 1); +#if __FreeBSD_version > 1300092 +MODULE_DEPEND(zfsctrl, xdr, 1, 1, 1); +#else MODULE_DEPEND(zfsctrl, krpc, 1, 1, 1); +#endif MODULE_DEPEND(zfsctrl, acl_nfs4, 1, 1, 1); MODULE_DEPEND(zfsctrl, crypto, 1, 1, 1); MODULE_DEPEND(zfsctrl, cryptodev, 1, 1, 1);