diff options
Diffstat (limited to 'sys/modules')
| -rw-r--r-- | sys/modules/Makefile | 3 | ||||
| -rw-r--r-- | sys/modules/dtb/rockchip/Makefile | 3 | ||||
| -rw-r--r-- | sys/modules/irdma/Makefile | 6 | ||||
| -rw-r--r-- | sys/modules/ossl/Makefile | 7 | ||||
| -rw-r--r-- | sys/modules/sound/driver/hda/Makefile | 4 | ||||
| -rw-r--r-- | sys/modules/zfs/zfs_config.h | 12 | ||||
| -rw-r--r-- | sys/modules/zfs/zfs_gitrev.h | 2 |
7 files changed, 23 insertions, 14 deletions
diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 5315d518afd8..f9fdbca78869 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -576,7 +576,10 @@ _mlx5ib= mlx5ib ${MACHINE_CPUARCH} == "i386" _ena= ena _gve= gve +# gcc13 and earlier lack __builtin_bitcountg used by linux emulation +.if !(${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} < 140000) _iwlwifi= iwlwifi +.endif _rtw88= rtw88 _rtw89= rtw89 _vmware= vmware diff --git a/sys/modules/dtb/rockchip/Makefile b/sys/modules/dtb/rockchip/Makefile index 33c2048cbb15..9c8ca1acc837 100644 --- a/sys/modules/dtb/rockchip/Makefile +++ b/sys/modules/dtb/rockchip/Makefile @@ -21,7 +21,8 @@ DTS= \ rockchip/rk3566-quartz64-a.dts \ rockchip/rk3568-nanopi-r5s.dts \ rockchip/rk3566-radxa-zero-3e.dts \ - rockchip/rk3566-radxa-zero-3w.dts + rockchip/rk3566-radxa-zero-3w.dts \ + rockchip/rk3568-bpi-r2-pro.dts DTSO= rk3328-analog-sound.dtso \ rk3328-i2c0.dtso \ diff --git a/sys/modules/irdma/Makefile b/sys/modules/irdma/Makefile index b2ffb67ca66f..a9ef6e63d3f2 100644 --- a/sys/modules/irdma/Makefile +++ b/sys/modules/irdma/Makefile @@ -1,8 +1,8 @@ .include <bsd.own.mk> -OFED_INC_DIR = ${.CURDIR}/../../ofed/include -ICE_DIR = ${.CURDIR}/../../dev/ice -.PATH: ${.CURDIR}/../../dev/irdma +OFED_INC_DIR = ${SRCTOP}/sys/ofed/include +ICE_DIR = ${SRCTOP}/sys/dev/ice +.PATH: ${SRCTOP}/sys/dev/irdma KMOD= irdma SRCS= icrdma.c diff --git a/sys/modules/ossl/Makefile b/sys/modules/ossl/Makefile index ac2c752e922e..c516fe0c158d 100644 --- a/sys/modules/ossl/Makefile +++ b/sys/modules/ossl/Makefile @@ -25,7 +25,7 @@ SRCS.arm= \ sha256-armv4.S \ sha512-armv4.S \ ossl_arm.c \ - ossl_aes_gcm.c + ossl_aes_gcm_neon.c SRCS.aarch64= \ chacha-armv8.S \ @@ -48,6 +48,7 @@ SRCS.amd64= \ sha256-x86_64.S \ sha512-x86_64.S \ ossl_aes_gcm.c \ + ossl_aes_gcm_avx512.c \ ossl_x86.c SRCS.i386= \ @@ -60,6 +61,8 @@ SRCS.i386= \ ossl_x86.c SRCS.powerpc64le= \ + aes-gcm-ppc.S \ + ossl_aes_gcm.c \ ossl_ppccap.c \ aes-ppc.S \ aesp8-ppc.S \ @@ -81,6 +84,8 @@ SRCS.powerpc64le= \ x25519-ppc64.S SRCS.powerpc64= \ + aes-gcm-ppc.S \ + ossl_aes_gcm.c \ ossl_ppccap.c \ aes-ppc.S \ aesp8-ppc.S \ diff --git a/sys/modules/sound/driver/hda/Makefile b/sys/modules/sound/driver/hda/Makefile index 0eec98fc53e1..1e137dc5671c 100644 --- a/sys/modules/sound/driver/hda/Makefile +++ b/sys/modules/sound/driver/hda/Makefile @@ -2,7 +2,7 @@ KMOD= snd_hda SRCS= device_if.h bus_if.h pci_if.h channel_if.h mixer_if.h hdac_if.h -SRCS+= hdaa.c hdaa.h hdaa_patches.c hdac.c hdac_if.h hdac_if.c -SRCS+= hdacc.c hdac_private.h hdac_reg.h hda_reg.h hdac.h +SRCS+= hdaa.c hdaa.h hdaa_patches.c hdacc.c hdac.c hdac_if.c +SRCS+= hdac_private.h hdac_reg.h hda_reg.h hdac.h .include <bsd.kmod.mk> diff --git a/sys/modules/zfs/zfs_config.h b/sys/modules/zfs/zfs_config.h index 72167b752e53..77d08862dcd5 100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@ -258,6 +258,9 @@ /* dops->d_revalidate() takes 4 args */ /* #undef HAVE_D_REVALIDATE_4ARGS */ +/* Define if d_set_d_op() is available */ +/* #undef HAVE_D_SET_D_OP */ + /* Define to 1 if you have the 'execvpe' function. */ #define HAVE_EXECVPE 1 @@ -483,9 +486,6 @@ /* building against unsupported kernel version */ /* #undef HAVE_LINUX_EXPERIMENTAL */ -/* Define to 1 if you have the <linux/stat.h> header file. */ -/* #undef HAVE_LINUX_STAT_H */ - /* makedev() is declared in sys/mkdev.h */ /* #undef HAVE_MAKEDEV_IN_MKDEV */ @@ -840,7 +840,7 @@ /* #undef ZFS_DEVICE_MINOR */ /* Define the project alias string. */ -#define ZFS_META_ALIAS "zfs-2.4.0-rc1-FreeBSD_g00dfa094a" +#define ZFS_META_ALIAS "zfs-2.4.99-52-FreeBSD_g3f4312a0a" /* Define the project author. */ #define ZFS_META_AUTHOR "OpenZFS" @@ -870,10 +870,10 @@ #define ZFS_META_NAME "zfs" /* Define the project release. */ -#define ZFS_META_RELEASE "zfs-2.4.0-rc1-FreeBSD_g00dfa094a" +#define ZFS_META_RELEASE "52-FreeBSD_g3f4312a0a" /* Define the project version. */ -#define ZFS_META_VERSION "2.4.0" +#define ZFS_META_VERSION "2.4.99" /* count is located in percpu_ref.data */ /* #undef ZFS_PERCPU_REF_COUNT_IN_DATA */ diff --git a/sys/modules/zfs/zfs_gitrev.h b/sys/modules/zfs/zfs_gitrev.h index 2b5d717da216..585e308e72d5 100644 --- a/sys/modules/zfs/zfs_gitrev.h +++ b/sys/modules/zfs/zfs_gitrev.h @@ -1 +1 @@ -#define ZFS_META_GITREV "zfs-2.4.0-rc1-0-g00dfa094a" +#define ZFS_META_GITREV "zfs-2.4.99-52-g3f4312a0a" |