Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 23 May 2004 09:46:31 -0700 (PDT)
From:      Robert Watson <rwatson@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 53295 for review
Message-ID:  <200405231646.i4NGkVRJ016082@repoman.freebsd.org>

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

Change 53295 by rwatson@rwatson_paprika on 2004/05/23 09:45:52

	Integrate netperf_socket to CVS HEAD.  Many changes, the ones
	of primary interest for the netperf work are:
	
	- Thundering herd problem in soisconnected() fixed.
	- mbuf arithmetic fix.
	- Loopback of sendfile() Giant fix.
	- Loopback of netatalk soisdisconnected() pruning.
	- Optional IP option processing.

Affected files ...

.. //depot/projects/netperf_socket/sys/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/alpha/alpha/elf_machdep.c#2 integrate
.. //depot/projects/netperf_socket/sys/alpha/alpha/fp_emulate.c#2 integrate
.. //depot/projects/netperf_socket/sys/alpha/alpha/ieee_float.c#2 integrate
.. //depot/projects/netperf_socket/sys/alpha/include/_stdint.h#2 integrate
.. //depot/projects/netperf_socket/sys/alpha/include/fpu.h#2 integrate
.. //depot/projects/netperf_socket/sys/alpha/include/profile.h#2 integrate
.. //depot/projects/netperf_socket/sys/amd64/acpica/OsdEnvironment.c#2 integrate
.. //depot/projects/netperf_socket/sys/amd64/acpica/madt.c#3 integrate
.. //depot/projects/netperf_socket/sys/amd64/amd64/apic_vector.S#3 integrate
.. //depot/projects/netperf_socket/sys/amd64/amd64/cpu_switch.S#4 integrate
.. //depot/projects/netperf_socket/sys/amd64/amd64/elf_machdep.c#2 integrate
.. //depot/projects/netperf_socket/sys/amd64/amd64/genassym.c#4 integrate
.. //depot/projects/netperf_socket/sys/amd64/amd64/intr_machdep.c#2 integrate
.. //depot/projects/netperf_socket/sys/amd64/amd64/io_apic.c#2 integrate
.. //depot/projects/netperf_socket/sys/amd64/amd64/legacy.c#2 integrate
.. //depot/projects/netperf_socket/sys/amd64/amd64/local_apic.c#4 integrate
.. //depot/projects/netperf_socket/sys/amd64/amd64/machdep.c#4 integrate
.. //depot/projects/netperf_socket/sys/amd64/amd64/mp_machdep.c#5 integrate
.. //depot/projects/netperf_socket/sys/amd64/amd64/mptable.c#2 integrate
.. //depot/projects/netperf_socket/sys/amd64/amd64/mptable_pci.c#2 integrate
.. //depot/projects/netperf_socket/sys/amd64/amd64/nexus.c#2 integrate
.. //depot/projects/netperf_socket/sys/amd64/amd64/pmap.c#8 integrate
.. //depot/projects/netperf_socket/sys/amd64/amd64/prof_machdep.c#1 branch
.. //depot/projects/netperf_socket/sys/amd64/amd64/support.S#5 integrate
.. //depot/projects/netperf_socket/sys/amd64/conf/GENERIC#6 integrate
.. //depot/projects/netperf_socket/sys/amd64/conf/NOTES#6 integrate
.. //depot/projects/netperf_socket/sys/amd64/include/_stdint.h#2 integrate
.. //depot/projects/netperf_socket/sys/amd64/include/acpica_machdep.h#2 integrate
.. //depot/projects/netperf_socket/sys/amd64/include/apicvar.h#2 integrate
.. //depot/projects/netperf_socket/sys/amd64/include/intr_machdep.h#2 integrate
.. //depot/projects/netperf_socket/sys/amd64/include/legacyvar.h#2 integrate
.. //depot/projects/netperf_socket/sys/amd64/include/pcb.h#4 integrate
.. //depot/projects/netperf_socket/sys/amd64/include/pmap.h#6 integrate
.. //depot/projects/netperf_socket/sys/amd64/include/profile.h#3 integrate
.. //depot/projects/netperf_socket/sys/amd64/include/smp.h#3 integrate
.. //depot/projects/netperf_socket/sys/amd64/isa/atpic.c#4 integrate
.. //depot/projects/netperf_socket/sys/amd64/isa/atpic_vector.S#3 integrate
.. //depot/projects/netperf_socket/sys/amd64/isa/clock.c#3 integrate
.. //depot/projects/netperf_socket/sys/amd64/isa/elcr.c#1 branch
.. //depot/projects/netperf_socket/sys/amd64/isa/icu.h#3 integrate
.. //depot/projects/netperf_socket/sys/amd64/isa/nmi.c#3 integrate
.. //depot/projects/netperf_socket/sys/amd64/pci/pci_bus.c#3 integrate
.. //depot/projects/netperf_socket/sys/arm/arm/autoconf.c#1 branch
.. //depot/projects/netperf_socket/sys/arm/arm/bcopy_page.S#1 branch
.. //depot/projects/netperf_socket/sys/arm/arm/bcopyinout.S#1 branch
.. //depot/projects/netperf_socket/sys/arm/arm/bcopyinout_xscale.S#1 branch
.. //depot/projects/netperf_socket/sys/arm/arm/blockio.S#1 branch
.. //depot/projects/netperf_socket/sys/arm/arm/bootconfig.c#1 branch
.. //depot/projects/netperf_socket/sys/arm/arm/bus_space_asm_generic.S#1 branch
.. //depot/projects/netperf_socket/sys/arm/arm/busdma_machdep.c#1 branch
.. //depot/projects/netperf_socket/sys/arm/arm/copystr.S#1 branch
.. //depot/projects/netperf_socket/sys/arm/arm/cpufunc.c#1 branch
.. //depot/projects/netperf_socket/sys/arm/arm/cpufunc_asm.S#1 branch
.. //depot/projects/netperf_socket/sys/arm/arm/cpufunc_asm_arm10.S#1 branch
.. //depot/projects/netperf_socket/sys/arm/arm/cpufunc_asm_arm3.S#1 branch
.. //depot/projects/netperf_socket/sys/arm/arm/cpufunc_asm_arm67.S#1 branch
.. //depot/projects/netperf_socket/sys/arm/arm/cpufunc_asm_arm7tdmi.S#1 branch
.. //depot/projects/netperf_socket/sys/arm/arm/cpufunc_asm_arm8.S#1 branch
.. //depot/projects/netperf_socket/sys/arm/arm/cpufunc_asm_arm9.S#1 branch
.. //depot/projects/netperf_socket/sys/arm/arm/cpufunc_asm_armv4.S#1 branch
.. //depot/projects/netperf_socket/sys/arm/arm/cpufunc_asm_ixp12x0.S#1 branch
.. //depot/projects/netperf_socket/sys/arm/arm/cpufunc_asm_sa1.S#1 branch
.. //depot/projects/netperf_socket/sys/arm/arm/cpufunc_asm_sa11x0.S#1 branch
.. //depot/projects/netperf_socket/sys/arm/arm/cpufunc_asm_xscale.S#1 branch
.. //depot/projects/netperf_socket/sys/arm/arm/critical.c#1 branch
.. //depot/projects/netperf_socket/sys/arm/arm/db_disasm.c#1 branch
.. //depot/projects/netperf_socket/sys/arm/arm/db_interface.c#1 branch
.. //depot/projects/netperf_socket/sys/arm/arm/db_trace.c#1 branch
.. //depot/projects/netperf_socket/sys/arm/arm/disassem.c#1 branch
.. //depot/projects/netperf_socket/sys/arm/arm/dump_machdep.c#1 branch
.. //depot/projects/netperf_socket/sys/arm/arm/elf_machdep.c#1 branch
.. //depot/projects/netperf_socket/sys/arm/arm/exception.S#1 branch
.. //depot/projects/netperf_socket/sys/arm/arm/fiq.c#1 branch
.. //depot/projects/netperf_socket/sys/arm/arm/fiq_subr.S#1 branch
.. //depot/projects/netperf_socket/sys/arm/arm/fusu.S#1 branch
.. //depot/projects/netperf_socket/sys/arm/arm/genassym.c#1 branch
.. //depot/projects/netperf_socket/sys/arm/arm/identcpu.c#1 branch
.. //depot/projects/netperf_socket/sys/arm/arm/in_cksum.c#1 branch
.. //depot/projects/netperf_socket/sys/arm/arm/in_cksum_arm.S#1 branch
.. //depot/projects/netperf_socket/sys/arm/arm/intr.c#1 branch
.. //depot/projects/netperf_socket/sys/arm/arm/irq_dispatch.S#1 branch
.. //depot/projects/netperf_socket/sys/arm/arm/locore.S#1 branch
.. //depot/projects/netperf_socket/sys/arm/arm/machdep.c#1 branch
.. //depot/projects/netperf_socket/sys/arm/arm/nexus.c#1 branch
.. //depot/projects/netperf_socket/sys/arm/arm/nexus_io.c#1 branch
.. //depot/projects/netperf_socket/sys/arm/arm/nexus_io_asm.S#1 branch
.. //depot/projects/netperf_socket/sys/arm/arm/pmap.c#1 branch
.. //depot/projects/netperf_socket/sys/arm/arm/setcpsr.S#1 branch
.. //depot/projects/netperf_socket/sys/arm/arm/setstack.s#1 branch
.. //depot/projects/netperf_socket/sys/arm/arm/support.S#1 branch
.. //depot/projects/netperf_socket/sys/arm/arm/swtch.S#1 branch
.. //depot/projects/netperf_socket/sys/arm/arm/sys_machdep.c#1 branch
.. //depot/projects/netperf_socket/sys/arm/arm/trap.c#1 branch
.. //depot/projects/netperf_socket/sys/arm/arm/uio_machdep.c#1 branch
.. //depot/projects/netperf_socket/sys/arm/arm/undefined.c#1 branch
.. //depot/projects/netperf_socket/sys/arm/arm/vectors.S#1 branch
.. //depot/projects/netperf_socket/sys/arm/arm/vm_machdep.c#1 branch
.. //depot/projects/netperf_socket/sys/arm/conf/SIMICS#1 branch
.. //depot/projects/netperf_socket/sys/arm/include/_inttypes.h#1 branch
.. //depot/projects/netperf_socket/sys/arm/include/_stdint.h#2 integrate
.. //depot/projects/netperf_socket/sys/arm/include/_types.h#3 integrate
.. //depot/projects/netperf_socket/sys/arm/include/armreg.h#1 branch
.. //depot/projects/netperf_socket/sys/arm/include/asm.h#1 branch
.. //depot/projects/netperf_socket/sys/arm/include/asmacros.h#1 branch
.. //depot/projects/netperf_socket/sys/arm/include/atomic.h#1 branch
.. //depot/projects/netperf_socket/sys/arm/include/blockio.h#1 branch
.. //depot/projects/netperf_socket/sys/arm/include/bootconfig.h#1 branch
.. //depot/projects/netperf_socket/sys/arm/include/bus.h#1 branch
.. //depot/projects/netperf_socket/sys/arm/include/clock.h#1 branch
.. //depot/projects/netperf_socket/sys/arm/include/cpu.h#1 branch
.. //depot/projects/netperf_socket/sys/arm/include/cpuconf.h#1 branch
.. //depot/projects/netperf_socket/sys/arm/include/cpufunc.h#1 branch
.. //depot/projects/netperf_socket/sys/arm/include/critical.h#1 branch
.. //depot/projects/netperf_socket/sys/arm/include/db_machdep.h#1 branch
.. //depot/projects/netperf_socket/sys/arm/include/disassem.h#1 branch
.. //depot/projects/netperf_socket/sys/arm/include/elf.h#2 integrate
.. //depot/projects/netperf_socket/sys/arm/include/endian.h#2 integrate
.. //depot/projects/netperf_socket/sys/arm/include/fiq.h#1 branch
.. //depot/projects/netperf_socket/sys/arm/include/float.h#1 branch
.. //depot/projects/netperf_socket/sys/arm/include/floatingpoint.h#1 branch
.. //depot/projects/netperf_socket/sys/arm/include/fp.h#1 branch
.. //depot/projects/netperf_socket/sys/arm/include/frame.h#1 branch
.. //depot/projects/netperf_socket/sys/arm/include/ieee.h#1 branch
.. //depot/projects/netperf_socket/sys/arm/include/ieeefp.h#1 branch
.. //depot/projects/netperf_socket/sys/arm/include/in_cksum.h#1 branch
.. //depot/projects/netperf_socket/sys/arm/include/intr.h#1 branch
.. //depot/projects/netperf_socket/sys/arm/include/katelib.h#1 branch
.. //depot/projects/netperf_socket/sys/arm/include/machdep.h#1 branch
.. //depot/projects/netperf_socket/sys/arm/include/md_var.h#1 branch
.. //depot/projects/netperf_socket/sys/arm/include/metadata.h#1 branch
.. //depot/projects/netperf_socket/sys/arm/include/mutex.h#1 branch
.. //depot/projects/netperf_socket/sys/arm/include/param.h#2 integrate
.. //depot/projects/netperf_socket/sys/arm/include/pcb.h#1 branch
.. //depot/projects/netperf_socket/sys/arm/include/pcpu.h#1 branch
.. //depot/projects/netperf_socket/sys/arm/include/pmap.h#1 branch
.. //depot/projects/netperf_socket/sys/arm/include/proc.h#1 branch
.. //depot/projects/netperf_socket/sys/arm/include/profile.h#1 branch
.. //depot/projects/netperf_socket/sys/arm/include/psl.h#1 branch
.. //depot/projects/netperf_socket/sys/arm/include/pte.h#1 branch
.. //depot/projects/netperf_socket/sys/arm/include/ptrace.h#1 branch
.. //depot/projects/netperf_socket/sys/arm/include/reg.h#1 branch
.. //depot/projects/netperf_socket/sys/arm/include/reloc.h#1 branch
.. //depot/projects/netperf_socket/sys/arm/include/resource.h#1 branch
.. //depot/projects/netperf_socket/sys/arm/include/runq.h#1 branch
.. //depot/projects/netperf_socket/sys/arm/include/setjmp.h#1 branch
.. //depot/projects/netperf_socket/sys/arm/include/sf_buf.h#1 branch
.. //depot/projects/netperf_socket/sys/arm/include/sigframe.h#1 branch
.. //depot/projects/netperf_socket/sys/arm/include/signal.h#3 integrate
.. //depot/projects/netperf_socket/sys/arm/include/smp.h#1 branch
.. //depot/projects/netperf_socket/sys/arm/include/stdarg.h#1 branch
.. //depot/projects/netperf_socket/sys/arm/include/swi.h#1 branch
.. //depot/projects/netperf_socket/sys/arm/include/trap.h#1 branch
.. //depot/projects/netperf_socket/sys/arm/include/ucontext.h#2 integrate
.. //depot/projects/netperf_socket/sys/arm/include/undefined.h#1 branch
.. //depot/projects/netperf_socket/sys/arm/include/utrap.h#1 branch
.. //depot/projects/netperf_socket/sys/arm/include/vmparam.h#1 branch
.. //depot/projects/netperf_socket/sys/arm/sa11x0/assabet_machdep.c#1 branch
.. //depot/projects/netperf_socket/sys/arm/sa11x0/files.sa11x0#1 branch
.. //depot/projects/netperf_socket/sys/arm/sa11x0/sa11x0.c#1 branch
.. //depot/projects/netperf_socket/sys/arm/sa11x0/sa11x0_dmacreg.h#1 branch
.. //depot/projects/netperf_socket/sys/arm/sa11x0/sa11x0_gpioreg.h#1 branch
.. //depot/projects/netperf_socket/sys/arm/sa11x0/sa11x0_io.c#1 branch
.. //depot/projects/netperf_socket/sys/arm/sa11x0/sa11x0_io_asm.S#1 branch
.. //depot/projects/netperf_socket/sys/arm/sa11x0/sa11x0_irq.S#1 branch
.. //depot/projects/netperf_socket/sys/arm/sa11x0/sa11x0_irqhandler.c#1 branch
.. //depot/projects/netperf_socket/sys/arm/sa11x0/sa11x0_ost.c#1 branch
.. //depot/projects/netperf_socket/sys/arm/sa11x0/sa11x0_ostreg.h#1 branch
.. //depot/projects/netperf_socket/sys/arm/sa11x0/sa11x0_ppcreg.h#1 branch
.. //depot/projects/netperf_socket/sys/arm/sa11x0/sa11x0_reg.h#1 branch
.. //depot/projects/netperf_socket/sys/arm/sa11x0/sa11x0_var.h#1 branch
.. //depot/projects/netperf_socket/sys/arm/sa11x0/std.sa11x0#1 branch
.. //depot/projects/netperf_socket/sys/arm/sa11x0/uart_bus_sa1110.c#1 branch
.. //depot/projects/netperf_socket/sys/arm/sa11x0/uart_cpu_sa1110.c#1 branch
.. //depot/projects/netperf_socket/sys/arm/sa11x0/uart_dev_sa1110.c#1 branch
.. //depot/projects/netperf_socket/sys/arm/sa11x0/uart_dev_sa1110.h#1 branch
.. //depot/projects/netperf_socket/sys/boot/Makefile#3 integrate
.. //depot/projects/netperf_socket/sys/boot/common/loader.8#4 integrate
.. //depot/projects/netperf_socket/sys/boot/forth/loader.conf.5#3 integrate
.. //depot/projects/netperf_socket/sys/boot/i386/boot0/boot0.S#2 integrate
.. //depot/projects/netperf_socket/sys/boot/i386/boot2/boot1.S#3 integrate
.. //depot/projects/netperf_socket/sys/boot/i386/boot2/sio.S#3 integrate
.. //depot/projects/netperf_socket/sys/boot/i386/btx/btx/btx.S#3 integrate
.. //depot/projects/netperf_socket/sys/boot/i386/btx/btxldr/btxldr.S#3 integrate
.. //depot/projects/netperf_socket/sys/boot/i386/libi386/amd64_tramp.S#3 integrate
.. //depot/projects/netperf_socket/sys/boot/i386/libi386/biosacpi.c#2 integrate
.. //depot/projects/netperf_socket/sys/boot/i386/pxeldr/pxeldr.S#3 integrate
.. //depot/projects/netperf_socket/sys/boot/pc98/boot2/serial_16550.S#3 integrate
.. //depot/projects/netperf_socket/sys/boot/pc98/boot2/serial_8251.S#3 integrate
.. //depot/projects/netperf_socket/sys/boot/pc98/btx/btx/btx.S#3 integrate
.. //depot/projects/netperf_socket/sys/boot/pc98/btx/btxldr/btxldr.S#3 integrate
.. //depot/projects/netperf_socket/sys/conf/Makefile.alpha#3 integrate
.. //depot/projects/netperf_socket/sys/conf/Makefile.amd64#2 integrate
.. //depot/projects/netperf_socket/sys/conf/Makefile.arm#1 branch
.. //depot/projects/netperf_socket/sys/conf/Makefile.i386#2 integrate
.. //depot/projects/netperf_socket/sys/conf/Makefile.ia64#2 integrate
.. //depot/projects/netperf_socket/sys/conf/Makefile.pc98#2 integrate
.. //depot/projects/netperf_socket/sys/conf/Makefile.powerpc#2 integrate
.. //depot/projects/netperf_socket/sys/conf/Makefile.sparc64#2 integrate
.. //depot/projects/netperf_socket/sys/conf/NOTES#16 integrate
.. //depot/projects/netperf_socket/sys/conf/files#20 integrate
.. //depot/projects/netperf_socket/sys/conf/files.alpha#3 integrate
.. //depot/projects/netperf_socket/sys/conf/files.amd64#6 integrate
.. //depot/projects/netperf_socket/sys/conf/files.arm#1 branch
.. //depot/projects/netperf_socket/sys/conf/files.i386#15 integrate
.. //depot/projects/netperf_socket/sys/conf/files.ia64#3 integrate
.. //depot/projects/netperf_socket/sys/conf/files.pc98#9 integrate
.. //depot/projects/netperf_socket/sys/conf/files.sparc64#4 integrate
.. //depot/projects/netperf_socket/sys/conf/kern.mk#5 integrate
.. //depot/projects/netperf_socket/sys/conf/kmod.mk#6 integrate
.. //depot/projects/netperf_socket/sys/conf/ldscript.arm#1 branch
.. //depot/projects/netperf_socket/sys/conf/majors#5 integrate
.. //depot/projects/netperf_socket/sys/conf/options#12 integrate
.. //depot/projects/netperf_socket/sys/conf/options.arm#1 branch
.. //depot/projects/netperf_socket/sys/conf/options.pc98#4 integrate
.. //depot/projects/netperf_socket/sys/conf/options.sparc64#3 integrate
.. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acfreebsd.h#6 integrate
.. //depot/projects/netperf_socket/sys/contrib/ia64/libuwx/src.diff#1 branch
.. //depot/projects/netperf_socket/sys/contrib/ia64/libuwx/src/uwx.h#2 integrate
.. //depot/projects/netperf_socket/sys/contrib/ia64/libuwx/src/uwx_context.c#2 integrate
.. //depot/projects/netperf_socket/sys/contrib/ia64/libuwx/src/uwx_env.c#2 integrate
.. //depot/projects/netperf_socket/sys/contrib/ia64/libuwx/src/uwx_env.h#2 integrate
.. //depot/projects/netperf_socket/sys/contrib/ia64/libuwx/src/uwx_scoreboard.c#2 integrate
.. //depot/projects/netperf_socket/sys/contrib/ia64/libuwx/src/uwx_self-new.c#1 branch
.. //depot/projects/netperf_socket/sys/contrib/ia64/libuwx/src/uwx_self.c#2 integrate
.. //depot/projects/netperf_socket/sys/contrib/ia64/libuwx/src/uwx_self.h#2 integrate
.. //depot/projects/netperf_socket/sys/contrib/ia64/libuwx/src/uwx_self_context.s#2 integrate
.. //depot/projects/netperf_socket/sys/contrib/ia64/libuwx/src/uwx_step.c#2 integrate
.. //depot/projects/netperf_socket/sys/contrib/ia64/libuwx/src/uwx_step.h#2 integrate
.. //depot/projects/netperf_socket/sys/contrib/ia64/libuwx/src/uwx_str.c#2 integrate
.. //depot/projects/netperf_socket/sys/contrib/ia64/libuwx/src/uwx_ttrace.c#2 integrate
.. //depot/projects/netperf_socket/sys/contrib/ia64/libuwx/src/uwx_ttrace.h#2 integrate
.. //depot/projects/netperf_socket/sys/contrib/ia64/libuwx/src/uwx_uinfo.c#2 integrate
.. //depot/projects/netperf_socket/sys/contrib/ia64/libuwx/src/uwx_utable.c#2 integrate
.. //depot/projects/netperf_socket/sys/contrib/ia64/libuwx/src/uwx_utable.h#2 integrate
.. //depot/projects/netperf_socket/sys/ddb/db_elf.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/aac/aac_pci.c#5 integrate
.. //depot/projects/netperf_socket/sys/dev/acpica/Osd/OsdSchedule.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/acpica/Osd/OsdSynch.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/acpica/acpi.c#18 integrate
.. //depot/projects/netperf_socket/sys/dev/acpica/acpi_acad.c#5 integrate
.. //depot/projects/netperf_socket/sys/dev/acpica/acpi_cpu.c#7 integrate
.. //depot/projects/netperf_socket/sys/dev/acpica/acpi_ec.c#7 integrate
.. //depot/projects/netperf_socket/sys/dev/acpica/acpi_pci.c#8 integrate
.. //depot/projects/netperf_socket/sys/dev/acpica/acpi_pcib.c#6 integrate
.. //depot/projects/netperf_socket/sys/dev/acpica/acpi_pcib_pci.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/acpica/acpi_thermal.c#9 integrate
.. //depot/projects/netperf_socket/sys/dev/acpica/acpivar.h#11 integrate
.. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic79xx.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic79xx.h#3 integrate
.. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic79xx.reg#3 integrate
.. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic79xx.seq#3 integrate
.. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic79xx_inline.h#3 integrate
.. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic79xx_pci.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic7xxx.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic_osm_lib.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/an/if_an.c#4 integrate
.. //depot/projects/netperf_socket/sys/dev/an/if_an_pccard.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/arl/if_arl.c#4 integrate
.. //depot/projects/netperf_socket/sys/dev/asr/asr.c#5 integrate
.. //depot/projects/netperf_socket/sys/dev/ata/ata-all.c#7 integrate
.. //depot/projects/netperf_socket/sys/dev/ata/ata-chipset.c#8 integrate
.. //depot/projects/netperf_socket/sys/dev/ata/ata-lowlevel.c#7 integrate
.. //depot/projects/netperf_socket/sys/dev/ata/ata-pci.c#7 integrate
.. //depot/projects/netperf_socket/sys/dev/awi/if_awi_pccard.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/bfe/if_bfe.c#5 integrate
.. //depot/projects/netperf_socket/sys/dev/bge/if_bge.c#5 integrate
.. //depot/projects/netperf_socket/sys/dev/ciss/ciss.c#8 integrate
.. //depot/projects/netperf_socket/sys/dev/ciss/cissreg.h#4 integrate
.. //depot/projects/netperf_socket/sys/dev/cnw/if_cnw.c#4 integrate
.. //depot/projects/netperf_socket/sys/dev/cp/cpddk.c#1 branch
.. //depot/projects/netperf_socket/sys/dev/cp/cpddk.h#1 branch
.. //depot/projects/netperf_socket/sys/dev/cp/if_cp.c#1 branch
.. //depot/projects/netperf_socket/sys/dev/cp/ng_cp.h#1 branch
.. //depot/projects/netperf_socket/sys/dev/cs/if_cs.c#5 integrate
.. //depot/projects/netperf_socket/sys/dev/cs/if_cs_pccard.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/ctau/if_ct.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/cx/if_cx.c#4 integrate
.. //depot/projects/netperf_socket/sys/dev/cy/cy.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/ed/if_ed.c#6 integrate
.. //depot/projects/netperf_socket/sys/dev/ed/if_ed_pccard.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/em/if_em.c#5 integrate
.. //depot/projects/netperf_socket/sys/dev/ep/if_ep.c#5 integrate
.. //depot/projects/netperf_socket/sys/dev/ex/if_ex.c#5 integrate
.. //depot/projects/netperf_socket/sys/dev/fdc/fdc.c#1 branch
.. //depot/projects/netperf_socket/sys/dev/fdc/fdcreg.h#1 branch
.. //depot/projects/netperf_socket/sys/dev/fe/if_fe.c#5 integrate
.. //depot/projects/netperf_socket/sys/dev/firewire/firewire.c#4 integrate
.. //depot/projects/netperf_socket/sys/dev/firewire/firewire.h#3 integrate
.. //depot/projects/netperf_socket/sys/dev/firewire/firewirereg.h#3 integrate
.. //depot/projects/netperf_socket/sys/dev/firewire/fwcrom.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/firewire/fwdev.c#4 integrate
.. //depot/projects/netperf_socket/sys/dev/firewire/fwmem.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/firewire/fwmem.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/firewire/fwohci.c#4 integrate
.. //depot/projects/netperf_socket/sys/dev/firewire/fwohci_pci.c#5 integrate
.. //depot/projects/netperf_socket/sys/dev/firewire/fwohcireg.h#3 integrate
.. //depot/projects/netperf_socket/sys/dev/firewire/fwohcivar.h#3 integrate
.. //depot/projects/netperf_socket/sys/dev/firewire/fwphyreg.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/firewire/iec13213.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/firewire/iec68113.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/firewire/if_fwe.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/firewire/sbp.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/firewire/sbp.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/firewire/sbp_targ.c#4 integrate
.. //depot/projects/netperf_socket/sys/dev/fxp/if_fxp.c#6 integrate
.. //depot/projects/netperf_socket/sys/dev/gem/if_gem.c#4 integrate
.. //depot/projects/netperf_socket/sys/dev/gx/if_gx.c#4 integrate
.. //depot/projects/netperf_socket/sys/dev/hme/if_hme.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/hme/if_hmereg.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/ichwd/ichwd.c#1 branch
.. //depot/projects/netperf_socket/sys/dev/ichwd/ichwd.h#1 branch
.. //depot/projects/netperf_socket/sys/dev/if_ndis/if_ndis.c#11 integrate
.. //depot/projects/netperf_socket/sys/dev/iicbus/iic.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/iicbus/iicbus.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/iir/iir.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/iir/iir.h#5 integrate
.. //depot/projects/netperf_socket/sys/dev/iir/iir_ctrl.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/led/led.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/lge/if_lge.c#4 integrate
.. //depot/projects/netperf_socket/sys/dev/lnc/if_lnc.c#5 integrate
.. //depot/projects/netperf_socket/sys/dev/md/md.c#14 integrate
.. //depot/projects/netperf_socket/sys/dev/my/if_my.c#4 integrate
.. //depot/projects/netperf_socket/sys/dev/nge/if_nge.c#8 integrate
.. //depot/projects/netperf_socket/sys/dev/ofw/openfirm.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/ofw/openfirmio.c#4 integrate
.. //depot/projects/netperf_socket/sys/dev/ofw/openfirmio.h#3 integrate
.. //depot/projects/netperf_socket/sys/dev/owi/if_owi.c#4 integrate
.. //depot/projects/netperf_socket/sys/dev/pccard/files.pccard#2 delete
.. //depot/projects/netperf_socket/sys/dev/pccard/pccarddevs#5 integrate
.. //depot/projects/netperf_socket/sys/dev/pccard/pccarddevs.h#5 integrate
.. //depot/projects/netperf_socket/sys/dev/pccbb/pccbb.c#9 integrate
.. //depot/projects/netperf_socket/sys/dev/pccbb/pccbbvar.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/pci/pci.c#6 integrate
.. //depot/projects/netperf_socket/sys/dev/puc/pucdata.c#5 integrate
.. //depot/projects/netperf_socket/sys/dev/ray/if_ray.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/re/if_re.c#5 integrate
.. //depot/projects/netperf_socket/sys/dev/sbni/if_sbni.c#4 integrate
.. //depot/projects/netperf_socket/sys/dev/sbsh/if_sbsh.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/smbus/smb.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/smbus/smb.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/sn/if_sn.c#5 integrate
.. //depot/projects/netperf_socket/sys/dev/sn/if_sn_pccard.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/snc/dp83932.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/snc/if_snc_pccard.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/sound/isa/sb.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/sound/isa/sb16.c#5 integrate
.. //depot/projects/netperf_socket/sys/dev/sound/isa/sbc.c#4 integrate
.. //depot/projects/netperf_socket/sys/dev/sound/pcm/ac97.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/twa/twa.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/twa/twa_cam.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/twa/twa_freebsd.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/twe/twe.c#4 integrate
.. //depot/projects/netperf_socket/sys/dev/twe/twereg.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/twe/twevar.h#4 integrate
.. //depot/projects/netperf_socket/sys/dev/txp/if_txp.c#4 integrate
.. //depot/projects/netperf_socket/sys/dev/uart/uart_core.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/uart/uart_cpu_pc98.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/uart/uart_dev_z8530.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/ehci_pci.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/if_aue.c#4 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/if_auereg.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/if_axe.c#4 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/if_axereg.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/if_cue.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/if_cuereg.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/if_kue.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/if_kuereg.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/if_rue.c#4 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/if_ruereg.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/if_udav.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/if_udavreg.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/ohcireg.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/uhci.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/umass.c#5 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/umodem.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/usb.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/usbdevs#11 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/usbdevs.h#11 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/usbdevs_data.h#11 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/uvisor.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/vx/if_vx.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/wi/if_wi_pccard.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/wl/if_wl.c#5 integrate
.. //depot/projects/netperf_socket/sys/dev/xe/if_xe.c#5 integrate
.. //depot/projects/netperf_socket/sys/fs/fifofs/fifo_vnops.c#4 integrate
.. //depot/projects/netperf_socket/sys/fs/nwfs/nwfs_io.c#3 integrate
.. //depot/projects/netperf_socket/sys/fs/smbfs/smbfs_io.c#3 integrate
.. //depot/projects/netperf_socket/sys/fs/specfs/spec_vnops.c#6 integrate
.. //depot/projects/netperf_socket/sys/geom/concat/g_concat.c#7 integrate
.. //depot/projects/netperf_socket/sys/geom/concat/g_concat.h#6 integrate
.. //depot/projects/netperf_socket/sys/geom/gate/g_gate.c#2 integrate
.. //depot/projects/netperf_socket/sys/geom/geom_disk.c#3 integrate
.. //depot/projects/netperf_socket/sys/geom/nop/g_nop.c#1 branch
.. //depot/projects/netperf_socket/sys/geom/nop/g_nop.h#1 branch
.. //depot/projects/netperf_socket/sys/geom/stripe/g_stripe.c#1 branch
.. //depot/projects/netperf_socket/sys/geom/stripe/g_stripe.h#1 branch
.. //depot/projects/netperf_socket/sys/i386/acpica/OsdEnvironment.c#2 integrate
.. //depot/projects/netperf_socket/sys/i386/acpica/acpi_machdep.c#4 integrate
.. //depot/projects/netperf_socket/sys/i386/acpica/acpi_wakeup.c#3 integrate
.. //depot/projects/netperf_socket/sys/i386/acpica/madt.c#4 integrate
.. //depot/projects/netperf_socket/sys/i386/conf/NOTES#18 integrate
.. //depot/projects/netperf_socket/sys/i386/conf/PAE#2 integrate
.. //depot/projects/netperf_socket/sys/i386/i386/elf_machdep.c#2 integrate
.. //depot/projects/netperf_socket/sys/i386/i386/intr_machdep.c#2 integrate
.. //depot/projects/netperf_socket/sys/i386/i386/io_apic.c#2 integrate
.. //depot/projects/netperf_socket/sys/i386/i386/legacy.c#2 integrate
.. //depot/projects/netperf_socket/sys/i386/i386/local_apic.c#3 integrate
.. //depot/projects/netperf_socket/sys/i386/i386/machdep.c#3 integrate
.. //depot/projects/netperf_socket/sys/i386/i386/mptable.c#2 integrate
.. //depot/projects/netperf_socket/sys/i386/i386/nexus.c#2 integrate
.. //depot/projects/netperf_socket/sys/i386/i386/support.s#4 integrate
.. //depot/projects/netperf_socket/sys/i386/include/_stdint.h#2 integrate
.. //depot/projects/netperf_socket/sys/i386/include/acpica_machdep.h#2 integrate
.. //depot/projects/netperf_socket/sys/i386/include/apicvar.h#2 integrate
.. //depot/projects/netperf_socket/sys/i386/include/bus_pc98.h#2 integrate
.. //depot/projects/netperf_socket/sys/i386/include/intr_machdep.h#2 integrate
.. //depot/projects/netperf_socket/sys/i386/include/pci_cfgreg.h#3 integrate
.. //depot/projects/netperf_socket/sys/i386/include/profile.h#4 integrate
.. //depot/projects/netperf_socket/sys/i386/isa/atpic.c#5 integrate
.. //depot/projects/netperf_socket/sys/i386/isa/atpic_vector.s#5 integrate
.. //depot/projects/netperf_socket/sys/i386/isa/clock.c#4 integrate
.. //depot/projects/netperf_socket/sys/i386/isa/elcr.c#1 branch
.. //depot/projects/netperf_socket/sys/i386/isa/icu.h#3 integrate
.. //depot/projects/netperf_socket/sys/i386/isa/npx.c#5 integrate
.. //depot/projects/netperf_socket/sys/i386/pci/pci_bus.c#4 integrate
.. //depot/projects/netperf_socket/sys/i386/pci/pci_pir.c#3 integrate
.. //depot/projects/netperf_socket/sys/ia64/acpica/OsdEnvironment.c#2 integrate
.. //depot/projects/netperf_socket/sys/ia64/conf/NOTES#2 integrate
.. //depot/projects/netperf_socket/sys/ia64/ia64/elf_machdep.c#2 integrate
.. //depot/projects/netperf_socket/sys/ia64/ia64/interrupt.c#3 integrate
.. //depot/projects/netperf_socket/sys/ia64/ia64/trap.c#4 integrate
.. //depot/projects/netperf_socket/sys/ia64/include/_stdint.h#2 integrate
.. //depot/projects/netperf_socket/sys/ia64/include/acpica_machdep.h#2 integrate
.. //depot/projects/netperf_socket/sys/ia64/include/profile.h#2 integrate
.. //depot/projects/netperf_socket/sys/isa/fd.c#7 delete
.. //depot/projects/netperf_socket/sys/isa/fdreg.h#3 delete
.. //depot/projects/netperf_socket/sys/kern/kern_exec.c#9 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_exit.c#8 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_jail.c#6 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_linker.c#4 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_proc.c#6 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_resource.c#5 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_sig.c#8 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_synch.c#7 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_thread.c#8 integrate
.. //depot/projects/netperf_socket/sys/kern/link_elf.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/link_elf_obj.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/subr_prof.c#4 integrate
.. //depot/projects/netperf_socket/sys/kern/subr_sleepqueue.c#6 integrate
.. //depot/projects/netperf_socket/sys/kern/subr_smp.c#7 integrate
.. //depot/projects/netperf_socket/sys/kern/tty_compat.c#3 integrate
.. //depot/projects/netperf_socket/sys/kern/uipc_mbuf2.c#3 integrate
.. //depot/projects/netperf_socket/sys/kern/uipc_socket2.c#8 integrate
.. //depot/projects/netperf_socket/sys/kern/uipc_syscalls.c#10 integrate
.. //depot/projects/netperf_socket/sys/kern/vfs_bio.c#5 integrate
.. //depot/projects/netperf_socket/sys/kern/vfs_syscalls.c#7 integrate
.. //depot/projects/netperf_socket/sys/libkern/arm/divsi3.S#1 branch
.. //depot/projects/netperf_socket/sys/libkern/arm/ffs.S#1 branch
.. //depot/projects/netperf_socket/sys/libkern/arm/muldi3.c#1 branch
.. //depot/projects/netperf_socket/sys/libkern/quad.h#4 integrate
.. //depot/projects/netperf_socket/sys/modules/Makefile#9 integrate
.. //depot/projects/netperf_socket/sys/modules/cp/Makefile#1 branch
.. //depot/projects/netperf_socket/sys/modules/fdc/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/modules/geom/Makefile#4 integrate
.. //depot/projects/netperf_socket/sys/modules/geom/geom_nop/Makefile#1 branch
.. //depot/projects/netperf_socket/sys/modules/geom/geom_stripe/Makefile#1 branch
.. //depot/projects/netperf_socket/sys/modules/ichwd/Makefile#1 branch
.. //depot/projects/netperf_socket/sys/net/if_vlan.c#3 integrate
.. //depot/projects/netperf_socket/sys/net/rtsock.c#8 integrate
.. //depot/projects/netperf_socket/sys/net80211/ieee80211.c#4 integrate
.. //depot/projects/netperf_socket/sys/netatalk/ddp_usrreq.c#9 integrate
.. //depot/projects/netperf_socket/sys/netgraph/bluetooth/include/ng_bt3c.h#2 integrate
.. //depot/projects/netperf_socket/sys/netgraph/bluetooth/include/ng_btsocket.h#3 integrate
.. //depot/projects/netperf_socket/sys/netgraph/bluetooth/include/ng_h4.h#2 integrate
.. //depot/projects/netperf_socket/sys/netgraph/ng_ether.c#4 integrate
.. //depot/projects/netperf_socket/sys/netgraph/ng_hole.c#2 integrate
.. //depot/projects/netperf_socket/sys/netgraph/ng_hole.h#2 integrate
.. //depot/projects/netperf_socket/sys/netinet/in_pcb.c#9 integrate
.. //depot/projects/netperf_socket/sys/netinet/ip_fastfwd.c#6 integrate
.. //depot/projects/netperf_socket/sys/netinet/ip_icmp.c#6 integrate
.. //depot/projects/netperf_socket/sys/netinet/ip_input.c#11 integrate
.. //depot/projects/netperf_socket/sys/netinet/ip_output.c#10 integrate
.. //depot/projects/netperf_socket/sys/netinet/ip_var.h#6 integrate
.. //depot/projects/netperf_socket/sys/netinet6/ip6_output.c#5 integrate
.. //depot/projects/netperf_socket/sys/nfsclient/nfs_bio.c#6 integrate
.. //depot/projects/netperf_socket/sys/pc98/conf/NOTES#11 integrate
.. //depot/projects/netperf_socket/sys/pc98/pc98/sio.c#6 integrate
.. //depot/projects/netperf_socket/sys/pci/agp.c#5 integrate
.. //depot/projects/netperf_socket/sys/pci/agp_ali.c#3 integrate
.. //depot/projects/netperf_socket/sys/pci/agp_amd.c#4 integrate
.. //depot/projects/netperf_socket/sys/pci/agp_i810.c#5 integrate
.. //depot/projects/netperf_socket/sys/pci/agp_intel.c#4 integrate
.. //depot/projects/netperf_socket/sys/pci/agp_nvidia.c#3 integrate
.. //depot/projects/netperf_socket/sys/pci/agp_sis.c#3 integrate
.. //depot/projects/netperf_socket/sys/pci/agp_via.c#3 integrate
.. //depot/projects/netperf_socket/sys/pci/agppriv.h#2 integrate
.. //depot/projects/netperf_socket/sys/pci/agpreg.h#3 integrate
.. //depot/projects/netperf_socket/sys/pci/if_sk.c#8 integrate
.. //depot/projects/netperf_socket/sys/powerpc/include/_stdint.h#2 integrate
.. //depot/projects/netperf_socket/sys/powerpc/include/profile.h#2 integrate
.. //depot/projects/netperf_socket/sys/powerpc/powerpc/elf_machdep.c#2 integrate
.. //depot/projects/netperf_socket/sys/powerpc/powerpc/trap.c#2 integrate
.. //depot/projects/netperf_socket/sys/security/mac_portacl/mac_portacl.c#3 integrate
.. //depot/projects/netperf_socket/sys/sparc64/conf/GENERIC#4 integrate
.. //depot/projects/netperf_socket/sys/sparc64/conf/NOTES#3 integrate
.. //depot/projects/netperf_socket/sys/sparc64/ebus/ebus.c#4 integrate
.. //depot/projects/netperf_socket/sys/sparc64/include/_stdint.h#2 integrate
.. //depot/projects/netperf_socket/sys/sparc64/include/atomic.h#2 integrate
.. //depot/projects/netperf_socket/sys/sparc64/include/cpufunc.h#2 integrate
.. //depot/projects/netperf_socket/sys/sparc64/include/ofw_bus.h#2 integrate
.. //depot/projects/netperf_socket/sys/sparc64/include/pmap.h#5 integrate
.. //depot/projects/netperf_socket/sys/sparc64/include/profile.h#2 integrate
.. //depot/projects/netperf_socket/sys/sparc64/isa/isa.c#3 integrate
.. //depot/projects/netperf_socket/sys/sparc64/isa/ofw_isa.c#3 integrate
.. //depot/projects/netperf_socket/sys/sparc64/isa/ofw_isa.h#3 integrate
.. //depot/projects/netperf_socket/sys/sparc64/pci/apb.c#2 integrate
.. //depot/projects/netperf_socket/sys/sparc64/pci/ofw_pci.c#2 integrate
.. //depot/projects/netperf_socket/sys/sparc64/pci/ofw_pci.h#2 integrate
.. //depot/projects/netperf_socket/sys/sparc64/pci/ofw_pci_if.m#2 integrate
.. //depot/projects/netperf_socket/sys/sparc64/pci/ofw_pcib.c#2 integrate
.. //depot/projects/netperf_socket/sys/sparc64/pci/ofw_pcib_subr.c#2 integrate
.. //depot/projects/netperf_socket/sys/sparc64/pci/ofw_pcib_subr.h#2 integrate
.. //depot/projects/netperf_socket/sys/sparc64/pci/psycho.c#3 integrate
.. //depot/projects/netperf_socket/sys/sparc64/pci/psychovar.h#3 integrate
.. //depot/projects/netperf_socket/sys/sparc64/sparc64/counter.c#2 integrate
.. //depot/projects/netperf_socket/sys/sparc64/sparc64/elf_machdep.c#2 integrate
.. //depot/projects/netperf_socket/sys/sparc64/sparc64/nexus.c#3 integrate
.. //depot/projects/netperf_socket/sys/sparc64/sparc64/ofw_bus.c#2 integrate
.. //depot/projects/netperf_socket/sys/sparc64/sparc64/ofw_machdep.c#3 integrate
.. //depot/projects/netperf_socket/sys/sparc64/sparc64/pmap.c#6 integrate
.. //depot/projects/netperf_socket/sys/sparc64/sparc64/vm_machdep.c#6 integrate
.. //depot/projects/netperf_socket/sys/sys/_label.h#3 integrate
.. //depot/projects/netperf_socket/sys/sys/acl.h#2 integrate
.. //depot/projects/netperf_socket/sys/sys/ata.h#3 integrate
.. //depot/projects/netperf_socket/sys/sys/condvar.h#4 integrate
.. //depot/projects/netperf_socket/sys/sys/elf_common.h#2 integrate
.. //depot/projects/netperf_socket/sys/sys/gmon.h#3 integrate
.. //depot/projects/netperf_socket/sys/sys/imgact_aout.h#3 integrate
.. //depot/projects/netperf_socket/sys/sys/linker.h#2 integrate
.. //depot/projects/netperf_socket/sys/sys/mac.h#3 integrate
.. //depot/projects/netperf_socket/sys/sys/mac_policy.h#3 integrate
.. //depot/projects/netperf_socket/sys/sys/mbuf.h#8 integrate
.. //depot/projects/netperf_socket/sys/sys/regression.h#2 integrate
.. //depot/projects/netperf_socket/sys/sys/socket.h#5 integrate
.. //depot/projects/netperf_socket/sys/sys/sysctl.h#5 integrate
.. //depot/projects/netperf_socket/sys/sys/ttycom.h#4 integrate
.. //depot/projects/netperf_socket/sys/sys/user.h#4 integrate
.. //depot/projects/netperf_socket/sys/tools/miidevs2h.awk#1 branch
.. //depot/projects/netperf_socket/sys/tools/pccarddevs2h.awk#1 branch
.. //depot/projects/netperf_socket/sys/tools/usbdevs2h.awk#1 branch
.. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_alloc.c#4 integrate
.. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_vnops.c#5 integrate
.. //depot/projects/netperf_socket/sys/vm/swap_pager.c#3 integrate
.. //depot/projects/netperf_socket/sys/vm/vm_extern.h#6 integrate
.. //depot/projects/netperf_socket/sys/vm/vm_fault.c#4 integrate
.. //depot/projects/netperf_socket/sys/vm/vm_glue.c#7 integrate
.. //depot/projects/netperf_socket/sys/vm/vm_map.c#7 integrate
.. //depot/projects/netperf_socket/sys/vm/vm_mmap.c#8 integrate
.. //depot/projects/netperf_socket/sys/vm/vm_page.c#7 integrate
.. //depot/projects/netperf_socket/sys/vm/vm_pageout.c#4 integrate
.. //depot/projects/netperf_socket/sys/vm/vnode_pager.c#4 integrate

Differences ...

==== //depot/projects/netperf_socket/sys/Makefile#2 (text+ko) ====

@@ -1,7 +1,9 @@
-# $FreeBSD: src/sys/Makefile,v 1.29 2004/01/17 03:28:27 ru Exp $
+# $FreeBSD: src/sys/Makefile,v 1.30 2004/05/16 00:19:12 cognet Exp $
 
 # The boot loader
+.if ${MACHINE_ARCH} != "arm"
 SUBDIR=	boot
+.endif
 
 # Loadable kernel modules
 .if defined(MODULES_WITH_WORLD)

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

@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/elf_machdep.c,v 1.17 2003/12/23 02:42:38 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/elf_machdep.c,v 1.18 2004/05/16 20:00:27 peter Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -108,9 +108,9 @@
 
 /* Process one elf relocation with addend. */
 static int
-elf_reloc_internal(linker_file_t lf, const void *data, int type, int local)
+elf_reloc_internal(linker_file_t lf, Elf_Addr relocbase, const void *data,
+    int type, int local, elf_lookup_fn lookup)
 {
-	Elf_Addr relocbase = (Elf_Addr) lf->address;
 	Elf_Addr *where;
 	Elf_Addr addr;
 	Elf_Addr addend;
@@ -152,7 +152,7 @@
 			break;
 
 		case R_ALPHA_REFQUAD:
-			addr = elf_lookup(lf, symidx, 1);
+			addr = lookup(lf, symidx, 1);
 			if (addr == 0)
 				return -1;
 			addr += addend;
@@ -161,7 +161,7 @@
 			break;
 
 		case R_ALPHA_GLOB_DAT:
-			addr = elf_lookup(lf, symidx, 1);
+			addr = lookup(lf, symidx, 1);
 			if (addr == 0)
 				return -1;
 			addr += addend;
@@ -171,7 +171,7 @@
 
 		case R_ALPHA_JMP_SLOT:
 			/* No point in lazy binding for kernel modules. */
-			addr = elf_lookup(lf, symidx, 1);
+			addr = lookup(lf, symidx, 1);
 			if (addr == 0)
 				return -1;
 			if (*where != addr)
@@ -198,17 +198,19 @@
 }
 
 int
-elf_reloc(linker_file_t lf, const void *data, int type)
+elf_reloc(linker_file_t lf, Elf_Addr relocbase, const void *data, int type,
+    elf_lookup_fn lookup)
 {
 
-	return (elf_reloc_internal(lf, data, type, 0));
+	return (elf_reloc_internal(lf, relocbase, data, type, 0, lookup));
 }
 
 int
-elf_reloc_local(linker_file_t lf, const void *data, int type)
+elf_reloc_local(linker_file_t lf, Elf_Addr relocbase, const void *data,
+    int type, elf_lookup_fn lookup)
 {
 
-	return (elf_reloc_internal(lf, data, type, 1));
+	return (elf_reloc_internal(lf, relocbase, data, type, 1, lookup));
 }
 
 int

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

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/fp_emulate.c,v 1.13 2003/08/17 06:42:07 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/fp_emulate.c,v 1.14 2004/05/06 09:35:57 das Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -296,7 +296,7 @@
 		td->td_pcb->pcb_fp_control = control;
 
 		/* Regenerate the control register */
-		fpcr = fpregs->fpr_cr & FPCR_DYN_MASK;
+		fpcr = fpregs->fpr_cr & (FPCR_DYN_MASK | FPCR_STATUS_MASK);
 		fpcr |= ((control & IEEE_STATUS_MASK)
 			 << IEEE_STATUS_TO_FPCR_SHIFT);
 		if (!(control & IEEE_TRAP_ENABLE_INV))

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

@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/ieee_float.c,v 1.9 2003/08/22 07:20:25 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/ieee_float.c,v 1.10 2004/05/06 09:36:11 das Exp $");
 
 #include <sys/types.h>
 #ifdef TEST
@@ -312,6 +312,9 @@
 			break;
 		}
 
+		if (frac == 0)
+			*status |= FPCR_UNF;
+
 		/*
 		 * Rounding up may take us to TWO if
 		 * fraclo == (TWO - epsilon).  Also If fraclo has been

==== //depot/projects/netperf_socket/sys/alpha/include/_stdint.h#2 (text+ko) ====

@@ -34,7 +34,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/alpha/include/_stdint.h,v 1.1 2002/07/29 17:41:06 mike Exp $
+ * $FreeBSD: src/sys/alpha/include/_stdint.h,v 1.2 2004/05/18 16:04:56 stefanf Exp $
  */
 
 #ifndef	_MACHINE__STDINT_H_
@@ -160,11 +160,11 @@
 /* Limits of wchar_t. */
 #define	WCHAR_MIN	INT32_MIN
 #define	WCHAR_MAX	INT32_MAX
+#endif
 
 /* Limits of wint_t. */
 #define	WINT_MIN	INT32_MIN
 #define	WINT_MAX	INT32_MAX
-#endif
 
 #endif /* !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) */
 

==== //depot/projects/netperf_socket/sys/alpha/include/fpu.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/fpu.h,v 1.6 2002/11/16 06:35:51 deischen Exp $
+ * $FreeBSD: src/sys/alpha/include/fpu.h,v 1.7 2004/05/06 09:35:57 das Exp $
  */
 
 #ifndef _MACHINE_FPU_H_
@@ -56,6 +56,8 @@
 #define FPCR_INED	(1LL << 62)	/* Inexact Disable */
 #define FPCR_SUM	(1LL << 63)	/* Summary Bit */
 #define FPCR_MASK	(~0LL << 49)
+#define	FPCR_STATUS_MASK	(FPCR_INV | FPCR_DZE | FPCR_OVF | \
+				 FPCR_UNF | FPCR_INE | FPCR_IOV)
 
 /*
  * Exception summary bits.

==== //depot/projects/netperf_socket/sys/alpha/include/profile.h#2 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/alpha/include/profile.h,v 1.5 2002/03/20 18:58:45 obrien Exp $ */
+/* $FreeBSD: src/sys/alpha/include/profile.h,v 1.6 2004/05/19 15:41:25 bde Exp $ */
 /* From: NetBSD: profile.h,v 1.9 1997/04/06 08:47:37 cgd Exp */
 
 /*
@@ -220,18 +220,6 @@
 #define MCOUNT_EXIT(s) \
 	(void)_alpha_pal_swpipl(s);
 #define	MCOUNT_DECL(s)	u_long s;
-#ifdef GUPROF
-struct gmonparam;
-
-void	nullfunc_loop_profiled(void);
-void	nullfunc_profiled(void);
-void	startguprof(struct gmonparam *p);
-void	stopguprof(struct gmonparam *p);
-#else
-#define startguprof(p)
-#define stopguprof(p)
-#endif /* GUPROF */
-
 #else /* !_KERNEL */
 typedef u_long	uintfptr_t;
 #endif

==== //depot/projects/netperf_socket/sys/amd64/acpica/OsdEnvironment.c#2 (text+ko) ====

@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/acpica/OsdEnvironment.c,v 1.11 2003/08/28 16:30:31 njl Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/acpica/OsdEnvironment.c,v 1.12 2004/05/06 02:18:57 njl Exp $");
 
 /*
  * 6.1 : Environmental support
@@ -37,7 +37,7 @@
 
 #include "acpi.h"
 
-u_long amd64_acpi_root;
+static u_long amd64_acpi_root;
 
 SYSCTL_ULONG(_machdep, OID_AUTO, acpi_root, CTLFLAG_RD, &amd64_acpi_root, 0,
 	     "The physical address of the RSDP");

==== //depot/projects/netperf_socket/sys/amd64/acpica/madt.c#3 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.11 2004/01/30 00:24:45 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.12 2004/05/16 20:30:46 peter Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -49,6 +49,7 @@
 #include <machine/specialreg.h>
 
 #include "acpi.h"
+#include <contrib/dev/acpica/actables.h>
 #include <dev/acpica/acpivar.h>
 #include <dev/pci/pcivar.h>
 
@@ -69,14 +70,15 @@
 	u_int la_apic_id:8;
 } lapics[NLAPICS + 1];
 
+static int madt_found_sci_override;
 static MULTIPLE_APIC_TABLE *madt;
 static vm_paddr_t madt_physaddr;
 static vm_offset_t madt_length;
 
 MALLOC_DEFINE(M_MADT, "MADT Table", "ACPI MADT Table Items");
 
-static u_char	interrupt_polarity(UINT16 Polarity);
-static u_char	interrupt_trigger(UINT16 TriggerMode);
+static enum intr_polarity interrupt_polarity(UINT16 Polarity, UINT8 Source);
+static enum intr_trigger interrupt_trigger(UINT16 TriggerMode, UINT8 Source);
 static int	madt_find_cpu(u_int acpi_id, u_int *apic_id);
 static int	madt_find_interrupt(int intr, void **apic, u_int *pin);
 static void	*madt_map(vm_paddr_t pa, int offset, vm_offset_t length);
@@ -157,6 +159,7 @@
 {
 	ACPI_TABLE_HEADER *header;
 	vm_offset_t length;
+	void *table;
 
 	header = madt_map(pa, offset, sizeof(ACPI_TABLE_HEADER));
 	if (strncmp(header->Signature, sig, 4) != 0) {
@@ -165,7 +168,14 @@
 	}
 	length = header->Length;
 	madt_unmap(header, sizeof(ACPI_TABLE_HEADER));
-	return (madt_map(pa, offset, length));
+	table = madt_map(pa, offset, length);
+	if (ACPI_FAILURE(AcpiTbVerifyTableChecksum(table))) {
+		if (bootverbose)
+			printf("MADT: Failed checksum for table %s\n", sig);
+		madt_unmap(table, length);
+		return (NULL);
+	}
+	return (table);
 }
 
 static void
@@ -215,6 +225,16 @@
 	 * Page 0 is used to map in the headers of candidate ACPI tables.
 	 */
 	if (rsdp->Revision >= 2) {
+		/*
+		 * AcpiOsGetRootPointer only verifies the checksum for
+		 * the version 1.0 portion of the RSDP.  Version 2.0 has
+		 * an additional checksum that we verify first.
+		 */
+		if (AcpiTbChecksum(rsdp, ACPI_RSDP_XCHECKSUM_LENGTH) != 0) {
+			if (bootverbose)
+				printf("MADT: RSDP failed extended checksum\n");
+			return (ENXIO);
+		}
 		xsdt = madt_map_table(rsdp->XsdtPhysicalAddress, 1, XSDT_SIG);
 		if (xsdt == NULL) {
 			if (bootverbose)
@@ -251,6 +271,16 @@
 		printf("MADT: Found table at 0x%jx\n",
 		    (uintmax_t)madt_physaddr);
 
+	/*
+	 * Verify that we can map the full table and that its checksum is
+	 * correct, etc.
+	 */
+	madt = madt_map_table(madt_physaddr, 0, APIC_SIG);
+	if (madt == NULL)
+		return (ENXIO);
+	madt_unmap_table(madt);
+	madt = NULL;
+
 	return (0);
 }
 
@@ -273,7 +303,6 @@
 		printf("Table '%.4s' at 0x%jx\n", table->Signature,
 		    (uintmax_t)address);
 
-	/* XXX: Verify checksum? */
 	if (strncmp(table->Signature, APIC_SIG, 4) != 0) {
 		madt_unmap(table, sizeof(ACPI_TABLE_HEADER));
 		return (0);
@@ -325,6 +354,8 @@
 static int
 madt_setup_io(void)
 {
+	void *ioapic;
+	u_int pin;
 	int i;
 
 	/* Try to initialize ACPI so that we can access the FADT. */
@@ -337,11 +368,30 @@
 	}
 		    
 	/* First, we run through adding I/O APIC's. */
+	if (madt->PCATCompat)
+		ioapic_enable_mixed_mode();
 	madt_walk_table(madt_parse_apics, NULL);
 
 	/* Second, we run through the table tweaking interrupt sources. */
 	madt_walk_table(madt_parse_ints, NULL);
 
+	/*
+	 * If there was not an explicit override entry for the SCI,
+	 * force it to use level trigger and active-low polarity.
+	 */
+	if (!madt_found_sci_override) {
+		if (madt_find_interrupt(AcpiGbl_FADT->SciInt, &ioapic, &pin)
+		    != 0)
+			printf("MADT: Could not find APIC for SCI IRQ %d\n",
+			    AcpiGbl_FADT->SciInt);
+		else {
+			printf(
+	"MADT: Forcing active-low polarity and level trigger for SCI\n");
+			ioapic_set_polarity(ioapic, pin, INTR_POLARITY_LOW);
+			ioapic_set_triggermode(ioapic, pin, INTR_TRIGGER_LEVEL);
+		}
+	}
+
 	/* Third, we register all the I/O APIC's. */
 	for (i = 0; i < NIOAPICS; i++)
 		if (ioapics[i].io_apic != NULL)
@@ -446,35 +496,44 @@
 }
 
 /*
- * Determine properties of an interrupt source.  Note that for ACPI,
- * these are only used for ISA interrupts, so we assume ISA bus values
- * (Active Hi, Edge Triggered) for conforming values.
+ * Determine properties of an interrupt source.  Note that for ACPI these
+ * functions are only used for ISA interrupts, so we assume ISA bus values
+ * (Active Hi, Edge Triggered) for conforming values except for the ACPI
+ * SCI for which we use Active Lo, Level Triggered.
  */
-static u_char
-interrupt_polarity(UINT16 Polarity)
+static enum intr_polarity
+interrupt_polarity(UINT16 Polarity, UINT8 Source)
 {
 
 	switch (Polarity) {
 	case POLARITY_CONFORMS:
+		if (Source == AcpiGbl_FADT->SciInt)
+			return (INTR_POLARITY_LOW);
+		else
+			return (INTR_POLARITY_HIGH);
 	case POLARITY_ACTIVE_HIGH:
-		return (1);
+		return (INTR_POLARITY_HIGH);
 	case POLARITY_ACTIVE_LOW:
-		return (0);
+		return (INTR_POLARITY_LOW);
 	default:
 		panic("Bogus Interrupt Polarity");
 	}
 }
 
-static u_char
-interrupt_trigger(UINT16 TriggerMode)
+static enum intr_trigger
+interrupt_trigger(UINT16 TriggerMode, UINT8 Source)
 {
 
 	switch (TriggerMode) {
 	case TRIGGER_CONFORMS:
+		if (Source == AcpiGbl_FADT->SciInt)
+			return (INTR_TRIGGER_LEVEL);
+		else
+			return (INTR_TRIGGER_EDGE);
 	case TRIGGER_EDGE:
-		return (1);
+		return (INTR_TRIGGER_EDGE);
 	case TRIGGER_LEVEL:
-		return (0);

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



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