Date: Tue, 15 Apr 2003 13:44:59 -0700 (PDT) From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 29016 for review Message-ID: <200304152044.h3FKixHi042057@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=29016 Change 29016 by jhb@jhb_laptop on 2003/04/15 13:44:35 IFC @29014. Affected files ... .. //depot/projects/smpng/sys/alpha/conf/NOTES#5 integrate .. //depot/projects/smpng/sys/conf/files#72 integrate .. //depot/projects/smpng/sys/conf/options#51 integrate .. //depot/projects/smpng/sys/dev/an/if_an_isa.c#8 integrate .. //depot/projects/smpng/sys/dev/an/if_an_pccard.c#9 integrate .. //depot/projects/smpng/sys/dev/an/if_an_pci.c#12 integrate .. //depot/projects/smpng/sys/dev/ar/if_ar_isa.c#3 integrate .. //depot/projects/smpng/sys/dev/ar/if_ar_pci.c#2 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#22 integrate .. //depot/projects/smpng/sys/dev/cm/if_cm_isa.c#3 integrate .. //depot/projects/smpng/sys/dev/cnw/if_cnw.c#12 integrate .. //depot/projects/smpng/sys/dev/cs/if_cs_isa.c#2 integrate .. //depot/projects/smpng/sys/dev/cs/if_cs_pccard.c#5 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_cbus.c#6 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_isa.c#4 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_pccard.c#15 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_pci.c#3 integrate .. //depot/projects/smpng/sys/dev/em/if_em.c#18 integrate .. //depot/projects/smpng/sys/dev/firewire/if_fwe.c#9 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#31 integrate .. //depot/projects/smpng/sys/dev/gem/if_gem_pci.c#7 integrate .. //depot/projects/smpng/sys/dev/gx/if_gx.c#10 integrate .. //depot/projects/smpng/sys/dev/hme/if_hme_pci.c#5 integrate .. //depot/projects/smpng/sys/dev/hme/if_hme_sbus.c#4 integrate .. //depot/projects/smpng/sys/dev/lge/if_lge.c#12 integrate .. //depot/projects/smpng/sys/dev/lnc/if_lnc_cbus.c#3 integrate .. //depot/projects/smpng/sys/dev/lnc/if_lnc_isa.c#3 integrate .. //depot/projects/smpng/sys/dev/lnc/if_lnc_pci.c#3 integrate .. //depot/projects/smpng/sys/dev/my/if_my.c#10 integrate .. //depot/projects/smpng/sys/dev/nge/if_nge.c#22 integrate .. //depot/projects/smpng/sys/dev/pci/pci.c#22 integrate .. //depot/projects/smpng/sys/dev/pdq/if_fea.c#5 integrate .. //depot/projects/smpng/sys/dev/pdq/if_fpa.c#4 integrate .. //depot/projects/smpng/sys/dev/sbni/if_sbni_isa.c#6 integrate .. //depot/projects/smpng/sys/dev/sbni/if_sbni_pci.c#5 integrate .. //depot/projects/smpng/sys/dev/sbsh/if_sbsh.c#2 integrate .. //depot/projects/smpng/sys/dev/sn/if_sn_isa.c#2 integrate .. //depot/projects/smpng/sys/dev/sn/if_sn_pccard.c#7 integrate .. //depot/projects/smpng/sys/dev/snc/if_snc_cbus.c#3 integrate .. //depot/projects/smpng/sys/dev/snc/if_snc_pccard.c#2 integrate .. //depot/projects/smpng/sys/dev/sr/if_sr_isa.c#2 integrate .. //depot/projects/smpng/sys/dev/sr/if_sr_pci.c#2 integrate .. //depot/projects/smpng/sys/dev/tx/if_tx.c#8 integrate .. //depot/projects/smpng/sys/dev/txp/if_txp.c#13 integrate .. //depot/projects/smpng/sys/dev/usb/if_aue.c#21 integrate .. //depot/projects/smpng/sys/dev/usb/if_cue.c#12 integrate .. //depot/projects/smpng/sys/dev/usb/if_kue.c#13 integrate .. //depot/projects/smpng/sys/dev/vx/if_vx_pci.c#2 integrate .. //depot/projects/smpng/sys/dev/wi/if_wi_pccard.c#15 integrate .. //depot/projects/smpng/sys/dev/wi/if_wi_pci.c#11 integrate .. //depot/projects/smpng/sys/i386/i386/busdma_machdep.c#16 integrate .. //depot/projects/smpng/sys/i386/linux/linux_ptrace.c#6 integrate .. //depot/projects/smpng/sys/isa/isa_common.c#9 integrate .. //depot/projects/smpng/sys/kern/kern_mac.c#21 integrate .. //depot/projects/smpng/sys/kern/subr_mbuf.c#28 integrate .. //depot/projects/smpng/sys/kern/uipc_mbuf.c#18 integrate .. //depot/projects/smpng/sys/kern/uipc_mbuf2.c#9 integrate .. //depot/projects/smpng/sys/net/if_loop.c#17 integrate .. //depot/projects/smpng/sys/pci/agp_ali.c#4 integrate .. //depot/projects/smpng/sys/pci/agp_amd.c#8 integrate .. //depot/projects/smpng/sys/pci/agp_i810.c#8 integrate .. //depot/projects/smpng/sys/pci/agp_intel.c#9 integrate .. //depot/projects/smpng/sys/pci/agp_sis.c#5 integrate .. //depot/projects/smpng/sys/pci/agp_via.c#5 integrate .. //depot/projects/smpng/sys/pci/alpm.c#4 integrate .. //depot/projects/smpng/sys/pci/amdpm.c#6 integrate .. //depot/projects/smpng/sys/pci/cy_pci.c#5 integrate .. //depot/projects/smpng/sys/pci/if_dc.c#30 integrate .. //depot/projects/smpng/sys/pci/if_de.c#9 integrate .. //depot/projects/smpng/sys/pci/if_en_pci.c#3 integrate .. //depot/projects/smpng/sys/pci/if_pcn.c#13 integrate .. //depot/projects/smpng/sys/pci/if_rl.c#25 integrate .. //depot/projects/smpng/sys/pci/if_sf.c#15 integrate .. //depot/projects/smpng/sys/pci/if_sis.c#21 integrate .. //depot/projects/smpng/sys/pci/if_sk.c#14 integrate .. //depot/projects/smpng/sys/pci/if_ste.c#17 integrate .. //depot/projects/smpng/sys/pci/if_ti.c#23 integrate .. //depot/projects/smpng/sys/pci/if_tl.c#12 integrate .. //depot/projects/smpng/sys/pci/if_vr.c#14 integrate .. //depot/projects/smpng/sys/pci/if_wb.c#13 integrate .. //depot/projects/smpng/sys/pci/if_xl.c#24 integrate .. //depot/projects/smpng/sys/pci/ncr.c#7 integrate .. //depot/projects/smpng/sys/pci/viapm.c#3 integrate .. //depot/projects/smpng/sys/pci/xrpu.c#7 integrate .. //depot/projects/smpng/sys/sys/mac.h#15 integrate .. //depot/projects/smpng/sys/sys/mac_policy.h#13 integrate .. //depot/projects/smpng/sys/sys/mbuf.h#22 integrate .. //depot/projects/smpng/sys/vm/vm_kern.c#12 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/conf/NOTES#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/alpha/conf/NOTES,v 1.150 2003/02/25 20:59:22 obrien Exp $ +# $FreeBSD: src/sys/alpha/conf/NOTES,v 1.151 2003/04/15 20:21:56 jhb Exp $ # # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. @@ -65,4 +65,14 @@ ##################################################################### -# SIMULATOR OPTIONS +# ABI Emulation + +# Enable OSF/1 ABI emulation +options COMPAT_OSF1 + +# Enable Linux ABI emulation (requires COMPAT_OSF1) +options COMPAT_LINUX + +# Enable the linux-like proc filesystem support (requires COMPAT_LINUX +# and PSEUDOFS) +options LINPROCFS ==== //depot/projects/smpng/sys/conf/files#72 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.781 2003/04/14 14:04:07 ticso Exp $ +# $FreeBSD: src/sys/conf/files,v 1.782 2003/04/15 04:08:01 mdodd Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -288,7 +288,7 @@ dev/amr/amr_cam.c optional amr dev/amr/amr.c optional amr dev/amr/amr_disk.c optional amr -dev/amr/amr_pci.c optional amr +dev/amr/amr_pci.c optional amr pci dev/an/if_an.c optional an dev/an/if_an_isa.c optional an isa dev/an/if_an_pccard.c optional an card @@ -343,8 +343,8 @@ dev/cs/if_cs_pccard.c optional cs card dev/cs/if_cs_pccard.c optional cs pccard dev/digi/digi.c optional digi -dev/digi/digi_isa.c optional digi -dev/digi/digi_pci.c optional digi +dev/digi/digi_isa.c optional digi isa +dev/digi/digi_pci.c optional digi pci dev/digi/CX.c optional digi_CX dev/digi/CX_PCI.c optional digi_CX_PCI dev/digi/EPCX.c optional digi_EPCX @@ -506,12 +506,12 @@ dev/mk48txx/mk48txx.c optional mk48txx dev/mlx/mlx.c optional mlx dev/mlx/mlx_disk.c optional mlx -dev/mlx/mlx_pci.c optional mlx +dev/mlx/mlx_pci.c optional mlx pci dev/mly/mly.c optional mly dev/mpt/mpt.c optional mpt dev/mpt/mpt_debug.c optional mpt dev/mpt/mpt_freebsd.c optional mpt -dev/mpt/mpt_pci.c optional mpt +dev/mpt/mpt_pci.c optional mpt pci dev/my/if_my.c optional my dev/musycc/musycc.c optional musycc dev/nge/if_nge.c optional nge @@ -756,9 +756,9 @@ dev/usb/if_cue.c optional cue dev/usb/if_kue.c optional kue dev/usb/ehci.c optional ehci -dev/usb/ehci_pci.c optional ehci +dev/usb/ehci_pci.c optional ehci pci dev/usb/ohci.c optional ohci -dev/usb/ohci_pci.c optional ohci +dev/usb/ohci_pci.c optional ohci pci dev/usb/ubsa.c optional ubsa ucom dev/usb/ucom.c optional ucom dev/usb/udbp.c optional udbp @@ -766,7 +766,7 @@ dev/usb/uftdi.c optional uftdi ucom dev/usb/ugen.c optional ugen dev/usb/uhci.c optional uhci -dev/usb/uhci_pci.c optional uhci +dev/usb/uhci_pci.c optional uhci pci dev/usb/uhid.c optional uhid dev/usb/uhub.c optional usb dev/usb/ukbd.c optional ukbd @@ -1482,31 +1482,31 @@ pccard/pcic.c optional pcic card pccard/pcic_isa.c optional pcic card isa pccard/pcic_pci.c optional pcic card pci -pci/agp.c optional agp -pci/agp_if.m optional agp -pci/alpm.c optional alpm -pci/amdpm.c optional amdpm -pci/amdpm.c optional nfpm -pci/if_dc.c optional dc -pci/if_de.c optional de +pci/agp.c optional agp pci +pci/agp_if.m optional agp pci +pci/alpm.c optional alpm pci +pci/amdpm.c optional amdpm pci +pci/amdpm.c optional nfpm pci +pci/if_dc.c optional dc pci +pci/if_de.c optional de pci pci/if_en_pci.c optional en pci -pci/if_mn.c optional mn -pci/if_pcn.c optional pcn -pci/if_rl.c optional rl -pci/if_sf.c optional sf -pci/if_sis.c optional sis -pci/if_sk.c optional sk -pci/if_ste.c optional ste -pci/if_ti.c optional ti -pci/if_tl.c optional tl -pci/if_vr.c optional vr -pci/if_wb.c optional wb -pci/if_xl.c optional xl -pci/intpm.c optional intpm +pci/if_mn.c optional mn pci +pci/if_pcn.c optional pcn pci +pci/if_rl.c optional rl pci +pci/if_sf.c optional sf pci +pci/if_sis.c optional sis pci +pci/if_sk.c optional sk pci +pci/if_ste.c optional ste pci +pci/if_ti.c optional ti pci +pci/if_tl.c optional tl pci +pci/if_vr.c optional vr pci +pci/if_wb.c optional wb pci +pci/if_xl.c optional xl pci +pci/intpm.c optional intpm pci pci/meteor.c count meteor pci nowerror -pci/ncr.c optional ncr -pci/viapm.c optional viapm -pci/xrpu.c optional xrpu +pci/ncr.c optional ncr pci +pci/viapm.c optional viapm pci +pci/xrpu.c optional xrpu pci posix4/ksched.c optional _kposix_priority_scheduling posix4/p1003_1b.c standard posix4/posix4_mib.c standard ==== //depot/projects/smpng/sys/conf/options#51 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.387 2003/04/12 09:40:37 des Exp $ +# $FreeBSD: src/sys/conf/options,v 1.389 2003/04/15 19:43:52 rwatson Exp $ # # On the handling of kernel options # @@ -72,15 +72,14 @@ # mapped I/O # Miscellaneous options. +ADAPTIVE_MUTEXES ALQ -ADAPTIVE_MUTEXES COMPAT_43 opt_compat.h COMPAT_FREEBSD4 opt_compat.h COMPAT_SUNOS opt_compat.h -NO_COMPAT_FREEBSD4 opt_compat.h COMPILING_LINT opt_global.h +CONSPEED opt_comconsole.h CY_PCI_FASTINTR -CONSPEED opt_comconsole.h DDB DDB_NOKLDSYM opt_ddb.h DDB_TRACE @@ -103,12 +102,26 @@ KTRACE KTRACE_REQUEST_POOL opt_ktrace.h LIBICONV +MAC +MAC_ALWAYS_LABEL_MBUF opt_mac.h +MAC_BIBA opt_dontuse.h +MAC_BSDEXTENDED opt_dontuse.h +MAC_DEBUG opt_mac.h +MAC_IFOFF opt_dontuse.h +MAC_LOMAC opt_dontuse.h +MAC_MLS opt_dontuse.h +MAC_NONE opt_dontuse.h +MAC_PARTITION opt_dontuse.h +MAC_PORTACL opt_dontuse.h +MAC_SEEOTHERUIDS opt_dontuse.h +MAC_TEST opt_dontuse.h MD_ROOT opt_md.h MD_ROOT_SIZE opt_md.h NDGBPORTS opt_dgb.h -NTIMECOUNTER opt_ntp.h +NO_COMPAT_FREEBSD4 opt_compat.h NSWAPDEV opt_swap.h NSWBUF_MIN opt_swap.h +NTIMECOUNTER opt_ntp.h PANIC_REBOOT_WAIT_TIME opt_panic.h PPS_SYNC opt_ntp.h PUC_FASTINTR opt_puc.h @@ -149,23 +162,6 @@ _KPOSIX_PRIORITY_SCHEDULING opt_posix.h P1003_1B_SEMAPHORES opt_posix.h -##################################################################### -# SECURITY POLICY PARAMETERS - -# Support for Mandatory Access Control (MAC) -MAC -MAC_BIBA opt_dontuse.h -MAC_BSDEXTENDED opt_dontuse.h -MAC_DEBUG opt_mac.h -MAC_IFOFF opt_dontuse.h -MAC_LOMAC opt_dontuse.h -MAC_MLS opt_dontuse.h -MAC_NONE opt_dontuse.h -MAC_PARTITION opt_dontuse.h -MAC_PORTACL opt_dontuse.h -MAC_SEEOTHERUIDS opt_dontuse.h -MAC_TEST opt_dontuse.h - # Do we want the config file compiled into the kernel? INCLUDE_CONFIG_FILE opt_config.h @@ -177,24 +173,24 @@ CODA opt_dontuse.h EXT2FS opt_dontuse.h FDESCFS opt_dontuse.h +HPFS opt_dontuse.h LINPROCFS opt_dontuse.h MSDOSFS opt_dontuse.h +NTFS opt_dontuse.h NULLFS opt_dontuse.h NWFS opt_dontuse.h PORTALFS opt_dontuse.h PROCFS opt_dontuse.h PSEUDOFS opt_dontuse.h +SMBFS opt_dontuse.h +UDF opt_dontuse.h UMAPFS opt_dontuse.h -NTFS opt_dontuse.h -HPFS opt_dontuse.h -SMBFS opt_dontuse.h UNIONFS opt_dontuse.h -UDF opt_dontuse.h # Broken - ffs_snapshot() dependency from ufs_lookup() :-( FFS opt_ffs_broken_fixme.h -# These static filesystems has one slightly bogus static dependency in +# These static filesystems have one slightly bogus static dependency in # sys/i386/i386/autoconf.c. If any of these filesystems are # statically compiled into the kernel, code for mounting them as root # filesystems will be enabled - but look below. @@ -221,7 +217,8 @@ # Enable fast hash lookups for large directories on UFS-based filesystems. UFS_DIRHASH opt_ufs.h -# The above static dependencies are planned removed, with a +# The below sentence is not in English, and neither is this one. +# We plan to remove the static dependences above, with a # <filesystem>_ROOT option to control if it usable as root. This list # allows these options to be present in config files already (though # they won't make any difference yet). @@ -257,8 +254,6 @@ SCSI_NO_SENSE_STRINGS opt_scsi.h SCSI_NO_OP_STRINGS opt_scsi.h - - # Options used only in cam/scsi/scsi_cd.c CHANGER_MIN_BUSY_SECONDS opt_cd.h CHANGER_MAX_BUSY_SECONDS opt_cd.h @@ -300,6 +295,10 @@ ISP_FW_CRASH_DUMP opt_isp.h # Options used in the 'ata' ATA/ATAPI driver +ACD_DEBUG opt_ata.h +AST_DEBUG opt_ata.h +ATAPI_DEBUG opt_ata.h +ATA_DEBUG opt_ata.h ATA_STATIC_ID opt_ata.h ATA_NOPCI opt_ata.h DEV_ATADISK opt_ata.h @@ -307,10 +306,6 @@ DEV_ATAPIST opt_ata.h DEV_ATAPIFD opt_ata.h DEV_ATAPICAM opt_ata.h -ATA_DEBUG opt_ata.h -ATAPI_DEBUG opt_ata.h -ACD_DEBUG opt_ata.h -AST_DEBUG opt_ata.h # Net stuff. ACCEPT_FILTER_DATA @@ -382,8 +377,8 @@ NETGRAPH_IFACE opt_netgraph.h NETGRAPH_IP_INPUT opt_netgraph.h NETGRAPH_KSOCKET opt_netgraph.h +NETGRAPH_L2TP opt_netgraph.h NETGRAPH_LMI opt_netgraph.h -NETGRAPH_L2TP opt_netgraph.h # MPPC compression requires proprietary files (not included) NETGRAPH_MPPC_COMPRESSION opt_netgraph.h NETGRAPH_MPPC_ENCRYPTION opt_netgraph.h @@ -403,7 +398,6 @@ DRM_LINUX opt_drm.h DRM_DEBUG opt_drm.h - ZERO_COPY_SOCKETS opt_zero.h TI_PRIVATE_JUMBOS opt_ti.h TI_JUMBO_HDRSPLIT opt_ti.h @@ -460,10 +454,10 @@ DEBUG opt_global.h DEBUG_LOCKS opt_global.h DEBUG_VFS_LOCKS opt_global.h -LOOKUP_SHARED opt_global.h DIAGNOSTIC opt_global.h INVARIANT_SUPPORT opt_global.h INVARIANTS opt_global.h +LOOKUP_SHARED opt_global.h MCLSHIFT opt_global.h MSIZE opt_global.h REGRESSION opt_global.h @@ -562,11 +556,11 @@ FDC_DEBUG opt_fdc.h PCFCLOCK_VERBOSE opt_pcfclock.h PCFCLOCK_MAX_RETRIES opt_pcfclock.h +TDFX_LINUX opt_tdfx.h # RAIDframe options RAID_AUTOCONFIG opt_raid.h RAID_DEBUG opt_raid.h -TDFX_LINUX opt_tdfx.h KTR opt_global.h KTR_ALQ opt_ktr.h @@ -575,7 +569,6 @@ KTR_COMPILE opt_global.h KTR_ENTRIES opt_global.h KTR_VERBOSE opt_ktr.h -MUTEX_DEBUG opt_global.h WITNESS opt_global.h WITNESS_DDB opt_witness.h WITNESS_SKIPSPIN opt_witness.h @@ -600,12 +593,8 @@ # wi driver WI_SYMBOL_FIRMWARE opt_wi.h -# Polling device handling +# XXX bogusly global. DEVICE_POLLING opt_global.h - -# Mutex profiling -MUTEX_PROFILING opt_global.h - # options for ubsec driver UBSEC_DEBUG opt_ubsec.h UBSEC_RNDTEST opt_ubsec.h ==== //depot/projects/smpng/sys/dev/an/if_an_isa.c#8 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/an/if_an_isa.c,v 1.11 2003/04/10 05:12:45 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/an/if_an_isa.c,v 1.12 2003/04/15 06:37:19 mdodd Exp $"); #include "opt_inet.h" @@ -166,5 +166,6 @@ static devclass_t an_isa_devclass; -DRIVER_MODULE(if_an, isa, an_isa_driver, an_isa_devclass, 0, 0); -MODULE_DEPEND(if_an, wlan, 1, 1, 1); +DRIVER_MODULE(an, isa, an_isa_driver, an_isa_devclass, 0, 0); +MODULE_DEPEND(an, isa, 1, 1, 1); +MODULE_DEPEND(an, wlan, 1, 1, 1); ==== //depot/projects/smpng/sys/dev/an/if_an_pccard.c#9 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/an/if_an_pccard.c,v 1.19 2003/04/10 05:12:45 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/an/if_an_pccard.c,v 1.20 2003/04/15 06:37:19 mdodd Exp $"); #include "opt_inet.h" @@ -105,8 +105,9 @@ static devclass_t an_pccard_devclass; -DRIVER_MODULE(if_an, pccard, an_pccard_driver, an_pccard_devclass, 0, 0); -MODULE_DEPEND(if_an, wlan, 1, 1, 1); +DRIVER_MODULE(an, pccard, an_pccard_driver, an_pccard_devclass, 0, 0); +MODULE_DEPEND(an, wlan, 1, 1, 1); +MODULE_DEPEND(an, pccard, 1, 1, 1); static const struct pccard_product an_pccard_products[] = { PCMCIA_CARD(AIRONET, PC4800, 0), ==== //depot/projects/smpng/sys/dev/an/if_an_pci.c#12 (text+ko) ==== @@ -51,7 +51,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/an/if_an_pci.c,v 1.19 2003/04/10 05:12:45 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/an/if_an_pci.c,v 1.20 2003/04/15 06:37:19 mdodd Exp $"); #include "opt_inet.h" @@ -297,5 +297,6 @@ static devclass_t an_devclass; -DRIVER_MODULE(if_an, pci, an_pci_driver, an_devclass, 0, 0); -MODULE_DEPEND(if_an, wlan, 1, 1, 1); +DRIVER_MODULE(an, pci, an_pci_driver, an_devclass, 0, 0); +MODULE_DEPEND(an, pci, 1, 1, 1); +MODULE_DEPEND(an, wlan, 1, 1, 1); ==== //depot/projects/smpng/sys/dev/ar/if_ar_isa.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ar/if_ar_isa.c,v 1.50 2003/02/23 13:20:42 nyan Exp $ + * $FreeBSD: src/sys/dev/ar/if_ar_isa.c,v 1.51 2003/04/15 06:37:20 mdodd Exp $ */ /* @@ -90,7 +90,8 @@ sizeof (struct ar_hardc) }; -DRIVER_MODULE(if_ar, isa, ar_isa_driver, ar_devclass, 0, 0); +DRIVER_MODULE(ar, isa, ar_isa_driver, ar_devclass, 0, 0); +MODULE_DEPEND(ar, isa, 1, 1, 1); /* * Probe to see if it is there. ==== //depot/projects/smpng/sys/dev/ar/if_ar_pci.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ar/if_ar_pci.c,v 1.6 2001/01/30 10:01:15 jhay Exp $ + * $FreeBSD: src/sys/dev/ar/if_ar_pci.c,v 1.7 2003/04/15 06:37:20 mdodd Exp $ */ #include <sys/param.h> @@ -71,7 +71,8 @@ sizeof(struct ar_hardc), }; -DRIVER_MODULE(if_ar, pci, ar_pci_driver, ar_devclass, 0, 0); +DRIVER_MODULE(ar, pci, ar_pci_driver, ar_devclass, 0, 0); +MODULE_DEPEND(ar, pci, 1, 1, 1); static int ar_pci_probe(device_t device) ==== //depot/projects/smpng/sys/dev/bge/if_bge.c#22 (text+ko) ==== @@ -64,7 +64,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.32 2003/04/03 21:36:30 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.33 2003/04/15 06:37:21 mdodd Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -111,6 +111,8 @@ #define BGE_CSUM_FEATURES (CSUM_IP | CSUM_TCP | CSUM_UDP) +MODULE_DEPEND(bge, pci, 1, 1, 1); +MODULE_DEPEND(bge, ether, 1, 1, 1); MODULE_DEPEND(bge, miibus, 1, 1, 1); /* "controller miibus0" required. See GENERIC if you get errors here. */ @@ -241,7 +243,7 @@ static devclass_t bge_devclass; -DRIVER_MODULE(if_bge, pci, bge_driver, bge_devclass, 0, 0); +DRIVER_MODULE(bge, pci, bge_driver, bge_devclass, 0, 0); DRIVER_MODULE(miibus, bge, miibus_driver, miibus_devclass, 0, 0); static u_int32_t ==== //depot/projects/smpng/sys/dev/cm/if_cm_isa.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: if_bah_zbus.c,v 1.6 2000/01/23 21:06:12 aymeric Exp $ */ -/* $FreeBSD: src/sys/dev/cm/if_cm_isa.c,v 1.2 2002/03/20 02:04:09 alfred Exp $ */ +/* $FreeBSD: src/sys/dev/cm/if_cm_isa.c,v 1.3 2003/04/15 06:37:21 mdodd Exp $ */ /*- * Copyright (c) 1994, 1995, 1998 The NetBSD Foundation, Inc. @@ -132,4 +132,5 @@ sizeof(struct cm_softc) }; -DRIVER_MODULE(if_cm, isa, cm_isa_driver, cm_devclass, 0, 0); +DRIVER_MODULE(cm, isa, cm_isa_driver, cm_devclass, 0, 0); +MODULE_DEPEND(cm, isa, 1, 1, 1); ==== //depot/projects/smpng/sys/dev/cnw/if_cnw.c#12 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: if_cnw.c,v 1.15 2000/10/16 10:26:41 itojun Exp $ */ -/* $FreeBSD: src/sys/dev/cnw/if_cnw.c,v 1.10 2003/02/23 13:24:26 nyan Exp $ */ +/* $FreeBSD: src/sys/dev/cnw/if_cnw.c,v 1.11 2003/04/15 06:37:21 mdodd Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -337,7 +337,8 @@ static devclass_t cnw_pccard_devclass; -DRIVER_MODULE(if_cnw, pccard, cnw_pccard_driver, cnw_pccard_devclass, 0, 0); +DRIVER_MODULE(cnw, pccard, cnw_pccard_driver, cnw_pccard_devclass, 0, 0); +MODULE_DEPEND(cnw, ether, 1, 1, 1); #endif /* !defined(__FreeBSD__) */ ==== //depot/projects/smpng/sys/dev/cs/if_cs_isa.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/cs/if_cs_isa.c,v 1.2 2001/02/23 08:08:21 imp Exp $ + * $FreeBSD: src/sys/dev/cs/if_cs_isa.c,v 1.3 2003/04/15 06:37:22 mdodd Exp $ */ #include <sys/param.h> @@ -126,4 +126,6 @@ extern devclass_t cs_devclass; -DRIVER_MODULE(if_cs, isa, cs_isa_driver, cs_devclass, 0, 0); +DRIVER_MODULE(cs, isa, cs_isa_driver, cs_devclass, 0, 0); +MODULE_DEPEND(cs, isa, 1, 1, 1); +MODULE_DEPEND(cs, ether, 1, 1, 1); ==== //depot/projects/smpng/sys/dev/cs/if_cs_pccard.c#5 (text+ko) ==== @@ -22,7 +22,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/cs/if_cs_pccard.c,v 1.5 2003/04/10 04:36:01 imp Exp $ + * $FreeBSD: src/sys/dev/cs/if_cs_pccard.c,v 1.6 2003/04/15 06:37:22 mdodd Exp $ */ #include <sys/param.h> @@ -123,5 +123,6 @@ extern devclass_t cs_devclass; -DRIVER_MODULE(if_cs, pccard, cs_pccard_driver, cs_devclass, 0, 0); -MODULE_DEPEND(if_cs, pccard, 1, 1, 1); +DRIVER_MODULE(cs, pccard, cs_pccard_driver, cs_devclass, 0, 0); +MODULE_DEPEND(cs, pccard, 1, 1, 1); +MODULE_DEPEND(cs, ether, 1, 1, 1); ==== //depot/projects/smpng/sys/dev/ed/if_ed_cbus.c#6 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ed/if_ed_cbus.c,v 1.8 2003/03/25 00:07:00 jake Exp $ + * $FreeBSD: src/sys/dev/ed/if_ed_cbus.c,v 1.9 2003/04/15 06:37:22 mdodd Exp $ */ #include <sys/param.h> @@ -1753,4 +1753,6 @@ sizeof(struct ed_softc) }; -DRIVER_MODULE(if_ed, isa, ed_isa_driver, ed_devclass, 0, 0); +DRIVER_MODULE(ed, isa, ed_isa_driver, ed_devclass, 0, 0); +MODULE_DEPEND(ed, isa, 1, 1, 1); +MODULE_DEPEND(ed, ether, 1, 1, 1); ==== //depot/projects/smpng/sys/dev/ed/if_ed_isa.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ed/if_ed_isa.c,v 1.11 2002/07/26 17:33:58 takawata Exp $ + * $FreeBSD: src/sys/dev/ed/if_ed_isa.c,v 1.12 2003/04/15 06:37:22 mdodd Exp $ */ #include <sys/param.h> @@ -152,4 +152,6 @@ sizeof(struct ed_softc) }; -DRIVER_MODULE(if_ed, isa, ed_isa_driver, ed_devclass, 0, 0); +DRIVER_MODULE(ed, isa, ed_isa_driver, ed_devclass, 0, 0); +MODULE_DEPEND(ed, isa, 1, 1, 1); +MODULE_DEPEND(ed, ether, 1, 1, 1); ==== //depot/projects/smpng/sys/dev/ed/if_ed_pccard.c#15 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ed/if_ed_pccard.c,v 1.47 2003/04/10 07:35:19 imp Exp $ + * $FreeBSD: src/sys/dev/ed/if_ed_pccard.c,v 1.48 2003/04/15 06:37:23 mdodd Exp $ */ #include "opt_ed.h" @@ -64,6 +64,8 @@ MODULE_DEPEND(ed, miibus, 1, 1, 1); #endif +MODULE_DEPEND(ed, ether, 1, 1, 1); +MODULE_DEPEND(ed, pccard, 1, 1, 1); /* * PC-Card (PCMCIA) specific code. @@ -525,7 +527,7 @@ sizeof(struct ed_softc) }; -DRIVER_MODULE(if_ed, pccard, ed_pccard_driver, ed_devclass, 0, 0); +DRIVER_MODULE(ed, pccard, ed_pccard_driver, ed_devclass, 0, 0); #ifndef ED_NO_MIIBUS DRIVER_MODULE(miibus, ed, miibus_driver, miibus_devclass, 0, 0); #endif ==== //depot/projects/smpng/sys/dev/ed/if_ed_pci.c#3 (text+ko) ==== @@ -17,7 +17,7 @@ * 4. Modifications may be freely made to this file if the above conditions * are met. * - * $FreeBSD: src/sys/dev/ed/if_ed_pci.c,v 1.29 2002/03/20 02:07:18 alfred Exp $ + * $FreeBSD: src/sys/dev/ed/if_ed_pci.c,v 1.30 2003/04/15 06:37:23 mdodd Exp $ */ #include <sys/param.h> @@ -120,4 +120,6 @@ sizeof(struct ed_softc), }; -DRIVER_MODULE(if_ed, pci, ed_pci_driver, ed_devclass, 0, 0); +DRIVER_MODULE(ed, pci, ed_pci_driver, ed_devclass, 0, 0); +MODULE_DEPEND(ed, pci, 1, 1, 1); +MODULE_DEPEND(ed, ether, 1, 1, 1); ==== //depot/projects/smpng/sys/dev/em/if_em.c#18 (text+ko) ==== @@ -31,7 +31,7 @@ ***************************************************************************/ -/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.20 2003/03/21 21:47:30 pdeuskar Exp $*/ +/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.21 2003/04/15 06:37:23 mdodd Exp $*/ #include <dev/em/if_em.h> @@ -174,7 +174,9 @@ }; static devclass_t em_devclass; -DRIVER_MODULE(if_em, pci, em_driver, em_devclass, 0, 0); +DRIVER_MODULE(em, pci, em_driver, em_devclass, 0, 0); +MODULE_DEPEND(em, pci, 1, 1, 1); +MODULE_DEPEND(em, ether, 1, 1, 1); /********************************************************************* * Device identification routine ==== //depot/projects/smpng/sys/dev/firewire/if_fwe.c#9 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/if_fwe.c,v 1.12 2003/03/19 07:04:11 simokawa Exp $ + * $FreeBSD: src/sys/dev/firewire/if_fwe.c,v 1.13 2003/04/15 06:37:23 mdodd Exp $ */ #include "opt_inet.h" @@ -684,6 +684,6 @@ }; -DRIVER_MODULE(if_fwe, firewire, fwe_driver, fwe_devclass, 0, 0); -MODULE_VERSION(if_fwe, 1); -MODULE_DEPEND(if_fwe, firewire, 1, 1, 1); +DRIVER_MODULE(fwe, firewire, fwe_driver, fwe_devclass, 0, 0); +MODULE_VERSION(fwe, 1); +MODULE_DEPEND(fwe, firewire, 1, 1, 1); ==== //depot/projects/smpng/sys/dev/fxp/if_fxp.c#31 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.170 2003/04/14 15:50:04 sobomax Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.171 2003/04/15 06:37:24 mdodd Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -79,6 +79,8 @@ #include <dev/fxp/if_fxpvar.h> #include <dev/fxp/rcvbundl.h> +MODULE_DEPEND(fxp, pci, 1, 1, 1); +MODULE_DEPEND(fxp, ether, 1, 1, 1); MODULE_DEPEND(fxp, miibus, 1, 1, 1); #include "miibus_if.h" @@ -251,8 +253,8 @@ static devclass_t fxp_devclass; -DRIVER_MODULE(if_fxp, pci, fxp_driver, fxp_devclass, 0, 0); -DRIVER_MODULE(if_fxp, cardbus, fxp_driver, fxp_devclass, 0, 0); +DRIVER_MODULE(fxp, pci, fxp_driver, fxp_devclass, 0, 0); +DRIVER_MODULE(fxp, cardbus, fxp_driver, fxp_devclass, 0, 0); DRIVER_MODULE(miibus, fxp, miibus_driver, miibus_devclass, 0, 0); static int fxp_rnr; ==== //depot/projects/smpng/sys/dev/gem/if_gem_pci.c#7 (text+ko) ==== @@ -26,7 +26,7 @@ * * from: NetBSD: if_gem_pci.c,v 1.7 2001/10/18 15:09:15 thorpej Exp * - * $FreeBSD: src/sys/dev/gem/if_gem_pci.c,v 1.7 2003/01/21 17:28:36 tmm Exp $ + * $FreeBSD: src/sys/dev/gem/if_gem_pci.c,v 1.8 2003/04/15 06:37:24 mdodd Exp $ */ /* @@ -110,7 +110,9 @@ }; -DRIVER_MODULE(if_gem, pci, gem_pci_driver, gem_devclass, 0, 0); +DRIVER_MODULE(gem, pci, gem_pci_driver, gem_devclass, 0, 0); +MODULE_DEPEND(gem, pci, 1, 1, 1); +MODULE_DEPEND(gem, ether, 1, 1, 1); struct gem_pci_dev { u_int32_t gpd_devid; ==== //depot/projects/smpng/sys/dev/gx/if_gx.c#10 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/gx/if_gx.c,v 1.9 2003/02/19 05:47:05 imp Exp $ + * $FreeBSD: src/sys/dev/gx/if_gx.c,v 1.10 2003/04/15 06:37:24 mdodd Exp $ */ #include <sys/param.h> @@ -72,6 +72,8 @@ #include <dev/gx/if_gxreg.h> #include <dev/gx/if_gxvar.h> +MODULE_DEPEND(gx, pci, 1, 1, 1); +MODULE_DEPEND(gx, ether, 1, 1, 1); MODULE_DEPEND(gx, miibus, 1, 1, 1); #include "miibus_if.h" @@ -196,7 +198,7 @@ static devclass_t gx_devclass; -DRIVER_MODULE(if_gx, pci, gx_driver, gx_devclass, 0, 0); +DRIVER_MODULE(gx, pci, gx_driver, gx_devclass, 0, 0); DRIVER_MODULE(miibus, gx, miibus_driver, miibus_devclass, 0, 0); static struct gx_device * ==== //depot/projects/smpng/sys/dev/hme/if_hme_pci.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ * * from: NetBSD: if_hme_pci.c,v 1.4 2001/08/27 22:18:49 augustss Exp * - * $FreeBSD: src/sys/dev/hme/if_hme_pci.c,v 1.4 2003/01/09 00:45:10 tmm Exp $ + * $FreeBSD: src/sys/dev/hme/if_hme_pci.c,v 1.5 2003/04/15 06:37:24 mdodd Exp $ */ /* @@ -109,7 +109,9 @@ sizeof(struct hme_pci_softc) }; -DRIVER_MODULE(if_hme, pci, hme_pci_driver, hme_devclass, 0, 0); +DRIVER_MODULE(hme, pci, hme_pci_driver, hme_devclass, 0, 0); +MODULE_DEPEND(hme, pci, 1, 1, 1); +MODULE_DEPEND(hme, ether, 1, 1, 1); int hme_pci_probe(device_t dev) ==== //depot/projects/smpng/sys/dev/hme/if_hme_sbus.c#4 (text+ko) ==== @@ -35,7 +35,7 @@ * * from: NetBSD: if_hme_sbus.c,v 1.9 2001/11/13 06:58:17 lukem Exp * - * $FreeBSD: src/sys/dev/hme/if_hme_sbus.c,v 1.3 2003/01/09 00:45:10 tmm Exp $ + * $FreeBSD: src/sys/dev/hme/if_hme_sbus.c,v 1.4 2003/04/15 06:37:24 mdodd Exp $ */ /* @@ -124,7 +124,8 @@ sizeof(struct hme_sbus_softc) }; -DRIVER_MODULE(if_hme, sbus, hme_sbus_driver, hme_devclass, 0, 0); +DRIVER_MODULE(hme, sbus, hme_sbus_driver, hme_devclass, 0, 0); +MODULE_DEPEND(hme, ether, 1, 1, 1); static int hme_sbus_probe(device_t dev) ==== //depot/projects/smpng/sys/dev/lge/if_lge.c#12 (text+ko) ==== @@ -67,7 +67,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/lge/if_lge.c,v 1.18 2003/04/03 21:36:30 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/lge/if_lge.c,v 1.19 2003/04/15 06:37:24 mdodd Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -189,8 +189,11 @@ static devclass_t lge_devclass; -DRIVER_MODULE(if_lge, pci, lge_driver, lge_devclass, 0, 0); +DRIVER_MODULE(lge, pci, lge_driver, lge_devclass, 0, 0); DRIVER_MODULE(miibus, lge, miibus_driver, miibus_devclass, 0, 0); +MODULE_DEPEND(lge, pci, 1, 1, 1); +MODULE_DEPEND(lge, ether, 1, 1, 1); +MODULE_DEPEND(lge, miibus, 1, 1, 1); #define LGE_SETBIT(sc, reg, x) \ CSR_WRITE_4(sc, reg, \ ==== //depot/projects/smpng/sys/dev/lnc/if_lnc_cbus.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/lnc/if_lnc_cbus.c,v 1.2 2002/11/14 23:54:53 sam Exp $ + * $FreeBSD: src/sys/dev/lnc/if_lnc_cbus.c,v 1.3 2003/04/15 06:37:25 mdodd Exp $ */ #include <sys/param.h> @@ -312,4 +312,6 @@ sizeof(struct lnc_softc), }; -DRIVER_MODULE(if_lnc, isa, lnc_isa_driver, lnc_devclass, 0, 0); +DRIVER_MODULE(lnc, isa, lnc_isa_driver, lnc_devclass, 0, 0); +MODULE_DEPEND(lnc, isa, 1, 1, 1); +MODULE_DEPEND(lnc, ether, 1, 1, 1); ==== //depot/projects/smpng/sys/dev/lnc/if_lnc_isa.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/lnc/if_lnc_isa.c,v 1.13 2002/11/14 23:54:53 sam Exp $ + * $FreeBSD: src/sys/dev/lnc/if_lnc_isa.c,v 1.14 2003/04/15 06:37:25 mdodd Exp $ */ #include <sys/param.h> @@ -283,4 +283,6 @@ sizeof(struct lnc_softc), }; >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200304152044.h3FKixHi042057>