Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 1 Jan 2005 19:19:08 GMT
From:      Robert Watson <rwatson@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 68079 for review
Message-ID:  <200501011919.j01JJ8CG043295@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=68079

Change 68079 by rwatson@rwatson_zoo on 2005/01/01 19:18:51

	Integrate netperf_socket from FreeBSD CVS HEAD:
	
	- Various alpha cpu tweakage
	- CPU reset on i386 and amd64 now done on boot processor.
	- Various armisms.
	- NOMAN->NO_MAN and friends.
	- vfs_omount gone from Coda, HPFS, FAT, NTFS, NWFS, portalfs, smbfs,
	  cd9660, NFS; various mount-related cleanups in other file systems
	  and in the vfs_mount infrastructure.
	- Much 802.11 movement, including separate modules for various
	  optional bits (WEP, CCMP, etc).
	- ACPI module for IBM hardware.
	- uipc_jumbo.c no longer required; sfbufs all around.
	- Sizable ath driver update.
	- ipfilter now runs with locking.
	- fflag now passed into GEOM ioctls; API version bump.
	- ofw_disk now a GEOM module
	- Various USB updates
	- Schedule priority setting cleanup in various spots.
	- gmirror removal cleanup, generation ID
	- Much i386 IPI cleanup.
	- PCI express
	- device quiesce API in newbus
	- Root mount cleanup
	- file descriptor locking redo, cleanup, etc.  Now use a sometimes-
	  sleep lock with fast/slow interfaces.
	- umtx bug fixes, etc.
	- DDB "show alllocks"
	- m_append()
	- uipc_socket.c, uipc_socket2.c command cleanup
	- Socket buffer locking fix in UNIX domain sockets.
	- Substantial device weirdness goes away, including addalias(),
	  bdevvp().
	- BPF locking bug fixes.
	- vlans now notified of link state changes.
	- sppp cleanup and lockdown.
	- Lowered socket buffer locking overhead in DDP.
	- More netgraph timeout/callout cleanups.
	- less route caching in if_gif.
	- INP_UNLOCK_ASSERT().
	- ipfw2 locking changes to use leaf locks a and avoid waiting in the    
	  fast path.  Fixes several lock order problems.
	- Merge of some ip_ctloutput() locking cleanups, such as pushing pcb
	  references into ip_getmoptions(), ip_pcbopts(), so they can be used   
	  to acquire locks as needed.
	- Substantial TCP locking cleanup, especially relating to assertions,
	  timers, timewait handling, documentation, etc.  GC of now unused
	  tcp_canceltimers().
	- IPX now uses queue(9) macros rather than home-brew.  Unused parts
	  of IPX GC'd, including unimplemented PCB notifications.
	- Substantial NFS cleanup relating to signals, blocking in dissection
	  macros, NFS directIO, time stamp accuracy, client receive locking
	  improvements.  NFS advisory locking no longer uses a fifo, now a
	  special device (also fixing chroot problems).
	- Various and sundry if_sk improvements.
	- Various mac_portacl improvements, including moving to a mutex from
	  an sx lock, handling ancillary ports, and moving to O(1) operations
	  to replace rule sets.
	- KTR_SCHED
	- 64-bit UFS fixes.
	- Various VMisms.

Affected files ...

.. //depot/projects/netperf_socket/sys/alpha/alpha/cpuconf.c#2 integrate
.. //depot/projects/netperf_socket/sys/alpha/alpha/machdep.c#12 integrate
.. //depot/projects/netperf_socket/sys/alpha/alpha/pmap.c#21 integrate
.. //depot/projects/netperf_socket/sys/alpha/conf/GENERIC#14 integrate
.. //depot/projects/netperf_socket/sys/alpha/include/rpb.h#2 integrate
.. //depot/projects/netperf_socket/sys/amd64/amd64/intr_machdep.c#9 integrate
.. //depot/projects/netperf_socket/sys/amd64/amd64/pmap.c#32 integrate
.. //depot/projects/netperf_socket/sys/amd64/amd64/vm_machdep.c#14 integrate
.. //depot/projects/netperf_socket/sys/amd64/conf/GENERIC#20 integrate
.. //depot/projects/netperf_socket/sys/amd64/isa/isa.c#3 integrate
.. //depot/projects/netperf_socket/sys/arm/arm/bcopyinout.S#4 integrate
.. //depot/projects/netperf_socket/sys/arm/arm/busdma_machdep.c#7 integrate
.. //depot/projects/netperf_socket/sys/arm/arm/intr.c#6 integrate
.. //depot/projects/netperf_socket/sys/arm/arm/pmap.c#13 integrate
.. //depot/projects/netperf_socket/sys/arm/arm/swtch.S#6 integrate
.. //depot/projects/netperf_socket/sys/arm/arm/trap.c#7 integrate
.. //depot/projects/netperf_socket/sys/arm/arm/undefined.c#4 integrate
.. //depot/projects/netperf_socket/sys/arm/conf/SIMICS#6 integrate
.. //depot/projects/netperf_socket/sys/arm/include/atomic.h#3 integrate
.. //depot/projects/netperf_socket/sys/arm/include/pmap.h#6 integrate
.. //depot/projects/netperf_socket/sys/arm/sa11x0/assabet_machdep.c#7 integrate
.. //depot/projects/netperf_socket/sys/arm/sa11x0/sa11x0_irqhandler.c#3 integrate
.. //depot/projects/netperf_socket/sys/arm/xscale/i80321/i80321_pci.c#2 integrate
.. //depot/projects/netperf_socket/sys/arm/xscale/i80321/iq31244_machdep.c#5 integrate
.. //depot/projects/netperf_socket/sys/boot/Makefile#6 integrate
.. //depot/projects/netperf_socket/sys/boot/alpha/boot1/Makefile#3 integrate
.. //depot/projects/netperf_socket/sys/boot/alpha/cdboot/Makefile#3 integrate
.. //depot/projects/netperf_socket/sys/boot/alpha/common/Makefile.common#4 integrate
.. //depot/projects/netperf_socket/sys/boot/alpha/netboot/Makefile#3 integrate
.. //depot/projects/netperf_socket/sys/boot/arc/loader/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/boot/forth/loader.rc#2 integrate
.. //depot/projects/netperf_socket/sys/boot/i386/boot0/Makefile#5 integrate
.. //depot/projects/netperf_socket/sys/boot/i386/btx/btx/Makefile#4 integrate
.. //depot/projects/netperf_socket/sys/boot/i386/btx/btxldr/Makefile#4 integrate
.. //depot/projects/netperf_socket/sys/boot/i386/btx/lib/Makefile#3 integrate
.. //depot/projects/netperf_socket/sys/boot/i386/cdboot/Makefile#4 integrate
.. //depot/projects/netperf_socket/sys/boot/i386/kgzldr/Makefile#3 integrate
.. //depot/projects/netperf_socket/sys/boot/i386/loader/Makefile#4 integrate
.. //depot/projects/netperf_socket/sys/boot/i386/mbr/Makefile#5 integrate
.. //depot/projects/netperf_socket/sys/boot/ia64/efi/Makefile#3 integrate
.. //depot/projects/netperf_socket/sys/boot/ia64/ski/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/boot/pc98/boot0.5/Makefile#3 integrate
.. //depot/projects/netperf_socket/sys/boot/pc98/boot0/Makefile#3 integrate
.. //depot/projects/netperf_socket/sys/boot/pc98/boot2/Makefile#4 integrate
.. //depot/projects/netperf_socket/sys/boot/pc98/btx/btx/Makefile#4 integrate
.. //depot/projects/netperf_socket/sys/boot/pc98/btx/btxldr/Makefile#4 integrate
.. //depot/projects/netperf_socket/sys/boot/pc98/btx/lib/Makefile#3 integrate
.. //depot/projects/netperf_socket/sys/boot/pc98/kgzldr/Makefile#3 integrate
.. //depot/projects/netperf_socket/sys/boot/pc98/loader/Makefile#5 integrate
.. //depot/projects/netperf_socket/sys/boot/powerpc/loader/Makefile#7 integrate
.. //depot/projects/netperf_socket/sys/boot/sparc64/boot1/Makefile#3 integrate
.. //depot/projects/netperf_socket/sys/boot/sparc64/loader/Makefile#4 integrate
.. //depot/projects/netperf_socket/sys/coda/coda_vfsops.c#7 integrate
.. //depot/projects/netperf_socket/sys/compat/ndis/subr_hal.c#6 integrate
.. //depot/projects/netperf_socket/sys/conf/NOTES#47 integrate
.. //depot/projects/netperf_socket/sys/conf/files#58 integrate
.. //depot/projects/netperf_socket/sys/conf/files.amd64#19 integrate
.. //depot/projects/netperf_socket/sys/conf/files.i386#32 integrate
.. //depot/projects/netperf_socket/sys/conf/files.pc98#18 integrate
.. //depot/projects/netperf_socket/sys/conf/kmod.mk#20 integrate
.. //depot/projects/netperf_socket/sys/conf/majors#8 integrate
.. //depot/projects/netperf_socket/sys/conf/options#34 integrate
.. //depot/projects/netperf_socket/sys/contrib/dev/ath/COPYRIGHT#2 integrate
.. //depot/projects/netperf_socket/sys/contrib/dev/ath/README#2 integrate
.. //depot/projects/netperf_socket/sys/contrib/dev/ath/ah.h#2 integrate
.. //depot/projects/netperf_socket/sys/contrib/dev/ath/ah_desc.h#2 integrate
.. //depot/projects/netperf_socket/sys/contrib/dev/ath/ah_devid.h#2 integrate
.. //depot/projects/netperf_socket/sys/contrib/dev/ath/freebsd/ah_if.m#2 integrate
.. //depot/projects/netperf_socket/sys/contrib/dev/ath/freebsd/ah_osdep.c#3 integrate
.. //depot/projects/netperf_socket/sys/contrib/dev/ath/freebsd/ah_osdep.h#2 integrate
.. //depot/projects/netperf_socket/sys/contrib/dev/ath/freebsd/i386-elf.hal.o.uu#2 delete
.. //depot/projects/netperf_socket/sys/contrib/dev/ath/freebsd/opt_ah.h#2 delete
.. //depot/projects/netperf_socket/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#1 branch
.. //depot/projects/netperf_socket/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#1 branch
.. //depot/projects/netperf_socket/sys/contrib/dev/ath/public/arm9-le-thumb-elf.opt_ah.h#1 branch
.. //depot/projects/netperf_socket/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#1 branch
.. //depot/projects/netperf_socket/sys/contrib/dev/ath/public/armv4-be-elf.inc#1 branch
.. //depot/projects/netperf_socket/sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#1 branch
.. //depot/projects/netperf_socket/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#1 branch
.. //depot/projects/netperf_socket/sys/contrib/dev/ath/public/armv4-le-elf.inc#1 branch
.. //depot/projects/netperf_socket/sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#1 branch
.. //depot/projects/netperf_socket/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#1 branch
.. //depot/projects/netperf_socket/sys/contrib/dev/ath/public/i386-elf.inc#1 branch
.. //depot/projects/netperf_socket/sys/contrib/dev/ath/public/i386-elf.opt_ah.h#1 branch
.. //depot/projects/netperf_socket/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#1 branch
.. //depot/projects/netperf_socket/sys/contrib/dev/ath/public/mips-be-elf.inc#1 branch
.. //depot/projects/netperf_socket/sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h#1 branch
.. //depot/projects/netperf_socket/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#1 branch
.. //depot/projects/netperf_socket/sys/contrib/dev/ath/public/mips-le-elf.inc#1 branch
.. //depot/projects/netperf_socket/sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h#1 branch
.. //depot/projects/netperf_socket/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#1 branch
.. //depot/projects/netperf_socket/sys/contrib/dev/ath/public/mips1-be-elf.inc#1 branch
.. //depot/projects/netperf_socket/sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#1 branch
.. //depot/projects/netperf_socket/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#1 branch
.. //depot/projects/netperf_socket/sys/contrib/dev/ath/public/mips1-le-elf.inc#1 branch
.. //depot/projects/netperf_socket/sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#1 branch
.. //depot/projects/netperf_socket/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#1 branch
.. //depot/projects/netperf_socket/sys/contrib/dev/ath/public/mipsisa32-be-elf.inc#1 branch
.. //depot/projects/netperf_socket/sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#1 branch
.. //depot/projects/netperf_socket/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#1 branch
.. //depot/projects/netperf_socket/sys/contrib/dev/ath/public/mipsisa32-le-elf.inc#1 branch
.. //depot/projects/netperf_socket/sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#1 branch
.. //depot/projects/netperf_socket/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#1 branch
.. //depot/projects/netperf_socket/sys/contrib/dev/ath/public/powerpc-be-eabi.inc#1 branch
.. //depot/projects/netperf_socket/sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#1 branch
.. //depot/projects/netperf_socket/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#1 branch
.. //depot/projects/netperf_socket/sys/contrib/dev/ath/public/powerpc-le-eabi.inc#1 branch
.. //depot/projects/netperf_socket/sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#1 branch
.. //depot/projects/netperf_socket/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#1 branch
.. //depot/projects/netperf_socket/sys/contrib/dev/ath/public/sh4-le-elf.inc#1 branch
.. //depot/projects/netperf_socket/sys/contrib/dev/ath/public/sh4-le-elf.opt_ah.h#1 branch
.. //depot/projects/netperf_socket/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#1 branch
.. //depot/projects/netperf_socket/sys/contrib/dev/ath/public/x86_64-elf.inc#1 branch
.. //depot/projects/netperf_socket/sys/contrib/dev/ath/public/x86_64-elf.opt_ah.h#1 branch
.. //depot/projects/netperf_socket/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#1 branch
.. //depot/projects/netperf_socket/sys/contrib/dev/ath/public/xscale-be-elf.inc#1 branch
.. //depot/projects/netperf_socket/sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#1 branch
.. //depot/projects/netperf_socket/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#1 branch
.. //depot/projects/netperf_socket/sys/contrib/dev/ath/public/xscale-le-elf.inc#1 branch
.. //depot/projects/netperf_socket/sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#1 branch
.. //depot/projects/netperf_socket/sys/contrib/dev/ath/version.h#2 integrate
.. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/fil.c#5 integrate
.. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_auth.c#4 integrate
.. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_compat.h#4 integrate
.. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_fil.c#8 integrate
.. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_fil.h#5 integrate
.. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_frag.c#3 integrate
.. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_log.c#3 integrate
.. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_nat.c#3 integrate
.. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_nat.h#3 integrate
.. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_proxy.c#2 integrate
.. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_state.c#3 integrate
.. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_state.h#3 integrate
.. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/mlfk_ipl.c#4 integrate
.. //depot/projects/netperf_socket/sys/contrib/pf/net/if_pfsync.c#12 integrate
.. //depot/projects/netperf_socket/sys/contrib/pf/net/pf.c#18 integrate
.. //depot/projects/netperf_socket/sys/crypto/rijndael/Makefile#3 integrate
.. //depot/projects/netperf_socket/sys/dev/aac/aac.c#13 integrate
.. //depot/projects/netperf_socket/sys/dev/aac/aac_cam.c#5 integrate
.. //depot/projects/netperf_socket/sys/dev/aac/aac_debug.c#4 integrate
.. //depot/projects/netperf_socket/sys/dev/aac/aac_disk.c#7 integrate
.. //depot/projects/netperf_socket/sys/dev/aac/aac_ioctl.h#3 delete
.. //depot/projects/netperf_socket/sys/dev/aac/aac_pci.c#9 integrate
.. //depot/projects/netperf_socket/sys/dev/acpi_support/acpi_asus.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/acpi_support/acpi_ibm.c#1 branch
.. //depot/projects/netperf_socket/sys/dev/acpi_support/acpi_panasonic.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/acpi_support/acpi_sony.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/acpi_support/acpi_toshiba.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/acpica/acpi.c#43 integrate
.. //depot/projects/netperf_socket/sys/dev/acpica/acpi_cmbat.c#12 integrate
.. //depot/projects/netperf_socket/sys/dev/acpica/acpi_ec.c#12 integrate
.. //depot/projects/netperf_socket/sys/dev/acpica/acpi_pci_link.c#18 integrate
.. //depot/projects/netperf_socket/sys/dev/acpica/acpi_pcib.c#14 integrate
.. //depot/projects/netperf_socket/sys/dev/acpica/acpi_pcib_pci.c#7 integrate
.. //depot/projects/netperf_socket/sys/dev/acpica/acpi_powerres.c#10 integrate
.. //depot/projects/netperf_socket/sys/dev/acpica/acpi_resource.c#12 integrate
.. //depot/projects/netperf_socket/sys/dev/acpica/acpivar.h#24 integrate
.. //depot/projects/netperf_socket/sys/dev/advansys/adwcam.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/aic7xxx/aicasm/Makefile#5 integrate
.. //depot/projects/netperf_socket/sys/dev/amr/amr.c#7 integrate
.. //depot/projects/netperf_socket/sys/dev/amr/amr_cam.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/amr/amr_pci.c#5 integrate
.. //depot/projects/netperf_socket/sys/dev/amr/amrvar.h#5 integrate
.. //depot/projects/netperf_socket/sys/dev/ata/ata-all.h#14 integrate
.. //depot/projects/netperf_socket/sys/dev/ata/ata-chipset.c#22 integrate
.. //depot/projects/netperf_socket/sys/dev/ata/ata-disk.c#11 integrate
.. //depot/projects/netperf_socket/sys/dev/ata/ata-lowlevel.c#20 integrate
.. //depot/projects/netperf_socket/sys/dev/ata/ata-pci.c#13 integrate
.. //depot/projects/netperf_socket/sys/dev/ata/ata-pci.h#10 integrate
.. //depot/projects/netperf_socket/sys/dev/ata/ata-queue.c#18 integrate
.. //depot/projects/netperf_socket/sys/dev/ata/atapi-cd.c#11 integrate
.. //depot/projects/netperf_socket/sys/dev/ath/ath_rate/amrr/amrr.c#1 branch
.. //depot/projects/netperf_socket/sys/dev/ath/ath_rate/amrr/amrr.h#1 branch
.. //depot/projects/netperf_socket/sys/dev/ath/ath_rate/onoe/onoe.c#1 branch
.. //depot/projects/netperf_socket/sys/dev/ath/ath_rate/onoe/onoe.h#1 branch
.. //depot/projects/netperf_socket/sys/dev/ath/if_ath.c#10 integrate
.. //depot/projects/netperf_socket/sys/dev/ath/if_ath_pci.c#4 integrate
.. //depot/projects/netperf_socket/sys/dev/ath/if_athioctl.h#3 integrate
.. //depot/projects/netperf_socket/sys/dev/ath/if_athrate.h#1 branch
.. //depot/projects/netperf_socket/sys/dev/ath/if_athvar.h#4 integrate
.. //depot/projects/netperf_socket/sys/dev/awi/awi.c#6 integrate
.. //depot/projects/netperf_socket/sys/dev/awi/awivar.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/bge/if_bge.c#15 integrate
.. //depot/projects/netperf_socket/sys/dev/bge/if_bgereg.h#6 integrate
.. //depot/projects/netperf_socket/sys/dev/bktr/CHANGELOG.TXT#2 integrate
.. //depot/projects/netperf_socket/sys/dev/bktr/bktr_card.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/bktr/bktr_card.h#3 integrate
.. //depot/projects/netperf_socket/sys/dev/bktr/bktr_tuner.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/bktr/bktr_tuner.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/bktr/msp34xx.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/cp/cpddk.c#4 integrate
.. //depot/projects/netperf_socket/sys/dev/cp/cpddk.h#3 integrate
.. //depot/projects/netperf_socket/sys/dev/cp/if_cp.c#11 integrate
.. //depot/projects/netperf_socket/sys/dev/ctau/if_ct.c#13 integrate
.. //depot/projects/netperf_socket/sys/dev/cx/if_cx.c#20 integrate
.. //depot/projects/netperf_socket/sys/dev/drm/drm_sysctl.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/fb/vga.c#6 integrate
.. //depot/projects/netperf_socket/sys/dev/fdc/fdc.c#16 integrate
.. //depot/projects/netperf_socket/sys/dev/fxp/if_fxp.c#15 integrate
.. //depot/projects/netperf_socket/sys/dev/hme/if_hme_pci.c#7 integrate
.. //depot/projects/netperf_socket/sys/dev/hptmv/entry.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/ida/ida.c#4 integrate
.. //depot/projects/netperf_socket/sys/dev/ida/ida_pci.c#4 integrate
.. //depot/projects/netperf_socket/sys/dev/ida/idavar.h#4 integrate
.. //depot/projects/netperf_socket/sys/dev/if_ndis/if_ndis.c#20 integrate
.. //depot/projects/netperf_socket/sys/dev/if_ndis/if_ndisvar.h#8 integrate
.. //depot/projects/netperf_socket/sys/dev/kbd/atkbd.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/kbd/atkbdreg.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/kbd/kbd.c#5 integrate
.. //depot/projects/netperf_socket/sys/dev/md/md.c#26 integrate
.. //depot/projects/netperf_socket/sys/dev/mii/mii.c#6 integrate
.. //depot/projects/netperf_socket/sys/dev/mpt/mpt_pci.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/mse/mse.c#1 branch
.. //depot/projects/netperf_socket/sys/dev/mse/mse_cbus.c#1 branch
.. //depot/projects/netperf_socket/sys/dev/mse/mse_isa.c#1 branch
.. //depot/projects/netperf_socket/sys/dev/mse/msevar.h#1 branch
.. //depot/projects/netperf_socket/sys/dev/nmdm/nmdm.c#12 integrate
.. //depot/projects/netperf_socket/sys/dev/ofw/ofw_disk.c#5 integrate
.. //depot/projects/netperf_socket/sys/dev/patm/genrtab/Makefile#4 integrate
.. //depot/projects/netperf_socket/sys/dev/pccbb/pccbb_pci.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/pccbb/pccbbdevid.h#3 integrate
.. //depot/projects/netperf_socket/sys/dev/pci/pci.c#15 integrate
.. //depot/projects/netperf_socket/sys/dev/random/randomdev.c#13 integrate
.. //depot/projects/netperf_socket/sys/dev/random/randomdev_soft.c#9 integrate
.. //depot/projects/netperf_socket/sys/dev/ray/if_ray.c#6 integrate
.. //depot/projects/netperf_socket/sys/dev/ray/if_rayvar.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/snp/snp.c#10 integrate
.. //depot/projects/netperf_socket/sys/dev/sound/isa/es1888.c#4 integrate
.. //depot/projects/netperf_socket/sys/dev/sound/usb/uaudio.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/sound/usb/uaudio.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/sound/usb/uaudio_pcm.c#4 integrate
.. //depot/projects/netperf_socket/sys/dev/sound/usb/uaudioreg.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/twe/twe.c#6 integrate
.. //depot/projects/netperf_socket/sys/dev/twe/tweio.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/uart/uart_cpu_ia64.c#5 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/FILES#2 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/ehci.c#13 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/ehci_pci.c#6 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/ehcivar.h#5 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/if_axe.c#12 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/if_axereg.h#3 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/if_udav.c#8 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/ohci.c#7 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/ohci_pci.c#4 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/ugen.c#11 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/uhci_pci.c#5 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/uhid.c#9 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/ukbd.c#5 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/umodem.c#6 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/ums.c#7 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/uplcom.c#7 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/urio.c#6 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/usb.c#6 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/usbdevs#29 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/usbdi.h#4 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/usbhid.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/uscanner.c#9 integrate
.. //depot/projects/netperf_socket/sys/dev/vkbd/vkbd.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/wi/if_wi.c#7 integrate
.. //depot/projects/netperf_socket/sys/dev/wi/if_wi_pci.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/wi/if_wivar.h#3 integrate
.. //depot/projects/netperf_socket/sys/fs/devfs/devfs_vfsops.c#7 integrate
.. //depot/projects/netperf_socket/sys/fs/devfs/devfs_vnops.c#11 integrate
.. //depot/projects/netperf_socket/sys/fs/fdescfs/fdesc_vfsops.c#9 integrate
.. //depot/projects/netperf_socket/sys/fs/fifofs/fifo_vnops.c#15 integrate
.. //depot/projects/netperf_socket/sys/fs/hpfs/hpfs_subr.c#2 integrate
.. //depot/projects/netperf_socket/sys/fs/hpfs/hpfs_subr.h#2 integrate
.. //depot/projects/netperf_socket/sys/fs/hpfs/hpfs_vfsops.c#8 integrate
.. //depot/projects/netperf_socket/sys/fs/msdosfs/msdosfs_vfsops.c#12 integrate
.. //depot/projects/netperf_socket/sys/fs/ntfs/ntfs.h#5 integrate
.. //depot/projects/netperf_socket/sys/fs/ntfs/ntfs_vfsops.c#9 integrate
.. //depot/projects/netperf_socket/sys/fs/ntfs/ntfs_vnops.c#6 integrate
.. //depot/projects/netperf_socket/sys/fs/nullfs/null_vfsops.c#9 integrate
.. //depot/projects/netperf_socket/sys/fs/nwfs/nwfs_vfsops.c#6 integrate
.. //depot/projects/netperf_socket/sys/fs/nwfs/nwfs_vnops.c#4 integrate
.. //depot/projects/netperf_socket/sys/fs/portalfs/portal_vfsops.c#8 integrate
.. //depot/projects/netperf_socket/sys/fs/pseudofs/pseudofs.c#5 integrate
.. //depot/projects/netperf_socket/sys/fs/pseudofs/pseudofs_vnops.c#7 integrate
.. //depot/projects/netperf_socket/sys/fs/smbfs/smbfs.h#3 integrate
.. //depot/projects/netperf_socket/sys/fs/smbfs/smbfs_node.c#5 integrate
.. //depot/projects/netperf_socket/sys/fs/smbfs/smbfs_smb.c#2 integrate
.. //depot/projects/netperf_socket/sys/fs/smbfs/smbfs_vfsops.c#7 integrate
.. //depot/projects/netperf_socket/sys/fs/smbfs/smbfs_vnops.c#6 integrate
.. //depot/projects/netperf_socket/sys/fs/udf/udf_vfsops.c#7 integrate
.. //depot/projects/netperf_socket/sys/fs/umapfs/umap_vfsops.c#7 integrate
.. //depot/projects/netperf_socket/sys/fs/unionfs/union_vfsops.c#8 integrate
.. //depot/projects/netperf_socket/sys/geom/bde/g_bde_lock.c#3 integrate
.. //depot/projects/netperf_socket/sys/geom/geom.h#10 integrate
.. //depot/projects/netperf_socket/sys/geom/geom_bsd.c#4 integrate
.. //depot/projects/netperf_socket/sys/geom/geom_dev.c#8 integrate
.. //depot/projects/netperf_socket/sys/geom/geom_disk.c#8 integrate
.. //depot/projects/netperf_socket/sys/geom/geom_gpt.c#5 integrate
.. //depot/projects/netperf_socket/sys/geom/geom_kern.c#4 integrate
.. //depot/projects/netperf_socket/sys/geom/geom_mbr.c#7 integrate
.. //depot/projects/netperf_socket/sys/geom/geom_pc98.c#6 integrate
.. //depot/projects/netperf_socket/sys/geom/mirror/g_mirror.c#16 integrate
.. //depot/projects/netperf_socket/sys/geom/mirror/g_mirror.h#8 integrate
.. //depot/projects/netperf_socket/sys/geom/mirror/g_mirror_ctl.c#3 integrate
.. //depot/projects/netperf_socket/sys/geom/raid3/g_raid3.c#10 integrate
.. //depot/projects/netperf_socket/sys/geom/raid3/g_raid3.h#5 integrate
.. //depot/projects/netperf_socket/sys/geom/raid3/g_raid3_ctl.c#4 integrate
.. //depot/projects/netperf_socket/sys/geom/stripe/g_stripe.c#13 integrate
.. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_vfsops.c#13 integrate
.. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_vnops.c#11 integrate
.. //depot/projects/netperf_socket/sys/i386/acpica/genwakecode.sh#3 integrate
.. //depot/projects/netperf_socket/sys/i386/conf/GENERIC#17 integrate
.. //depot/projects/netperf_socket/sys/i386/conf/NOTES#32 integrate
.. //depot/projects/netperf_socket/sys/i386/conf/PAE#4 integrate
.. //depot/projects/netperf_socket/sys/i386/i386/apic_vector.s#7 integrate
.. //depot/projects/netperf_socket/sys/i386/i386/bios.c#8 integrate
.. //depot/projects/netperf_socket/sys/i386/i386/exception.s#7 integrate
.. //depot/projects/netperf_socket/sys/i386/i386/identcpu.c#9 integrate
.. //depot/projects/netperf_socket/sys/i386/i386/intr_machdep.c#9 integrate
.. //depot/projects/netperf_socket/sys/i386/i386/legacy.c#6 integrate
.. //depot/projects/netperf_socket/sys/i386/i386/local_apic.c#5 integrate
.. //depot/projects/netperf_socket/sys/i386/i386/longrun.c#2 integrate
.. //depot/projects/netperf_socket/sys/i386/i386/mp_machdep.c#13 integrate
.. //depot/projects/netperf_socket/sys/i386/i386/pmap.c#34 integrate
.. //depot/projects/netperf_socket/sys/i386/i386/sys_machdep.c#4 integrate
.. //depot/projects/netperf_socket/sys/i386/i386/vm_machdep.c#19 integrate
.. //depot/projects/netperf_socket/sys/i386/include/apicreg.h#2 integrate
.. //depot/projects/netperf_socket/sys/i386/include/apicvar.h#4 integrate
.. //depot/projects/netperf_socket/sys/i386/include/intr_machdep.h#4 integrate
.. //depot/projects/netperf_socket/sys/i386/include/smp.h#2 integrate
.. //depot/projects/netperf_socket/sys/i386/isa/isa.c#5 integrate
.. //depot/projects/netperf_socket/sys/i386/isa/mse.c#6 delete
.. //depot/projects/netperf_socket/sys/i386/pci/pci_cfgreg.c#5 integrate
.. //depot/projects/netperf_socket/sys/ia64/ia64/machdep.c#15 integrate
.. //depot/projects/netperf_socket/sys/ia64/ia64/pmap.c#21 integrate
.. //depot/projects/netperf_socket/sys/ia64/include/fpu.h#3 integrate
.. //depot/projects/netperf_socket/sys/ia64/include/md_var.h#6 integrate
.. //depot/projects/netperf_socket/sys/isa/isa_common.c#3 integrate
.. //depot/projects/netperf_socket/sys/isa/isa_common.h#2 integrate
.. //depot/projects/netperf_socket/sys/isa/isavar.h#3 integrate
.. //depot/projects/netperf_socket/sys/isa/pnp.c#2 integrate
.. //depot/projects/netperf_socket/sys/isa/pnpvar.h#2 integrate
.. //depot/projects/netperf_socket/sys/isofs/cd9660/cd9660_vfsops.c#12 integrate
.. //depot/projects/netperf_socket/sys/kern/device_if.m#4 integrate
.. //depot/projects/netperf_socket/sys/kern/init_main.c#14 integrate
.. //depot/projects/netperf_socket/sys/kern/init_sysent.c#15 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_clock.c#10 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_descrip.c#25 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_exec.c#21 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_fork.c#23 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_intr.c#15 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_kse.c#17 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_resource.c#13 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_sig.c#24 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_subr.c#10 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_switch.c#19 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_synch.c#21 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_sysctl.c#11 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_thread.c#31 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_umtx.c#6 integrate
.. //depot/projects/netperf_socket/sys/kern/sched_4bsd.c#18 integrate
.. //depot/projects/netperf_socket/sys/kern/sched_ule.c#25 integrate
.. //depot/projects/netperf_socket/sys/kern/subr_bus.c#17 integrate
.. //depot/projects/netperf_socket/sys/kern/subr_disk.c#3 integrate
.. //depot/projects/netperf_socket/sys/kern/subr_eventhandler.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/subr_trap.c#12 integrate
.. //depot/projects/netperf_socket/sys/kern/subr_turnstile.c#10 integrate
.. //depot/projects/netperf_socket/sys/kern/subr_witness.c#14 integrate
.. //depot/projects/netperf_socket/sys/kern/syscalls.c#15 integrate
.. //depot/projects/netperf_socket/sys/kern/syscalls.master#15 integrate
.. //depot/projects/netperf_socket/sys/kern/sysv_msg.c#4 integrate
.. //depot/projects/netperf_socket/sys/kern/tty.c#20 integrate
.. //depot/projects/netperf_socket/sys/kern/tty_pty.c#14 integrate
.. //depot/projects/netperf_socket/sys/kern/uipc_domain.c#10 integrate
.. //depot/projects/netperf_socket/sys/kern/uipc_jumbo.c#4 delete
.. //depot/projects/netperf_socket/sys/kern/uipc_mbuf.c#10 integrate
.. //depot/projects/netperf_socket/sys/kern/uipc_sem.c#4 integrate
.. //depot/projects/netperf_socket/sys/kern/uipc_socket.c#45 integrate
.. //depot/projects/netperf_socket/sys/kern/uipc_socket2.c#25 integrate
.. //depot/projects/netperf_socket/sys/kern/uipc_usrreq.c#30 integrate
.. //depot/projects/netperf_socket/sys/kern/vfs_cluster.c#8 integrate
.. //depot/projects/netperf_socket/sys/kern/vfs_init.c#9 integrate
.. //depot/projects/netperf_socket/sys/kern/vfs_mount.c#21 integrate
.. //depot/projects/netperf_socket/sys/kern/vfs_subr.c#30 integrate
.. //depot/projects/netperf_socket/sys/modules/Makefile#25 integrate
.. //depot/projects/netperf_socket/sys/modules/acpi/Makefile#7 integrate
.. //depot/projects/netperf_socket/sys/modules/acpi/acpi_asus/Makefile#5 integrate
.. //depot/projects/netperf_socket/sys/modules/acpi/acpi_ibm/Makefile#1 branch
.. //depot/projects/netperf_socket/sys/modules/acpi/acpi_video/Makefile#4 integrate
.. //depot/projects/netperf_socket/sys/modules/ath_hal/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/modules/ath_rate_amrr/Makefile#1 branch
.. //depot/projects/netperf_socket/sys/modules/ath_rate_onoe/Makefile#1 branch
.. //depot/projects/netperf_socket/sys/modules/bktr/bktr/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/modules/cp/Makefile#3 integrate
.. //depot/projects/netperf_socket/sys/modules/if_gif/Makefile#4 integrate
.. //depot/projects/netperf_socket/sys/modules/if_ppp/Makefile#3 integrate
.. //depot/projects/netperf_socket/sys/modules/if_tun/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/modules/io/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/modules/ipfilter/Makefile#4 integrate
.. //depot/projects/netperf_socket/sys/modules/mac_portacl/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/modules/mem/Makefile#4 integrate
.. //depot/projects/netperf_socket/sys/modules/mse/Makefile#1 branch
.. //depot/projects/netperf_socket/sys/modules/netgraph/Makefile#9 integrate
.. //depot/projects/netperf_socket/sys/modules/netgraph/bluetooth/ubt/Makefile#3 integrate
.. //depot/projects/netperf_socket/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile#3 integrate
.. //depot/projects/netperf_socket/sys/modules/netgraph/fec/sample_startup#2 delete
.. //depot/projects/netperf_socket/sys/modules/pf/Makefile#6 integrate
.. //depot/projects/netperf_socket/sys/modules/snp/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/modules/sound/driver/uaudio/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/modules/sppp/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/modules/ti/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/modules/ubsa/Makefile#3 integrate
.. //depot/projects/netperf_socket/sys/modules/ubser/Makefile#3 integrate
.. //depot/projects/netperf_socket/sys/modules/ucom/Makefile#3 integrate
.. //depot/projects/netperf_socket/sys/modules/ucycom/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/modules/uftdi/Makefile#3 integrate
.. //depot/projects/netperf_socket/sys/modules/ugen/Makefile#3 integrate
.. //depot/projects/netperf_socket/sys/modules/uhid/Makefile#3 integrate
.. //depot/projects/netperf_socket/sys/modules/ukbd/Makefile#3 integrate
.. //depot/projects/netperf_socket/sys/modules/ulpt/Makefile#3 integrate
.. //depot/projects/netperf_socket/sys/modules/umct/Makefile#3 integrate
.. //depot/projects/netperf_socket/sys/modules/umodem/Makefile#3 integrate
.. //depot/projects/netperf_socket/sys/modules/ums/Makefile#3 integrate
.. //depot/projects/netperf_socket/sys/modules/uplcom/Makefile#3 integrate
.. //depot/projects/netperf_socket/sys/modules/urio/Makefile#3 integrate
.. //depot/projects/netperf_socket/sys/modules/usb/Makefile#4 integrate
.. //depot/projects/netperf_socket/sys/modules/uscanner/Makefile#4 integrate
.. //depot/projects/netperf_socket/sys/modules/uvisor/Makefile#3 integrate
.. //depot/projects/netperf_socket/sys/modules/uvscom/Makefile#3 integrate
.. //depot/projects/netperf_socket/sys/modules/vkbd/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/modules/wlan/Makefile#3 integrate
.. //depot/projects/netperf_socket/sys/modules/wlan_acl/Makefile#1 branch
.. //depot/projects/netperf_socket/sys/modules/wlan_ccmp/Makefile#1 branch
.. //depot/projects/netperf_socket/sys/modules/wlan_tkip/Makefile#1 branch
.. //depot/projects/netperf_socket/sys/modules/wlan_wep/Makefile#1 branch
.. //depot/projects/netperf_socket/sys/modules/wlan_xauth/Makefile#1 branch
.. //depot/projects/netperf_socket/sys/net/bpf.c#14 integrate
.. //depot/projects/netperf_socket/sys/net/if.c#26 integrate
.. //depot/projects/netperf_socket/sys/net/if_sppp.h#2 integrate
.. //depot/projects/netperf_socket/sys/net/if_spppfr.c#1 branch
.. //depot/projects/netperf_socket/sys/net/if_spppsubr.c#11 integrate
.. //depot/projects/netperf_socket/sys/net/if_tap.c#12 integrate
.. //depot/projects/netperf_socket/sys/net/if_tun.c#13 integrate
.. //depot/projects/netperf_socket/sys/net/if_var.h#23 integrate
.. //depot/projects/netperf_socket/sys/net/ppp_tty.c#6 integrate
.. //depot/projects/netperf_socket/sys/net80211/_ieee80211.h#1 branch
.. //depot/projects/netperf_socket/sys/net80211/ieee80211.c#6 integrate
.. //depot/projects/netperf_socket/sys/net80211/ieee80211.h#3 integrate
.. //depot/projects/netperf_socket/sys/net80211/ieee80211_acl.c#1 branch
.. //depot/projects/netperf_socket/sys/net80211/ieee80211_crypto.c#2 integrate
.. //depot/projects/netperf_socket/sys/net80211/ieee80211_crypto.h#2 integrate
.. //depot/projects/netperf_socket/sys/net80211/ieee80211_crypto_ccmp.c#1 branch
.. //depot/projects/netperf_socket/sys/net80211/ieee80211_crypto_none.c#1 branch
.. //depot/projects/netperf_socket/sys/net80211/ieee80211_crypto_tkip.c#1 branch
.. //depot/projects/netperf_socket/sys/net80211/ieee80211_crypto_wep.c#1 branch
.. //depot/projects/netperf_socket/sys/net80211/ieee80211_freebsd.c#1 branch
.. //depot/projects/netperf_socket/sys/net80211/ieee80211_freebsd.h#1 branch
.. //depot/projects/netperf_socket/sys/net80211/ieee80211_input.c#4 integrate
.. //depot/projects/netperf_socket/sys/net80211/ieee80211_ioctl.c#4 integrate
.. //depot/projects/netperf_socket/sys/net80211/ieee80211_ioctl.h#3 integrate
.. //depot/projects/netperf_socket/sys/net80211/ieee80211_node.c#5 integrate
.. //depot/projects/netperf_socket/sys/net80211/ieee80211_node.h#4 integrate
.. //depot/projects/netperf_socket/sys/net80211/ieee80211_output.c#4 integrate
.. //depot/projects/netperf_socket/sys/net80211/ieee80211_proto.c#5 integrate
.. //depot/projects/netperf_socket/sys/net80211/ieee80211_proto.h#2 integrate
.. //depot/projects/netperf_socket/sys/net80211/ieee80211_radiotap.h#3 integrate
.. //depot/projects/netperf_socket/sys/net80211/ieee80211_var.h#5 integrate
.. //depot/projects/netperf_socket/sys/net80211/ieee80211_xauth.c#1 branch
.. //depot/projects/netperf_socket/sys/netatalk/ddp_input.c#8 integrate
.. //depot/projects/netperf_socket/sys/netgraph/netflow/netflow.c#3 integrate
.. //depot/projects/netperf_socket/sys/netgraph/netflow/ng_netflow.c#2 integrate
.. //depot/projects/netperf_socket/sys/netgraph/netflow/ng_netflow.h#2 integrate
.. //depot/projects/netperf_socket/sys/netgraph/ng_base.c#15 integrate
.. //depot/projects/netperf_socket/sys/netgraph/ng_bridge.c#8 integrate
.. //depot/projects/netperf_socket/sys/netgraph/ng_device.c#10 integrate
.. //depot/projects/netperf_socket/sys/netgraph/ng_ether.c#11 integrate
.. //depot/projects/netperf_socket/sys/netgraph/ng_ppp.c#8 integrate
.. //depot/projects/netperf_socket/sys/netgraph/ng_pppoe.c#8 integrate
.. //depot/projects/netperf_socket/sys/netgraph/ng_pptpgre.c#5 integrate
.. //depot/projects/netperf_socket/sys/netgraph/ng_sample.c#6 integrate
.. //depot/projects/netperf_socket/sys/netgraph/ng_tty.c#8 integrate
.. //depot/projects/netperf_socket/sys/netinet/if_ether.c#13 integrate
.. //depot/projects/netperf_socket/sys/netinet/in_gif.c#4 integrate
.. //depot/projects/netperf_socket/sys/netinet/in_pcb.h#9 integrate
.. //depot/projects/netperf_socket/sys/netinet/in_rmx.c#2 integrate
.. //depot/projects/netperf_socket/sys/netinet/ip_fw2.c#21 integrate
.. //depot/projects/netperf_socket/sys/netinet/ip_fw_pfil.c#6 integrate
.. //depot/projects/netperf_socket/sys/netinet/ip_output.c#23 integrate
.. //depot/projects/netperf_socket/sys/netinet/tcp_hostcache.c#6 integrate
.. //depot/projects/netperf_socket/sys/netinet/tcp_input.c#26 integrate
.. //depot/projects/netperf_socket/sys/netinet/tcp_subr.c#26 integrate
.. //depot/projects/netperf_socket/sys/netinet/tcp_timer.c#7 integrate
.. //depot/projects/netperf_socket/sys/netinet/tcp_var.h#13 integrate
.. //depot/projects/netperf_socket/sys/netinet6/in6_gif.c#2 integrate
.. //depot/projects/netperf_socket/sys/netipx/ipx_input.c#2 integrate
.. //depot/projects/netperf_socket/sys/netipx/ipx_pcb.c#6 integrate
.. //depot/projects/netperf_socket/sys/netipx/ipx_pcb.h#2 integrate
.. //depot/projects/netperf_socket/sys/netipx/ipx_usrreq.c#6 integrate
.. //depot/projects/netperf_socket/sys/netipx/ipx_var.h#2 integrate
.. //depot/projects/netperf_socket/sys/netipx/spx_usrreq.c#10 integrate
.. //depot/projects/netperf_socket/sys/nfs/nfs_common.c#3 integrate
.. //depot/projects/netperf_socket/sys/nfs/nfs_common.h#3 integrate
.. //depot/projects/netperf_socket/sys/nfs4client/nfs4_vfs_subs.c#3 integrate
.. //depot/projects/netperf_socket/sys/nfs4client/nfs4_vfsops.c#10 integrate
.. //depot/projects/netperf_socket/sys/nfs4client/nfs4_vn_subs.c#3 integrate
.. //depot/projects/netperf_socket/sys/nfs4client/nfs4_vnops.c#10 integrate
.. //depot/projects/netperf_socket/sys/nfsclient/bootp_subr.c#7 integrate
.. //depot/projects/netperf_socket/sys/nfsclient/nfs.h#10 integrate
.. //depot/projects/netperf_socket/sys/nfsclient/nfs_bio.c#14 integrate
.. //depot/projects/netperf_socket/sys/nfsclient/nfs_lock.c#2 integrate
.. //depot/projects/netperf_socket/sys/nfsclient/nfs_lock.h#2 integrate
.. //depot/projects/netperf_socket/sys/nfsclient/nfs_nfsiod.c#5 integrate
.. //depot/projects/netperf_socket/sys/nfsclient/nfs_node.c#6 integrate
.. //depot/projects/netperf_socket/sys/nfsclient/nfs_socket.c#13 integrate
.. //depot/projects/netperf_socket/sys/nfsclient/nfs_subs.c#13 integrate
.. //depot/projects/netperf_socket/sys/nfsclient/nfs_vfsops.c#13 integrate
.. //depot/projects/netperf_socket/sys/nfsclient/nfs_vnops.c#11 integrate
.. //depot/projects/netperf_socket/sys/nfsclient/nfsm_subs.h#3 integrate
.. //depot/projects/netperf_socket/sys/nfsclient/nfsmount.h#4 integrate
.. //depot/projects/netperf_socket/sys/nfsclient/nfsnode.h#7 integrate
.. //depot/projects/netperf_socket/sys/pc98/pc98/fd.c#17 integrate
.. //depot/projects/netperf_socket/sys/pc98/pc98/mse.c#6 delete
.. //depot/projects/netperf_socket/sys/pci/agp_ali.c#6 integrate
.. //depot/projects/netperf_socket/sys/pci/agp_intel.c#7 integrate
.. //depot/projects/netperf_socket/sys/pci/agp_sis.c#7 integrate
.. //depot/projects/netperf_socket/sys/pci/agp_via.c#9 integrate
.. //depot/projects/netperf_socket/sys/pci/if_sk.c#15 integrate
.. //depot/projects/netperf_socket/sys/pci/if_ti.c#10 integrate
.. //depot/projects/netperf_socket/sys/powerpc/powerpc/pmap.c#19 integrate
.. //depot/projects/netperf_socket/sys/security/mac_portacl/mac_portacl.c#4 integrate
.. //depot/projects/netperf_socket/sys/sparc64/conf/GENERIC#16 integrate
.. //depot/projects/netperf_socket/sys/sparc64/include/ver.h#2 integrate
.. //depot/projects/netperf_socket/sys/sparc64/isa/isa.c#6 integrate
.. //depot/projects/netperf_socket/sys/sparc64/sparc64/identcpu.c#3 integrate
.. //depot/projects/netperf_socket/sys/sparc64/sparc64/pmap.c#15 integrate
.. //depot/projects/netperf_socket/sys/sys/aac_ioctl.h#1 branch
.. //depot/projects/netperf_socket/sys/sys/bio.h#8 integrate
.. //depot/projects/netperf_socket/sys/sys/bus.h#6 integrate
.. //depot/projects/netperf_socket/sys/sys/copyright.h#2 integrate
.. //depot/projects/netperf_socket/sys/sys/eventhandler.h#4 integrate
.. //depot/projects/netperf_socket/sys/sys/filedesc.h#8 integrate
.. //depot/projects/netperf_socket/sys/sys/jumbo.h#2 delete
.. //depot/projects/netperf_socket/sys/sys/kernel.h#9 integrate
.. //depot/projects/netperf_socket/sys/sys/ktr.h#5 integrate
.. //depot/projects/netperf_socket/sys/sys/mbuf.h#20 integrate
.. //depot/projects/netperf_socket/sys/sys/mdioctl.h#7 integrate
.. //depot/projects/netperf_socket/sys/sys/mount.h#17 integrate
.. //depot/projects/netperf_socket/sys/sys/mouse.h#3 integrate
.. //depot/projects/netperf_socket/sys/sys/param.h#32 integrate
.. //depot/projects/netperf_socket/sys/sys/proc.h#31 integrate
.. //depot/projects/netperf_socket/sys/sys/sched.h#9 integrate
.. //depot/projects/netperf_socket/sys/sys/syscall.h#14 integrate
.. //depot/projects/netperf_socket/sys/sys/syscall.mk#14 integrate
.. //depot/projects/netperf_socket/sys/sys/sysproto.h#14 integrate
.. //depot/projects/netperf_socket/sys/sys/systm.h#14 integrate
.. //depot/projects/netperf_socket/sys/sys/turnstile.h#5 integrate
.. //depot/projects/netperf_socket/sys/sys/uio.h#6 integrate
.. //depot/projects/netperf_socket/sys/sys/umtx.h#3 integrate
.. //depot/projects/netperf_socket/sys/sys/vnode.h#16 integrate
.. //depot/projects/netperf_socket/sys/tools/usbdevs2h.awk#2 integrate
.. //depot/projects/netperf_socket/sys/tools/vnode_if.awk#4 integrate
.. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_alloc.c#9 integrate
.. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_snapshot.c#10 integrate
.. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_vfsops.c#17 integrate
.. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_vnops.c#12 integrate
.. //depot/projects/netperf_socket/sys/ufs/ufs/ufs_extattr.c#5 integrate
.. //depot/projects/netperf_socket/sys/ufs/ufs/ufs_vnops.c#13 integrate
.. //depot/projects/netperf_socket/sys/vm/uma.h#5 integrate
.. //depot/projects/netperf_socket/sys/vm/uma_core.c#17 integrate
.. //depot/projects/netperf_socket/sys/vm/uma_dbg.c#5 integrate
.. //depot/projects/netperf_socket/sys/vm/uma_dbg.h#3 integrate
.. //depot/projects/netperf_socket/sys/vm/uma_int.h#5 integrate
.. //depot/projects/netperf_socket/sys/vm/vm_fault.c#13 integrate
.. //depot/projects/netperf_socket/sys/vm/vm_map.c#24 integrate
.. //depot/projects/netperf_socket/sys/vm/vm_meter.c#6 integrate
.. //depot/projects/netperf_socket/sys/vm/vm_object.c#14 integrate
.. //depot/projects/netperf_socket/sys/vm/vm_object.h#6 integrate
.. //depot/projects/netperf_socket/sys/vm/vm_page.c#18 integrate
.. //depot/projects/netperf_socket/sys/vm/vm_page.h#10 integrate
.. //depot/projects/netperf_socket/sys/vm/vnode_pager.c#10 integrate

Differences ...

==== //depot/projects/netperf_socket/sys/alpha/alpha/cpuconf.c#2 (text+ko) ====

@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/cpuconf.c,v 1.16 2003/08/17 06:42:07 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/cpuconf.c,v 1.17 2005/01/01 16:11:53 wilko Exp $");
 
 #include "opt_cpu.h"
 
@@ -122,41 +122,46 @@
 #endif
 
 struct cpuinit cpuinit[] = {
-	cpu_notsupp("???"),			     /*  0: ??? */
-	cpu_notsupp("ST_ADU"),			     /*  1: ST_ADU */
-	cpu_notsupp("ST_DEC_4000"),		     /*  2: ST_DEC_4000 */
-	cpu_notsupp("ST_DEC_7000"),		     /*  3: ST_DEC_7000 */
-	cpu_notsupp("DEC_3000_500"),		     /*  4: ST_DEC_3000_500 */
-	cpu_notsupp("???"),			     /*  5: ??? */
-	cpu_notsupp("ST_DEC_2000_300"),		     /*  6: ST_DEC_2000_300 */
-	cpu_notsupp("DEC_3000_300"),  		     /*  7: ST_DEC_3000_300 */
-	cpu_init(avalon_a12_init,"ST_AVALON_A12"),   /*  8: ST_AVALON_A12 */
-	cpu_init(dec_2100_a500_init, "ST_DEC_2100_A500"),	/*  9: ST_DEC_2100_A500 */
-	cpu_notsupp("ST_DEC_APXVME_64"),	     /* 10: ST_DEC_APXVME_64 */
-	cpu_init(dec_axppci_33_init,"DEC_AXPPCI_33"),/* 11: ST_DEC_AXPPCI_33 */
-	cpu_init(dec_kn8ae_init,"DEC_KN8AE"),	     /* 12: ST_DEC_21000 */
-	cpu_init(dec_2100_a50_init,"DEC_2100_A50"),  /* 13: ST_DEC_2100_A50 */
-	cpu_notsupp("ST_DEC_MUSTANG"),		     /* 14: ST_DEC_MUSTANG */
-	cpu_init(dec_kn20aa_init,"DEC_KN20AA"),	     /* 15: ST_DEC_KN20AA */
-	cpu_notsupp("???"),			     /* 16: ??? */
-	cpu_init(dec_1000a_init, "ST_DEC_1000"),     /* 17: ST_DEC_1000 */
-	cpu_notsupp("???"),			     /* 18: ??? */
-	cpu_notsupp("ST_EB66"),			     /* 19: ST_EB66 */
-	cpu_init(dec_eb64plus_init,"DEC_EB64PLUS"),  /* 20: ST_EB64P */
-	cpu_notsupp("ST_ALPHABOOK1"),		     /* 21: ST_ALPHABOOK1 */
-	cpu_init(dec_kn300_init,"DEC_KN300"),	     /* 22: ST_DEC_4100 */
-	cpu_notsupp("ST_DEC_EV45_PBP"),		     /* 23: ST_DEC_EV45_PBP */
-	cpu_init(dec_2100_a500_init, "ST_DEC_2100A_A500"), /* 24: ST_DEC_2100A_A500 */
-	cpu_notsupp("???"),			     /* 25: ??? */
-	cpu_init(dec_eb164_init,"DEC_EB164"),	     /* 26: ST_EB164 */
-	cpu_init(dec_1000a_init,"ST_DEC_1000A"),     /* 27: ST_DEC_1000A */
-	cpu_notsupp("ST_DEC_ALPHAVME_224"),	   /* 28: ST_DEC_ALPHAVME_224 */
-	cpu_notsupp("???"),			     /* 29: ??? */
-	cpu_init(st550_init,"DEC_ST550"),            /* 30: ST_DEC_550 */
-	cpu_notsupp("???"),			     /* 31: ??? */
-	cpu_notsupp("ST_DEC_EV56_PBP"),		     /* 32: ST_DEC_EV56_PBP */
-	cpu_notsupp("ST_DEC_ALPHAVME_320"),	   /* 33: ST_DEC_ALPHAVME_320 */
-	cpu_init(st6600_init, "ST_DEC_ST6600"),	     /* 34: ST_DEC_6600 */
+	cpu_notsupp("???"),				/*  0: ??? */
+	cpu_notsupp("ST_ADU"),				/*  1: ADU */
+	cpu_notsupp("ST_DEC_4000"),			/*  2: Cobra */
+	cpu_notsupp("ST_DEC_7000"),			/*  3: Ruby */
+	cpu_notsupp("DEC_3000_500"),			/*  4: Flamingo */
+	cpu_notsupp("???"),				/*  5: simulator */
+	cpu_notsupp("ST_DEC_2000_300"),			/*  6: Jensen */
+	cpu_notsupp("DEC_3000_300"),			/*  7: Pelican */
+	cpu_init(avalon_a12_init,"ST_AVALON_A12"),	/*  8: AVALON */
+	cpu_init(dec_2100_a500_init, "ST_DEC_2100_A500"), /*  9: Sable */
+	cpu_notsupp("ST_DEC_APXVME_64"),		/* 10: AXPvme */
+	cpu_init(dec_axppci_33_init,"DEC_AXPPCI_33"),	/* 11: NoName */
+	cpu_init(dec_kn8ae_init,"DEC_KN8AE"),		/* 12: Turbolaser */
+	cpu_init(dec_2100_a50_init,"DEC_2100_A50"),	/* 13: Avanti */
+	cpu_notsupp("ST_DEC_MUSTANG"),			/* 14: Mustang */
+	cpu_init(dec_kn20aa_init,"DEC_KN20AA"),		/* 15: Alcor */
+	cpu_notsupp("cancelled"),			/* 16: cancelled */
+	cpu_init(dec_1000a_init, "ST_DEC_1000"),	/* 17: Mikasa */
+	cpu_notsupp("ST_DEC_EB64"),			/* 18: EB64 */
+	cpu_notsupp("ST_EB66"),				/* 19: EB66 */
+	cpu_init(dec_eb64plus_init,"DEC_EB64PLUS"),	/* 20: EB64+ */
+	cpu_notsupp("ST_ALPHABOOK1"),			/* 21: AlphaBook */
+	cpu_init(dec_kn300_init,"DEC_KN300"),		/* 22: Rawhide */
+	cpu_notsupp("ST_DEC_EV45_PBP"),			/* 23: K2 */
+	cpu_init(dec_2100_a500_init, "ST_DEC_2100A_A500"), /* 24: Lynx */
+	cpu_notsupp("ST_DEC_ALPHAXL"),			/* 25: AlphaXL */
+	cpu_init(dec_eb164_init,"DEC_EB164"),		/* 26: EB164 */
+	cpu_init(dec_1000a_init,"ST_DEC_1000A"),	/* 27: Noritake */
+	cpu_notsupp("ST_DEC_ALPHAVME_224"),		/* 28: Cortex */
+	cpu_notsupp("unused"),				/* 29: unused */
+	cpu_init(st550_init,"DEC_ST550"),		/* 30: Miata */
+	cpu_notsupp("ST_DEC_XXM"),			/* 31: XXM */
+	cpu_notsupp("ST_DEC_EV56_PBP"),			/* 32: Takara */
+	cpu_notsupp("ST_DEC_ALPHAVME_320"),		/* 33: Yukon */
+	cpu_init(st6600_init, "ST_DEC_ST6600"),		/* 34: Tsunami */
+	cpu_notsupp("ST_DEC_WILDFIRE"),			/* 35: Wildfire */
+	cpu_notsupp("ST_DEC_CUSCO"),		     	/* 36: Cusco */
+	cpu_notsupp("ST_DEC_EIGER"),			/* 37: Eiger */
+	cpu_notsupp("ST_DEC_TITAN"),			/* 38: Titan */
+	cpu_notsupp("ST_DEC_MARVEL")			/* 39: Marvel */
 };
 int ncpuinit = (sizeof(cpuinit) / sizeof(cpuinit[0]));
 

==== //depot/projects/netperf_socket/sys/alpha/alpha/machdep.c#12 (text+ko) ====

@@ -88,7 +88,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.226 2004/11/27 06:51:32 das Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.227 2004/12/26 13:23:01 wilko Exp $");
 
 #include "opt_compat.h"
 #include "opt_ddb.h"
@@ -338,7 +338,7 @@
 		"EV3",			/* 1 */
 		"EV4 (21064)",		/* 2 */
 		"Simulation",		/* 3 */
-		"LCA Family",		/* 4 */
+		"LCA (21066/21068)",	/* 4 */
 		"EV5 (21164)",		/* 5 */
 		"EV45 (21064A)",	/* 6 */
 		"EV56 (21164A)",	/* 7 */
@@ -348,7 +348,8 @@
 		"EV67 (21264A)",	/* 11 */
 		"EV68CB (21264C)"	/* 12 */
 		"EV68AL (21264B)",	/* 13 */
-		"EV68CX (21264D)"	/* 14 */
+		"EV68CX (21264D)",	/* 14 */
+		"EV7 (21364)"		/* 15 */
 	};
 
 	/*

==== //depot/projects/netperf_socket/sys/alpha/alpha/pmap.c#21 (text+ko) ====

@@ -148,11 +148,12 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.174 2004/11/27 06:51:32 das Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.176 2004/12/23 20:16:09 alc Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
+#include <sys/malloc.h>
 #include <sys/proc.h>
 #include <sys/msgbuf.h>
 #include <sys/vmmeter.h>
@@ -334,7 +335,7 @@
 
 static vm_page_t pmap_allocpte(pmap_t pmap, vm_offset_t va);
 
-static vm_page_t _pmap_allocpte(pmap_t pmap, unsigned ptepindex);
+static vm_page_t _pmap_allocpte(pmap_t pmap, unsigned ptepindex, int flags);
 static int _pmap_unwire_pte_hold(pmap_t pmap, vm_offset_t va, vm_page_t m);
 static int pmap_unuse_pt(pmap_t, vm_offset_t, vm_page_t);
 #ifdef SMP
@@ -1038,24 +1039,28 @@
  * mapped correctly.
  */
 static vm_page_t
-_pmap_allocpte(pmap, ptepindex)
-	pmap_t	pmap;
-	unsigned ptepindex;
+_pmap_allocpte(pmap_t pmap, unsigned ptepindex, int flags)
 {
 	pt_entry_t* pte;
 	vm_offset_t ptepa;
 	vm_page_t m;
 
+	KASSERT((flags & (M_NOWAIT | M_WAITOK)) == M_NOWAIT ||
+	    (flags & (M_NOWAIT | M_WAITOK)) == M_WAITOK,
+	    ("_pmap_allocpte: flags is neither M_NOWAIT nor M_WAITOK"));
+
 	/*
 	 * Find or fabricate a new pagetable page
 	 */
 	if ((m = vm_page_alloc(NULL, ptepindex, VM_ALLOC_NOOBJ |
 	    VM_ALLOC_WIRED | VM_ALLOC_ZERO)) == NULL) {
-		PMAP_UNLOCK(pmap);
-		vm_page_unlock_queues();
-		VM_WAIT;
-		vm_page_lock_queues();
-		PMAP_LOCK(pmap);
+		if (flags & M_WAITOK) {
+			PMAP_UNLOCK(pmap);
+			vm_page_unlock_queues();
+			VM_WAIT;
+			vm_page_lock_queues();
+			PMAP_LOCK(pmap);
+		}
 
 		/*
 		 * Indicate the need to retry.  While waiting, the page table
@@ -1082,7 +1087,8 @@
 		pt_entry_t* l1pte = &pmap->pm_lev1[l1index];
 		pt_entry_t* l2map;
 		if (!pmap_pte_v(l1pte)) {
-			if (_pmap_allocpte(pmap, NUSERLEV3MAPS + l1index) == NULL) {
+			if (_pmap_allocpte(pmap, NUSERLEV3MAPS + l1index,
+			    flags) == NULL) {
 				--m->wire_count;
 				vm_page_free(m);
 				return (NULL);
@@ -1146,7 +1152,7 @@
 		 * Here if the pte page isn't mapped, or if it has been
 		 * deallocated.
 		 */
-		m = _pmap_allocpte(pmap, ptepindex);
+		m = _pmap_allocpte(pmap, ptepindex, M_WAITOK);
 		if (m == NULL)
 			goto retry;
 	}
@@ -1793,7 +1799,6 @@
  * 2. Not wired.
  * 3. Read access.
  * 4. No page table pages.
- * 5. Tlbflush is deferred to calling procedure.
  * 6. Page IS managed.
  * but is *MUCH* faster than pmap_enter...
  */
@@ -1804,7 +1809,8 @@
 	register pt_entry_t *pte;
 	int managed;
 
-	vm_page_lock_queues();
+	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
+	VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED);
 	PMAP_LOCK(pmap);
 
 	/*
@@ -1842,9 +1848,20 @@
 				}
 				mpte->wire_count++;
 			} else {
-				mpte = _pmap_allocpte(pmap, ptepindex);
-				if (mpte == NULL)
+				mpte = _pmap_allocpte(pmap, ptepindex,
+				    M_NOWAIT);
+				if (mpte == NULL) {
+					PMAP_UNLOCK(pmap);
+					vm_page_busy(m);
+					vm_page_unlock_queues();
+					VM_OBJECT_UNLOCK(m->object);
+					VM_WAIT;
+					VM_OBJECT_LOCK(m->object);
+					vm_page_lock_queues();
+					vm_page_wakeup(m);
+					PMAP_LOCK(pmap);
 					goto retry;
+				}
 			}
 		}
 	} else {
@@ -1888,7 +1905,6 @@
 	*pte = pmap_phys_to_pte(VM_PAGE_TO_PHYS(m)) | PG_V | PG_KRE | PG_URE | managed;
 out:
 	alpha_pal_imb();			/* XXX overkill? */
-	vm_page_unlock_queues();
 	PMAP_UNLOCK(pmap);
 	return mpte;
 }

==== //depot/projects/netperf_socket/sys/alpha/conf/GENERIC#14 (text+ko) ====

@@ -18,17 +18,17 @@
 #
 # For hardware specific information check HARDWARE.TXT
 #
-# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.181 2004/11/09 22:23:34 wilko Exp $
+# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.182 2004/12/30 15:32:31 jhb Exp $
 
 machine		alpha
 cpu		EV4
 cpu		EV5
 ident		GENERIC
 
-#To statically compile in device wiring instead of /boot/device.hints
-#hints		"GENERIC.hints"
+# To statically compile in device wiring instead of /boot/device.hints
+#hints		"GENERIC.hints"		# Default places to look for devices.
 
-makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
+makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
 
 # Platforms supported
 options 	API_UP1000		# UP1000, UP1100 (Nautilus)
@@ -43,41 +43,44 @@
 options 	DEC_KN300		# AlphaServer 4100 (Rawhide),
 					# AlphaServer 1200 (Tincup)
 
-#options 	SCHED_ULE		#ULE scheduler
-options 	SCHED_4BSD		#4BSD scheduler
-options 	PREEMPTION		#Enable kernel thread preemption
-options 	INET			#InterNETworking
-options 	INET6			#IPv6 communications protocols
-options 	FFS			#Berkeley Fast Filesystem
-options 	SOFTUPDATES		#Enable FFS soft updates support
-options 	UFS_ACL			#Support for access control lists
-options 	UFS_DIRHASH		#Improve performance on big directories
-options 	MD_ROOT			#MD is a potential root device
-options 	NFSCLIENT		#Network Filesystem Client
-options 	NFSSERVER		#Network Filesystem Server
-options 	NFS_ROOT		#NFS usable as root device
-options 	MSDOSFS			#MSDOS Filesystem
-options 	CD9660			#ISO 9660 Filesystem
-options 	PROCFS			#Process filesystem (requires PSEUDOFS)
-options 	PSEUDOFS		#Pseudo-filesystem framework
-options 	GEOM_GPT		#GUID Partition Tables.
-options 	COMPAT_43		#Compatible with BSD 4.3 [KEEP THIS!]
-options 	COMPAT_FREEBSD4		#Compatible with FreeBSD4
-options 	SCSI_DELAY=5000		#Delay (in ms) before probing SCSI
-options 	KTRACE			#ktrace(1) syscall trace support
-options 	SYSVSHM			#SYSV-style shared memory
-options 	SYSVMSG			#SYSV-style message queues
-options 	SYSVSEM			#SYSV-style semaphores
-options 	_KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
+#options 	SCHED_ULE		# ULE scheduler
+options 	SCHED_4BSD		# 4BSD scheduler
+options 	PREEMPTION		# Enable kernel thread preemption
+options 	INET			# InterNETworking
+options 	INET6			# IPv6 communications protocols
+options 	FFS			# Berkeley Fast Filesystem
+options 	SOFTUPDATES		# Enable FFS soft updates support
+options 	UFS_ACL			# Support for access control lists
+options 	UFS_DIRHASH		# Improve performance on big directories
+options 	MD_ROOT			# MD is a potential root device
+options 	NFSCLIENT		# Network Filesystem Client
+options 	NFSSERVER		# Network Filesystem Server
+options 	NFS_ROOT		# NFS usable as /, requires NFSCLIENT
+options 	MSDOSFS			# MSDOS Filesystem
+options 	CD9660			# ISO 9660 Filesystem
+options 	PROCFS			# Process filesystem (requires PSEUDOFS)
+options 	PSEUDOFS		# Pseudo-filesystem framework
+options 	GEOM_GPT		# GUID Partition Tables.
+options 	COMPAT_43		# Compatible with BSD 4.3 [KEEP THIS!]
+options 	COMPAT_FREEBSD4		# Compatible with FreeBSD4
+options 	SCSI_DELAY=5000		# Delay (in ms) before probing SCSI
+options 	KTRACE			# ktrace(1) support
+options 	SYSVSHM			# SYSV-style shared memory
+options 	SYSVMSG			# SYSV-style message queues
+options 	SYSVSEM			# SYSV-style semaphores
+options 	_KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
+options 	AHC_REG_PRETTY_PRINT	# Print register bitfields in debug
+					# output.  Adds ~128k to driver.
+options 	ADAPTIVE_GIANT		# Giant mutex is adaptive.
 
 # Debugging for use in -current
-options 	KDB			#Enable kernel debugger support
-options 	DDB			#Support DDB
-options 	GDB			#Support remote GDB 
-options 	INVARIANTS		#Enable calls of extra sanity checking
-options 	INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS
-#options 	WITNESS			#Enable checks to detect deadlocks and cycles
-options         WITNESS_SKIPSPIN        #Don't run witness on spinlocks for speed
+options 	KDB			# Enable kernel debugger support.
+options 	DDB			# Support DDB.
+options 	GDB			# Support remote GDB.
+options 	INVARIANTS		# Enable calls of extra sanity checking
+options 	INVARIANT_SUPPORT	# Extra sanity checks of internal structures, required by INVARIANTS
+#options 	WITNESS			# Enable checks to detect deadlocks and cycles
+options 	WITNESS_SKIPSPIN	# Don't run witness on spinlocks for speed
 
 # To make an SMP kernel, the next line is needed

>>> TRUNCATED FOR MAIL (1000 lines) <<<



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200501011919.j01JJ8CG043295>