From owner-svn-src-all@FreeBSD.ORG Wed Oct 10 08:36:40 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 695901F6; Wed, 10 Oct 2012 08:36:40 +0000 (UTC) (envelope-from kevlo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4DD348FC08; Wed, 10 Oct 2012 08:36:40 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9A8ae2q088352; Wed, 10 Oct 2012 08:36:40 GMT (envelope-from kevlo@svn.freebsd.org) Received: (from kevlo@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9A8adKj088270; Wed, 10 Oct 2012 08:36:39 GMT (envelope-from kevlo@svn.freebsd.org) Message-Id: <201210100836.q9A8adKj088270@svn.freebsd.org> From: Kevin Lo Date: Wed, 10 Oct 2012 08:36:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r241394 - in head: share/examples/kld/dyn_sysctl share/examples/kld/firmware/fwconsumer share/man/man9 sys/amd64/linux32 sys/cddl/contrib/opensolaris/uts/common/fs/zfs sys/compat/svr4 s... X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Oct 2012 08:36:40 -0000 Author: kevlo Date: Wed Oct 10 08:36:38 2012 New Revision: 241394 URL: http://svn.freebsd.org/changeset/base/241394 Log: Revert previous commit... Pointyhat to: kevlo (myself) Modified: head/share/examples/kld/dyn_sysctl/dyn_sysctl.c head/share/examples/kld/firmware/fwconsumer/fw_consumer.c head/share/man/man9/module.9 head/sys/amd64/linux32/linux32_sysvec.c head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c head/sys/compat/svr4/svr4_sysvec.c head/sys/contrib/ipfilter/netinet/mlfk_ipl.c head/sys/contrib/rdma/rdma_addr.c head/sys/contrib/rdma/rdma_cma.c head/sys/contrib/rdma/rdma_device.c head/sys/contrib/rdma/rdma_iwcm.c head/sys/crypto/rc4/rc4.c head/sys/dev/bktr/bktr_mem.c head/sys/dev/cxgb/cxgb_t3fw.c head/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c head/sys/dev/cxgb/ulp/tom/cxgb_tom.c head/sys/dev/cxgbe/tom/t4_tom.c head/sys/dev/drm2/drm_drv.c head/sys/dev/iscsi/initiator/iscsi.c head/sys/dev/mxge/mxge_eth_z8e.c head/sys/dev/mxge/mxge_ethp_z8e.c head/sys/dev/mxge/mxge_rss_eth_z8e.c head/sys/dev/mxge/mxge_rss_ethp_z8e.c head/sys/dev/nvd/nvd.c head/sys/dev/nvme/nvme.c head/sys/dev/rndtest/rndtest.c head/sys/dev/streams/streams.c head/sys/dev/tdfx/tdfx_linux.c head/sys/dev/usb/net/usb_ethernet.c head/sys/dev/utopia/utopia.c head/sys/dev/virtio/virtio.c head/sys/i386/ibcs2/ibcs2_sysvec.c head/sys/i386/isa/elink.c head/sys/i386/linux/linux_sysvec.c head/sys/net/bridgestp.c head/sys/net/if_arcsubr.c head/sys/net/if_atmsubr.c head/sys/net/if_bridge.c head/sys/net/if_enc.c head/sys/net/if_epair.c head/sys/net/if_ethersubr.c head/sys/net/if_faith.c head/sys/net/if_fddisubr.c head/sys/net/if_fwsubr.c head/sys/net/if_gif.c head/sys/net/if_gre.c head/sys/net/if_iso88025subr.c head/sys/net/if_lagg.c head/sys/net/if_loop.c head/sys/net/if_spppsubr.c head/sys/net/if_stf.c head/sys/net/if_tun.c head/sys/net/if_vlan.c head/sys/net/zlib.c head/sys/net80211/ieee80211_freebsd.c head/sys/net80211/ieee80211_freebsd.h head/sys/netgraph/atm/ngatmbase.c head/sys/netinet/igmp.c head/sys/netinet/ip_carp.c head/sys/netinet/ip_divert.c head/sys/netinet/ip_mroute.c head/sys/netinet/toecore.c head/sys/netinet6/ip6_mroute.c head/sys/netinet6/mld6.c head/sys/netinet6/send.c head/sys/netpfil/ipfw/ip_fw2.c head/sys/netpfil/ipfw/ip_fw_nat.c head/sys/netpfil/pf/if_pflog.c head/sys/netpfil/pf/if_pfsync.c head/sys/netpfil/pf/pf_ioctl.c head/sys/nfs/nfs_nfssvc.c head/sys/nfsserver/nfs_srvsubs.c head/sys/opencrypto/cryptodev.c head/sys/tools/fw_stub.awk head/tools/regression/kthread/kld/kthrdlk.c head/tools/regression/net80211/ccmp/test_ccmp.c head/tools/regression/net80211/tkip/test_tkip.c head/tools/regression/net80211/wep/test_wep.c head/tools/tools/kttcp/sys/kttcp.c Modified: head/share/examples/kld/dyn_sysctl/dyn_sysctl.c ============================================================================== --- head/share/examples/kld/dyn_sysctl/dyn_sysctl.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/share/examples/kld/dyn_sysctl/dyn_sysctl.c Wed Oct 10 08:36:38 2012 (r241394) @@ -163,7 +163,7 @@ load(module_t mod, int cmd, void *arg) static moduledata_t mod_data = { "dyn_sysctl", load, - NULL + 0 }; DECLARE_MODULE(dyn_sysctl, mod_data, SI_SUB_EXEC, SI_ORDER_ANY); Modified: head/share/examples/kld/firmware/fwconsumer/fw_consumer.c ============================================================================== --- head/share/examples/kld/firmware/fwconsumer/fw_consumer.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/share/examples/kld/firmware/fwconsumer/fw_consumer.c Wed Oct 10 08:36:38 2012 (r241394) @@ -71,7 +71,7 @@ fw_consumer_modevent(module_t mod, int t static moduledata_t fw_consumer_mod = { "fw_consumer", fw_consumer_modevent, - NULL + 0 }; DECLARE_MODULE(fw_consumer, fw_consumer_mod, SI_SUB_DRIVERS, SI_ORDER_ANY); MODULE_VERSION(fw_consumer, 1); Modified: head/share/man/man9/module.9 ============================================================================== --- head/share/man/man9/module.9 Wed Oct 10 05:43:04 2012 (r241393) +++ head/share/man/man9/module.9 Wed Oct 10 08:36:38 2012 (r241394) @@ -99,7 +99,7 @@ static int foo_handler(module_t mod, int static moduledata_t mod_data= { "foo", foo_handler, - NULL + 0 }; MODULE_VERSION(foo, 1); Modified: head/sys/amd64/linux32/linux32_sysvec.c ============================================================================== --- head/sys/amd64/linux32/linux32_sysvec.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/amd64/linux32/linux32_sysvec.c Wed Oct 10 08:36:38 2012 (r241394) @@ -1198,7 +1198,7 @@ linux_elf_modevent(module_t mod, int typ static moduledata_t linux_elf_mod = { "linuxelf", linux_elf_modevent, - NULL + 0 }; DECLARE_MODULE_TIED(linuxelf, linux_elf_mod, SI_SUB_EXEC, SI_ORDER_ANY); Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c ============================================================================== --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c Wed Oct 10 08:36:38 2012 (r241394) @@ -5526,7 +5526,7 @@ zfs_modevent(module_t mod, int type, voi static moduledata_t zfs_mod = { "zfsctrl", zfs_modevent, - NULL + 0 }; DECLARE_MODULE(zfsctrl, zfs_mod, SI_SUB_VFS, SI_ORDER_ANY); MODULE_DEPEND(zfsctrl, opensolaris, 1, 1, 1); Modified: head/sys/compat/svr4/svr4_sysvec.c ============================================================================== --- head/sys/compat/svr4/svr4_sysvec.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/compat/svr4/svr4_sysvec.c Wed Oct 10 08:36:38 2012 (r241394) @@ -308,7 +308,7 @@ svr4_elf_modevent(module_t mod, int type static moduledata_t svr4_elf_mod = { "svr4elf", svr4_elf_modevent, - NULL + 0 }; DECLARE_MODULE_TIED(svr4elf, svr4_elf_mod, SI_SUB_EXEC, SI_ORDER_ANY); MODULE_DEPEND(svr4elf, streams, 1, 1, 1); Modified: head/sys/contrib/ipfilter/netinet/mlfk_ipl.c ============================================================================== --- head/sys/contrib/ipfilter/netinet/mlfk_ipl.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/contrib/ipfilter/netinet/mlfk_ipl.c Wed Oct 10 08:36:38 2012 (r241394) @@ -275,7 +275,7 @@ ipf_modunload() static moduledata_t ipfiltermod = { "ipfilter", ipfilter_modevent, - NULL + 0 }; Modified: head/sys/contrib/rdma/rdma_addr.c ============================================================================== --- head/sys/contrib/rdma/rdma_addr.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/contrib/rdma/rdma_addr.c Wed Oct 10 08:36:38 2012 (r241394) @@ -407,7 +407,7 @@ addr_load(module_t mod, int cmd, void *a static moduledata_t mod_data = { "rdma_addr", addr_load, - NULL + 0 }; MODULE_VERSION(rdma_addr, 1); Modified: head/sys/contrib/rdma/rdma_cma.c ============================================================================== --- head/sys/contrib/rdma/rdma_cma.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/contrib/rdma/rdma_cma.c Wed Oct 10 08:36:38 2012 (r241394) @@ -2990,7 +2990,7 @@ cma_load(module_t mod, int cmd, void *ar static moduledata_t mod_data = { "rdma_cma", cma_load, - NULL + 0 }; MODULE_VERSION(rdma_cma, 1); Modified: head/sys/contrib/rdma/rdma_device.c ============================================================================== --- head/sys/contrib/rdma/rdma_device.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/contrib/rdma/rdma_device.c Wed Oct 10 08:36:38 2012 (r241394) @@ -769,7 +769,7 @@ rdma_core_load(module_t mod, int cmd, vo static moduledata_t mod_data = { "rdma_core", rdma_core_load, - NULL + 0 }; MODULE_VERSION(rdma_core, 1); Modified: head/sys/contrib/rdma/rdma_iwcm.c ============================================================================== --- head/sys/contrib/rdma/rdma_iwcm.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/contrib/rdma/rdma_iwcm.c Wed Oct 10 08:36:38 2012 (r241394) @@ -1078,7 +1078,7 @@ iw_cm_load(module_t mod, int cmd, void * static moduledata_t mod_data = { "rdma_iwcm", iw_cm_load, - NULL + 0 }; MODULE_VERSION(rdma_iwcm, 1); Modified: head/sys/crypto/rc4/rc4.c ============================================================================== --- head/sys/crypto/rc4/rc4.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/crypto/rc4/rc4.c Wed Oct 10 08:36:38 2012 (r241394) @@ -122,7 +122,7 @@ rc4_modevent(module_t mod, int type, voi static moduledata_t rc4_mod = { "rc4", rc4_modevent, - NULL + 0 }; DECLARE_MODULE(rc4, rc4_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST); MODULE_VERSION(rc4, 1); Modified: head/sys/dev/bktr/bktr_mem.c ============================================================================== --- head/sys/dev/bktr/bktr_mem.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/dev/bktr/bktr_mem.c Wed Oct 10 08:36:38 2012 (r241394) @@ -182,7 +182,7 @@ bktr_retrieve_address(int unit, int type static moduledata_t bktr_mem_mod = { "bktr_mem", bktr_mem_modevent, - NULL + 0 }; /* Modified: head/sys/dev/cxgb/cxgb_t3fw.c ============================================================================== --- head/sys/dev/cxgb/cxgb_t3fw.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/dev/cxgb/cxgb_t3fw.c Wed Oct 10 08:36:38 2012 (r241394) @@ -43,7 +43,7 @@ cxgb_t3fw_modevent(module_t mod, int typ static moduledata_t cxgb_t3fw_mod = { "cxgb_t3fw", cxgb_t3fw_modevent, - NULL + 0 }; DECLARE_MODULE(cxgb_t3fw, cxgb_t3fw_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST); MODULE_VERSION(cxgb_t3fw, 1); @@ -76,7 +76,7 @@ cxgb_t3b_protocol_sram_modevent(module_t static moduledata_t cxgb_t3b_protocol_sram_mod = { "cxgb_t3b_protocol_sram", cxgb_t3b_protocol_sram_modevent, - NULL + 0 }; DECLARE_MODULE(cxgb_t3b_protocol_sram, cxgb_t3b_protocol_sram_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST); MODULE_VERSION(cxgb_t3b_protocol_sram, 1); @@ -109,7 +109,7 @@ cxgb_t3b_tp_eeprom_modevent(module_t mod static moduledata_t cxgb_t3b_tp_eeprom_mod = { "cxgb_t3b_tp_eeprom", cxgb_t3b_tp_eeprom_modevent, - NULL + 0 }; DECLARE_MODULE(cxgb_t3b_tp_eeprom, cxgb_t3b_tp_eeprom_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST); MODULE_VERSION(cxgb_t3b_tp_eeprom, 1); @@ -142,7 +142,7 @@ cxgb_t3c_protocol_sram_modevent(module_t static moduledata_t cxgb_t3c_protocol_sram_mod = { "cxgb_t3c_protocol_sram", cxgb_t3c_protocol_sram_modevent, - NULL + 0 }; DECLARE_MODULE(cxgb_t3c_protocol_sram, cxgb_t3c_protocol_sram_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST); MODULE_VERSION(cxgb_t3c_protocol_sram, 1); @@ -175,7 +175,7 @@ cxgb_t3c_tp_eeprom_modevent(module_t mod static moduledata_t cxgb_t3c_tp_eeprom_mod = { "cxgb_t3c_tp_eeprom", cxgb_t3c_tp_eeprom_modevent, - NULL + 0 }; DECLARE_MODULE(cxgb_t3c_tp_eeprom, cxgb_t3c_tp_eeprom_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST); MODULE_VERSION(cxgb_t3c_tp_eeprom, 1); Modified: head/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c ============================================================================== --- head/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c Wed Oct 10 08:36:38 2012 (r241394) @@ -290,7 +290,7 @@ iwch_modevent(module_t mod, int cmd, voi static moduledata_t iwch_mod_data = { "iw_cxgb", iwch_modevent, - NULL + 0 }; MODULE_VERSION(iw_cxgb, 1); Modified: head/sys/dev/cxgb/ulp/tom/cxgb_tom.c ============================================================================== --- head/sys/dev/cxgb/ulp/tom/cxgb_tom.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/dev/cxgb/ulp/tom/cxgb_tom.c Wed Oct 10 08:36:38 2012 (r241394) @@ -387,7 +387,7 @@ t3_tom_modevent(module_t mod, int cmd, v static moduledata_t t3_tom_moddata= { "t3_tom", t3_tom_modevent, - NULL + 0 }; MODULE_VERSION(t3_tom, 1); Modified: head/sys/dev/cxgbe/tom/t4_tom.c ============================================================================== --- head/sys/dev/cxgbe/tom/t4_tom.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/dev/cxgbe/tom/t4_tom.c Wed Oct 10 08:36:38 2012 (r241394) @@ -768,7 +768,7 @@ t4_tom_modevent(module_t mod, int cmd, v static moduledata_t t4_tom_moddata= { "t4_tom", t4_tom_modevent, - NULL + 0 }; MODULE_VERSION(t4_tom, 1); Modified: head/sys/dev/drm2/drm_drv.c ============================================================================== --- head/sys/dev/drm2/drm_drv.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/dev/drm2/drm_drv.c Wed Oct 10 08:36:38 2012 (r241394) @@ -74,7 +74,7 @@ drm_modevent(module_t mod, int type, voi static moduledata_t drm_mod = { "drmn", drm_modevent, - NULL + 0 }; DECLARE_MODULE(drmn, drm_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST); MODULE_VERSION(drmn, 1); Modified: head/sys/dev/iscsi/initiator/iscsi.c ============================================================================== --- head/sys/dev/iscsi/initiator/iscsi.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/dev/iscsi/initiator/iscsi.c Wed Oct 10 08:36:38 2012 (r241394) @@ -855,9 +855,9 @@ iscsi_modevent(module_t mod, int what, v } moduledata_t iscsi_mod = { - "iscsi", - (modeventhand_t) iscsi_modevent, - NULL + "iscsi", + (modeventhand_t) iscsi_modevent, + 0 }; #ifdef ISCSI_ROOT Modified: head/sys/dev/mxge/mxge_eth_z8e.c ============================================================================== --- head/sys/dev/mxge/mxge_eth_z8e.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/dev/mxge/mxge_eth_z8e.c Wed Oct 10 08:36:38 2012 (r241394) @@ -39,7 +39,7 @@ mxge_eth_z8e_fw_modevent(module_t mod, i static moduledata_t mxge_eth_z8e_fw_mod = { "mxge_eth_z8e_fw", mxge_eth_z8e_fw_modevent, - NULL + 0 }; DECLARE_MODULE(mxge_eth_z8e_fw, mxge_eth_z8e_fw_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST); MODULE_VERSION(mxge_eth_z8e_fw, 1); Modified: head/sys/dev/mxge/mxge_ethp_z8e.c ============================================================================== --- head/sys/dev/mxge/mxge_ethp_z8e.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/dev/mxge/mxge_ethp_z8e.c Wed Oct 10 08:36:38 2012 (r241394) @@ -39,7 +39,7 @@ mxge_ethp_z8e_fw_modevent(module_t mod, static moduledata_t mxge_ethp_z8e_fw_mod = { "mxge_ethp_z8e_fw", mxge_ethp_z8e_fw_modevent, - NULL + 0 }; DECLARE_MODULE(mxge_ethp_z8e_fw, mxge_ethp_z8e_fw_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST); MODULE_VERSION(mxge_ethp_z8e_fw, 1); Modified: head/sys/dev/mxge/mxge_rss_eth_z8e.c ============================================================================== --- head/sys/dev/mxge/mxge_rss_eth_z8e.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/dev/mxge/mxge_rss_eth_z8e.c Wed Oct 10 08:36:38 2012 (r241394) @@ -39,7 +39,7 @@ mxge_rss_eth_z8e_fw_modevent(module_t mo static moduledata_t mxge_rss_eth_z8e_fw_mod = { "mxge_rss_eth_z8e_fw", mxge_rss_eth_z8e_fw_modevent, - NULL + 0 }; DECLARE_MODULE(mxge_rss_eth_z8e_fw, mxge_rss_eth_z8e_fw_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST); MODULE_VERSION(mxge_rss_eth_z8e_fw, 1); Modified: head/sys/dev/mxge/mxge_rss_ethp_z8e.c ============================================================================== --- head/sys/dev/mxge/mxge_rss_ethp_z8e.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/dev/mxge/mxge_rss_ethp_z8e.c Wed Oct 10 08:36:38 2012 (r241394) @@ -39,7 +39,7 @@ mxge_rss_ethp_z8e_fw_modevent(module_t m static moduledata_t mxge_rss_ethp_z8e_fw_mod = { "mxge_rss_ethp_z8e_fw", mxge_rss_ethp_z8e_fw_modevent, - NULL + 0 }; DECLARE_MODULE(mxge_rss_ethp_z8e_fw, mxge_rss_ethp_z8e_fw_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST); MODULE_VERSION(mxge_rss_ethp_z8e_fw, 1); Modified: head/sys/dev/nvd/nvd.c ============================================================================== --- head/sys/dev/nvd/nvd.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/dev/nvd/nvd.c Wed Oct 10 08:36:38 2012 (r241394) @@ -93,7 +93,7 @@ static int nvd_modevent(module_t mod, in moduledata_t nvd_mod = { "nvd", (modeventhand_t)nvd_modevent, - NULL + 0 }; DECLARE_MODULE(nvd, nvd_mod, SI_SUB_DRIVERS, SI_ORDER_ANY); Modified: head/sys/dev/nvme/nvme.c ============================================================================== --- head/sys/dev/nvme/nvme.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/dev/nvme/nvme.c Wed Oct 10 08:36:38 2012 (r241394) @@ -177,7 +177,7 @@ nvme_modevent(module_t mod, int type, vo moduledata_t nvme_mod = { "nvme", (modeventhand_t)nvme_modevent, - NULL + 0 }; DECLARE_MODULE(nvme, nvme_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST); Modified: head/sys/dev/rndtest/rndtest.c ============================================================================== --- head/sys/dev/rndtest/rndtest.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/dev/rndtest/rndtest.c Wed Oct 10 08:36:38 2012 (r241394) @@ -402,7 +402,7 @@ rndtest_modevent(module_t mod, int type, static moduledata_t rndtest_mod = { "rndtest", rndtest_modevent, - NULL + 0 }; DECLARE_MODULE(rndtest, rndtest_mod, SI_SUB_DRIVERS, SI_ORDER_ANY); MODULE_VERSION(rndtest, 1); Modified: head/sys/dev/streams/streams.c ============================================================================== --- head/sys/dev/streams/streams.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/dev/streams/streams.c Wed Oct 10 08:36:38 2012 (r241394) @@ -171,7 +171,7 @@ streams_modevent(module_t mod, int type, static moduledata_t streams_mod = { "streams", streams_modevent, - NULL + 0 }; DECLARE_MODULE(streams, streams_mod, SI_SUB_DRIVERS, SI_ORDER_ANY); MODULE_VERSION(streams, 1); Modified: head/sys/dev/tdfx/tdfx_linux.c ============================================================================== --- head/sys/dev/tdfx/tdfx_linux.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/dev/tdfx/tdfx_linux.c Wed Oct 10 08:36:38 2012 (r241394) @@ -78,7 +78,7 @@ tdfx_linux_modevent(struct module *mod _ static moduledata_t tdfx_linux_mod = { "tdfx_linux", tdfx_linux_modevent, - NULL + 0 }; /* As in SYSCALL_MODULE */ Modified: head/sys/dev/usb/net/usb_ethernet.c ============================================================================== --- head/sys/dev/usb/net/usb_ethernet.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/dev/usb/net/usb_ethernet.c Wed Oct 10 08:36:38 2012 (r241394) @@ -549,7 +549,7 @@ uether_modevent(module_t mod, int type, static moduledata_t uether_mod = { "uether", uether_modevent, - NULL + 0 }; struct mbuf * Modified: head/sys/dev/utopia/utopia.c ============================================================================== --- head/sys/dev/utopia/utopia.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/dev/utopia/utopia.c Wed Oct 10 08:36:38 2012 (r241394) @@ -668,7 +668,7 @@ utopia_mod_init(module_t mod, int what, static moduledata_t utopia_mod = { "utopia", utopia_mod_init, - NULL + 0 }; DECLARE_MODULE(utopia, utopia_mod, SI_SUB_INIT_IF, SI_ORDER_ANY); Modified: head/sys/dev/virtio/virtio.c ============================================================================== --- head/sys/dev/virtio/virtio.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/dev/virtio/virtio.c Wed Oct 10 08:36:38 2012 (r241394) @@ -269,7 +269,7 @@ virtio_modevent(module_t mod, int type, static moduledata_t virtio_mod = { "virtio", virtio_modevent, - NULL + 0 }; DECLARE_MODULE(virtio, virtio_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST); Modified: head/sys/i386/ibcs2/ibcs2_sysvec.c ============================================================================== --- head/sys/i386/ibcs2/ibcs2_sysvec.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/i386/ibcs2/ibcs2_sysvec.c Wed Oct 10 08:36:38 2012 (r241394) @@ -133,6 +133,6 @@ ibcs2_modevent(module_t mod, int type, v static moduledata_t ibcs2_mod = { "ibcs2", ibcs2_modevent, - NULL + 0 }; DECLARE_MODULE_TIED(ibcs2, ibcs2_mod, SI_SUB_PSEUDO, SI_ORDER_ANY); Modified: head/sys/i386/isa/elink.c ============================================================================== --- head/sys/i386/isa/elink.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/i386/isa/elink.c Wed Oct 10 08:36:38 2012 (r241394) @@ -87,7 +87,7 @@ elink_idseq(u_char p) static moduledata_t elink_mod = { "elink",/* module name */ NULL, /* event handler */ - NULL /* extra data */ + 0 /* extra data */ }; DECLARE_MODULE(elink, elink_mod, SI_SUB_PSEUDO, SI_ORDER_ANY); Modified: head/sys/i386/linux/linux_sysvec.c ============================================================================== --- head/sys/i386/linux/linux_sysvec.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/i386/linux/linux_sysvec.c Wed Oct 10 08:36:38 2012 (r241394) @@ -1173,7 +1173,7 @@ linux_elf_modevent(module_t mod, int typ static moduledata_t linux_elf_mod = { "linuxelf", linux_elf_modevent, - NULL + 0 }; DECLARE_MODULE_TIED(linuxelf, linux_elf_mod, SI_SUB_EXEC, SI_ORDER_ANY); Modified: head/sys/net/bridgestp.c ============================================================================== --- head/sys/net/bridgestp.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/net/bridgestp.c Wed Oct 10 08:36:38 2012 (r241394) @@ -2124,7 +2124,7 @@ bstp_modevent(module_t mod, int type, vo static moduledata_t bstp_mod = { "bridgestp", bstp_modevent, - NULL + 0 }; DECLARE_MODULE(bridgestp, bstp_mod, SI_SUB_PSEUDO, SI_ORDER_ANY); Modified: head/sys/net/if_arcsubr.c ============================================================================== --- head/sys/net/if_arcsubr.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/net/if_arcsubr.c Wed Oct 10 08:36:38 2012 (r241394) @@ -878,7 +878,7 @@ arc_modevent(module_t mod, int type, voi static moduledata_t arc_mod = { "arcnet", arc_modevent, - NULL + 0 }; DECLARE_MODULE(arcnet, arc_mod, SI_SUB_INIT_IF, SI_ORDER_ANY); Modified: head/sys/net/if_atmsubr.c ============================================================================== --- head/sys/net/if_atmsubr.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/net/if_atmsubr.c Wed Oct 10 08:36:38 2012 (r241394) @@ -496,7 +496,7 @@ atm_modevent(module_t mod, int type, voi static moduledata_t atm_mod = { "atm", atm_modevent, - NULL + 0 }; DECLARE_MODULE(atm, atm_mod, SI_SUB_INIT_IF, SI_ORDER_ANY); Modified: head/sys/net/if_bridge.c ============================================================================== --- head/sys/net/if_bridge.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/net/if_bridge.c Wed Oct 10 08:36:38 2012 (r241394) @@ -523,7 +523,7 @@ bridge_modevent(module_t mod, int type, static moduledata_t bridge_mod = { "if_bridge", bridge_modevent, - NULL + 0 }; DECLARE_MODULE(if_bridge, bridge_mod, SI_SUB_PSEUDO, SI_ORDER_ANY); Modified: head/sys/net/if_enc.c ============================================================================== --- head/sys/net/if_enc.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/net/if_enc.c Wed Oct 10 08:36:38 2012 (r241394) @@ -181,7 +181,7 @@ enc_modevent(module_t mod, int type, voi static moduledata_t enc_mod = { "if_enc", enc_modevent, - NULL + 0 }; DECLARE_MODULE(if_enc, enc_mod, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_ANY); Modified: head/sys/net/if_epair.c ============================================================================== --- head/sys/net/if_epair.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/net/if_epair.c Wed Oct 10 08:36:38 2012 (r241394) @@ -978,7 +978,7 @@ epair_modevent(module_t mod, int type, v static moduledata_t epair_mod = { "if_epair", epair_modevent, - NULL + 0 }; DECLARE_MODULE(if_epair, epair_mod, SI_SUB_PSEUDO, SI_ORDER_ANY); Modified: head/sys/net/if_ethersubr.c ============================================================================== --- head/sys/net/if_ethersubr.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/net/if_ethersubr.c Wed Oct 10 08:36:38 2012 (r241394) @@ -1237,7 +1237,7 @@ ether_modevent(module_t mod, int type, v static moduledata_t ether_mod = { "ether", ether_modevent, - NULL + 0 }; void Modified: head/sys/net/if_faith.c ============================================================================== --- head/sys/net/if_faith.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/net/if_faith.c Wed Oct 10 08:36:38 2012 (r241394) @@ -136,7 +136,7 @@ faithmodevent(mod, type, data) static moduledata_t faith_mod = { "if_faith", faithmodevent, - NULL + 0 }; DECLARE_MODULE(if_faith, faith_mod, SI_SUB_PSEUDO, SI_ORDER_ANY); Modified: head/sys/net/if_fddisubr.c ============================================================================== --- head/sys/net/if_fddisubr.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/net/if_fddisubr.c Wed Oct 10 08:36:38 2012 (r241394) @@ -792,7 +792,7 @@ fddi_resolvemulti(ifp, llsa, sa) static moduledata_t fddi_mod = { "fddi", /* module name */ NULL, /* event handler */ - NULL /* extra data */ + 0 /* extra data */ }; DECLARE_MODULE(fddi, fddi_mod, SI_SUB_PSEUDO, SI_ORDER_ANY); Modified: head/sys/net/if_fwsubr.c ============================================================================== --- head/sys/net/if_fwsubr.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/net/if_fwsubr.c Wed Oct 10 08:36:38 2012 (r241394) @@ -845,7 +845,7 @@ firewire_modevent(module_t mod, int type static moduledata_t firewire_mod = { "if_firewire", firewire_modevent, - NULL + 0 }; DECLARE_MODULE(if_firewire, firewire_mod, SI_SUB_INIT_IF, SI_ORDER_ANY); Modified: head/sys/net/if_gif.c ============================================================================== --- head/sys/net/if_gif.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/net/if_gif.c Wed Oct 10 08:36:38 2012 (r241394) @@ -272,7 +272,7 @@ gifmodevent(mod, type, data) static moduledata_t gif_mod = { "if_gif", gifmodevent, - NULL + 0 }; DECLARE_MODULE(if_gif, gif_mod, SI_SUB_PSEUDO, SI_ORDER_ANY); Modified: head/sys/net/if_gre.c ============================================================================== --- head/sys/net/if_gre.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/net/if_gre.c Wed Oct 10 08:36:38 2012 (r241394) @@ -973,7 +973,7 @@ gremodevent(module_t mod, int type, void static moduledata_t gre_mod = { "if_gre", gremodevent, - NULL + 0 }; DECLARE_MODULE(if_gre, gre_mod, SI_SUB_PSEUDO, SI_ORDER_ANY); Modified: head/sys/net/if_iso88025subr.c ============================================================================== --- head/sys/net/if_iso88025subr.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/net/if_iso88025subr.c Wed Oct 10 08:36:38 2012 (r241394) @@ -823,7 +823,7 @@ iso88025_modevent(module_t mod, int type static moduledata_t iso88025_mod = { "iso88025", iso88025_modevent, - NULL + 0 }; DECLARE_MODULE(iso88025, iso88025_mod, SI_SUB_PSEUDO, SI_ORDER_ANY); Modified: head/sys/net/if_lagg.c ============================================================================== --- head/sys/net/if_lagg.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/net/if_lagg.c Wed Oct 10 08:36:38 2012 (r241394) @@ -211,7 +211,7 @@ lagg_modevent(module_t mod, int type, vo static moduledata_t lagg_mod = { "if_lagg", lagg_modevent, - NULL + 0 }; DECLARE_MODULE(if_lagg, lagg_mod, SI_SUB_PSEUDO, SI_ORDER_ANY); Modified: head/sys/net/if_loop.c ============================================================================== --- head/sys/net/if_loop.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/net/if_loop.c Wed Oct 10 08:36:38 2012 (r241394) @@ -205,7 +205,7 @@ loop_modevent(module_t mod, int type, vo static moduledata_t loop_mod = { "if_lo", loop_modevent, - NULL + 0 }; DECLARE_MODULE(if_lo, loop_mod, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_ANY); Modified: head/sys/net/if_spppsubr.c ============================================================================== --- head/sys/net/if_spppsubr.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/net/if_spppsubr.c Wed Oct 10 08:36:38 2012 (r241394) @@ -494,7 +494,7 @@ sppp_modevent(module_t mod, int type, vo static moduledata_t spppmod = { "sppp", sppp_modevent, - NULL + 0 }; MODULE_VERSION(sppp, 1); DECLARE_MODULE(sppp, spppmod, SI_SUB_DRIVERS, SI_ORDER_ANY); Modified: head/sys/net/if_stf.c ============================================================================== --- head/sys/net/if_stf.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/net/if_stf.c Wed Oct 10 08:36:38 2012 (r241394) @@ -301,7 +301,7 @@ stfmodevent(mod, type, data) static moduledata_t stf_mod = { "if_stf", stfmodevent, - NULL + 0 }; DECLARE_MODULE(if_stf, stf_mod, SI_SUB_PSEUDO, SI_ORDER_ANY); Modified: head/sys/net/if_tun.c ============================================================================== --- head/sys/net/if_tun.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/net/if_tun.c Wed Oct 10 08:36:38 2012 (r241394) @@ -317,7 +317,7 @@ tunmodevent(module_t mod, int type, void static moduledata_t tun_mod = { "if_tun", tunmodevent, - NULL + 0 }; DECLARE_MODULE(if_tun, tun_mod, SI_SUB_PSEUDO, SI_ORDER_ANY); Modified: head/sys/net/if_vlan.c ============================================================================== --- head/sys/net/if_vlan.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/net/if_vlan.c Wed Oct 10 08:36:38 2012 (r241394) @@ -762,7 +762,7 @@ vlan_modevent(module_t mod, int type, vo static moduledata_t vlan_mod = { "if_vlan", vlan_modevent, - NULL + 0 }; DECLARE_MODULE(if_vlan, vlan_mod, SI_SUB_PSEUDO, SI_ORDER_ANY); Modified: head/sys/net/zlib.c ============================================================================== --- head/sys/net/zlib.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/net/zlib.c Wed Oct 10 08:36:38 2012 (r241394) @@ -5400,7 +5400,7 @@ zlib_modevent(module_t mod, int type, vo static moduledata_t zlib_mod = { "zlib", zlib_modevent, - NULL + 0 }; DECLARE_MODULE(zlib, zlib_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST); MODULE_VERSION(zlib, 1); Modified: head/sys/net80211/ieee80211_freebsd.c ============================================================================== --- head/sys/net80211/ieee80211_freebsd.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/net80211/ieee80211_freebsd.c Wed Oct 10 08:36:38 2012 (r241394) @@ -822,7 +822,7 @@ wlan_modevent(module_t mod, int type, vo static moduledata_t wlan_mod = { "wlan", wlan_modevent, - NULL + 0 }; DECLARE_MODULE(wlan, wlan_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST); MODULE_VERSION(wlan, 1); Modified: head/sys/net80211/ieee80211_freebsd.h ============================================================================== --- head/sys/net80211/ieee80211_freebsd.h Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/net80211/ieee80211_freebsd.h Wed Oct 10 08:36:38 2012 (r241394) @@ -323,7 +323,7 @@ wlan_##name##_modevent(module_t mod, int static moduledata_t name##_mod = { \ "wlan_" #name, \ wlan_##name##_modevent, \ - NULL \ + 0 \ }; \ DECLARE_MODULE(wlan_##name, name##_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST);\ MODULE_VERSION(wlan_##name, version); \ Modified: head/sys/netgraph/atm/ngatmbase.c ============================================================================== --- head/sys/netgraph/atm/ngatmbase.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/netgraph/atm/ngatmbase.c Wed Oct 10 08:36:38 2012 (r241394) @@ -51,7 +51,7 @@ static int ngatm_handler(module_t, int, static moduledata_t ngatm_data = { "ngatmbase", ngatm_handler, - NULL + 0 }; MODULE_VERSION(ngatmbase, NGATMBASE_VERSION); Modified: head/sys/netinet/igmp.c ============================================================================== --- head/sys/netinet/igmp.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/netinet/igmp.c Wed Oct 10 08:36:38 2012 (r241394) @@ -3644,6 +3644,6 @@ igmp_modevent(module_t mod, int type, vo static moduledata_t igmp_mod = { "igmp", igmp_modevent, - NULL + 0 }; DECLARE_MODULE(igmp, igmp_mod, SI_SUB_PSEUDO, SI_ORDER_ANY); Modified: head/sys/netinet/ip_carp.c ============================================================================== --- head/sys/netinet/ip_carp.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/netinet/ip_carp.c Wed Oct 10 08:36:38 2012 (r241394) @@ -2145,7 +2145,7 @@ carp_modevent(module_t mod, int type, vo static moduledata_t carp_mod = { "carp", carp_modevent, - NULL + 0 }; DECLARE_MODULE(carp, carp_mod, SI_SUB_PROTO_DOMAIN, SI_ORDER_ANY); Modified: head/sys/netinet/ip_divert.c ============================================================================== --- head/sys/netinet/ip_divert.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/netinet/ip_divert.c Wed Oct 10 08:36:38 2012 (r241394) @@ -834,7 +834,7 @@ div_modevent(module_t mod, int type, voi static moduledata_t ipdivertmod = { "ipdivert", div_modevent, - NULL + 0 }; DECLARE_MODULE(ipdivert, ipdivertmod, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_ANY); Modified: head/sys/netinet/ip_mroute.c ============================================================================== --- head/sys/netinet/ip_mroute.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/netinet/ip_mroute.c Wed Oct 10 08:36:38 2012 (r241394) @@ -2944,7 +2944,7 @@ ip_mroute_modevent(module_t mod, int typ static moduledata_t ip_mroutemod = { "ip_mroute", ip_mroute_modevent, - NULL + 0 }; DECLARE_MODULE(ip_mroute, ip_mroutemod, SI_SUB_PSEUDO, SI_ORDER_MIDDLE); Modified: head/sys/netinet/toecore.c ============================================================================== --- head/sys/netinet/toecore.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/netinet/toecore.c Wed Oct 10 08:36:38 2012 (r241394) @@ -570,7 +570,7 @@ toecore_mod_handler(module_t mod, int cm static moduledata_t mod_data= { "toecore", toecore_mod_handler, - NULL + 0 }; MODULE_VERSION(toecore, 1); Modified: head/sys/netinet6/ip6_mroute.c ============================================================================== --- head/sys/netinet6/ip6_mroute.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/netinet6/ip6_mroute.c Wed Oct 10 08:36:38 2012 (r241394) @@ -2059,7 +2059,7 @@ ip6_mroute_modevent(module_t mod, int ty static moduledata_t ip6_mroutemod = { "ip6_mroute", ip6_mroute_modevent, - NULL + 0 }; DECLARE_MODULE(ip6_mroute, ip6_mroutemod, SI_SUB_PSEUDO, SI_ORDER_ANY); Modified: head/sys/netinet6/mld6.c ============================================================================== --- head/sys/netinet6/mld6.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/netinet6/mld6.c Wed Oct 10 08:36:38 2012 (r241394) @@ -3309,6 +3309,6 @@ mld_modevent(module_t mod, int type, voi static moduledata_t mld_mod = { "mld", mld_modevent, - NULL + 0 }; DECLARE_MODULE(mld, mld_mod, SI_SUB_PSEUDO, SI_ORDER_ANY); Modified: head/sys/netinet6/send.c ============================================================================== --- head/sys/netinet6/send.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/netinet6/send.c Wed Oct 10 08:36:38 2012 (r241394) @@ -361,7 +361,7 @@ send_modevent(module_t mod, int type, vo static moduledata_t sendmod = { "send", send_modevent, - NULL + 0 }; DECLARE_MODULE(send, sendmod, SI_SUB_PROTO_DOMAIN, SI_ORDER_ANY); Modified: head/sys/netpfil/ipfw/ip_fw2.c ============================================================================== --- head/sys/netpfil/ipfw/ip_fw2.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/netpfil/ipfw/ip_fw2.c Wed Oct 10 08:36:38 2012 (r241394) @@ -2756,7 +2756,7 @@ ipfw_modevent(module_t mod, int type, vo static moduledata_t ipfwmod = { "ipfw", ipfw_modevent, - NULL + 0 }; /* Define startup order. */ Modified: head/sys/netpfil/ipfw/ip_fw_nat.c ============================================================================== --- head/sys/netpfil/ipfw/ip_fw_nat.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/netpfil/ipfw/ip_fw_nat.c Wed Oct 10 08:36:38 2012 (r241394) @@ -651,7 +651,7 @@ ipfw_nat_modevent(module_t mod, int type static moduledata_t ipfw_nat_mod = { "ipfw_nat", ipfw_nat_modevent, - NULL + 0 }; DECLARE_MODULE(ipfw_nat, ipfw_nat_mod, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_ANY); Modified: head/sys/netpfil/pf/if_pflog.c ============================================================================== --- head/sys/netpfil/pf/if_pflog.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/netpfil/pf/if_pflog.c Wed Oct 10 08:36:38 2012 (r241394) @@ -281,7 +281,7 @@ pflog_modevent(module_t mod, int type, v return error; } -static moduledata_t pflog_mod = { "pflog", pflog_modevent, NULL }; +static moduledata_t pflog_mod = { "pflog", pflog_modevent, 0 }; #define PFLOG_MODVER 1 Modified: head/sys/netpfil/pf/if_pfsync.c ============================================================================== --- head/sys/netpfil/pf/if_pfsync.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/netpfil/pf/if_pfsync.c Wed Oct 10 08:36:38 2012 (r241394) @@ -2402,7 +2402,7 @@ pfsync_modevent(module_t mod, int type, static moduledata_t pfsync_mod = { "pfsync", pfsync_modevent, - NULL + 0 }; #define PFSYNC_MODVER 1 Modified: head/sys/netpfil/pf/pf_ioctl.c ============================================================================== --- head/sys/netpfil/pf/pf_ioctl.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/netpfil/pf/pf_ioctl.c Wed Oct 10 08:36:38 2012 (r241394) @@ -3722,7 +3722,7 @@ pf_modevent(module_t mod, int type, void static moduledata_t pf_mod = { "pf", pf_modevent, - NULL + 0 }; DECLARE_MODULE(pf, pf_mod, SI_SUB_PSEUDO, SI_ORDER_FIRST); Modified: head/sys/nfs/nfs_nfssvc.c ============================================================================== --- head/sys/nfs/nfs_nfssvc.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/nfs/nfs_nfssvc.c Wed Oct 10 08:36:38 2012 (r241394) @@ -147,7 +147,7 @@ nfssvc_modevent(module_t mod, int type, static moduledata_t nfssvc_mod = { "nfssvc", nfssvc_modevent, - NULL + NULL, }; DECLARE_MODULE(nfssvc, nfssvc_mod, SI_SUB_VFS, SI_ORDER_ANY); Modified: head/sys/nfsserver/nfs_srvsubs.c ============================================================================== --- head/sys/nfsserver/nfs_srvsubs.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/nfsserver/nfs_srvsubs.c Wed Oct 10 08:36:38 2012 (r241394) @@ -552,7 +552,7 @@ nfsrv_modevent(module_t mod, int type, v static moduledata_t nfsserver_mod = { "nfsserver", nfsrv_modevent, - NULL + NULL, }; DECLARE_MODULE(nfsserver, nfsserver_mod, SI_SUB_VFS, SI_ORDER_ANY); Modified: head/sys/opencrypto/cryptodev.c ============================================================================== --- head/sys/opencrypto/cryptodev.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/opencrypto/cryptodev.c Wed Oct 10 08:36:38 2012 (r241394) @@ -1171,7 +1171,7 @@ cryptodev_modevent(module_t mod, int typ static moduledata_t cryptodev_mod = { "cryptodev", cryptodev_modevent, - NULL + 0 }; MODULE_VERSION(cryptodev, 1); DECLARE_MODULE(cryptodev, cryptodev_mod, SI_SUB_PSEUDO, SI_ORDER_ANY); Modified: head/sys/tools/fw_stub.awk ============================================================================== --- head/sys/tools/fw_stub.awk Wed Oct 10 05:43:04 2012 (r241393) +++ head/sys/tools/fw_stub.awk Wed Oct 10 08:36:38 2012 (r241394) @@ -215,7 +215,7 @@ printc("\t\treturn (error);\ static moduledata_t " modname "_fw_mod = {\ \"" modname "_fw\",\ " modname "_fw_modevent,\ - NULL\ + 0\ };\ DECLARE_MODULE(" modname "_fw, " modname "_fw_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST);\ MODULE_VERSION(" modname "_fw, 1);\ Modified: head/tools/regression/kthread/kld/kthrdlk.c ============================================================================== --- head/tools/regression/kthread/kld/kthrdlk.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/tools/regression/kthread/kld/kthrdlk.c Wed Oct 10 08:36:38 2012 (r241394) @@ -193,11 +193,12 @@ kthrdlk_handler(module_t mod, int /*mode } static moduledata_t mod_data= { - "kthrdlk", - kthrdlk_handler, - NULL -}; + "kthrdlk", + kthrdlk_handler, + 0 + }; MODULE_VERSION(kthrdlk, 1); DECLARE_MODULE(kthrdlk, mod_data, SI_SUB_EXEC, SI_ORDER_ANY); + Modified: head/tools/regression/net80211/ccmp/test_ccmp.c ============================================================================== --- head/tools/regression/net80211/ccmp/test_ccmp.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/tools/regression/net80211/ccmp/test_ccmp.c Wed Oct 10 08:36:38 2012 (r241394) @@ -742,7 +742,7 @@ test_ccmp_modevent(module_t mod, int typ static moduledata_t test_ccmp_mod = { "test_ccmp", test_ccmp_modevent, - NULL + 0 }; DECLARE_MODULE(test_ccmp, test_ccmp_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST); MODULE_VERSION(test_ccmp, 1); Modified: head/tools/regression/net80211/tkip/test_tkip.c ============================================================================== --- head/tools/regression/net80211/tkip/test_tkip.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/tools/regression/net80211/tkip/test_tkip.c Wed Oct 10 08:36:38 2012 (r241394) @@ -381,7 +381,7 @@ test_tkip_modevent(module_t mod, int typ static moduledata_t test_tkip_mod = { "test_tkip", test_tkip_modevent, - NULL + 0 }; DECLARE_MODULE(test_tkip, test_tkip_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST); MODULE_VERSION(test_tkip, 1); Modified: head/tools/regression/net80211/wep/test_wep.c ============================================================================== --- head/tools/regression/net80211/wep/test_wep.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/tools/regression/net80211/wep/test_wep.c Wed Oct 10 08:36:38 2012 (r241394) @@ -328,7 +328,7 @@ test_wep_modevent(module_t mod, int type static moduledata_t test_wep_mod = { "test_wep", test_wep_modevent, - NULL + 0 }; DECLARE_MODULE(test_wep, test_wep_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST); MODULE_VERSION(test_wep, 1); Modified: head/tools/tools/kttcp/sys/kttcp.c ============================================================================== --- head/tools/tools/kttcp/sys/kttcp.c Wed Oct 10 05:43:04 2012 (r241393) +++ head/tools/tools/kttcp/sys/kttcp.c Wed Oct 10 08:36:38 2012 (r241394) @@ -268,7 +268,7 @@ kttcpdev_modevent(module_t mod, int type static moduledata_t kttcpdev_mod = { "kttcpdev", kttcpdev_modevent, - NULL + 0 }; MODULE_VERSION(kttcpdev, 1); DECLARE_MODULE(kttcpdev, kttcpdev_mod, SI_SUB_PSEUDO, SI_ORDER_ANY);