PERFORCE change 47801 for review
Robert Watson
rwatson at FreeBSD.org
Sat Feb 28 09:52:16 PST 2004
http://perforce.freebsd.org/chv.cgi?CH=47801
Change 47801 by rwatson at rwatson_tislabs on 2004/02/28 09:51:12
Integrate the netperf_socket branch forward to HEAD, including
looping back the MT_TAG cleanup, introduction of pf. A few
instances of XXXRW added for things I need to revisit, as well
as some open questions about:
- Reviewing pf to make sure it's occasional socket access is
safe (seems safe, since it appears only to access static
fields in struct socket).
- Understanding some of the ipsec changes and state magic.
- Need to determine if TCP/MD5 state is properly synchronized.
Affected files ...
.. //depot/projects/netperf_socket/sys/alpha/alpha/machdep.c#2 integrate
.. //depot/projects/netperf_socket/sys/alpha/alpha/mem.c#2 integrate
.. //depot/projects/netperf_socket/sys/alpha/alpha/promcons.c#2 integrate
.. //depot/projects/netperf_socket/sys/alpha/alpha/support.s#2 integrate
.. //depot/projects/netperf_socket/sys/alpha/conf/GENERIC#2 integrate
.. //depot/projects/netperf_socket/sys/alpha/linux/linux_machdep.c#2 integrate
.. //depot/projects/netperf_socket/sys/alpha/linux/linux_proto.h#2 integrate
.. //depot/projects/netperf_socket/sys/alpha/linux/linux_syscall.h#2 integrate
.. //depot/projects/netperf_socket/sys/alpha/linux/linux_sysent.c#2 integrate
.. //depot/projects/netperf_socket/sys/alpha/linux/syscalls.master#2 integrate
.. //depot/projects/netperf_socket/sys/alpha/osf1/osf1_misc.c#2 integrate
.. //depot/projects/netperf_socket/sys/alpha/osf1/osf1_proto.h#2 integrate
.. //depot/projects/netperf_socket/sys/alpha/osf1/osf1_syscall.h#2 integrate
.. //depot/projects/netperf_socket/sys/alpha/osf1/osf1_sysent.c#2 integrate
.. //depot/projects/netperf_socket/sys/alpha/osf1/syscalls.master#2 integrate
.. //depot/projects/netperf_socket/sys/alpha/tlsb/zs_tlsb.c#2 integrate
.. //depot/projects/netperf_socket/sys/amd64/acpica/madt.c#2 integrate
.. //depot/projects/netperf_socket/sys/amd64/amd64/cpu_switch.S#2 integrate
.. //depot/projects/netperf_socket/sys/amd64/amd64/db_interface.c#2 integrate
.. //depot/projects/netperf_socket/sys/amd64/amd64/db_trace.c#2 integrate
.. //depot/projects/netperf_socket/sys/amd64/amd64/fpu.c#2 integrate
.. //depot/projects/netperf_socket/sys/amd64/amd64/genassym.c#2 integrate
.. //depot/projects/netperf_socket/sys/amd64/amd64/local_apic.c#2 integrate
.. //depot/projects/netperf_socket/sys/amd64/amd64/machdep.c#2 integrate
.. //depot/projects/netperf_socket/sys/amd64/amd64/mem.c#2 integrate
.. //depot/projects/netperf_socket/sys/amd64/amd64/mp_machdep.c#2 integrate
.. //depot/projects/netperf_socket/sys/amd64/amd64/mpboot.S#2 integrate
.. //depot/projects/netperf_socket/sys/amd64/amd64/pmap.c#2 integrate
.. //depot/projects/netperf_socket/sys/amd64/amd64/trap.c#2 integrate
.. //depot/projects/netperf_socket/sys/amd64/amd64/vm_machdep.c#2 integrate
.. //depot/projects/netperf_socket/sys/amd64/conf/GENERIC#2 integrate
.. //depot/projects/netperf_socket/sys/amd64/conf/NOTES#1 branch
.. //depot/projects/netperf_socket/sys/amd64/ia32/ia32_signal.c#2 integrate
.. //depot/projects/netperf_socket/sys/amd64/include/cpufunc.h#2 integrate
.. //depot/projects/netperf_socket/sys/amd64/include/fpu.h#2 integrate
.. //depot/projects/netperf_socket/sys/amd64/include/md_var.h#2 integrate
.. //depot/projects/netperf_socket/sys/amd64/include/pcb.h#2 integrate
.. //depot/projects/netperf_socket/sys/amd64/include/reg.h#2 integrate
.. //depot/projects/netperf_socket/sys/amd64/include/smp.h#2 integrate
.. //depot/projects/netperf_socket/sys/amd64/include/specialreg.h#2 integrate
.. //depot/projects/netperf_socket/sys/amd64/isa/atpic.c#2 integrate
.. //depot/projects/netperf_socket/sys/amd64/isa/isa_dma.c#2 integrate
.. //depot/projects/netperf_socket/sys/amd64/pci/pci_cfgreg.c#2 integrate
.. //depot/projects/netperf_socket/sys/boot/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/boot/alpha/Makefile.inc#2 integrate
.. //depot/projects/netperf_socket/sys/boot/alpha/boot1/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/boot/alpha/cdboot/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/boot/alpha/common/Makefile.common#2 integrate
.. //depot/projects/netperf_socket/sys/boot/alpha/libalpha/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/boot/alpha/loader/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/boot/alpha/netboot/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/boot/common/Makefile.inc#2 integrate
.. //depot/projects/netperf_socket/sys/boot/common/help.common#2 integrate
.. //depot/projects/netperf_socket/sys/boot/common/loader.8#2 integrate
.. //depot/projects/netperf_socket/sys/boot/efi/Makefile.inc#2 integrate
.. //depot/projects/netperf_socket/sys/boot/efi/libefi/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/boot/efi/loader/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/boot/ficl/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/boot/forth/loader.conf#2 integrate
.. //depot/projects/netperf_socket/sys/boot/forth/loader.conf.5#2 integrate
.. //depot/projects/netperf_socket/sys/boot/i386/Makefile.inc#2 integrate
.. //depot/projects/netperf_socket/sys/boot/i386/boot0/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/boot/i386/boot0sio/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/boot/i386/boot2/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/boot/i386/boot2/boot1.S#1 branch
.. //depot/projects/netperf_socket/sys/boot/i386/boot2/boot1.s#2 delete
.. //depot/projects/netperf_socket/sys/boot/i386/boot2/sio.S#1 branch
.. //depot/projects/netperf_socket/sys/boot/i386/boot2/sio.s#2 delete
.. //depot/projects/netperf_socket/sys/boot/i386/btx/Makefile.inc#2 integrate
.. //depot/projects/netperf_socket/sys/boot/i386/btx/btx/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/boot/i386/btx/btx/btx.S#1 branch
.. //depot/projects/netperf_socket/sys/boot/i386/btx/btx/btx.s#2 delete
.. //depot/projects/netperf_socket/sys/boot/i386/btx/btxldr/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/boot/i386/btx/btxldr/btxldr.S#1 branch
.. //depot/projects/netperf_socket/sys/boot/i386/btx/btxldr/btxldr.s#2 delete
.. //depot/projects/netperf_socket/sys/boot/i386/btx/lib/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/boot/i386/cdboot/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/boot/i386/kgzldr/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/boot/i386/libi386/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/boot/i386/libi386/biosdisk.c#2 integrate
.. //depot/projects/netperf_socket/sys/boot/i386/loader/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/boot/i386/mbr/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/boot/i386/pxeldr/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/boot/i386/pxeldr/pxeldr.S#1 branch
.. //depot/projects/netperf_socket/sys/boot/i386/pxeldr/pxeldr.s#2 delete
.. //depot/projects/netperf_socket/sys/boot/ia64/Makefile.inc#2 integrate
.. //depot/projects/netperf_socket/sys/boot/ia64/libski/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/boot/ia64/skiload/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/boot/pc98/Makefile.inc#2 integrate
.. //depot/projects/netperf_socket/sys/boot/pc98/boot0.5/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/boot/pc98/boot0/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/boot/pc98/boot2/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/boot/pc98/btx/Makefile.inc#1 branch
.. //depot/projects/netperf_socket/sys/boot/pc98/btx/btx/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/boot/pc98/btx/btx/btx.S#1 branch
.. //depot/projects/netperf_socket/sys/boot/pc98/btx/btx/btx.s#2 delete
.. //depot/projects/netperf_socket/sys/boot/pc98/btx/btxldr/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/boot/pc98/btx/btxldr/btxldr.S#1 branch
.. //depot/projects/netperf_socket/sys/boot/pc98/btx/btxldr/btxldr.s#2 delete
.. //depot/projects/netperf_socket/sys/boot/pc98/btx/lib/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/boot/pc98/kgzldr/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/boot/pc98/libpc98/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/boot/pc98/loader/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/boot/powerpc/loader/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/boot/sparc64/Makefile.inc#1 branch
.. //depot/projects/netperf_socket/sys/boot/sparc64/boot1/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/boot/sparc64/boot1/_start.S#2 delete
.. //depot/projects/netperf_socket/sys/boot/sparc64/boot1/_start.s#1 branch
.. //depot/projects/netperf_socket/sys/boot/sparc64/loader/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/cam/cam_xpt.c#2 integrate
.. //depot/projects/netperf_socket/sys/cam/scsi/scsi_cd.c#2 integrate
.. //depot/projects/netperf_socket/sys/cam/scsi/scsi_ch.c#2 integrate
.. //depot/projects/netperf_socket/sys/cam/scsi/scsi_da.c#2 integrate
.. //depot/projects/netperf_socket/sys/cam/scsi/scsi_pass.c#2 integrate
.. //depot/projects/netperf_socket/sys/cam/scsi/scsi_pt.c#2 integrate
.. //depot/projects/netperf_socket/sys/cam/scsi/scsi_sa.c#2 integrate
.. //depot/projects/netperf_socket/sys/cam/scsi/scsi_ses.c#2 integrate
.. //depot/projects/netperf_socket/sys/cam/scsi/scsi_target.c#2 integrate
.. //depot/projects/netperf_socket/sys/coda/coda_fbsd.c#2 integrate
.. //depot/projects/netperf_socket/sys/coda/coda_venus.c#2 integrate
.. //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_misc.c#2 integrate
.. //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_proto.h#2 integrate
.. //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_syscall.h#2 integrate
.. //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_syscalls.c#2 integrate
.. //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_sysent.c#2 integrate
.. //depot/projects/netperf_socket/sys/compat/freebsd32/syscalls.master#2 integrate
.. //depot/projects/netperf_socket/sys/compat/ia32/ia32_genassym.c#2 integrate
.. //depot/projects/netperf_socket/sys/compat/ia32/ia32_signal.h#2 integrate
.. //depot/projects/netperf_socket/sys/compat/ia32/ia32_sysvec.c#2 integrate
.. //depot/projects/netperf_socket/sys/compat/linprocfs/linprocfs.c#2 integrate
.. //depot/projects/netperf_socket/sys/compat/linux/linux_ioctl.c#2 integrate
.. //depot/projects/netperf_socket/sys/compat/linux/linux_ioctl.h#2 integrate
.. //depot/projects/netperf_socket/sys/compat/linux/linux_misc.c#2 integrate
.. //depot/projects/netperf_socket/sys/compat/linux/linux_stats.c#2 integrate
.. //depot/projects/netperf_socket/sys/compat/ndis/kern_ndis.c#2 integrate
.. //depot/projects/netperf_socket/sys/compat/ndis/ndis_var.h#2 integrate
.. //depot/projects/netperf_socket/sys/compat/ndis/ntoskrnl_var.h#2 integrate
.. //depot/projects/netperf_socket/sys/compat/ndis/subr_hal.c#2 integrate
.. //depot/projects/netperf_socket/sys/compat/ndis/subr_ndis.c#2 integrate
.. //depot/projects/netperf_socket/sys/compat/ndis/subr_ntoskrnl.c#2 integrate
.. //depot/projects/netperf_socket/sys/compat/svr4/imgact_svr4.c#2 integrate
.. //depot/projects/netperf_socket/sys/compat/svr4/svr4_filio.c#2 integrate
.. //depot/projects/netperf_socket/sys/compat/svr4/svr4_misc.c#2 integrate
.. //depot/projects/netperf_socket/sys/compat/svr4/svr4_proto.h#2 integrate
.. //depot/projects/netperf_socket/sys/compat/svr4/svr4_resource.c#2 integrate
.. //depot/projects/netperf_socket/sys/compat/svr4/svr4_syscall.h#2 integrate
.. //depot/projects/netperf_socket/sys/compat/svr4/svr4_syscallnames.c#2 integrate
.. //depot/projects/netperf_socket/sys/compat/svr4/svr4_sysent.c#2 integrate
.. //depot/projects/netperf_socket/sys/compat/svr4/svr4_types.h#2 integrate
.. //depot/projects/netperf_socket/sys/compat/svr4/syscalls.master#2 integrate
.. //depot/projects/netperf_socket/sys/conf/Makefile.alpha#2 integrate
.. //depot/projects/netperf_socket/sys/conf/NOTES#2 integrate
.. //depot/projects/netperf_socket/sys/conf/files#2 integrate
.. //depot/projects/netperf_socket/sys/conf/files.amd64#2 integrate
.. //depot/projects/netperf_socket/sys/conf/files.i386#2 integrate
.. //depot/projects/netperf_socket/sys/conf/files.pc98#2 integrate
.. //depot/projects/netperf_socket/sys/conf/files.powerpc#2 integrate
.. //depot/projects/netperf_socket/sys/conf/kern.mk#2 integrate
.. //depot/projects/netperf_socket/sys/conf/kern.post.mk#2 integrate
.. //depot/projects/netperf_socket/sys/conf/kern.pre.mk#2 integrate
.. //depot/projects/netperf_socket/sys/conf/kmod.mk#2 integrate
.. //depot/projects/netperf_socket/sys/conf/ldscript.alpha#2 integrate
.. //depot/projects/netperf_socket/sys/conf/majors#2 integrate
.. //depot/projects/netperf_socket/sys/conf/options#2 integrate
.. //depot/projects/netperf_socket/sys/conf/options.i386#2 integrate
.. //depot/projects/netperf_socket/sys/conf/options.pc98#2 integrate
.. //depot/projects/netperf_socket/sys/conf/options.powerpc#2 integrate
.. //depot/projects/netperf_socket/sys/conf/systags.sh#2 integrate
.. //depot/projects/netperf_socket/sys/contrib/dev/fla/fla.c#2 integrate
.. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_fil.c#2 integrate
.. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/mlfk_ipl.c#2 integrate
.. //depot/projects/netperf_socket/sys/contrib/pf/net/if_pflog.c#1 branch
.. //depot/projects/netperf_socket/sys/contrib/pf/net/if_pflog.h#1 branch
.. //depot/projects/netperf_socket/sys/contrib/pf/net/if_pfsync.c#1 branch
.. //depot/projects/netperf_socket/sys/contrib/pf/net/if_pfsync.h#1 branch
.. //depot/projects/netperf_socket/sys/contrib/pf/net/pf.c#1 branch
.. //depot/projects/netperf_socket/sys/contrib/pf/net/pf_ioctl.c#1 branch
.. //depot/projects/netperf_socket/sys/contrib/pf/net/pf_norm.c#1 branch
.. //depot/projects/netperf_socket/sys/contrib/pf/net/pf_osfp.c#1 branch
.. //depot/projects/netperf_socket/sys/contrib/pf/net/pf_table.c#1 branch
.. //depot/projects/netperf_socket/sys/contrib/pf/net/pfvar.h#1 branch
.. //depot/projects/netperf_socket/sys/contrib/pf/netinet/in4_cksum.c#1 branch
.. //depot/projects/netperf_socket/sys/crypto/md5.c#2 integrate
.. //depot/projects/netperf_socket/sys/ddb/db_output.c#2 integrate
.. //depot/projects/netperf_socket/sys/ddb/db_ps.c#2 integrate
.. //depot/projects/netperf_socket/sys/ddb/db_sym.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/aac/aac.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/aac/aac_debug.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/aac/aac_disk.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/aac/aac_ioctl.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/aac/aac_pci.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/aac/aacvar.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/acpica/Osd/OsdTable.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/acpica/acpi.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/acpica/acpi_button.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/acpica/acpi_pci_link.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/acpica/acpi_powerres.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/acpica/acpi_thermal.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/acpica/acpivar.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/adlink/adlink.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic79xx.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic79xx.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic79xx.reg#2 integrate
.. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic79xx.seq#2 integrate
.. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic79xx_inline.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic79xx_pci.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic7xxx.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/aic7xxx/aicasm/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/dev/amd/amd.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/amr/amr.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/amr/amr_disk.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/amr/amrvar.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/ar/if_ar.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/asr/asr.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/ata/ata-all.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/ata/ata-all.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/ata/ata-chipset.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/ata/ata-disk.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/ata/ata-disk.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/ata/ata-lowlevel.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/ata/ata-pci.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/ata/ata-pci.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/ata/ata-queue.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/ata/ata-raid.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/ata/ata-raid.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/ata/atapi-cam.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/ata/atapi-cd.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/ata/atapi-fd.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/ata/atapi-fd.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/ata/atapi-tape.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/ath/if_ath.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/bktr/bktr_os.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/ciss/ciss.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/ctau/am8530.h#1 branch
.. //depot/projects/netperf_socket/sys/dev/ctau/ctau.c#1 branch
.. //depot/projects/netperf_socket/sys/dev/ctau/ctau2fw.h#1 branch
.. //depot/projects/netperf_socket/sys/dev/ctau/ctaue1fw.h#1 branch
.. //depot/projects/netperf_socket/sys/dev/ctau/ctaufw.h#1 branch
.. //depot/projects/netperf_socket/sys/dev/ctau/ctaug7fw.h#1 branch
.. //depot/projects/netperf_socket/sys/dev/ctau/ctaureg.h#1 branch
.. //depot/projects/netperf_socket/sys/dev/ctau/ctddk.c#1 branch
.. //depot/projects/netperf_socket/sys/dev/ctau/ctddk.h#1 branch
.. //depot/projects/netperf_socket/sys/dev/ctau/ds2153.h#1 branch
.. //depot/projects/netperf_socket/sys/dev/ctau/hdc64570.h#1 branch
.. //depot/projects/netperf_socket/sys/dev/ctau/if_ct.c#1 branch
.. //depot/projects/netperf_socket/sys/dev/ctau/lxt318.h#1 branch
.. //depot/projects/netperf_socket/sys/dev/ctau/ng_ct.h#1 branch
.. //depot/projects/netperf_socket/sys/dev/cx/if_cx.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/cx/ng_cx.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/dcons/dcons.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/dcons/dcons.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/dcons/dcons_crom.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/digi/digi.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/dpt/dpt.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/drm/drm_drv.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/drm/drm_os_freebsd.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/drm/r128_state.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/em/if_em.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/em/if_em_hw.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/em/if_em_hw.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/fb/fb.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/fb/fbreg.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/firewire/firewire.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/firewire/fwdev.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/firewire/fwohci.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/firewire/fwohci_pci.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/firewire/fwohcireg.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/firewire/sbp_targ.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/gem/if_gem_pci.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/harp/if_harp.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/hfa/fore_buffer.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/hfa/fore_command.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/hfa/fore_init.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/hfa/fore_load.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/hfa/fore_output.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/hfa/fore_receive.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/hfa/fore_stats.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/hfa/fore_transmit.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/hfa/fore_var.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/hifn/hifn7751.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/ida/ida.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/ida/ida_disk.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/ida/idavar.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/if_ndis/if_ndis.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/if_ndis/if_ndisvar.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/iicbus/iic.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/iir/iir.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/iir/iir_ctrl.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/ips/ips.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/ips/ips_disk.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/ips/ips_disk.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/isp/isp.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/isp/isp_freebsd.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/isp/isp_freebsd.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/isp/isp_ioctl.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/isp/isp_pci.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/isp/isp_target.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/isp/ispmbox.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/isp/ispvar.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/joy/joy.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/kbd/kbd.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/led/led.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/lnc/if_lnc_pci.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/matcd/matcd.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/mcd/mcd.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/md/md.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/mlx/mlx.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/mlx/mlx_disk.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/mlx/mlxvar.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/mly/mly.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/nmdm/nmdm.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/null/null.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/ofw/ofw_console.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/ofw/ofw_disk.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/ofw/openfirmio.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/ofw/openpromio.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/patm/genrtab/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/dev/pccard/pccarddevs#2 integrate
.. //depot/projects/netperf_socket/sys/dev/pccard/pccarddevs.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/pci/pci_user.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/ppbus/lpt.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/ppbus/pcfclock.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/ppbus/ppi.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/ppbus/pps.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/pst/pst-raid.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/puc/pucdata.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_diskqueue.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_freebsdkintf.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_paritylog.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/random/randomdev.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/rc/rc.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/rp/rp.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/sab/sab.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/safe/safe.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/scd/scd.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/si/si.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/sio/sio.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/smbus/smb.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/snp/snp.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/sound/driver.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/sound/midi/midi.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/sound/midi/midi.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/sound/midi/sequencer.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/sound/pcm/ac97.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/sound/pcm/buffer.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/sound/pcm/buffer.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/sound/pcm/channel.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/sound/pcm/channel.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/sound/pcm/dsp.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/sound/pcm/dsp.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/sound/pcm/mixer.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/sound/pcm/sndstat.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/sound/pcm/sound.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/sound/pcm/sound.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/sound/pcm/vchan.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/sr/if_sr.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/streams/streams.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/syscons/scgfbrndr.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/syscons/schistory.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/syscons/scterm-dumb.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/syscons/scterm-sc.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/syscons/syscons.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/syscons/sysmouse.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/tdfx/tdfx_pci.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/tdfx/tdfx_vars.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/tga/tga_pci.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/trm/trm.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/twe/twe.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/twe/twe_freebsd.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/twe/twevar.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/uart/uart_tty.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/if_udav.c#1 branch
.. //depot/projects/netperf_socket/sys/dev/usb/if_udavreg.h#1 branch
.. //depot/projects/netperf_socket/sys/dev/usb/ucom.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/ufm.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/uftdi.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/ugen.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/uhid.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/ukbd.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/ulpt.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/umass.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/ums.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/urio.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/usb.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/usbdevs#2 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/usbdevs.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/usbdevs_data.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/usbdi.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/uscanner.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/vinum/vinum.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/vinum/vinumconfig.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/vinum/vinumvar.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/zs/zs.c#2 integrate
.. //depot/projects/netperf_socket/sys/fs/devfs/devfs.h#2 integrate
.. //depot/projects/netperf_socket/sys/fs/devfs/devfs_devs.c#2 integrate
.. //depot/projects/netperf_socket/sys/fs/devfs/devfs_rule.c#2 integrate
.. //depot/projects/netperf_socket/sys/fs/devfs/devfs_vnops.c#2 integrate
.. //depot/projects/netperf_socket/sys/fs/fdescfs/fdesc_vfsops.c#2 integrate
.. //depot/projects/netperf_socket/sys/fs/msdosfs/direntry.h#2 integrate
.. //depot/projects/netperf_socket/sys/fs/msdosfs/msdosfs_conv.c#2 integrate
.. //depot/projects/netperf_socket/sys/fs/msdosfs/msdosfs_vfsops.c#2 integrate
.. //depot/projects/netperf_socket/sys/fs/msdosfs/msdosfs_vnops.c#2 integrate
.. //depot/projects/netperf_socket/sys/fs/msdosfs/msdosfsmount.h#2 integrate
.. //depot/projects/netperf_socket/sys/fs/nwfs/nwfs_io.c#2 integrate
.. //depot/projects/netperf_socket/sys/fs/procfs/procfs_rlimit.c#2 integrate
.. //depot/projects/netperf_socket/sys/fs/pseudofs/pseudofs_vnops.c#2 integrate
.. //depot/projects/netperf_socket/sys/fs/smbfs/smbfs_io.c#2 integrate
.. //depot/projects/netperf_socket/sys/fs/smbfs/smbfs_node.c#2 integrate
.. //depot/projects/netperf_socket/sys/fs/smbfs/smbfs_node.h#2 integrate
.. //depot/projects/netperf_socket/sys/fs/smbfs/smbfs_vnops.c#2 integrate
.. //depot/projects/netperf_socket/sys/fs/specfs/spec_vnops.c#2 integrate
.. //depot/projects/netperf_socket/sys/geom/bde/g_bde.c#2 integrate
.. //depot/projects/netperf_socket/sys/geom/bde/g_bde_crypt.c#2 integrate
.. //depot/projects/netperf_socket/sys/geom/bde/g_bde_work.c#2 integrate
.. //depot/projects/netperf_socket/sys/geom/concat/g_concat.c#1 branch
.. //depot/projects/netperf_socket/sys/geom/concat/g_concat.h#1 branch
.. //depot/projects/netperf_socket/sys/geom/geom.h#2 integrate
.. //depot/projects/netperf_socket/sys/geom/geom_aes.c#2 integrate
.. //depot/projects/netperf_socket/sys/geom/geom_apple.c#2 integrate
.. //depot/projects/netperf_socket/sys/geom/geom_bsd.c#2 integrate
.. //depot/projects/netperf_socket/sys/geom/geom_ccd.c#2 integrate
.. //depot/projects/netperf_socket/sys/geom/geom_ctl.c#2 integrate
.. //depot/projects/netperf_socket/sys/geom/geom_dev.c#2 integrate
.. //depot/projects/netperf_socket/sys/geom/geom_disk.c#2 integrate
.. //depot/projects/netperf_socket/sys/geom/geom_disk.h#2 integrate
.. //depot/projects/netperf_socket/sys/geom/geom_event.c#2 integrate
.. //depot/projects/netperf_socket/sys/geom/geom_fox.c#2 integrate
.. //depot/projects/netperf_socket/sys/geom/geom_gpt.c#2 integrate
.. //depot/projects/netperf_socket/sys/geom/geom_io.c#2 integrate
.. //depot/projects/netperf_socket/sys/geom/geom_kern.c#2 integrate
.. //depot/projects/netperf_socket/sys/geom/geom_mbr.c#2 integrate
.. //depot/projects/netperf_socket/sys/geom/geom_mirror.c#2 integrate
.. //depot/projects/netperf_socket/sys/geom/geom_pc98.c#2 integrate
.. //depot/projects/netperf_socket/sys/geom/geom_slice.c#2 integrate
.. //depot/projects/netperf_socket/sys/geom/geom_subr.c#2 integrate
.. //depot/projects/netperf_socket/sys/geom/geom_sunlabel.c#2 integrate
.. //depot/projects/netperf_socket/sys/geom/geom_vol_ffs.c#2 integrate
.. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_fs.h#2 integrate
.. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_fs_sb.h#2 integrate
.. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_inode.c#2 integrate
.. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_inode_cnv.c#2 integrate
.. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_lookup.c#2 integrate
.. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_readwrite.c#2 integrate
.. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_vfsops.c#2 integrate
.. //depot/projects/netperf_socket/sys/i386/acpica/acpi_machdep.c#2 integrate
.. //depot/projects/netperf_socket/sys/i386/acpica/madt.c#2 integrate
.. //depot/projects/netperf_socket/sys/i386/bios/apm.c#2 integrate
.. //depot/projects/netperf_socket/sys/i386/bios/smapi.c#2 integrate
.. //depot/projects/netperf_socket/sys/i386/conf/GENERIC#2 integrate
.. //depot/projects/netperf_socket/sys/i386/conf/NOTES#2 integrate
.. //depot/projects/netperf_socket/sys/i386/i386/apic_vector.s#2 integrate
.. //depot/projects/netperf_socket/sys/i386/i386/db_interface.c#2 integrate
.. //depot/projects/netperf_socket/sys/i386/i386/elan-mmcr.c#2 integrate
.. //depot/projects/netperf_socket/sys/i386/i386/geode.c#2 integrate
.. //depot/projects/netperf_socket/sys/i386/i386/identcpu.c#2 integrate
.. //depot/projects/netperf_socket/sys/i386/i386/local_apic.c#2 integrate
.. //depot/projects/netperf_socket/sys/i386/i386/longrun.c#1 branch
.. //depot/projects/netperf_socket/sys/i386/i386/machdep.c#2 integrate
.. //depot/projects/netperf_socket/sys/i386/i386/mem.c#2 integrate
.. //depot/projects/netperf_socket/sys/i386/i386/mp_machdep.c#2 integrate
.. //depot/projects/netperf_socket/sys/i386/i386/p4tcc.c#1 branch
.. //depot/projects/netperf_socket/sys/i386/i386/perfmon.c#2 integrate
.. //depot/projects/netperf_socket/sys/i386/i386/pmap.c#2 integrate
.. //depot/projects/netperf_socket/sys/i386/i386/swtch.s#2 integrate
.. //depot/projects/netperf_socket/sys/i386/i386/trap.c#2 integrate
.. //depot/projects/netperf_socket/sys/i386/ibcs2/ibcs2_isc_syscall.h#2 integrate
.. //depot/projects/netperf_socket/sys/i386/ibcs2/ibcs2_isc_sysent.c#2 integrate
.. //depot/projects/netperf_socket/sys/i386/ibcs2/ibcs2_misc.c#2 integrate
.. //depot/projects/netperf_socket/sys/i386/ibcs2/ibcs2_proto.h#2 integrate
.. //depot/projects/netperf_socket/sys/i386/ibcs2/ibcs2_syscall.h#2 integrate
.. //depot/projects/netperf_socket/sys/i386/ibcs2/ibcs2_sysent.c#2 integrate
.. //depot/projects/netperf_socket/sys/i386/ibcs2/ibcs2_xenix.h#2 integrate
.. //depot/projects/netperf_socket/sys/i386/ibcs2/ibcs2_xenix_syscall.h#2 integrate
.. //depot/projects/netperf_socket/sys/i386/ibcs2/ibcs2_xenix_sysent.c#2 integrate
.. //depot/projects/netperf_socket/sys/i386/ibcs2/syscalls.isc#2 integrate
.. //depot/projects/netperf_socket/sys/i386/ibcs2/syscalls.master#2 integrate
.. //depot/projects/netperf_socket/sys/i386/ibcs2/syscalls.xenix#2 integrate
.. //depot/projects/netperf_socket/sys/i386/include/pci_cfgreg.h#2 integrate
.. //depot/projects/netperf_socket/sys/i386/include/specialreg.h#2 integrate
.. //depot/projects/netperf_socket/sys/i386/isa/asc.c#2 integrate
.. //depot/projects/netperf_socket/sys/i386/isa/atpic_vector.s#2 integrate
.. //depot/projects/netperf_socket/sys/i386/isa/ctx.c#2 integrate
.. //depot/projects/netperf_socket/sys/i386/isa/cy.c#2 integrate
.. //depot/projects/netperf_socket/sys/i386/isa/gpib.c#2 integrate
.. //depot/projects/netperf_socket/sys/i386/isa/gsc.c#2 integrate
.. //depot/projects/netperf_socket/sys/i386/isa/istallion.c#2 integrate
.. //depot/projects/netperf_socket/sys/i386/isa/mse.c#2 integrate
.. //depot/projects/netperf_socket/sys/i386/isa/npx.c#2 integrate
.. //depot/projects/netperf_socket/sys/i386/isa/pcvt/pcvt_drv.c#2 integrate
.. //depot/projects/netperf_socket/sys/i386/isa/pcvt/pcvt_ext.c#2 integrate
.. //depot/projects/netperf_socket/sys/i386/isa/pcvt/pcvt_hdr.h#2 integrate
.. //depot/projects/netperf_socket/sys/i386/isa/spic.c#2 integrate
.. //depot/projects/netperf_socket/sys/i386/isa/spicreg.h#2 integrate
.. //depot/projects/netperf_socket/sys/i386/isa/spigot.c#2 integrate
.. //depot/projects/netperf_socket/sys/i386/isa/spkr.c#2 integrate
.. //depot/projects/netperf_socket/sys/i386/isa/stallion.c#2 integrate
.. //depot/projects/netperf_socket/sys/i386/isa/wt.c#2 integrate
.. //depot/projects/netperf_socket/sys/i386/linux/imgact_linux.c#2 integrate
.. //depot/projects/netperf_socket/sys/i386/linux/linux_machdep.c#2 integrate
.. //depot/projects/netperf_socket/sys/i386/linux/linux_proto.h#2 integrate
.. //depot/projects/netperf_socket/sys/i386/linux/linux_syscall.h#2 integrate
.. //depot/projects/netperf_socket/sys/i386/linux/linux_sysent.c#2 integrate
.. //depot/projects/netperf_socket/sys/i386/linux/syscalls.master#2 integrate
.. //depot/projects/netperf_socket/sys/i386/pci/pci_bus.c#2 integrate
.. //depot/projects/netperf_socket/sys/i386/pci/pci_cfgreg.c#2 integrate
.. //depot/projects/netperf_socket/sys/i386/pci/pci_pir.c#1 branch
.. //depot/projects/netperf_socket/sys/i4b/driver/i4b_ctl.c#2 integrate
.. //depot/projects/netperf_socket/sys/i4b/driver/i4b_rbch.c#2 integrate
.. //depot/projects/netperf_socket/sys/i4b/driver/i4b_tel.c#2 integrate
.. //depot/projects/netperf_socket/sys/i4b/driver/i4b_trace.c#2 integrate
.. //depot/projects/netperf_socket/sys/i4b/layer4/i4b_i4bdrv.c#2 integrate
.. //depot/projects/netperf_socket/sys/ia64/conf/GENERIC#2 integrate
.. //depot/projects/netperf_socket/sys/ia64/ia64/interrupt.c#2 integrate
.. //depot/projects/netperf_socket/sys/ia64/ia64/machdep.c#2 integrate
.. //depot/projects/netperf_socket/sys/ia64/ia64/mem.c#2 integrate
.. //depot/projects/netperf_socket/sys/ia64/ia64/mp_machdep.c#2 integrate
.. //depot/projects/netperf_socket/sys/ia64/ia64/ssc.c#2 integrate
.. //depot/projects/netperf_socket/sys/ia64/ia64/sscdisk.c#2 integrate
.. //depot/projects/netperf_socket/sys/ia64/ia64/trap.c#2 integrate
.. //depot/projects/netperf_socket/sys/ia64/include/md_var.h#2 integrate
.. //depot/projects/netperf_socket/sys/isa/fd.c#2 integrate
.. //depot/projects/netperf_socket/sys/isa/psm.c#2 integrate
.. //depot/projects/netperf_socket/sys/isa/vga_isa.c#2 integrate
.. //depot/projects/netperf_socket/sys/isofs/cd9660/cd9660_vnops.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/imgact_aout.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/imgact_elf.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/imgact_gzip.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/init_main.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/init_sysent.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_acct.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_acl.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_condvar.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_conf.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_descrip.c#3 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_event.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_exec.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_exit.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_fork.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_idle.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_intr.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_jail.c#3 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_ktrace.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_linker.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_mac.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_malloc.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_mutex.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_ntptime.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_poll.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_proc.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_prot.c#3 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_resource.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_shutdown.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_sig.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_subr.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_switch.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_sx.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_synch.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_sysctl.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_tc.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_thread.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_uuid.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/sched_4bsd.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/sched_ule.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/subr_bus.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/subr_devstat.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/subr_log.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/subr_prf.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/subr_sbuf.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/subr_sleepqueue.c#1 branch
.. //depot/projects/netperf_socket/sys/kern/subr_smp.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/subr_taskqueue.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/subr_trap.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/subr_turnstile.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/subr_witness.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/sys_generic.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/sys_pipe.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/sys_process.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/syscalls.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/syscalls.master#2 integrate
.. //depot/projects/netperf_socket/sys/kern/sysv_shm.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/tty.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/tty_cons.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/tty_pty.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/tty_tty.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/uipc_mbuf.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/uipc_sem.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/uipc_socket.c#4 integrate
.. //depot/projects/netperf_socket/sys/kern/uipc_socket2.c#3 integrate
.. //depot/projects/netperf_socket/sys/kern/uipc_syscalls.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/uipc_usrreq.c#3 integrate
.. //depot/projects/netperf_socket/sys/kern/vfs_bio.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/vfs_init.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/vfs_mount.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/vfs_subr.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/vfs_syscalls.c#2 integrate
.. //depot/projects/netperf_socket/sys/libkern/bcmp.c#2 integrate
.. //depot/projects/netperf_socket/sys/modules/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/modules/fatm/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/modules/firewire/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/modules/firewire/Makefile.inc#2 integrate
.. //depot/projects/netperf_socket/sys/modules/firewire/sbp_targ/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/modules/geom/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/modules/geom/geom_concat/Makefile#1 branch
.. //depot/projects/netperf_socket/sys/modules/harp/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/modules/hatm/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/modules/if_ef/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/modules/lnc/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/modules/ncp/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/modules/netgraph/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/modules/nwfs/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/modules/osf1/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/modules/patm/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/modules/pecoff/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/modules/pf/Makefile#1 branch
.. //depot/projects/netperf_socket/sys/modules/pflog/Makefile#1 branch
.. //depot/projects/netperf_socket/sys/modules/pfsync/Makefile#1 branch
.. //depot/projects/netperf_socket/sys/modules/smbfs/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/modules/syscons/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/modules/udav/Makefile#1 branch
.. //depot/projects/netperf_socket/sys/modules/uscanner/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/net/bpf.c#3 integrate
.. //depot/projects/netperf_socket/sys/net/bpf.h#2 integrate
.. //depot/projects/netperf_socket/sys/net/bridge.c#3 integrate
.. //depot/projects/netperf_socket/sys/net/if.c#2 integrate
.. //depot/projects/netperf_socket/sys/net/if_atm.h#2 integrate
.. //depot/projects/netperf_socket/sys/net/if_ethersubr.c#4 integrate
.. //depot/projects/netperf_socket/sys/net/if_gre.c#2 integrate
.. //depot/projects/netperf_socket/sys/net/if_gre.h#2 integrate
.. //depot/projects/netperf_socket/sys/net/if_media.h#2 integrate
.. //depot/projects/netperf_socket/sys/net/if_ppp.c#2 integrate
.. //depot/projects/netperf_socket/sys/net/if_spppsubr.c#2 integrate
.. //depot/projects/netperf_socket/sys/net/if_tap.c#2 integrate
.. //depot/projects/netperf_socket/sys/net/if_tapvar.h#2 integrate
.. //depot/projects/netperf_socket/sys/net/if_tun.c#2 integrate
.. //depot/projects/netperf_socket/sys/net/if_tunvar.h#2 delete
.. //depot/projects/netperf_socket/sys/net/if_types.h#2 integrate
.. //depot/projects/netperf_socket/sys/net/if_var.h#2 integrate
.. //depot/projects/netperf_socket/sys/net/if_vlan_var.h#2 integrate
.. //depot/projects/netperf_socket/sys/net/pfkeyv2.h#2 integrate
.. //depot/projects/netperf_socket/sys/net80211/ieee80211_ioctl.c#2 integrate
.. //depot/projects/netperf_socket/sys/netatm/atm_subr.c#2 integrate
.. //depot/projects/netperf_socket/sys/netgraph/atm/ng_atm.c#2 integrate
.. //depot/projects/netperf_socket/sys/netgraph/atm/ng_atm.h#2 integrate
.. //depot/projects/netperf_socket/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#2 integrate
.. //depot/projects/netperf_socket/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#2 integrate
.. //depot/projects/netperf_socket/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#2 integrate
.. //depot/projects/netperf_socket/sys/netgraph/bluetooth/include/ng_btsocket.h#2 integrate
.. //depot/projects/netperf_socket/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#2 integrate
.. //depot/projects/netperf_socket/sys/netgraph/netgraph.h#2 integrate
.. //depot/projects/netperf_socket/sys/netgraph/ng_base.c#2 integrate
.. //depot/projects/netperf_socket/sys/netgraph/ng_bpf.h#2 integrate
.. //depot/projects/netperf_socket/sys/netgraph/ng_bridge.c#2 integrate
.. //depot/projects/netperf_socket/sys/netgraph/ng_cisco.c#2 integrate
.. //depot/projects/netperf_socket/sys/netgraph/ng_device.c#2 integrate
.. //depot/projects/netperf_socket/sys/netgraph/ng_etf.h#2 integrate
.. //depot/projects/netperf_socket/sys/netgraph/ng_ether.c#2 integrate
.. //depot/projects/netperf_socket/sys/netgraph/ng_ether.h#2 integrate
.. //depot/projects/netperf_socket/sys/netgraph/ng_gif.c#2 integrate
.. //depot/projects/netperf_socket/sys/netgraph/ng_ksocket.c#2 integrate
.. //depot/projects/netperf_socket/sys/netgraph/ng_message.h#2 integrate
.. //depot/projects/netperf_socket/sys/netgraph/ng_one2many.c#2 integrate
.. //depot/projects/netperf_socket/sys/netgraph/ng_one2many.h#2 integrate
.. //depot/projects/netperf_socket/sys/netgraph/ng_parse.c#2 integrate
.. //depot/projects/netperf_socket/sys/netgraph/ng_parse.h#2 integrate
.. //depot/projects/netperf_socket/sys/netgraph/ng_pppoe.c#2 integrate
.. //depot/projects/netperf_socket/sys/netgraph/ng_pppoe.h#2 integrate
.. //depot/projects/netperf_socket/sys/netgraph/ng_socket.c#2 integrate
.. //depot/projects/netperf_socket/sys/netgraph/ng_source.c#2 integrate
.. //depot/projects/netperf_socket/sys/netgraph/ng_source.h#2 integrate
.. //depot/projects/netperf_socket/sys/netinet/icmp_var.h#2 integrate
.. //depot/projects/netperf_socket/sys/netinet/in.c#2 integrate
.. //depot/projects/netperf_socket/sys/netinet/in_proto.c#3 integrate
.. //depot/projects/netperf_socket/sys/netinet/ip.h#2 integrate
.. //depot/projects/netperf_socket/sys/netinet/ip_divert.c#3 integrate
.. //depot/projects/netperf_socket/sys/netinet/ip_divert.h#2 integrate
.. //depot/projects/netperf_socket/sys/netinet/ip_dummynet.c#3 integrate
.. //depot/projects/netperf_socket/sys/netinet/ip_dummynet.h#3 integrate
.. //depot/projects/netperf_socket/sys/netinet/ip_fastfwd.c#4 integrate
.. //depot/projects/netperf_socket/sys/netinet/ip_fw.h#3 integrate
.. //depot/projects/netperf_socket/sys/netinet/ip_fw2.c#3 integrate
.. //depot/projects/netperf_socket/sys/netinet/ip_gre.c#2 integrate
.. //depot/projects/netperf_socket/sys/netinet/ip_icmp.c#4 integrate
.. //depot/projects/netperf_socket/sys/netinet/ip_icmp.h#2 integrate
.. //depot/projects/netperf_socket/sys/netinet/ip_id.c#2 integrate
.. //depot/projects/netperf_socket/sys/netinet/ip_input.c#3 integrate
.. //depot/projects/netperf_socket/sys/netinet/ip_output.c#3 integrate
.. //depot/projects/netperf_socket/sys/netinet/ip_var.h#3 integrate
.. //depot/projects/netperf_socket/sys/netinet/raw_ip.c#2 integrate
.. //depot/projects/netperf_socket/sys/netinet/tcp.h#2 integrate
.. //depot/projects/netperf_socket/sys/netinet/tcp_debug.c#3 integrate
.. //depot/projects/netperf_socket/sys/netinet/tcp_input.c#3 integrate
.. //depot/projects/netperf_socket/sys/netinet/tcp_output.c#2 integrate
.. //depot/projects/netperf_socket/sys/netinet/tcp_subr.c#3 integrate
.. //depot/projects/netperf_socket/sys/netinet/tcp_syncache.c#4 integrate
.. //depot/projects/netperf_socket/sys/netinet/tcp_usrreq.c#3 integrate
.. //depot/projects/netperf_socket/sys/netinet/tcp_var.h#3 integrate
.. //depot/projects/netperf_socket/sys/netinet/udp_usrreq.c#3 integrate
.. //depot/projects/netperf_socket/sys/netinet6/icmp6.c#2 integrate
.. //depot/projects/netperf_socket/sys/netinet6/in6.c#2 integrate
.. //depot/projects/netperf_socket/sys/netinet6/in6_ifattach.c#2 integrate
.. //depot/projects/netperf_socket/sys/netinet6/in6_pcb.c#3 integrate
.. //depot/projects/netperf_socket/sys/netinet6/in6_pcb.h#2 integrate
.. //depot/projects/netperf_socket/sys/netinet6/in6_src.c#2 integrate
.. //depot/projects/netperf_socket/sys/netinet6/ip6_forward.c#2 integrate
.. //depot/projects/netperf_socket/sys/netinet6/ip6_input.c#2 integrate
.. //depot/projects/netperf_socket/sys/netinet6/ip6_output.c#2 integrate
.. //depot/projects/netperf_socket/sys/netinet6/ipsec.c#2 integrate
.. //depot/projects/netperf_socket/sys/netinet6/ipsec.h#2 integrate
.. //depot/projects/netperf_socket/sys/netinet6/ipsec6.h#2 integrate
.. //depot/projects/netperf_socket/sys/netinet6/nd6.c#2 integrate
.. //depot/projects/netperf_socket/sys/netinet6/nd6_nbr.c#2 integrate
.. //depot/projects/netperf_socket/sys/netinet6/raw_ip6.c#2 integrate
.. //depot/projects/netperf_socket/sys/netinet6/udp6_output.c#2 integrate
.. //depot/projects/netperf_socket/sys/netinet6/udp6_usrreq.c#2 integrate
.. //depot/projects/netperf_socket/sys/netipsec/ipsec.c#2 integrate
.. //depot/projects/netperf_socket/sys/netipsec/ipsec.h#2 integrate
.. //depot/projects/netperf_socket/sys/netipsec/ipsec_output.c#2 integrate
.. //depot/projects/netperf_socket/sys/netipsec/key.c#2 integrate
.. //depot/projects/netperf_socket/sys/netipsec/xform_esp.c#2 integrate
.. //depot/projects/netperf_socket/sys/netipsec/xform_ipcomp.c#2 integrate
.. //depot/projects/netperf_socket/sys/netipsec/xform_ipip.c#2 integrate
.. //depot/projects/netperf_socket/sys/netkey/key.c#2 integrate
.. //depot/projects/netperf_socket/sys/netncp/ncp_conn.c#2 integrate
.. //depot/projects/netperf_socket/sys/netncp/ncp_mod.c#2 integrate
.. //depot/projects/netperf_socket/sys/netsmb/smb_conn.c#3 integrate
.. //depot/projects/netperf_socket/sys/netsmb/smb_dev.c#2 integrate
.. //depot/projects/netperf_socket/sys/netsmb/smb_dev.h#2 integrate
.. //depot/projects/netperf_socket/sys/nfs4client/nfs4_dev.c#2 integrate
.. //depot/projects/netperf_socket/sys/nfs4client/nfs4_idmap.c#2 integrate
.. //depot/projects/netperf_socket/sys/nfs4client/nfs4_socket.c#2 integrate
.. //depot/projects/netperf_socket/sys/nfs4client/nfs4_subs.c#2 integrate
.. //depot/projects/netperf_socket/sys/nfs4client/nfs4_vfsops.c#2 integrate
.. //depot/projects/netperf_socket/sys/nfs4client/nfs4_vnops.c#2 integrate
.. //depot/projects/netperf_socket/sys/nfsclient/nfs.h#2 integrate
.. //depot/projects/netperf_socket/sys/nfsclient/nfs_bio.c#2 integrate
.. //depot/projects/netperf_socket/sys/nfsclient/nfs_vfsops.c#3 integrate
.. //depot/projects/netperf_socket/sys/opencrypto/cryptodev.c#2 integrate
.. //depot/projects/netperf_socket/sys/opencrypto/cryptodev.h#2 integrate
.. //depot/projects/netperf_socket/sys/opencrypto/cryptosoft.c#2 integrate
.. //depot/projects/netperf_socket/sys/opencrypto/rijndael.c#2 integrate
.. //depot/projects/netperf_socket/sys/pc98/conf/GENERIC#2 integrate
.. //depot/projects/netperf_socket/sys/pc98/conf/NOTES#2 integrate
.. //depot/projects/netperf_socket/sys/pc98/pc98/fd.c#2 integrate
.. //depot/projects/netperf_socket/sys/pc98/pc98/mse.c#2 integrate
.. //depot/projects/netperf_socket/sys/pc98/pc98/olpt.c#2 integrate
.. //depot/projects/netperf_socket/sys/pc98/pc98/pc98gdc.c#2 integrate
.. //depot/projects/netperf_socket/sys/pc98/pc98/sio.c#2 integrate
.. //depot/projects/netperf_socket/sys/pc98/pc98/wd.c#2 integrate
.. //depot/projects/netperf_socket/sys/pc98/pc98/wd_cd.c#2 integrate
.. //depot/projects/netperf_socket/sys/pccard/pccard.c#2 integrate
.. //depot/projects/netperf_socket/sys/pci/agp.c#2 integrate
.. //depot/projects/netperf_socket/sys/pci/if_rl.c#2 integrate
.. //depot/projects/netperf_socket/sys/pci/if_sk.c#2 integrate
.. //depot/projects/netperf_socket/sys/pci/if_ti.c#2 integrate
.. //depot/projects/netperf_socket/sys/pci/xrpu.c#2 integrate
.. //depot/projects/netperf_socket/sys/posix4/_semaphore.h#2 integrate
.. //depot/projects/netperf_socket/sys/posix4/semaphore.h#2 integrate
.. //depot/projects/netperf_socket/sys/powerpc/conf/GENERIC#2 integrate
.. //depot/projects/netperf_socket/sys/powerpc/include/float.h#2 integrate
.. //depot/projects/netperf_socket/sys/powerpc/include/floatingpoint.h#1 branch
.. //depot/projects/netperf_socket/sys/powerpc/include/hid.h#2 integrate
.. //depot/projects/netperf_socket/sys/powerpc/include/intr_machdep.h#2 integrate
.. //depot/projects/netperf_socket/sys/powerpc/include/param.h#2 integrate
.. //depot/projects/netperf_socket/sys/powerpc/include/pcpu.h#2 integrate
.. //depot/projects/netperf_socket/sys/powerpc/include/pmap.h#2 integrate
.. //depot/projects/netperf_socket/sys/powerpc/include/sc_machdep.h#1 branch
.. //depot/projects/netperf_socket/sys/powerpc/include/spr.h#2 integrate
.. //depot/projects/netperf_socket/sys/powerpc/include/sr.h#2 integrate
.. //depot/projects/netperf_socket/sys/powerpc/include/vmparam.h#2 integrate
.. //depot/projects/netperf_socket/sys/powerpc/ofw/ofw_pci.c#2 integrate
.. //depot/projects/netperf_socket/sys/powerpc/ofw/ofw_syscons.c#1 branch
.. //depot/projects/netperf_socket/sys/powerpc/ofw/ofw_syscons.h#1 branch
.. //depot/projects/netperf_socket/sys/powerpc/powermac/ata_kauai.c#1 branch
.. //depot/projects/netperf_socket/sys/powerpc/powermac/grackle.c#2 integrate
.. //depot/projects/netperf_socket/sys/powerpc/powermac/openpic_macio.c#2 integrate
.. //depot/projects/netperf_socket/sys/powerpc/powerpc/clock.c#2 integrate
.. //depot/projects/netperf_socket/sys/powerpc/powerpc/copyinout.c#2 integrate
.. //depot/projects/netperf_socket/sys/powerpc/powerpc/cpu.c#2 integrate
.. //depot/projects/netperf_socket/sys/powerpc/powerpc/critical.c#2 integrate
.. //depot/projects/netperf_socket/sys/powerpc/powerpc/db_memrw.c#2 integrate
.. //depot/projects/netperf_socket/sys/powerpc/powerpc/fpu.c#2 integrate
.. //depot/projects/netperf_socket/sys/powerpc/powerpc/genassym.c#2 integrate
.. //depot/projects/netperf_socket/sys/powerpc/powerpc/intr_machdep.c#2 integrate
.. //depot/projects/netperf_socket/sys/powerpc/powerpc/locore.S#2 integrate
.. //depot/projects/netperf_socket/sys/powerpc/powerpc/machdep.c#2 integrate
.. //depot/projects/netperf_socket/sys/powerpc/powerpc/nexus.c#2 integrate
.. //depot/projects/netperf_socket/sys/powerpc/powerpc/pmap.c#2 integrate
.. //depot/projects/netperf_socket/sys/powerpc/powerpc/sc_machdep.c#1 branch
.. //depot/projects/netperf_socket/sys/powerpc/powerpc/suswintr.c#2 integrate
.. //depot/projects/netperf_socket/sys/powerpc/powerpc/trap_subr.S#2 integrate
.. //depot/projects/netperf_socket/sys/powerpc/powerpc/uma_machdep.c#1 branch
.. //depot/projects/netperf_socket/sys/powerpc/psim/ata_iobus.c#2 integrate
.. //depot/projects/netperf_socket/sys/powerpc/psim/psim-tree#2 integrate
.. //depot/projects/netperf_socket/sys/security/mac/mac_inet.c#1 branch
.. //depot/projects/netperf_socket/sys/security/mac/mac_internal.h#2 integrate
.. //depot/projects/netperf_socket/sys/security/mac/mac_net.c#2 integrate
.. //depot/projects/netperf_socket/sys/security/mac/mac_pipe.c#2 integrate
.. //depot/projects/netperf_socket/sys/security/mac/mac_process.c#2 integrate
.. //depot/projects/netperf_socket/sys/security/mac/mac_socket.c#1 branch
.. //depot/projects/netperf_socket/sys/security/mac/mac_system.c#2 integrate
.. //depot/projects/netperf_socket/sys/security/mac/mac_vfs.c#2 integrate
.. //depot/projects/netperf_socket/sys/security/mac_biba/mac_biba.c#2 integrate
.. //depot/projects/netperf_socket/sys/security/mac_biba/mac_biba.h#2 integrate
.. //depot/projects/netperf_socket/sys/security/mac_bsdextended/mac_bsdextended.c#2 integrate
.. //depot/projects/netperf_socket/sys/security/mac_bsdextended/mac_bsdextended.h#2 integrate
.. //depot/projects/netperf_socket/sys/security/mac_ifoff/mac_ifoff.c#2 integrate
.. //depot/projects/netperf_socket/sys/security/mac_lomac/mac_lomac.c#2 integrate
.. //depot/projects/netperf_socket/sys/security/mac_lomac/mac_lomac.h#2 integrate
.. //depot/projects/netperf_socket/sys/security/mac_mls/mac_mls.c#2 integrate
.. //depot/projects/netperf_socket/sys/security/mac_mls/mac_mls.h#2 integrate
.. //depot/projects/netperf_socket/sys/security/mac_none/mac_none.c#2 integrate
.. //depot/projects/netperf_socket/sys/security/mac_partition/mac_partition.c#2 integrate
.. //depot/projects/netperf_socket/sys/security/mac_partition/mac_partition.h#2 integrate
.. //depot/projects/netperf_socket/sys/security/mac_portacl/mac_portacl.c#2 integrate
.. //depot/projects/netperf_socket/sys/security/mac_seeotheruids/mac_seeotheruids.c#2 integrate
.. //depot/projects/netperf_socket/sys/security/mac_stub/mac_stub.c#2 integrate
.. //depot/projects/netperf_socket/sys/security/mac_test/mac_test.c#2 integrate
.. //depot/projects/netperf_socket/sys/sparc64/conf/GENERIC#2 integrate
.. //depot/projects/netperf_socket/sys/sparc64/creator/creator_upa.c#2 integrate
.. //depot/projects/netperf_socket/sys/sparc64/include/asmacros.h#2 integrate
.. //depot/projects/netperf_socket/sys/sparc64/sparc64/mem.c#2 integrate
.. //depot/projects/netperf_socket/sys/sys/_label.h#2 integrate
.. //depot/projects/netperf_socket/sys/sys/_mutex.h#2 integrate
.. //depot/projects/netperf_socket/sys/sys/_task.h#1 branch
.. //depot/projects/netperf_socket/sys/sys/bio.h#2 integrate
.. //depot/projects/netperf_socket/sys/sys/condvar.h#2 integrate
.. //depot/projects/netperf_socket/sys/sys/conf.h#2 integrate
.. //depot/projects/netperf_socket/sys/sys/cons.h#2 integrate
.. //depot/projects/netperf_socket/sys/sys/jail.h#2 integrate
.. //depot/projects/netperf_socket/sys/sys/kernel.h#2 integrate
.. //depot/projects/netperf_socket/sys/sys/libkern.h#2 integrate
.. //depot/projects/netperf_socket/sys/sys/limits.h#2 integrate
.. //depot/projects/netperf_socket/sys/sys/lock.h#2 integrate
.. //depot/projects/netperf_socket/sys/sys/mac.h#2 integrate
.. //depot/projects/netperf_socket/sys/sys/mac_policy.h#2 integrate
.. //depot/projects/netperf_socket/sys/sys/mbuf.h#3 integrate
.. //depot/projects/netperf_socket/sys/sys/mount.h#2 integrate
.. //depot/projects/netperf_socket/sys/sys/msgbuf.h#2 integrate
.. //depot/projects/netperf_socket/sys/sys/param.h#2 integrate
.. //depot/projects/netperf_socket/sys/sys/pipe.h#2 integrate
.. //depot/projects/netperf_socket/sys/sys/proc.h#2 integrate
.. //depot/projects/netperf_socket/sys/sys/resource.h#2 integrate
.. //depot/projects/netperf_socket/sys/sys/resourcevar.h#2 integrate
.. //depot/projects/netperf_socket/sys/sys/sched.h#2 integrate
.. //depot/projects/netperf_socket/sys/sys/sleepqueue.h#1 branch
.. //depot/projects/netperf_socket/sys/sys/socket.h#2 integrate
.. //depot/projects/netperf_socket/sys/sys/sockio.h#2 integrate
.. //depot/projects/netperf_socket/sys/sys/sx.h#2 integrate
.. //depot/projects/netperf_socket/sys/sys/syscall.h#2 integrate
.. //depot/projects/netperf_socket/sys/sys/syscall.mk#2 integrate
.. //depot/projects/netperf_socket/sys/sys/sysctl.h#2 integrate
.. //depot/projects/netperf_socket/sys/sys/sysproto.h#2 integrate
.. //depot/projects/netperf_socket/sys/sys/systm.h#2 integrate
.. //depot/projects/netperf_socket/sys/sys/taskqueue.h#2 integrate
.. //depot/projects/netperf_socket/sys/sys/ttycom.h#2 integrate
.. //depot/projects/netperf_socket/sys/sys/turnstile.h#2 integrate
.. //depot/projects/netperf_socket/sys/sys/uio.h#2 integrate
.. //depot/projects/netperf_socket/sys/sys/user.h#2 integrate
.. //depot/projects/netperf_socket/sys/tools/emu10k1-mkalsa.sh#1 branch
.. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_snapshot.c#2 integrate
.. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_softdep.c#2 integrate
.. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_vfsops.c#2 integrate
.. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_vnops.c#2 integrate
.. //depot/projects/netperf_socket/sys/ufs/ufs/ufs_dirhash.c#2 integrate
.. //depot/projects/netperf_socket/sys/ufs/ufs/ufs_extattr.c#2 integrate
.. //depot/projects/netperf_socket/sys/ufs/ufs/ufs_vnops.c#2 integrate
.. //depot/projects/netperf_socket/sys/vm/swap_pager.c#2 integrate
.. //depot/projects/netperf_socket/sys/vm/uma_core.c#2 integrate
.. //depot/projects/netperf_socket/sys/vm/vm_contig.c#2 integrate
.. //depot/projects/netperf_socket/sys/vm/vm_extern.h#2 integrate
.. //depot/projects/netperf_socket/sys/vm/vm_fault.c#2 integrate
.. //depot/projects/netperf_socket/sys/vm/vm_glue.c#2 integrate
.. //depot/projects/netperf_socket/sys/vm/vm_kern.c#2 integrate
.. //depot/projects/netperf_socket/sys/vm/vm_map.c#2 integrate
.. //depot/projects/netperf_socket/sys/vm/vm_mmap.c#2 integrate
.. //depot/projects/netperf_socket/sys/vm/vm_object.c#2 integrate
.. //depot/projects/netperf_socket/sys/vm/vm_page.c#2 integrate
.. //depot/projects/netperf_socket/sys/vm/vm_pageout.c#2 integrate
.. //depot/projects/netperf_socket/sys/vm/vm_unix.c#2 integrate
.. //depot/projects/netperf_socket/sys/vm/vm_zeroidle.c#2 integrate
Differences ...
==== //depot/projects/netperf_socket/sys/alpha/alpha/machdep.c#2 (text+ko) ====
@@ -88,7 +88,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.216 2004/01/03 02:02:24 davidxu Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.217 2004/02/27 19:30:46 kensmith Exp $");
#include "opt_compat.h"
#include "opt_ddb.h"
@@ -201,6 +201,9 @@
long unknownmem; /* amount of memory with an unknown use */
int ncpus; /* number of cpus */
+int promcons_dly_mkdev = 1; /* need to delay call to make_dev() */
+void promcons_delayed_makedev(void);
+
vm_offset_t phys_avail[10];
/* must be 2 less so 0 0 can signal end of chunks */
@@ -889,6 +892,14 @@
}
/*
+ * Check to see if promcons needs to make_dev() now,
+ * doing it before now crashes with kernel stack issues.
+ */
+ if (promcons_dly_mkdev > 1)
+ promcons_delayed_makedev();
+ promcons_dly_mkdev = 0;
+
+ /*
* Initialize the virtual memory system, and set the
* page table base register in proc 0's PCB.
*/
==== //depot/projects/netperf_socket/sys/alpha/alpha/mem.c#2 (text+ko) ====
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/mem.c,v 1.46 2003/08/17 06:42:07 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/mem.c,v 1.47 2004/02/21 21:10:38 phk Exp $");
/*
* Memory special file
@@ -83,6 +83,7 @@
#define CDEV_MAJOR 2
static struct cdevsw mem_cdevsw = {
+ .d_version = D_VERSION,
.d_open = mmopen,
.d_close = mmclose,
.d_read = mmrw,
@@ -91,7 +92,7 @@
.d_mmap = memmmap,
.d_name = "mem",
.d_maj = CDEV_MAJOR,
- .d_flags = D_MEM,
+ .d_flags = D_MEM | D_NEEDGIANT,
};
struct mem_range_softc mem_range_softc;
==== //depot/projects/netperf_socket/sys/alpha/alpha/promcons.c#2 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/promcons.c,v 1.31 2003/09/26 10:52:16 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/promcons.c,v 1.36 2004/02/28 16:36:14 kensmith Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -63,16 +63,13 @@
static d_close_t promclose;
static d_ioctl_t promioctl;
-#define CDEV_MAJOR 97
static struct cdevsw prom_cdevsw = {
+ .d_version = D_VERSION,
.d_open = promopen,
.d_close = promclose,
- .d_read = ttyread,
- .d_write = ttywrite,
.d_ioctl = promioctl,
- .d_poll = ttypoll,
.d_name = "prom",
- .d_maj = CDEV_MAJOR,
+ .d_flags = D_TTY | D_NEEDGIANT,
};
@@ -86,6 +83,9 @@
int promparam(struct tty *, struct termios *);
void promstop(struct tty *, int);
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list