diff options
Diffstat (limited to 'sys/modules')
| -rw-r--r-- | sys/modules/Makefile | 22 | ||||
| -rw-r--r-- | sys/modules/allwinner/aw_sid/Makefile | 3 | ||||
| -rw-r--r-- | sys/modules/allwinner/aw_thermal/Makefile | 3 | ||||
| -rw-r--r-- | sys/modules/dtb/allwinner/Makefile | 7 | ||||
| -rw-r--r-- | sys/modules/dtb/arm/Makefile | 6 | ||||
| -rw-r--r-- | sys/modules/dtb/starfive/Makefile | 7 | ||||
| -rw-r--r-- | sys/modules/dummynet/Makefile | 3 | ||||
| -rw-r--r-- | sys/modules/hifn/Makefile | 12 | ||||
| -rw-r--r-- | sys/modules/iwlwifi/Makefile | 68 | ||||
| -rw-r--r-- | sys/modules/mt76/Makefile.inc | 1 | ||||
| -rw-r--r-- | sys/modules/rdrand_rng/Makefile | 5 | ||||
| -rw-r--r-- | sys/modules/rdseed_rng/Makefile | 9 | ||||
| -rw-r--r-- | sys/modules/rtw88/Makefile | 5 | ||||
| -rw-r--r-- | sys/modules/rtw89/Makefile | 8 | ||||
| -rw-r--r-- | sys/modules/smbfs/Makefile | 4 | ||||
| -rw-r--r-- | sys/modules/thunderbolt/Makefile | 2 | ||||
| -rw-r--r-- | sys/modules/zfs/zfs_config.h | 17 | ||||
| -rw-r--r-- | sys/modules/zfs/zfs_gitrev.h | 2 | 
18 files changed, 119 insertions, 65 deletions
| diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 63a0b3260e6d..2aded5d568cb 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -135,7 +135,6 @@ SUBDIR=	\  	gpio \  	${_gve} \  	hid \ -	hifn \  	${_hpt27xx} \  	${_hptiop} \  	${_hptmv} \ @@ -173,6 +172,7 @@ SUBDIR=	\  	iflib \  	${_igc} \  	imgact_binmisc \ +	${_imx} \  	${_intelspi} \  	${_io} \  	${_ioat} \ @@ -346,6 +346,7 @@ SUBDIR=	\  	rc4 \  	${_rdma} \  	${_rdrand_rng} \ +	${_rdseed_rng} \  	re \  	rl \  	${_rockchip} \ @@ -680,7 +681,9 @@ _irdma=		irdma  .if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "arm" || \  	${MACHINE_CPUARCH} == "riscv"  .if !empty(OPT_FDT) +_allwinner=	allwinner  _if_cgem=	if_cgem +_sdhci_fdt=	sdhci_fdt  .endif  .endif @@ -713,7 +716,6 @@ _hyperv=  hyperv  _vf_i2c=	vf_i2c  .if !empty(OPT_FDT) -_allwinner=	allwinner  _dwwdt=		dwwdt  _enetc=		enetc  _felix=		felix @@ -721,12 +723,8 @@ _rockchip=	rockchip  .endif  .endif -.if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "arm" || \ -    ${MACHINE_CPUARCH} == "riscv" -.if !empty(OPT_FDT) -_sdhci_fdt=	sdhci_fdt -.endif -_neta=		neta +.if ${MACHINE_CPUARCH} == "arm" +_imx=		imx  .endif  .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" @@ -820,8 +818,8 @@ _nfe=		nfe  _nvram=		nvram  .if ${MK_CRYPT} != "no" || defined(ALL_MODULES)  _padlock=	padlock -_padlock_rng=	padlock_rng  _rdrand_rng=	rdrand_rng +_rdseed_rng=	rdseed_rng  .endif  _pchtherm = pchtherm  _s3=		s3 @@ -892,6 +890,9 @@ _glxsb=		glxsb  _pcfclock=	pcfclock  _pst=		pst  _sbni=		sbni +.if ${MK_CRYPT} != "no" || defined(ALL_MODULES) +_padlock_rng=	padlock_rng +.endif  .endif  .if ${MACHINE_ARCH} == "armv7" @@ -923,7 +924,8 @@ _nvram+=	powermac_nvram  .if ${MACHINE_CPUARCH} == "arm" || ${MACHINE_CPUARCH} == "aarch64"  _bcm283x_clkman=  bcm283x_clkman -_bcm283x_pwm=  bcm283x_pwm +_bcm283x_pwm=	bcm283x_pwm +_neta=		neta  .endif  .if ${MACHINE_CPUARCH} == "amd64" diff --git a/sys/modules/allwinner/aw_sid/Makefile b/sys/modules/allwinner/aw_sid/Makefile index 7d3dad68acb9..2679aa83d09d 100644 --- a/sys/modules/allwinner/aw_sid/Makefile +++ b/sys/modules/allwinner/aw_sid/Makefile @@ -7,6 +7,7 @@ SRCS+=	\  	bus_if.h \  	clknode_if.h \  	device_if.h \ -	ofw_bus_if.h \ +	nvmem_if.h \ +	ofw_bus_if.h  .include <bsd.kmod.mk> diff --git a/sys/modules/allwinner/aw_thermal/Makefile b/sys/modules/allwinner/aw_thermal/Makefile index 911e6406d947..924b09a3b3c8 100644 --- a/sys/modules/allwinner/aw_thermal/Makefile +++ b/sys/modules/allwinner/aw_thermal/Makefile @@ -7,6 +7,7 @@ SRCS+=	\  	bus_if.h \  	clknode_if.h \  	device_if.h \ -	ofw_bus_if.h \ +	nvmem_if.h \ +	ofw_bus_if.h  .include <bsd.kmod.mk> diff --git a/sys/modules/dtb/allwinner/Makefile b/sys/modules/dtb/allwinner/Makefile index 242ee5d974ad..2666e786a9df 100644 --- a/sys/modules/dtb/allwinner/Makefile +++ b/sys/modules/dtb/allwinner/Makefile @@ -65,7 +65,12 @@ DTSO=	sun50i-a64-mmc0-disable.dtso \  	sun50i-a64-timer.dtso \  	sun50i-h5-opp.dtso \  	sun50i-h5-nanopi-neo2-opp.dtso - +.elif ${MACHINE_CPUARCH} == "riscv" +DTS=	\ +	allwinner/sun20i-d1-dongshan-nezha-stu.dts \ +	allwinner/sun20i-d1-lichee-rv.dts \ +	allwinner/sun20i-d1-mangopi-mq-pro.dts \ +	allwinner/sun20i-d1-nezha.dts  .endif  .include <bsd.dtb.mk> diff --git a/sys/modules/dtb/arm/Makefile b/sys/modules/dtb/arm/Makefile new file mode 100644 index 000000000000..34136c78c03d --- /dev/null +++ b/sys/modules/dtb/arm/Makefile @@ -0,0 +1,6 @@ +# All the dts files for Arm systems we support. + +DTS=	\ +	arm/fvp-base-revc.dts + +.include <bsd.dtb.mk> diff --git a/sys/modules/dtb/starfive/Makefile b/sys/modules/dtb/starfive/Makefile new file mode 100644 index 000000000000..2da30f0985c7 --- /dev/null +++ b/sys/modules/dtb/starfive/Makefile @@ -0,0 +1,7 @@ +DTS=	\ +	starfive/jh7110-pine64-star64.dts \ +	starfive/jh7110-milkv-mars.dts \ +	starfive/jh7110-starfive-visionfive-2-v1.3b.dts \ +	starfive/jh7110-starfive-visionfive-2-v1.2a.dts + +.include <bsd.dtb.mk> diff --git a/sys/modules/dummynet/Makefile b/sys/modules/dummynet/Makefile index 4ff023e6bca5..a645c1673167 100644 --- a/sys/modules/dummynet/Makefile +++ b/sys/modules/dummynet/Makefile @@ -1,7 +1,6 @@  .PATH:  ${SRCTOP}/sys/netpfil/ipfw  KMOD=   dummynet -SRCS=   ip_dummynet.c -SRCS+= ip_dn_glue.c ip_dn_io.c +SRCS=   ip_dummynet.c ip_dn_io.c  SRCS+= dn_aqm_codel.c dn_aqm_pie.c  SRCS+= dn_heap.c dn_sched_fifo.c dn_sched_qfq.c dn_sched_rr.c dn_sched_wf2q.c   SRCS+= dn_sched_prio.c dn_sched_fq_codel.c dn_sched_fq_pie.c diff --git a/sys/modules/hifn/Makefile b/sys/modules/hifn/Makefile deleted file mode 100644 index a425cc39768a..000000000000 --- a/sys/modules/hifn/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -.PATH:	${SRCTOP}/sys/dev/hifn -KMOD	= hifn -SRCS	= hifn7751.c opt_hifn.h -SRCS   += device_if.h bus_if.h pci_if.h -SRCS   += opt_bus.h cryptodev_if.h - -.if !defined(KERNBUILDDIR) -opt_hifn.h: -	echo "#define HIFN_DEBUG 1" > ${.TARGET} -.endif - -.include <bsd.kmod.mk> diff --git a/sys/modules/iwlwifi/Makefile b/sys/modules/iwlwifi/Makefile index 9774c3da61ee..5d4830537a0b 100644 --- a/sys/modules/iwlwifi/Makefile +++ b/sys/modules/iwlwifi/Makefile @@ -3,40 +3,58 @@ DEVIWLWIFIDIR=	${SRCTOP}/sys/contrib/dev/iwlwifi  .PATH: ${DEVIWLWIFIDIR}  WITH_CONFIG_PM=	0 -WITH_DEBUGFS=	1 +WITH_DEBUGFS=	0  WITH_CONFIG_ACPI=	1  KMOD=	if_iwlwifi -SRCS=	iwl-drv.c -SRCS+=	iwl-dbg-tlv.c iwl-debug.c -SRCS+=	iwl-io.c iwl-nvm-parse.c iwl-nvm-utils.c iwl-phy-db.c iwl-trans.c -SRCS+=	cfg/7000.c cfg/8000.c cfg/9000.c cfg/22000.c -SRCS+=	cfg/ax210.c cfg/bz.c cfg/sc.c -SRCS+=	fw/dbg.c fw/dump.c fw/img.c fw/notif-wait.c -SRCS+=	fw/paging.c fw/pnvm.c fw/regulatory.c fw/rs.c fw/smem.c fw/init.c +SRCS=	iwl-dbg-tlv.c iwl-drv.c iwl-debug.c iwl-devtrace.c iwl-io.c +SRCS+=	iwl-nvm-parse.c iwl-nvm-utils.c iwl-trans.c iwl-phy-db.c +SRCS+=	iwl-utils.c + +SRCS+=	cfg/22000.c cfg/7000.c cfg/8000.c cfg/9000.c cfg/ax210.c +SRCS+=	cfg/bz.c cfg/sc.c cfg/dr.c +SRCS+=	cfg/rf-fm.c cfg/rf-gf.c cfg/rf-hr.c cfg/rf-jf.c cfg/rf-pe.c +SRCS+=	cfg/rf-wh.c + +SRCS+=	fw/dbg.c fw/dump.c fw/img.c fw/init.c +SRCS+=	fw/notif-wait.c fw/paging.c fw/pnvm.c fw/regulatory.c fw/rs.c +SRCS+=	fw/smem.c  #SRCS+=	fw/uefi.c -SRCS+=	mvm/rs.c mvm/binding.c mvm/coex.c mvm/ftm-initiator.c -SRCS+=	mvm/ftm-responder.c mvm/fw.c mvm/mac-ctxt.c -SRCS+=	mvm/mac80211.c mvm/nvm.c mvm/offloading.c mvm/ops.c -SRCS+=	mvm/phy-ctxt.c mvm/power.c mvm/quota.c mvm/rs-fw.c mvm/rfi.c -SRCS+=	mvm/rx.c mvm/rxmq.c mvm/scan.c mvm/sf.c mvm/sta.c mvm/tdls.c -SRCS+=	mvm/time-event.c mvm/tt.c mvm/tx.c mvm/utils.c -SRCS+=	mvm/link.c -SRCS+=	mvm/mld-key.c mvm/mld-mac.c mvm/mld-mac80211.c mvm/mld-sta.c -SRCS+=	mvm/ptp.c mvm/time-sync.c + +SRCS+=	pcie/ctxt-info-v2.c pcie/ctxt-info.c pcie/drv.c pcie/utils.c +SRCS+=	pcie/gen1_2/rx.c pcie/gen1_2/trans-gen2.c pcie/gen1_2/trans.c +SRCS+=	pcie/gen1_2/tx-gen2.c pcie/gen1_2/tx.c + +SRCS+=	mvm/binding.c mvm/coex.c +SRCS+=	mvm/ftm-initiator.c mvm/ftm-responder.c mvm/fw.c  #SRCS+=	mvm/led.c -SRCS+=	pcie/ctxt-info-gen3.c pcie/ctxt-info.c -SRCS+=	pcie/drv.c pcie/rx.c pcie/trans-gen2.c pcie/trans.c -SRCS+=	pcie/tx-gen2.c pcie/tx.c +SRCS+=	mvm/link.c mvm/mac-ctxt.c mvm/mac80211.c mvm/mld-key.c +SRCS+=	mvm/mld-mac.c mvm/mld-mac80211.c mvm/mld-sta.c mvm/nvm.c +SRCS+=	mvm/offloading.c mvm/ops.c mvm/phy-ctxt.c mvm/power.c mvm/ptp.c +SRCS+=	mvm/quota.c mvm/rfi.c mvm/rs-fw.c mvm/rs.c mvm/rx.c mvm/rxmq.c +SRCS+=	mvm/scan.c mvm/sf.c mvm/sta.c mvm/tdls.c mvm/time-event.c +SRCS+=	mvm/time-sync.c mvm/tt.c mvm/tx.c mvm/utils.c + +SRCS+=	mld/agg.c mld/ap.c mld/coex.c +SRCS+=	mld/ftm-initiator.c mld/fw.c mld/iface.c mld/key.c +#SRCS+=	mld/led.c +SRCS+=	mld/link.c mld/low_latency.c mld/mac80211.c mld/mcc.c mld/mld.c +SRCS+=	mld/mlo.c mld/notif.c mld/phy.c mld/power.c mld/ptp.c +SRCS+=	mld/regulatory.c mld/roc.c mld/rx.c mld/scan.c +SRCS+=	mld/session-protect.c mld/sta.c mld/stats.c mld/thermal.c +SRCS+=	mld/time_sync.c mld/tlc.c mld/tx.c  .if defined(WITH_DEBUGFS) && ${WITH_DEBUGFS} > 0 -SRCS+=	fw/debugfs.c mvm/debugfs.c mvm/debugfs-vif.c +SRCS+=	fw/debugfs.c +SRCS+=	mvm/debugfs.c mvm/debugfs-vif.c +SRCS+=	mld/debugfs.c  CFLAGS+=	-DCONFIG_IWLWIFI_DEBUGFS  CFLAGS+=	-DCONFIG_MAC80211_DEBUGFS  .endif  .if defined(WITH_CONFIG_PM) && ${WITH_CONFIG_PM} > 0  SRCS+=	mvm/d3.c +SRCS+=	mld/d3.c  CFLAGS+=	-DCONFIG_PM  CFLAGS+=	-DCONFIG_PM_SLEEP  .endif @@ -47,19 +65,18 @@ CFLAGS+=	-DCONFIG_ACPI  CFLAGS+=	-DLINUXKPI_WANT_LINUX_ACPI  .endif -SRCS+=	iwl-devtrace.c -  # Other  SRCS+=	${LINUXKPI_GENSRCS}  SRCS+=	opt_wlan.h opt_inet6.h opt_inet.h opt_acpi.h  CFLAGS+=	-DKBUILD_MODNAME='"iwlwifi"' -CFLAGS+=	-DLINUXKPI_VERSION=61100 +CFLAGS+=	-DLINUXKPI_VERSION=61700  CFLAGS+=	-I${DEVIWLWIFIDIR}  CFLAGS+=	${LINUXKPI_INCLUDES}  CFLAGS+=	-DCONFIG_IWLDVM=0  CFLAGS+=	-DCONFIG_IWLMVM=1 +CFLAGS+=	-DCONFIG_IWLMLD=1  # Helpful after fresh imports.  #CFLAGS+=	-ferror-limit=0 @@ -74,4 +91,7 @@ CFLAGS+=	-DCONFIG_IWLWIFI_DEVICE_TRACING=1  #CFLAGS+=	-DCONFIG_THERMAL=1  #CFLAGS+=	-DCONFIG_EFI=1 +# XXX-BZ how to do this just for pcie/drv.c (and gcc vs. clang)? +CFLAGS += -Wno-override-init -Wno-initializer-overrides +  .include <bsd.kmod.mk> diff --git a/sys/modules/mt76/Makefile.inc b/sys/modules/mt76/Makefile.inc index da5fe9133884..35a8e34f14d3 100644 --- a/sys/modules/mt76/Makefile.inc +++ b/sys/modules/mt76/Makefile.inc @@ -24,5 +24,6 @@ CFLAGS+=	-DCONFIG_MAC80211_DEBUGFS=${WITH_DEBUGFS}  CFLAGS+=	-I${COMMONDIR}  CFLAGS+=	${LINUXKPI_INCLUDES} +CFLAGS+=	-DLINUXKPI_VERSION=61700  # end diff --git a/sys/modules/rdrand_rng/Makefile b/sys/modules/rdrand_rng/Makefile index 7fa7a8bb8fb9..496fc863033f 100644 --- a/sys/modules/rdrand_rng/Makefile +++ b/sys/modules/rdrand_rng/Makefile @@ -6,9 +6,4 @@ SRCS+=	bus_if.h device_if.h  CFLAGS+= -I${SRCTOP}/sys -# ld.bfd doesn't support ifuncs invoked non-PIC -.if ${MACHINE_CPUARCH} == "i386" -CFLAGS.gcc= -fPIC -.endif -  .include <bsd.kmod.mk> diff --git a/sys/modules/rdseed_rng/Makefile b/sys/modules/rdseed_rng/Makefile new file mode 100644 index 000000000000..6593505546dd --- /dev/null +++ b/sys/modules/rdseed_rng/Makefile @@ -0,0 +1,9 @@ +.PATH: ${SRCTOP}/sys/dev/random + +KMOD=	rdseed_rng +SRCS=	rdseed.c +SRCS+=	bus_if.h device_if.h + +CFLAGS+= -I${SRCTOP}/sys + +.include <bsd.kmod.mk> diff --git a/sys/modules/rtw88/Makefile b/sys/modules/rtw88/Makefile index 822be639da43..ee47df54bcf9 100644 --- a/sys/modules/rtw88/Makefile +++ b/sys/modules/rtw88/Makefile @@ -27,11 +27,14 @@ SRCS+=	rtw8723d.c rtw8723d_table.c rtw8723de.c		# 11n  SRCS+=	rtw8821c.c rtw8821c_table.c rtw8821ce.c		# 11ac  SRCS+=	rtw8822b.c rtw8822b_table.c rtw8822be.c		# 11ac  SRCS+=	rtw8822c.c rtw8822c_table.c rtw8822ce.c		# 11ac +SRCS+=	rtw8814a.c rtw8814a_table.c rtw8814ae.c		# 11ac  # USB parts  #SRCS+=	rtw88xxa.c					# 88xxa common  #SRCS+=	rtw8812a.c rtw8812a_table.c rtw8812au.c +#SRCS+=	rtw8814au.c  #SRCS+=	rtw8821a.c rtw8821a_table.c rtw8821au.c +#CFLAGS+=	-DCONFIG_RTW88_USB  .if defined(WITH_LEDS) && ${WITH_LEDS} > 0  CFLAGS+=	-DCONFIG_RTW88_LEDS @@ -43,7 +46,7 @@ SRCS+=	${LINUXKPI_GENSRCS}  SRCS+=	opt_wlan.h opt_inet6.h opt_inet.h  CFLAGS+=	-DKBUILD_MODNAME='"rtw88"' -CFLAGS+=	-DLINUXKPI_VERSION=61400 +CFLAGS+=	-DLINUXKPI_VERSION=61700  CFLAGS+=	-I${DEVRTW88DIR}  CFLAGS+=	${LINUXKPI_INCLUDES} diff --git a/sys/modules/rtw89/Makefile b/sys/modules/rtw89/Makefile index e66f85c3ac17..1307abf3d9b4 100644 --- a/sys/modules/rtw89/Makefile +++ b/sys/modules/rtw89/Makefile @@ -3,7 +3,7 @@ DEVRTW89DIR=	${SRCTOP}/sys/contrib/dev/rtw89  .PATH: ${DEVRTW89DIR}  WITH_CONFIG_PM=	0 -WITH_DEBUGFS=	1 +WITH_DEBUGFS=	0  KMOD=	if_rtw89 @@ -26,6 +26,10 @@ SRCS+=	rtw8852bte.c  SRCS+=	rtw8922a.c rtw8922a_rfk.c  SRCS+=	rtw8922ae.c +# USB parts +#SRCS+=	rtw8851bu.c rtw8852bu.c +#SRCS+=	usb.c +  # CONFIG_RTW89_DEBUG (always on for now)  SRCS+=	debug.c @@ -39,7 +43,7 @@ SRCS+=	${LINUXKPI_GENSRCS}  SRCS+=	opt_wlan.h opt_inet6.h opt_inet.h opt_acpi.h  CFLAGS+=	-DKBUILD_MODNAME='"rtw89"' -CFLAGS+=	-DLINUXKPI_VERSION=61400 +CFLAGS+=	-DLINUXKPI_VERSION=61700  CFLAGS+=	-DLINUXKPI_WANT_LINUX_ACPI  CFLAGS+=	-I${DEVRTW89DIR} diff --git a/sys/modules/smbfs/Makefile b/sys/modules/smbfs/Makefile index c796fb0701c5..5ef13757e621 100644 --- a/sys/modules/smbfs/Makefile +++ b/sys/modules/smbfs/Makefile @@ -1,6 +1,6 @@ -.PATH:	${SRCTOP}/sys/crypto/des \ +.PATH:	${SRCTOP}/sys/crypto \ +	${SRCTOP}/sys/crypto/des \  	${SRCTOP}/sys/crypto/des/arch/${MACHINE_CPUARCH} \ -	${SRCTOP}/sys/kern \  	${SRCTOP}/sys/libkern \  	${SRCTOP}/sys/netsmb \  	${SRCTOP}/sys/fs/smbfs diff --git a/sys/modules/thunderbolt/Makefile b/sys/modules/thunderbolt/Makefile index 3b279f4352d4..ba7c7cab6e6b 100644 --- a/sys/modules/thunderbolt/Makefile +++ b/sys/modules/thunderbolt/Makefile @@ -5,7 +5,7 @@ SRCS=	nhi_pci.c nhi.c tb_pcib.c tb_acpi_pcib.c tb_debug.c nhi_wmi.c  SRCS+=	router.c hcm.c tb_dev.c  SRCS+=	opt_thunderbolt.h  SRCS+=	device_if.h bus_if.h pci_if.h pcib_if.h tb_if.c tb_if.h -SRCS+=	opt_acpi.h opt_acpi_wmi.h acpi_if.h acpi_wmi_if.h +SRCS+=	opt_acpi.h acpi_if.h acpi_wmi_if.h  opt_thunderbolt.h:  	echo "#define THUNDERBOLT_DEBUG 1" > ${.TARGET} diff --git a/sys/modules/zfs/zfs_config.h b/sys/modules/zfs/zfs_config.h index db1b6f33a8ef..39b9229653af 100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@ -204,6 +204,10 @@  /* BLK_STS_RESV_CONFLICT is defined */  /* #undef HAVE_BLK_STS_RESV_CONFLICT */ +/* Define if getgeo() in block_device_operations takes struct gendisk * as its +   first arg */ +/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_GETGEO_GENDISK */ +  /* Define if release() in block_device_operations takes 1 arg */  /* #undef HAVE_BLOCK_DEVICE_OPERATIONS_RELEASE_1ARG */ @@ -339,6 +343,9 @@  /* Define if compiler supports -Winfinite-recursion */  /* #undef HAVE_INFINITE_RECURSION */ +/* inode_generic_drop() exists */ +/* #undef HAVE_INODE_GENERIC_DROP */ +  /* inode_get_atime() exists in linux/fs.h */  /* #undef HAVE_INODE_GET_ATIME */ @@ -510,6 +517,9 @@  /* Define if host toolchain supports MOVBE */  #define HAVE_MOVBE 1 +/* Define if ns_type is accessible through ns_common */ +/* #undef HAVE_NS_COMMON_TYPE */ +  /* folio_wait_bit() exists */  /* #undef HAVE_PAGEMAP_FOLIO_WAIT_BIT */ @@ -759,6 +769,9 @@  /* int (*writepage_t)() takes struct folio* */  /* #undef HAVE_WRITEPAGE_T_FOLIO */ +/* write_cache_pages() is available */ +/* #undef HAVE_WRITE_CACHE_PAGES */ +  /* xattr_handler->get() wants dentry and inode and flags */  /* #undef HAVE_XATTR_GET_DENTRY_INODE_FLAGS */ @@ -843,7 +856,7 @@  /* #undef ZFS_DEVICE_MINOR */  /* Define the project alias string. */ -#define ZFS_META_ALIAS "zfs-2.4.99-95-FreeBSD_g5605a6d79" +#define ZFS_META_ALIAS "zfs-2.4.99-129-FreeBSD_g0455150f1"  /* Define the project author. */  #define ZFS_META_AUTHOR "OpenZFS" @@ -873,7 +886,7 @@  #define ZFS_META_NAME "zfs"  /* Define the project release. */ -#define ZFS_META_RELEASE "95-FreeBSD_g5605a6d79" +#define ZFS_META_RELEASE "129-FreeBSD_g0455150f1"  /* Define the project version. */  #define ZFS_META_VERSION "2.4.99" diff --git a/sys/modules/zfs/zfs_gitrev.h b/sys/modules/zfs/zfs_gitrev.h index 8a1802f5480b..87d2071cb0d2 100644 --- a/sys/modules/zfs/zfs_gitrev.h +++ b/sys/modules/zfs/zfs_gitrev.h @@ -1 +1 @@ -#define	ZFS_META_GITREV "zfs-2.4.99-95-g5605a6d79" +#define	ZFS_META_GITREV "zfs-2.4.99-129-g0455150f1" | 
