Date: Sat, 9 Oct 2004 20:36:07 GMT From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 62922 for review Message-ID: <200410092036.i99Ka7gL017943@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=62922 Change 62922 by rwatson@rwatson_fledge on 2004/10/09 20:35:10 Integrate netperf_socket: - Various VMisms. - More tty-related cleanups. - Many ARMisms. - vge, lge, some more nge drivers - subr_unit - ELESSVINUM - ng_netflow - auxio driver - pf workarounds to avoid ordering problems with callouts. - inpcb reference (and lock) now passed into out-bound pfil hooks to avoid lock order issues. - various ACPIisms - various ATAisms and other driverisms. - much-needed if_em queueing fix (yay!) - getpages reductionism. - many geomisms, including much gmirror, gvinum, etc. - SCHED_4BSD now the default again. - Many scheduler changes, cleanup, kse cleanups, thr cleanups, etc. - kdb trap frame fixes - taskqueue_drain() - loop back of bpf locks in witness - loop back of BPF locking fixes - Missing sockbuf_lock() in sendfile() - Socket buffer locking in vfs_aio - Improved cdev locking, referencing, etc. - ENOVOP_FREEBLKS() - Fixes to getifaddr() queries to avoid blocking with mutexes held - ugid cache in ipfw - ALTQ, TCDATALEN, DIVERTED support in ipfw, more ipfw instruction checks. - ip_mroute fixes for debug.mpsafenet=0 - TCP SACK related locking fixes for tcp_output(), various other SACK fixes. - NFS over IPv6 fix regarding IPv6 MTU errors. - IPSEC pfkey fix for changes in MHLEN - No more device node use on non-devfs. - MBUMA keg math fix. Affected files ... .. //depot/projects/netperf_socket/sys/alpha/alpha/db_trace.c#4 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/pmap.c#19 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/promcons.c#7 integrate .. //depot/projects/netperf_socket/sys/alpha/conf/GENERIC#11 integrate .. //depot/projects/netperf_socket/sys/alpha/include/atomic.h#2 integrate .. //depot/projects/netperf_socket/sys/alpha/isa/isa_dma.c#3 integrate .. //depot/projects/netperf_socket/sys/alpha/osf1/osf1_misc.c#6 integrate .. //depot/projects/netperf_socket/sys/alpha/tlsb/zs_tlsb.c#8 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/bios.c#1 branch .. //depot/projects/netperf_socket/sys/amd64/amd64/db_trace.c#5 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/machdep.c#18 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/mp_machdep.c#13 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/mptable.c#5 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/pmap.c#29 integrate .. //depot/projects/netperf_socket/sys/amd64/conf/GENERIC#18 integrate .. //depot/projects/netperf_socket/sys/amd64/conf/NOTES#10 integrate .. //depot/projects/netperf_socket/sys/amd64/include/db_machdep.h#3 integrate .. //depot/projects/netperf_socket/sys/amd64/include/pc/bios.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/pmap.h#13 integrate .. //depot/projects/netperf_socket/sys/amd64/isa/isa_dma.c#5 integrate .. //depot/projects/netperf_socket/sys/amd64/isa/isa_dma.h#3 delete .. //depot/projects/netperf_socket/sys/amd64/linux32/linux32_machdep.c#4 integrate .. //depot/projects/netperf_socket/sys/arm/arm/bcopyinout.S#2 integrate .. //depot/projects/netperf_socket/sys/arm/arm/busdma_machdep.c#4 integrate .. //depot/projects/netperf_socket/sys/arm/arm/cpufunc.c#3 integrate .. //depot/projects/netperf_socket/sys/arm/arm/db_trace.c#5 integrate .. //depot/projects/netperf_socket/sys/arm/arm/elf_machdep.c#3 integrate .. //depot/projects/netperf_socket/sys/arm/arm/exception.S#3 integrate .. //depot/projects/netperf_socket/sys/arm/arm/fusu.S#2 integrate .. //depot/projects/netperf_socket/sys/arm/arm/genassym.c#2 integrate .. //depot/projects/netperf_socket/sys/arm/arm/identcpu.c#2 integrate .. //depot/projects/netperf_socket/sys/arm/arm/intr.c#3 integrate .. //depot/projects/netperf_socket/sys/arm/arm/irq_dispatch.S#2 integrate .. //depot/projects/netperf_socket/sys/arm/arm/locore.S#3 integrate .. //depot/projects/netperf_socket/sys/arm/arm/machdep.c#5 integrate .. //depot/projects/netperf_socket/sys/arm/arm/nexus_io.c#3 integrate .. //depot/projects/netperf_socket/sys/arm/arm/pmap.c#10 integrate .. //depot/projects/netperf_socket/sys/arm/arm/support.S#3 integrate .. //depot/projects/netperf_socket/sys/arm/arm/swtch.S#2 integrate .. //depot/projects/netperf_socket/sys/arm/arm/sys_machdep.c#3 integrate .. //depot/projects/netperf_socket/sys/arm/arm/trap.c#2 integrate .. //depot/projects/netperf_socket/sys/arm/arm/uio_machdep.c#3 integrate .. //depot/projects/netperf_socket/sys/arm/arm/vm_machdep.c#4 integrate .. //depot/projects/netperf_socket/sys/arm/conf/IQ31244#1 branch .. //depot/projects/netperf_socket/sys/arm/conf/SIMICS#2 integrate .. //depot/projects/netperf_socket/sys/arm/include/asm.h#2 integrate .. //depot/projects/netperf_socket/sys/arm/include/asmacros.h#2 integrate .. //depot/projects/netperf_socket/sys/arm/include/bus.h#3 integrate .. //depot/projects/netperf_socket/sys/arm/include/endian.h#4 integrate .. //depot/projects/netperf_socket/sys/arm/include/intr.h#2 integrate .. //depot/projects/netperf_socket/sys/arm/include/md_var.h#2 integrate .. //depot/projects/netperf_socket/sys/arm/include/param.h#3 integrate .. //depot/projects/netperf_socket/sys/arm/include/pcb.h#4 integrate .. //depot/projects/netperf_socket/sys/arm/include/pmap.h#4 integrate .. //depot/projects/netperf_socket/sys/arm/include/profile.h#4 integrate .. //depot/projects/netperf_socket/sys/arm/include/pte.h#2 integrate .. //depot/projects/netperf_socket/sys/arm/include/signal.h#4 integrate .. //depot/projects/netperf_socket/sys/arm/include/sysarch.h#1 branch .. //depot/projects/netperf_socket/sys/arm/include/vmparam.h#3 integrate .. //depot/projects/netperf_socket/sys/arm/sa11x0/assabet_machdep.c#4 integrate .. //depot/projects/netperf_socket/sys/arm/sa11x0/sa11x0.c#4 integrate .. //depot/projects/netperf_socket/sys/arm/sa11x0/sa11x0_io.c#3 integrate .. //depot/projects/netperf_socket/sys/arm/sa11x0/sa11x0_irq.S#2 integrate .. //depot/projects/netperf_socket/sys/arm/sa11x0/sa11x0_irqhandler.c#2 integrate .. //depot/projects/netperf_socket/sys/arm/sa11x0/std.sa11x0#2 integrate .. //depot/projects/netperf_socket/sys/arm/xscale/i80321/files.i80321#1 branch .. //depot/projects/netperf_socket/sys/arm/xscale/i80321/files.iq31244#1 branch .. //depot/projects/netperf_socket/sys/arm/xscale/i80321/i80321.c#1 branch .. //depot/projects/netperf_socket/sys/arm/xscale/i80321/i80321_intr.h#1 branch .. //depot/projects/netperf_socket/sys/arm/xscale/i80321/i80321_mcu.c#1 branch .. //depot/projects/netperf_socket/sys/arm/xscale/i80321/i80321_pci.c#1 branch .. //depot/projects/netperf_socket/sys/arm/xscale/i80321/i80321_space.c#1 branch .. //depot/projects/netperf_socket/sys/arm/xscale/i80321/i80321_timer.c#1 branch .. //depot/projects/netperf_socket/sys/arm/xscale/i80321/i80321reg.h#1 branch .. //depot/projects/netperf_socket/sys/arm/xscale/i80321/i80321var.h#1 branch .. //depot/projects/netperf_socket/sys/arm/xscale/i80321/iq31244_machdep.c#1 branch .. //depot/projects/netperf_socket/sys/arm/xscale/i80321/iq80321.c#1 branch .. //depot/projects/netperf_socket/sys/arm/xscale/i80321/iq80321reg.h#1 branch .. //depot/projects/netperf_socket/sys/arm/xscale/i80321/iq80321var.h#1 branch .. //depot/projects/netperf_socket/sys/arm/xscale/i80321/obio.c#1 branch .. //depot/projects/netperf_socket/sys/arm/xscale/i80321/obio_space.c#1 branch .. //depot/projects/netperf_socket/sys/arm/xscale/i80321/obiovar.h#1 branch .. //depot/projects/netperf_socket/sys/arm/xscale/i80321/std.i80321#1 branch .. //depot/projects/netperf_socket/sys/arm/xscale/i80321/std.iq31244#1 branch .. //depot/projects/netperf_socket/sys/arm/xscale/i80321/uart_bus_i80321.c#1 branch .. //depot/projects/netperf_socket/sys/arm/xscale/i80321/uart_cpu_i80321.c#1 branch .. //depot/projects/netperf_socket/sys/arm/xscale/xscalereg.h#1 branch .. //depot/projects/netperf_socket/sys/arm/xscale/xscalevar.h#1 branch .. //depot/projects/netperf_socket/sys/boot/alpha/common/help.alpha#2 integrate .. //depot/projects/netperf_socket/sys/boot/common/bcache.c#2 integrate .. //depot/projects/netperf_socket/sys/boot/common/commands.c#2 integrate .. //depot/projects/netperf_socket/sys/boot/common/help.common#6 integrate .. //depot/projects/netperf_socket/sys/boot/common/loader.8#8 integrate .. //depot/projects/netperf_socket/sys/boot/efi/libefi/elf_freebsd.c#3 integrate .. //depot/projects/netperf_socket/sys/boot/efi/loader/main.c#3 integrate .. //depot/projects/netperf_socket/sys/boot/forth/loader.4th.8#2 integrate .. //depot/projects/netperf_socket/sys/boot/forth/loader.conf#12 integrate .. //depot/projects/netperf_socket/sys/boot/forth/loader.conf.5#4 integrate .. //depot/projects/netperf_socket/sys/boot/i386/boot2/boot2.c#4 integrate .. //depot/projects/netperf_socket/sys/boot/i386/libi386/biosdisk.c#4 integrate .. //depot/projects/netperf_socket/sys/boot/i386/loader/help.i386#2 integrate .. //depot/projects/netperf_socket/sys/boot/ia64/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/boot/ia64/libski/Makefile#3 delete .. //depot/projects/netperf_socket/sys/boot/ia64/libski/acpi_stub.c#2 delete .. //depot/projects/netperf_socket/sys/boot/ia64/libski/bootinfo.c#2 delete .. //depot/projects/netperf_socket/sys/boot/ia64/libski/copy.c#2 delete .. //depot/projects/netperf_socket/sys/boot/ia64/libski/delay.c#2 delete .. //depot/projects/netperf_socket/sys/boot/ia64/libski/devicename.c#2 delete .. //depot/projects/netperf_socket/sys/boot/ia64/libski/efi_stub.c#2 delete .. //depot/projects/netperf_socket/sys/boot/ia64/libski/elf_freebsd.c#3 delete .. //depot/projects/netperf_socket/sys/boot/ia64/libski/exit.c#2 delete .. //depot/projects/netperf_socket/sys/boot/ia64/libski/libski.h#2 delete .. //depot/projects/netperf_socket/sys/boot/ia64/libski/module.c#2 delete .. //depot/projects/netperf_socket/sys/boot/ia64/libski/pal_stub.S#2 delete .. //depot/projects/netperf_socket/sys/boot/ia64/libski/sal_stub.c#2 delete .. //depot/projects/netperf_socket/sys/boot/ia64/libski/skiconsole.c#2 delete .. //depot/projects/netperf_socket/sys/boot/ia64/libski/skifs.c#2 delete .. //depot/projects/netperf_socket/sys/boot/ia64/libski/ssc.c#2 delete .. //depot/projects/netperf_socket/sys/boot/ia64/libski/time.c#2 delete .. //depot/projects/netperf_socket/sys/boot/ia64/ski/Makefile#1 branch .. //depot/projects/netperf_socket/sys/boot/ia64/ski/acpi_stub.c#1 branch .. //depot/projects/netperf_socket/sys/boot/ia64/ski/bootinfo.c#1 branch .. //depot/projects/netperf_socket/sys/boot/ia64/ski/conf.c#1 branch .. //depot/projects/netperf_socket/sys/boot/ia64/ski/copy.c#1 branch .. //depot/projects/netperf_socket/sys/boot/ia64/ski/delay.c#1 branch .. //depot/projects/netperf_socket/sys/boot/ia64/ski/devicename.c#1 branch .. //depot/projects/netperf_socket/sys/boot/ia64/ski/efi_stub.c#1 branch .. //depot/projects/netperf_socket/sys/boot/ia64/ski/elf_freebsd.c#1 branch .. //depot/projects/netperf_socket/sys/boot/ia64/ski/exit.c#1 branch .. //depot/projects/netperf_socket/sys/boot/ia64/ski/ldscript.ia64#1 branch .. //depot/projects/netperf_socket/sys/boot/ia64/ski/libski.h#1 branch .. //depot/projects/netperf_socket/sys/boot/ia64/ski/main.c#1 branch .. //depot/projects/netperf_socket/sys/boot/ia64/ski/pal_stub.S#1 branch .. //depot/projects/netperf_socket/sys/boot/ia64/ski/sal_stub.c#1 branch .. //depot/projects/netperf_socket/sys/boot/ia64/ski/skiconsole.c#1 branch .. //depot/projects/netperf_socket/sys/boot/ia64/ski/skifs.c#1 branch .. //depot/projects/netperf_socket/sys/boot/ia64/ski/skiload.cmd#1 branch .. //depot/projects/netperf_socket/sys/boot/ia64/ski/ssc.c#1 branch .. //depot/projects/netperf_socket/sys/boot/ia64/ski/start.S#1 branch .. //depot/projects/netperf_socket/sys/boot/ia64/ski/time.c#1 branch .. //depot/projects/netperf_socket/sys/boot/ia64/ski/version#1 branch .. //depot/projects/netperf_socket/sys/boot/ia64/skiload/Makefile#3 delete .. //depot/projects/netperf_socket/sys/boot/ia64/skiload/conf.c#2 delete .. //depot/projects/netperf_socket/sys/boot/ia64/skiload/ldscript.ia64#2 delete .. //depot/projects/netperf_socket/sys/boot/ia64/skiload/main.c#2 delete .. //depot/projects/netperf_socket/sys/boot/ia64/skiload/skiload.cmd#2 delete .. //depot/projects/netperf_socket/sys/boot/ia64/skiload/start.S#2 delete .. //depot/projects/netperf_socket/sys/boot/ia64/skiload/version#2 delete .. //depot/projects/netperf_socket/sys/boot/pc98/boot2/Makefile#3 integrate .. //depot/projects/netperf_socket/sys/boot/pc98/loader/help.pc98#2 integrate .. //depot/projects/netperf_socket/sys/cam/cam_periph.h#3 integrate .. //depot/projects/netperf_socket/sys/cam/cam_xpt.c#6 integrate .. //depot/projects/netperf_socket/sys/coda/coda_vfsops.c#6 integrate .. //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_misc.c#7 integrate .. //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_proto.h#8 integrate .. //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_syscall.h#8 integrate .. //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_syscalls.c#8 integrate .. //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_sysent.c#8 integrate .. //depot/projects/netperf_socket/sys/compat/freebsd32/syscalls.master#7 integrate .. //depot/projects/netperf_socket/sys/compat/linux/linux_misc.c#8 integrate .. //depot/projects/netperf_socket/sys/compat/linux/linux_stats.c#7 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/subr_ndis.c#16 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/subr_ntoskrnl.c#19 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_misc.c#4 integrate .. //depot/projects/netperf_socket/sys/conf/Makefile.arm#3 integrate .. //depot/projects/netperf_socket/sys/conf/NOTES#43 integrate .. //depot/projects/netperf_socket/sys/conf/files#53 integrate .. //depot/projects/netperf_socket/sys/conf/files.amd64#17 integrate .. //depot/projects/netperf_socket/sys/conf/files.i386#28 integrate .. //depot/projects/netperf_socket/sys/conf/files.ia64#8 integrate .. //depot/projects/netperf_socket/sys/conf/files.sparc64#10 integrate .. //depot/projects/netperf_socket/sys/conf/kern.post.mk#9 integrate .. //depot/projects/netperf_socket/sys/conf/kern.pre.mk#15 integrate .. //depot/projects/netperf_socket/sys/conf/kmod.mk#15 integrate .. //depot/projects/netperf_socket/sys/conf/ldscript.arm#2 integrate .. //depot/projects/netperf_socket/sys/conf/majors#7 integrate .. //depot/projects/netperf_socket/sys/conf/newvers.sh#5 integrate .. //depot/projects/netperf_socket/sys/conf/options#31 integrate .. //depot/projects/netperf_socket/sys/conf/options.arm#2 integrate .. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_fil.c#7 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/if_pflog.c#9 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/if_pfsync.c#11 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/pf.c#14 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/pf_if.c#5 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/pf_ioctl.c#11 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/pfvar.h#7 integrate .. //depot/projects/netperf_socket/sys/dev/aac/aac.c#11 integrate .. //depot/projects/netperf_socket/sys/dev/aac/aacreg.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/Osd/OsdTable.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi.c#40 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_pci.c#16 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_pci_link.c#14 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_pcib_acpi.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_quirks#3 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_thermal.c#14 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_timer.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpivar.h#23 integrate .. //depot/projects/netperf_socket/sys/dev/adlink/adlink.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/aha/aha_mca.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/amr/amr.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-all.c#19 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-all.h#13 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-card.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-cbus.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-chipset.c#21 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-disk.c#10 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-dma.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-isa.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-lowlevel.c#18 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-pci.c#12 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-pci.h#9 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-queue.c#14 integrate .. //depot/projects/netperf_socket/sys/dev/auxio/auxio.c#1 branch .. //depot/projects/netperf_socket/sys/dev/auxio/auxioreg.h#1 branch .. //depot/projects/netperf_socket/sys/dev/bfe/if_bfe.c#10 integrate .. //depot/projects/netperf_socket/sys/dev/bge/if_bge.c#10 integrate .. //depot/projects/netperf_socket/sys/dev/bge/if_bgereg.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/bktr/msp34xx.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/buslogic/bt_mca.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/cp/if_cp.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/ctau/if_ct.c#11 integrate .. //depot/projects/netperf_socket/sys/dev/cx/if_cx.c#17 integrate .. //depot/projects/netperf_socket/sys/dev/cy/cy.c#13 integrate .. //depot/projects/netperf_socket/sys/dev/dcons/dcons.c#10 integrate .. //depot/projects/netperf_socket/sys/dev/digi/digi.c#15 integrate .. //depot/projects/netperf_socket/sys/dev/digi/digi.h#5 integrate .. //depot/projects/netperf_socket/sys/dev/em/if_em.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/em/if_em_hw.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/esp/esp_sbus.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/fb/vga.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/fdc/fdc.c#11 integrate .. //depot/projects/netperf_socket/sys/dev/fdc/fdc_acpi.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/fdc/fdc_isa.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/fdc/fdc_pccard.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/fdc/fdcvar.h#5 integrate .. //depot/projects/netperf_socket/sys/dev/fe/if_fe.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/fxp/if_fxp.c#13 integrate .. //depot/projects/netperf_socket/sys/dev/if_ndis/if_ndis.c#18 integrate .. //depot/projects/netperf_socket/sys/dev/isp/isp_freebsd.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/isp/isp_pci.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/md/md.c#21 integrate .. //depot/projects/netperf_socket/sys/dev/mii/brgphy.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/mii/ciphy.c#1 branch .. //depot/projects/netperf_socket/sys/dev/mii/ciphyreg.h#1 branch .. //depot/projects/netperf_socket/sys/dev/mii/miidevs#2 integrate .. //depot/projects/netperf_socket/sys/dev/mk48txx/mk48txx.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/mk48txx/mk48txxreg.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/musycc/musycc.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/nge/if_nge.c#14 integrate .. //depot/projects/netperf_socket/sys/dev/nge/if_ngereg.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/pccard/pccarddevs#6 integrate .. //depot/projects/netperf_socket/sys/dev/pci/pci.c#10 integrate .. //depot/projects/netperf_socket/sys/dev/pdq/pdq.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/pst/pst-iop.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/pst/pst-iop.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/pst/pst-pci.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/pst/pst-raid.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/rc/rc.c#12 integrate .. //depot/projects/netperf_socket/sys/dev/re/if_re.c#14 integrate .. //depot/projects/netperf_socket/sys/dev/rp/rp.c#10 integrate .. //depot/projects/netperf_socket/sys/dev/rp/rpvar.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/sab/sab.c#12 integrate .. //depot/projects/netperf_socket/sys/dev/si/si.c#12 integrate .. //depot/projects/netperf_socket/sys/dev/si/si.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/si/sivar.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/sio/sio.c#20 integrate .. //depot/projects/netperf_socket/sys/dev/snp/snp.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/sound/isa/sb16.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/fm801.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/ich.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pcm/sndstat.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/sx/sx.c#10 integrate .. //depot/projects/netperf_socket/sys/dev/sx/sx.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/sym/sym_hipd.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/syscons/scvgarndr.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/syscons/syscons.c#13 integrate .. //depot/projects/netperf_socket/sys/dev/uart/uart_tty.c#10 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_axe.c#11 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ubser.c#10 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ucom.c#11 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ucomvar.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ugen.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/usb/uhci.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/usb/uhid.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/usb/uhub.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/usb/umct.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/usb/umodem.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/usb/uplcom.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usb_port.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usb_subr.c#10 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdevs#25 integrate .. //depot/projects/netperf_socket/sys/dev/usb/uvscom.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/vge/if_vge.c#1 branch .. //depot/projects/netperf_socket/sys/dev/vge/if_vgereg.h#1 branch .. //depot/projects/netperf_socket/sys/dev/vge/if_vgevar.h#1 branch .. //depot/projects/netperf_socket/sys/dev/vinum/vinumext.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/vinum/vinummemory.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/zs/zs.c#10 integrate .. //depot/projects/netperf_socket/sys/fs/autofs/autofs.h#4 integrate .. //depot/projects/netperf_socket/sys/fs/autofs/autofs_util.c#4 integrate .. //depot/projects/netperf_socket/sys/fs/autofs/autofs_vfsops.c#4 integrate .. //depot/projects/netperf_socket/sys/fs/autofs/autofs_vnops.c#4 integrate .. //depot/projects/netperf_socket/sys/fs/devfs/devfs_rule.c#4 integrate .. //depot/projects/netperf_socket/sys/fs/nwfs/nwfs_io.c#5 integrate .. //depot/projects/netperf_socket/sys/fs/procfs/procfs_dbregs.c#3 integrate .. //depot/projects/netperf_socket/sys/fs/procfs/procfs_fpregs.c#3 integrate .. //depot/projects/netperf_socket/sys/fs/procfs/procfs_regs.c#3 integrate .. //depot/projects/netperf_socket/sys/fs/procfs/procfs_status.c#4 integrate .. //depot/projects/netperf_socket/sys/fs/smbfs/smbfs_io.c#5 integrate .. //depot/projects/netperf_socket/sys/fs/specfs/spec_vnops.c#9 integrate .. //depot/projects/netperf_socket/sys/fs/unionfs/union.h#3 integrate .. //depot/projects/netperf_socket/sys/fs/unionfs/union_vfsops.c#5 integrate .. //depot/projects/netperf_socket/sys/fs/unionfs/union_vnops.c#4 integrate .. //depot/projects/netperf_socket/sys/geom/bde/g_bde_crypt.c#3 integrate .. //depot/projects/netperf_socket/sys/geom/bde/g_bde_lock.c#2 integrate .. //depot/projects/netperf_socket/sys/geom/concat/g_concat.c#15 integrate .. //depot/projects/netperf_socket/sys/geom/gate/g_gate.c#9 integrate .. //depot/projects/netperf_socket/sys/geom/geom_dev.c#6 integrate .. //depot/projects/netperf_socket/sys/geom/geom_io.c#9 integrate .. //depot/projects/netperf_socket/sys/geom/geom_kern.c#3 integrate .. //depot/projects/netperf_socket/sys/geom/geom_pc98.c#4 integrate .. //depot/projects/netperf_socket/sys/geom/label/g_label.c#7 integrate .. //depot/projects/netperf_socket/sys/geom/mirror/g_mirror.c#12 integrate .. //depot/projects/netperf_socket/sys/geom/mirror/g_mirror.h#6 integrate .. //depot/projects/netperf_socket/sys/geom/nop/g_nop.c#8 integrate .. //depot/projects/netperf_socket/sys/geom/raid3/g_raid3.c#7 integrate .. //depot/projects/netperf_socket/sys/geom/raid3/g_raid3.h#3 integrate .. //depot/projects/netperf_socket/sys/geom/stripe/g_stripe.c#12 integrate .. //depot/projects/netperf_socket/sys/geom/uzip/g_uzip.c#3 integrate .. //depot/projects/netperf_socket/sys/geom/vinum/geom_vinum.c#10 integrate .. //depot/projects/netperf_socket/sys/geom/vinum/geom_vinum.h#4 integrate .. //depot/projects/netperf_socket/sys/geom/vinum/geom_vinum_drive.c#11 integrate .. //depot/projects/netperf_socket/sys/geom/vinum/geom_vinum_init.c#4 integrate .. //depot/projects/netperf_socket/sys/geom/vinum/geom_vinum_list.c#2 integrate .. //depot/projects/netperf_socket/sys/geom/vinum/geom_vinum_plex.c#7 integrate .. //depot/projects/netperf_socket/sys/geom/vinum/geom_vinum_raid5.c#6 integrate .. //depot/projects/netperf_socket/sys/geom/vinum/geom_vinum_raid5.h#3 integrate .. //depot/projects/netperf_socket/sys/geom/vinum/geom_vinum_rm.c#3 integrate .. //depot/projects/netperf_socket/sys/geom/vinum/geom_vinum_share.c#3 integrate .. //depot/projects/netperf_socket/sys/geom/vinum/geom_vinum_state.c#4 integrate .. //depot/projects/netperf_socket/sys/geom/vinum/geom_vinum_subr.c#7 integrate .. //depot/projects/netperf_socket/sys/geom/vinum/geom_vinum_var.h#2 integrate .. //depot/projects/netperf_socket/sys/geom/vinum/geom_vinum_volume.c#6 integrate .. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_extern.h#4 integrate .. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_readwrite.c#4 integrate .. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_vfsops.c#9 integrate .. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_vnops.c#7 integrate .. //depot/projects/netperf_socket/sys/i386/conf/GENERIC#15 integrate .. //depot/projects/netperf_socket/sys/i386/conf/NOTES#29 integrate .. //depot/projects/netperf_socket/sys/i386/conf/PAE#3 integrate .. //depot/projects/netperf_socket/sys/i386/i386/autoconf.c#5 integrate .. //depot/projects/netperf_socket/sys/i386/i386/db_trace.c#4 integrate .. //depot/projects/netperf_socket/sys/i386/i386/gdb_machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/i386/mp_machdep.c#10 integrate .. //depot/projects/netperf_socket/sys/i386/i386/mptable.c#6 integrate .. //depot/projects/netperf_socket/sys/i386/i386/pmap.c#29 integrate .. //depot/projects/netperf_socket/sys/i386/include/db_machdep.h#3 integrate .. //depot/projects/netperf_socket/sys/i386/include/pmap.h#10 integrate .. //depot/projects/netperf_socket/sys/i386/isa/isa_dma.c#4 integrate .. //depot/projects/netperf_socket/sys/i386/isa/isa_dma.h#3 delete .. //depot/projects/netperf_socket/sys/i386/isa/pbio.c#1 branch .. //depot/projects/netperf_socket/sys/i386/linux/linux_ptrace.c#3 integrate .. //depot/projects/netperf_socket/sys/i386/pci/pci_bus.c#7 integrate .. //depot/projects/netperf_socket/sys/ia64/acpica/OsdEnvironment.c#3 integrate .. //depot/projects/netperf_socket/sys/ia64/conf/GENERIC#11 integrate .. //depot/projects/netperf_socket/sys/ia64/conf/SKI#7 integrate .. //depot/projects/netperf_socket/sys/ia64/ia32/ia32_trap.c#1 branch .. //depot/projects/netperf_socket/sys/ia64/ia64/db_trace.c#4 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/dump_machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/efi.c#2 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/eficlock.c#2 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/exception.S#3 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/genassym.c#3 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/locore.S#5 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/machdep.c#12 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/pmap.c#19 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/sal.c#3 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/trap.c#9 integrate .. //depot/projects/netperf_socket/sys/ia64/include/atomic.h#2 integrate .. //depot/projects/netperf_socket/sys/ia64/include/efi.h#2 integrate .. //depot/projects/netperf_socket/sys/ia64/include/fpu.h#2 integrate .. //depot/projects/netperf_socket/sys/ia64/include/md_var.h#5 integrate .. //depot/projects/netperf_socket/sys/ia64/include/pmap.h#7 integrate .. //depot/projects/netperf_socket/sys/ia64/include/pte.h#3 integrate .. //depot/projects/netperf_socket/sys/ia64/include/sal.h#2 integrate .. //depot/projects/netperf_socket/sys/ia64/isa/isa_dma.c#3 integrate .. //depot/projects/netperf_socket/sys/isa/isavar.h#2 integrate .. //depot/projects/netperf_socket/sys/isa/psm.c#12 integrate .. //depot/projects/netperf_socket/sys/isa/syscons_isa.c#3 integrate .. //depot/projects/netperf_socket/sys/isofs/cd9660/cd9660_vfsops.c#8 integrate .. //depot/projects/netperf_socket/sys/isofs/cd9660/cd9660_vnops.c#5 integrate .. //depot/projects/netperf_socket/sys/kern/imgact_elf.c#12 integrate .. //depot/projects/netperf_socket/sys/kern/init_main.c#10 integrate .. //depot/projects/netperf_socket/sys/kern/init_sysent.c#11 integrate .. //depot/projects/netperf_socket/sys/kern/kern_acct.c#5 integrate .. //depot/projects/netperf_socket/sys/kern/kern_clock.c#9 integrate .. //depot/projects/netperf_socket/sys/kern/kern_conf.c#10 integrate .. //depot/projects/netperf_socket/sys/kern/kern_descrip.c#19 integrate .. //depot/projects/netperf_socket/sys/kern/kern_event.c#13 integrate .. //depot/projects/netperf_socket/sys/kern/kern_exec.c#16 integrate .. //depot/projects/netperf_socket/sys/kern/kern_exit.c#20 integrate .. //depot/projects/netperf_socket/sys/kern/kern_fork.c#19 integrate .. //depot/projects/netperf_socket/sys/kern/kern_kse.c#15 integrate .. //depot/projects/netperf_socket/sys/kern/kern_ktr.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/kern_malloc.c#7 integrate .. //depot/projects/netperf_socket/sys/kern/kern_mbuf.c#4 integrate .. //depot/projects/netperf_socket/sys/kern/kern_physio.c#4 integrate .. //depot/projects/netperf_socket/sys/kern/kern_proc.c#17 integrate .. //depot/projects/netperf_socket/sys/kern/kern_resource.c#12 integrate .. //depot/projects/netperf_socket/sys/kern/kern_shutdown.c#17 integrate .. //depot/projects/netperf_socket/sys/kern/kern_sig.c#21 integrate .. //depot/projects/netperf_socket/sys/kern/kern_switch.c#15 integrate .. //depot/projects/netperf_socket/sys/kern/kern_synch.c#18 integrate .. //depot/projects/netperf_socket/sys/kern/kern_thr.c#14 integrate .. //depot/projects/netperf_socket/sys/kern/kern_thread.c#27 integrate .. //depot/projects/netperf_socket/sys/kern/kern_time.c#5 integrate .. //depot/projects/netperf_socket/sys/kern/sched_4bsd.c#17 integrate .. //depot/projects/netperf_socket/sys/kern/sched_ule.c#22 integrate .. //depot/projects/netperf_socket/sys/kern/subr_kdb.c#7 integrate .. //depot/projects/netperf_socket/sys/kern/subr_taskqueue.c#5 integrate .. //depot/projects/netperf_socket/sys/kern/subr_trap.c#10 integrate .. //depot/projects/netperf_socket/sys/kern/subr_turnstile.c#8 integrate .. //depot/projects/netperf_socket/sys/kern/subr_unit.c#1 branch .. //depot/projects/netperf_socket/sys/kern/subr_witness.c#11 integrate .. //depot/projects/netperf_socket/sys/kern/syscalls.c#11 integrate .. //depot/projects/netperf_socket/sys/kern/syscalls.master#11 integrate .. //depot/projects/netperf_socket/sys/kern/tty.c#15 integrate .. //depot/projects/netperf_socket/sys/kern/tty_cons.c#7 integrate .. //depot/projects/netperf_socket/sys/kern/tty_pty.c#12 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_mbuf.c#9 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_mbuf2.c#6 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_syscalls.c#26 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_aio.c#9 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_bio.c#11 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_cluster.c#4 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_default.c#6 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_init.c#7 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_mount.c#15 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_subr.c#24 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_vnops.c#11 integrate .. //depot/projects/netperf_socket/sys/kern/vnode_if.src#3 integrate .. //depot/projects/netperf_socket/sys/libkern/arm/divsi3.S#2 integrate .. //depot/projects/netperf_socket/sys/modules/Makefile#21 integrate .. //depot/projects/netperf_socket/sys/modules/auxio/Makefile#1 branch .. //depot/projects/netperf_socket/sys/modules/mem/Makefile#3 integrate .. //depot/projects/netperf_socket/sys/modules/netgraph/Makefile#7 integrate .. //depot/projects/netperf_socket/sys/modules/netgraph/netflow/Makefile#1 branch .. //depot/projects/netperf_socket/sys/modules/vge/Makefile#1 branch .. //depot/projects/netperf_socket/sys/net/bpf.c#13 integrate .. //depot/projects/netperf_socket/sys/net/bridge.c#11 integrate .. //depot/projects/netperf_socket/sys/net/ethernet.h#3 integrate .. //depot/projects/netperf_socket/sys/net/if.c#21 integrate .. //depot/projects/netperf_socket/sys/net/if_arcsubr.c#9 integrate .. //depot/projects/netperf_socket/sys/net/if_clone.c#3 integrate .. //depot/projects/netperf_socket/sys/net/if_tap.c#10 integrate .. //depot/projects/netperf_socket/sys/net/net_osdep.c#2 delete .. //depot/projects/netperf_socket/sys/net/net_osdep.h#2 integrate .. //depot/projects/netperf_socket/sys/net/pfil.c#2 integrate .. //depot/projects/netperf_socket/sys/net/pfil.h#3 integrate .. //depot/projects/netperf_socket/sys/net/route.h#11 integrate .. //depot/projects/netperf_socket/sys/net/rtsock.c#15 integrate .. //depot/projects/netperf_socket/sys/netgraph/netflow/netflow.c#1 branch .. //depot/projects/netperf_socket/sys/netgraph/netflow/netflow.h#1 branch .. //depot/projects/netperf_socket/sys/netgraph/netflow/ng_netflow.c#1 branch .. //depot/projects/netperf_socket/sys/netgraph/netflow/ng_netflow.h#1 branch .. //depot/projects/netperf_socket/sys/netgraph/ng_eiface.c#7 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_ether.c#9 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_tty.c#7 integrate .. //depot/projects/netperf_socket/sys/netinet/if_ether.c#10 integrate .. //depot/projects/netperf_socket/sys/netinet/in_pcb.c#16 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_divert.c#15 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_fastfwd.c#11 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_fw.h#11 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_fw2.c#19 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_fw_pfil.c#4 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_icmp.c#11 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_input.c#25 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_mroute.c#15 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_output.c#21 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_var.h#10 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_input.c#19 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_output.c#12 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_sack.c#3 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_subr.c#21 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_syncache.c#14 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_var.h#11 integrate .. //depot/projects/netperf_socket/sys/netinet6/in6_rmx.c#3 integrate .. //depot/projects/netperf_socket/sys/netinet6/ip6_forward.c#4 integrate .. //depot/projects/netperf_socket/sys/netinet6/ip6_fw.c#4 integrate .. //depot/projects/netperf_socket/sys/netinet6/ip6_input.c#11 integrate .. //depot/projects/netperf_socket/sys/netinet6/ip6_output.c#8 integrate .. //depot/projects/netperf_socket/sys/netinet6/nd6.c#8 integrate .. //depot/projects/netperf_socket/sys/netipsec/ipsec.c#3 integrate .. //depot/projects/netperf_socket/sys/netipsec/key.c#6 integrate .. //depot/projects/netperf_socket/sys/netipsec/key.h#2 integrate .. //depot/projects/netperf_socket/sys/netipsec/keydb.h#2 integrate .. //depot/projects/netperf_socket/sys/netkey/key.c#5 integrate .. //depot/projects/netperf_socket/sys/nfs4client/nfs4_vnops.c#7 integrate .. //depot/projects/netperf_socket/sys/nfsclient/nfs.h#9 integrate .. //depot/projects/netperf_socket/sys/nfsclient/nfs_bio.c#10 integrate .. //depot/projects/netperf_socket/sys/nfsclient/nfs_subs.c#10 integrate .. //depot/projects/netperf_socket/sys/nfsclient/nfs_vnops.c#8 integrate .. //depot/projects/netperf_socket/sys/nfsclient/nfsnode.h#4 integrate .. //depot/projects/netperf_socket/sys/pc98/conf/GENERIC#16 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/isa_dma.c#4 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/ppc.c#4 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/sio.c#18 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/sio_cbus.c#3 integrate .. //depot/projects/netperf_socket/sys/pci/agp_amd64.c#3 integrate .. //depot/projects/netperf_socket/sys/pci/if_dc.c#12 integrate .. //depot/projects/netperf_socket/sys/pci/if_rlreg.h#6 integrate .. //depot/projects/netperf_socket/sys/pci/if_sis.c#10 integrate .. //depot/projects/netperf_socket/sys/pci/if_xl.c#12 integrate .. //depot/projects/netperf_socket/sys/pci/ncr.c#5 integrate .. //depot/projects/netperf_socket/sys/pci/viapm.c#3 integrate .. //depot/projects/netperf_socket/sys/powerpc/powermac/uninorth.c#6 integrate .. //depot/projects/netperf_socket/sys/powerpc/powermac/uninorthvar.h#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/db_trace.c#4 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/pmap.c#18 integrate .. //depot/projects/netperf_socket/sys/rpc/rpcclnt.h#4 integrate .. //depot/projects/netperf_socket/sys/security/mac_bsdextended/mac_bsdextended.c#5 integrate .. //depot/projects/netperf_socket/sys/sparc64/conf/GENERIC#13 integrate .. //depot/projects/netperf_socket/sys/sparc64/conf/NOTES#7 integrate .. //depot/projects/netperf_socket/sys/sparc64/include/smp.h#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/bus_machdep.c#6 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/counter.c#3 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/db_trace.c#4 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/machdep.c#9 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/mp_machdep.c#3 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/rwindow.c#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/vm_machdep.c#9 integrate .. //depot/projects/netperf_socket/sys/sys/_task.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/buf.h#5 integrate .. //depot/projects/netperf_socket/sys/sys/conf.h#9 integrate .. //depot/projects/netperf_socket/sys/sys/interrupt.h#4 integrate .. //depot/projects/netperf_socket/sys/sys/kse.h#6 integrate .. //depot/projects/netperf_socket/sys/sys/mbuf.h#18 integrate .. //depot/projects/netperf_socket/sys/sys/mdioctl.h#5 integrate .. //depot/projects/netperf_socket/sys/sys/param.h#30 integrate .. //depot/projects/netperf_socket/sys/sys/pbioio.h#1 branch .. //depot/projects/netperf_socket/sys/sys/proc.h#27 integrate .. //depot/projects/netperf_socket/sys/sys/resource.h#5 integrate .. //depot/projects/netperf_socket/sys/sys/resourcevar.h#7 integrate .. //depot/projects/netperf_socket/sys/sys/rman.h#4 integrate .. //depot/projects/netperf_socket/sys/sys/runq.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/sched.h#8 integrate .. //depot/projects/netperf_socket/sys/sys/socketvar.h#23 integrate .. //depot/projects/netperf_socket/sys/sys/syscall.h#11 integrate .. //depot/projects/netperf_socket/sys/sys/syscall.mk#11 integrate .. //depot/projects/netperf_socket/sys/sys/syscallsubr.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/sysproto.h#11 integrate .. //depot/projects/netperf_socket/sys/sys/systm.h#11 integrate .. //depot/projects/netperf_socket/sys/sys/taskqueue.h#4 integrate .. //depot/projects/netperf_socket/sys/sys/thr.h#4 integrate .. //depot/projects/netperf_socket/sys/sys/tty.h#12 integrate .. //depot/projects/netperf_socket/sys/sys/ttydefaults.h#3 integrate .. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_alloc.c#7 integrate .. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_extern.h#4 integrate .. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_snapshot.c#8 integrate .. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_vfsops.c#10 integrate .. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_vnops.c#8 integrate .. //depot/projects/netperf_socket/sys/ufs/ufs/ufs_extern.h#4 integrate .. //depot/projects/netperf_socket/sys/ufs/ufs/ufs_vnops.c#9 integrate .. //depot/projects/netperf_socket/sys/vm/device_pager.c#7 integrate .. //depot/projects/netperf_socket/sys/vm/swap_pager.c#9 integrate .. //depot/projects/netperf_socket/sys/vm/uma_core.c#14 integrate .. //depot/projects/netperf_socket/sys/vm/uma_dbg.c#4 integrate .. //depot/projects/netperf_socket/sys/vm/vm_fault.c#11 integrate .. //depot/projects/netperf_socket/sys/vm/vm_glue.c#13 integrate .. //depot/projects/netperf_socket/sys/vm/vm_mmap.c#13 integrate .. //depot/projects/netperf_socket/sys/vm/vm_page.c#14 integrate Differences ... ==== //depot/projects/netperf_socket/sys/alpha/alpha/db_trace.c#4 (text+ko) ==== @@ -42,7 +42,7 @@ #include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ /*__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.9 2000/12/13 03:16:36 mycroft Exp $");*/ -__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.20 2004/07/21 05:07:08 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.21 2004/09/20 19:05:31 jhb Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -213,14 +213,16 @@ db_expr_t diff; db_addr_t symval; u_long last_ipl, tfps; - int i; + int i, quit; if (count == -1) count = 1024; last_ipl = ~0L; tf = NULL; - while (count--) { + quit = 0; + db_setup_paging(db_simple_pager, &quit, DB_LINES_PER_PAGE); + while (count-- && !quit) { sym = db_search_symbol(pc, DB_STGY_ANY, &diff); if (sym == DB_SYM_NULL) return (ENOENT); ==== //depot/projects/netperf_socket/sys/alpha/alpha/pmap.c#19 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.168 2004/08/27 19:06:16 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.173 2004/10/03 00:16:42 alc Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -895,8 +895,8 @@ pmap_unwire_pte_hold(pmap_t pmap, vm_offset_t va, vm_page_t m) { - vm_page_unhold(m); - if (m->hold_count == 0) + --m->wire_count; + if (m->wire_count == 0) return _pmap_unwire_pte_hold(pmap, va, m); else return 0; @@ -941,14 +941,8 @@ if (pmap->pm_ptphint == m) pmap->pm_ptphint = NULL; - /* - * If the page is finally unwired, simply free it. - */ - --m->wire_count; - if (m->wire_count == 0) { - vm_page_free_zero(m); - atomic_subtract_int(&cnt.v_wire_count, 1); - } + vm_page_free_zero(m); + atomic_subtract_int(&cnt.v_wire_count, 1); return 1; } @@ -1073,15 +1067,6 @@ if ((m->flags & PG_ZERO) == 0) pmap_zero_page(m); - KASSERT(m->queue == PQ_NONE, - ("_pmap_allocpte: %p->queue != PQ_NONE", m)); - - /* - * Increment the hold count for the page table page - * (denoting a new mapping.) - */ - m->hold_count++; - /* * Map the pagetable page into the process address space, if * it isn't already there. @@ -1099,7 +1084,7 @@ pt_entry_t* l2map; if (!pmap_pte_v(l1pte)) { if (_pmap_allocpte(pmap, NUSERLEV3MAPS + l1index) == NULL) { - vm_page_unhold(m); + --m->wire_count; vm_page_free(m); return (NULL); } @@ -1107,7 +1092,7 @@ vm_page_t l2page; l2page = PHYS_TO_VM_PAGE(pmap_pte_pa(l1pte)); - l2page->hold_count++; + l2page->wire_count++; } l2map = (pt_entry_t*) ALPHA_PHYS_TO_K0SEG(pmap_pte_pa(l1pte)); pte = &l2map[ptepindex & ((1 << ALPHA_PTSHIFT) - 1)]; @@ -1156,7 +1141,7 @@ m = PHYS_TO_VM_PAGE(pmap_pte_pa(lev2pte)); pmap->pm_ptphint = m; } - m->hold_count++; + m->wire_count++; } else { /* * Here if the pte page isn't mapped, or if it has been @@ -1632,7 +1617,8 @@ oldpte |= (PG_FOR | PG_FOE); } if ((oldpte & PG_FOW) == 0) { - m = PHYS_TO_VM_PAGE(pmap_pte_pa(pte)); + if (m == NULL) + m = PHYS_TO_VM_PAGE(pmap_pte_pa(pte)); if (pmap_track_modified(sva)) vm_page_dirty(m); oldpte |= PG_FOW; @@ -1700,7 +1686,7 @@ } origpte = *pte; - pa = VM_PAGE_TO_PHYS(m) & ~PAGE_MASK; + pa = VM_PAGE_TO_PHYS(m); managed = 0; opa = pmap_pte_pa(pte); @@ -1723,7 +1709,7 @@ * Remove extra pte reference */ if (mpte) - mpte->hold_count--; + mpte->wire_count--; /* * We might be turning off write access to the page, @@ -1731,11 +1717,8 @@ */ if (origpte & PG_MANAGED) { if ((origpte & PG_FOW) != PG_FOW - && pmap_track_modified(va)) { - vm_page_t om; - om = PHYS_TO_VM_PAGE(opa); - vm_page_dirty(om); - } + && pmap_track_modified(va)) + vm_page_dirty(m); } managed = origpte & PG_MANAGED; @@ -1838,7 +1821,7 @@ */ ptepindex = va >> ALPHA_L2SHIFT; if (mpte && (mpte->pindex == ptepindex)) { - mpte->hold_count++; + mpte->wire_count++; } else { retry: /* @@ -1858,7 +1841,7 @@ mpte = PHYS_TO_VM_PAGE(pmap_pte_pa(l2pte)); pmap->pm_ptphint = mpte; } - mpte->hold_count++; + mpte->wire_count++; } else { mpte = _pmap_allocpte(pmap, ptepindex); if (mpte == NULL) ==== //depot/projects/netperf_socket/sys/alpha/alpha/promcons.c#7 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/promcons.c,v 1.40 2004/07/15 20:47:36 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/promcons.c,v 1.41 2004/09/17 11:02:53 phk Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -71,7 +71,6 @@ }; -static struct tty *prom_tp = NULL; static int polltime; static struct callout_handle promtimeouthandle = CALLOUT_HANDLE_INITIALIZER(&promtimeouthandle); @@ -99,7 +98,7 @@ return ENXIO; - tp = prom_tp = dev->si_tty = ttymalloc(prom_tp); + tp = dev->si_tty = ttyalloc(); s = spltty(); tp->t_oproc = promstart; @@ -142,7 +141,7 @@ struct thread *td; { int unit = minor(dev); - struct tty *tp = prom_tp; + struct tty *tp = dev->si_tty; if (unit != 0) return ENXIO; ==== //depot/projects/netperf_socket/sys/alpha/conf/GENERIC#11 (text+ko) ==== @@ -18,7 +18,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.178 2004/09/07 22:37:43 scottl Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.179 2004/09/11 07:26:50 alc Exp $ machine alpha cpu EV4 @@ -163,6 +163,7 @@ device miibus # MII bus support device dc # DEC/Intel 21143 and workalikes device fxp # Intel EtherExpress PRO/100B (82557, 82558) +device nge # NatSemi DP83820 gigabit ethernet device pcn # AMD Am79C97x PCI 10/100 NICs device rl # RealTek 8129/8139 device sf # Adaptec AIC-6915 (``Starfire'') ==== //depot/projects/netperf_socket/sys/alpha/include/atomic.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/include/atomic.h,v 1.18 2003/02/23 06:34:21 marcel Exp $ + * $FreeBSD: src/sys/alpha/include/atomic.h,v 1.19 2004/09/10 05:00:27 marcel Exp $ */ #ifndef _MACHINE_ATOMIC_H_ @@ -32,18 +32,6 @@ #include <machine/alpha_cpu.h> /* - * Quick and dirty workaround for compiling LINT. The kernel is too - * large to jump between sections without linker stubs/trampolines. - */ -#ifdef COMPILING_LINT -#define __COLD_SECTION "br 3f\n" -#define __HOT_SECTION "3:\n" -#else -#define __COLD_SECTION ".section .text3,\"ax\"\n" -#define __HOT_SECTION ".previous\n" -#endif - -/* * Various simple arithmetic on memory which is atomic in the presence * of interrupts and SMP safe. */ @@ -67,10 +55,7 @@ "1:\tldl_l %0, %2\n\t" /* load old value */ "bis %0, %3, %0\n\t" /* calculate new value */ "stl_c %0, %1\n\t" /* attempt to store */ - "beq %0, 2f\n\t" /* spin if failed */ - __COLD_SECTION /* improve branch prediction */ - "2:\tbr 1b\n" /* try again */ - __HOT_SECTION + "beq %0, 1b\n" /* spin if failed */ : "=&r" (temp), "=m" (*p) : "m" (*p), "r" (v) : "memory"); @@ -86,10 +71,7 @@ "1:\tldl_l %0, %1\n\t" /* load old value */ "bic %0, %2, %0\n\t" /* calculate new value */ "stl_c %0, %1\n\t" /* attempt to store */ - "beq %0, 2f\n\t" /* spin if failed */ - __COLD_SECTION /* improve branch prediction */ - "2:\tbr 1b\n" /* try again */ - __HOT_SECTION + "beq %0, 1b\n" /* spin if failed */ : "=&r" (temp), "+m" (*p) : "r" (v) : "memory"); @@ -105,10 +87,7 @@ "1:\tldl_l %0, %1\n\t" /* load old value */ "addl %0, %2, %0\n\t" /* calculate new value */ "stl_c %0, %1\n\t" /* attempt to store */ - "beq %0, 2f\n\t" /* spin if failed */ - __COLD_SECTION /* improve branch prediction */ - "2:\tbr 1b\n" /* try again */ - __HOT_SECTION + "beq %0, 1b\n" /* spin if failed */ : "=&r" (temp), "+m" (*p) : "r" (v) : "memory"); @@ -124,10 +103,7 @@ "1:\tldl_l %0, %1\n\t" /* load old value */ "subl %0, %2, %0\n\t" /* calculate new value */ "stl_c %0, %1\n\t" /* attempt to store */ - "beq %0, 2f\n\t" /* spin if failed */ - __COLD_SECTION /* improve branch prediction */ - "2:\tbr 1b\n" /* try again */ - __HOT_SECTION + "beq %0, 1b\n" /* spin if failed */ : "=&r" (temp), "+m" (*p) : "r" (v) : "memory"); @@ -144,10 +120,7 @@ "1:\tldl_l %0,%2\n\t" /* load current value, asserting lock */ "ldiq %1,0\n\t" /* value to store */ "stl_c %1,%2\n\t" /* attempt to store */ - "beq %1,2f\n\t" /* if the store failed, spin */ - "br 3f\n" /* it worked, exit */ - "2:\tbr 1b\n" /* *addr not updated, loop */ - "3:\n" /* it worked */ + "beq %1,1b\n" /* if the store failed, spin */ : "=&r"(result), "=&r"(temp), "+m" (*addr) : : "memory"); @@ -165,10 +138,7 @@ "1:\tldq_l %0, %1\n\t" /* load old value */ "bis %0, %2, %0\n\t" /* calculate new value */ "stq_c %0, %1\n\t" /* attempt to store */ - "beq %0, 2f\n\t" /* spin if failed */ - __COLD_SECTION /* improve branch prediction */ - "2:\tbr 1b\n" /* try again */ - __HOT_SECTION + "beq %0, 1b\n" /* spin if failed */ : "=&r" (temp), "+m" (*p) : "r" (v) : "memory"); @@ -184,10 +154,7 @@ "1:\tldq_l %0, %1\n\t" /* load old value */ "bic %0, %2, %0\n\t" /* calculate new value */ "stq_c %0, %1\n\t" /* attempt to store */ - "beq %0, 2f\n\t" /* spin if failed */ - __COLD_SECTION /* improve branch prediction */ - "2:\tbr 1b\n" /* try again */ - __HOT_SECTION + "beq %0, 1b\n" /* spin if failed */ : "=&r" (temp), "+m" (*p) : "r" (v) : "memory"); @@ -203,10 +170,7 @@ "1:\tldq_l %0, %1\n\t" /* load old value */ "addq %0, %2, %0\n\t" /* calculate new value */ "stq_c %0, %1\n\t" /* attempt to store */ - "beq %0, 2f\n\t" /* spin if failed */ - __COLD_SECTION /* improve branch prediction */ - "2:\tbr 1b\n" /* try again */ - __HOT_SECTION + "beq %0, 1b\n" /* spin if failed */ : "=&r" (temp), "+m" (*p) : "r" (v) : "memory"); @@ -222,10 +186,7 @@ "1:\tldq_l %0, %1\n\t" /* load old value */ "subq %0, %2, %0\n\t" /* calculate new value */ "stq_c %0, %1\n\t" /* attempt to store */ - "beq %0, 2f\n\t" /* spin if failed */ - __COLD_SECTION /* improve branch prediction */ - "2:\tbr 1b\n" /* try again */ - __HOT_SECTION + "beq %0, 1b\n" /* spin if failed */ : "=&r" (temp), "+m" (*p) : "r" (v) : "memory"); @@ -242,10 +203,7 @@ "1:\tldq_l %0,%2\n\t" /* load current value, asserting lock */ "ldiq %1,0\n\t" /* value to store */ "stq_c %1,%2\n\t" /* attempt to store */ - "beq %1,2f\n\t" /* if the store failed, spin */ - "br 3f\n" /* it worked, exit */ - "2:\tbr 1b\n" /* *addr not updated, loop */ - "3:\n" /* it worked */ + "beq %1,1b\n" /* if the store failed, spin */ : "=&r"(result), "=&r"(temp), "+m" (*addr) : : "memory"); >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200410092036.i99Ka7gL017943>