Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 22 May 2006 00:37:05 GMT
From:      "George V. Neville-Neil" <gnn@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 97586 for review
Message-ID:  <200605220037.k4M0b5es065210@repoman.freebsd.org>

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

Change 97586 by gnn@fast_ipsec_integ on 2006/05/22 00:36:52

	Interate fast_ipsec

Affected files ...

.. //depot/projects/fast_ipsec/src/sbin/setkey/setkey.8#3 integrate
.. //depot/projects/fast_ipsec/src/sys/alpha/Makefile#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/alpha/api_up1000.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/alpha/atomic.s#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/alpha/autoconf.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/alpha/busdma_machdep.c#3 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/alpha/busspace.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/alpha/clock.c#6 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/alpha/clock_if.m#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/alpha/cpuconf.c#3 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/alpha/db_disasm.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/alpha/db_instruction.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/alpha/db_interface.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/alpha/db_trace.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/alpha/dec_1000a.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/alpha/dec_2100_a50.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/alpha/dec_2100_a500.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/alpha/dec_3000_300.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/alpha/dec_3000_500.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/alpha/dec_axppci_33.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/alpha/dec_eb164.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/alpha/dec_eb64plus.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/alpha/dec_kn20aa.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/alpha/dec_kn300.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/alpha/dec_kn8ae.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/alpha/dec_st550.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/alpha/dec_st6600.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/alpha/divrem.m4#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/alpha/dump_machdep.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/alpha/elf_machdep.c#3 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/alpha/exception.s#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/alpha/fp_emulate.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/alpha/gdb_machdep.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/alpha/genassym.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/alpha/ieee_float.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/alpha/ieee_float.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/alpha/in_cksum.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/alpha/interrupt.c#5 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/alpha/locore.s#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/alpha/machdep.c#4 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/alpha/mem.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/alpha/mp_machdep.c#4 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/alpha/pal.s#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/alpha/pmap.c#6 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/alpha/prom.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/alpha/prom_disp.s#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/alpha/promcons.c#3 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/alpha/sgmap.c#3 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/alpha/support.s#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/alpha/swtch.s#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/alpha/sys_machdep.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/alpha/trap.c#6 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/alpha/uio_machdep.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/alpha/uma_machdep.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/alpha/vm_machdep.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/compile/.cvsignore#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/conf/.cvsignore#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/conf/DEFAULTS#3 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/conf/GENERIC#6 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/conf/GENERIC.hints#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/conf/MAC#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/conf/Makefile#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/conf/NOTES#3 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/_bus.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/_inttypes.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/_limits.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/_stdint.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/_types.h#4 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/alpha_cpu.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/asm.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/atomic.h#3 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/bootinfo.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/bus.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/bus_dma.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/bwx.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/chipset.h#3 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/clock.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/clockvar.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/cpu.h#4 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/cpuconf.h#3 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/cpufunc.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/db_machdep.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/elf.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/endian.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/exec.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/float.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/floatingpoint.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/fpu.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/frame.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/gdb_machdep.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/ieee.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/ieeefp.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/in_cksum.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/inst.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/intr.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/intrcnt.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/ioctl_bt848.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/ioctl_meteor.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/kdb.h#3 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/limits.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/md_var.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/memdev.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/mutex.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/pal.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/param.h#4 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/pc/bios.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/pc/display.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/pc/vesa.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/pcb.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/pcpu.h#3 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/pmap.h#4 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/pmc_mdep.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/ppireg.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/proc.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/profile.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/prom.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/pte.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/ptrace.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/reg.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/reloc.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/resource.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/rpb.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/runq.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/setjmp.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/sf_buf.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/sgmap.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/sigframe.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/signal.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/smp.h#3 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/stdarg.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/swiz.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/sysarch.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/timerreg.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/ucontext.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/varargs.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/include/vmparam.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/isa/isa.c#5 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/isa/isa_dma.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/isa/isavar.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/isa/mcclock_isa.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/linux/Makefile#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/linux/linux.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/linux/linux_dummy.c#3 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/linux/linux_genassym.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/linux/linux_ipc64.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/linux/linux_locore.s#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/linux/linux_machdep.c#3 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/linux/linux_proto.h#4 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/linux/linux_syscall.h#4 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/linux/linux_sysent.c#4 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/linux/linux_sysvec.c#5 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/linux/syscalls.conf#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/linux/syscalls.master#4 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/mcbus/mcbus.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/mcbus/mcbusreg.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/mcbus/mcbusvar.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/mcbus/mcmem.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/mcbus/mcpcia.c#3 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/mcbus/mcpciareg.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/mcbus/mcpciavar.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/osf1/Makefile#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/osf1/README.mach-traps#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/osf1/exec_ecoff.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/osf1/imgact_osf1.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/osf1/osf1.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/osf1/osf1_ioctl.c#3 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/osf1/osf1_misc.c#4 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/osf1/osf1_mount.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/osf1/osf1_proto.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/osf1/osf1_signal.c#4 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/osf1/osf1_signal.h#3 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/osf1/osf1_syscall.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/osf1/osf1_sysent.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/osf1/osf1_sysvec.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/osf1/osf1_util.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/osf1/syscalls.conf#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/osf1/syscalls.master#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/pci/alphapci_if.m#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/pci/apecs.c#3 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/pci/apecs_pci.c#3 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/pci/apecsreg.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/pci/apecsvar.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/pci/bwx.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/pci/cia.c#3 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/pci/cia_pci.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/pci/ciareg.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/pci/ciavar.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/pci/irongate.c#3 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/pci/irongate_pci.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/pci/irongatereg.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/pci/irongatevar.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/pci/lca.c#3 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/pci/lca_pci.c#3 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/pci/lcareg.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/pci/lcavar.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/pci/pci_eb164_intr.s#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/pci/pci_eb64plus_intr.s#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/pci/pcibus.c#4 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/pci/pcibus.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/pci/swiz.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/pci/t2.c#3 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/pci/t2_pci.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/pci/t2reg.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/pci/t2var.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/pci/tsunami.c#3 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/pci/tsunami_pci.c#3 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/pci/tsunamireg.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/pci/tsunamivar.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/tlsb/dwlpx.c#3 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/tlsb/dwlpxreg.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/tlsb/dwlpxvar.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/tlsb/gbus.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/tlsb/gbusreg.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/tlsb/gbusvar.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/tlsb/kftxx.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/tlsb/kftxxreg.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/tlsb/kftxxvar.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/tlsb/mcclock_tlsb.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/tlsb/tlsb.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/tlsb/tlsbcpu.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/tlsb/tlsbmem.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/tlsb/tlsbreg.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/tlsb/tlsbvar.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/tlsb/zs_tlsb.c#3 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/tlsb/zsreg.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/alpha/tlsb/zsvar.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/amd64/amd64/apic_vector.S#5 integrate
.. //depot/projects/fast_ipsec/src/sys/amd64/amd64/busdma_machdep.c#5 integrate
.. //depot/projects/fast_ipsec/src/sys/amd64/amd64/machdep.c#8 integrate
.. //depot/projects/fast_ipsec/src/sys/amd64/amd64/mp_machdep.c#8 integrate
.. //depot/projects/fast_ipsec/src/sys/amd64/amd64/pmap.c#10 integrate
.. //depot/projects/fast_ipsec/src/sys/amd64/conf/GENERIC#7 integrate
.. //depot/projects/fast_ipsec/src/sys/amd64/conf/NOTES#9 integrate
.. //depot/projects/fast_ipsec/src/sys/amd64/include/apicvar.h#5 integrate
.. //depot/projects/fast_ipsec/src/sys/amd64/include/clock.h#3 integrate
.. //depot/projects/fast_ipsec/src/sys/amd64/include/cpu.h#3 integrate
.. //depot/projects/fast_ipsec/src/sys/amd64/include/mutex.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/amd64/include/pmap.h#5 integrate
.. //depot/projects/fast_ipsec/src/sys/amd64/include/smp.h#4 integrate
.. //depot/projects/fast_ipsec/src/sys/amd64/include/specialreg.h#3 integrate
.. //depot/projects/fast_ipsec/src/sys/amd64/linux32/linux32_dummy.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/amd64/linux32/linux32_proto.h#3 integrate
.. //depot/projects/fast_ipsec/src/sys/amd64/linux32/linux32_syscall.h#3 integrate
.. //depot/projects/fast_ipsec/src/sys/amd64/linux32/linux32_sysent.c#3 integrate
.. //depot/projects/fast_ipsec/src/sys/amd64/linux32/linux32_sysvec.c#7 integrate
.. //depot/projects/fast_ipsec/src/sys/amd64/linux32/syscalls.master#3 integrate
.. //depot/projects/fast_ipsec/src/sys/arm/arm/machdep.c#6 integrate
.. //depot/projects/fast_ipsec/src/sys/arm/at91/at91.c#5 integrate
.. //depot/projects/fast_ipsec/src/sys/arm/at91/at91_pdcreg.h#1 branch
.. //depot/projects/fast_ipsec/src/sys/arm/at91/at91_st.c#3 integrate
.. //depot/projects/fast_ipsec/src/sys/arm/at91/if_ate.c#4 integrate
.. //depot/projects/fast_ipsec/src/sys/arm/at91/uart_bus_at91usart.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/arm/at91/uart_dev_at91usart.c#4 integrate
.. //depot/projects/fast_ipsec/src/sys/arm/conf/KB920X#2 integrate
.. //depot/projects/fast_ipsec/src/sys/arm/conf/SIMICS#3 integrate
.. //depot/projects/fast_ipsec/src/sys/arm/conf/SKYEYE#2 integrate
.. //depot/projects/fast_ipsec/src/sys/arm/include/_types.h#4 integrate
.. //depot/projects/fast_ipsec/src/sys/arm/include/atomic.h#7 integrate
.. //depot/projects/fast_ipsec/src/sys/arm/include/cpu.h#3 integrate
.. //depot/projects/fast_ipsec/src/sys/arm/include/pmap.h#6 integrate
.. //depot/projects/fast_ipsec/src/sys/arm/sa11x0/sa11x0_io.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/arm/sa11x0/uart_dev_sa1110.c#3 integrate
.. //depot/projects/fast_ipsec/src/sys/arm/xscale/i80321/i80321_space.c#3 integrate
.. //depot/projects/fast_ipsec/src/sys/arm/xscale/i80321/iq80321.c#4 integrate
.. //depot/projects/fast_ipsec/src/sys/boot/Makefile#3 integrate
.. //depot/projects/fast_ipsec/src/sys/boot/alpha/Makefile#2 delete
.. //depot/projects/fast_ipsec/src/sys/boot/alpha/Makefile.inc#2 delete
.. //depot/projects/fast_ipsec/src/sys/boot/alpha/boot1/Makefile#2 delete
.. //depot/projects/fast_ipsec/src/sys/boot/alpha/boot1/boot1.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/boot/alpha/cdboot/Makefile#2 delete
.. //depot/projects/fast_ipsec/src/sys/boot/alpha/cdboot/version#2 delete
.. //depot/projects/fast_ipsec/src/sys/boot/alpha/common/Makefile.common#3 delete
.. //depot/projects/fast_ipsec/src/sys/boot/alpha/common/conf.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/boot/alpha/common/help.alpha#2 delete
.. //depot/projects/fast_ipsec/src/sys/boot/alpha/common/ldscript#2 delete
.. //depot/projects/fast_ipsec/src/sys/boot/alpha/common/main.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/boot/alpha/libalpha/Makefile#2 delete
.. //depot/projects/fast_ipsec/src/sys/boot/alpha/libalpha/OSFpal.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/boot/alpha/libalpha/alpha_copy.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/boot/alpha/libalpha/alpha_module.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/boot/alpha/libalpha/bbinfo.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/boot/alpha/libalpha/bootinfo.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/boot/alpha/libalpha/common.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/boot/alpha/libalpha/delay.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/boot/alpha/libalpha/devicename.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/boot/alpha/libalpha/elf_freebsd.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/boot/alpha/libalpha/getsecs.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/boot/alpha/libalpha/libalpha.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/boot/alpha/libalpha/pal.S#2 delete
.. //depot/projects/fast_ipsec/src/sys/boot/alpha/libalpha/prom.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/boot/alpha/libalpha/prom_disp.S#2 delete
.. //depot/projects/fast_ipsec/src/sys/boot/alpha/libalpha/prom_swpal.S#2 delete
.. //depot/projects/fast_ipsec/src/sys/boot/alpha/libalpha/reboot.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/boot/alpha/libalpha/srmdisk.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/boot/alpha/libalpha/srmnet.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/boot/alpha/libalpha/start.S#2 delete
.. //depot/projects/fast_ipsec/src/sys/boot/alpha/libalpha/time.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/boot/alpha/loader/Makefile#2 delete
.. //depot/projects/fast_ipsec/src/sys/boot/alpha/loader/version#2 delete
.. //depot/projects/fast_ipsec/src/sys/boot/alpha/netboot/Makefile#2 delete
.. //depot/projects/fast_ipsec/src/sys/boot/alpha/netboot/version#2 delete
.. //depot/projects/fast_ipsec/src/sys/boot/arc/Makefile#2 delete
.. //depot/projects/fast_ipsec/src/sys/boot/arc/Makefile.inc#2 delete
.. //depot/projects/fast_ipsec/src/sys/boot/arc/include/arcfuncs.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/boot/arc/include/arctypes.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/boot/arc/include/libarc.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/boot/arc/lib/Makefile#2 delete
.. //depot/projects/fast_ipsec/src/sys/boot/arc/lib/abort.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/boot/arc/lib/arcconsole.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/boot/arc/lib/arcdisk.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/boot/arc/lib/arch/alpha/copy.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/boot/arc/lib/arch/alpha/rpb.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/boot/arc/lib/arch/alpha/setjmp.S#2 delete
.. //depot/projects/fast_ipsec/src/sys/boot/arc/lib/arch/alpha/start.S#2 delete
.. //depot/projects/fast_ipsec/src/sys/boot/arc/lib/bootinfo.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/boot/arc/lib/delay.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/boot/arc/lib/devicename.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/boot/arc/lib/elf_freebsd.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/boot/arc/lib/module.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/boot/arc/lib/prom.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/boot/arc/lib/setjmperr.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/boot/arc/lib/time.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/boot/arc/loader/Makefile#2 delete
.. //depot/projects/fast_ipsec/src/sys/boot/arc/loader/conf.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/boot/arc/loader/help.alpha#2 delete
.. //depot/projects/fast_ipsec/src/sys/boot/arc/loader/main.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/boot/arc/loader/version#2 delete
.. //depot/projects/fast_ipsec/src/sys/boot/common/Makefile.inc#2 integrate
.. //depot/projects/fast_ipsec/src/sys/boot/common/load_elf.c#3 integrate
.. //depot/projects/fast_ipsec/src/sys/boot/common/loader.8#3 integrate
.. //depot/projects/fast_ipsec/src/sys/boot/efi/libefi/bootinfo.c#3 integrate
.. //depot/projects/fast_ipsec/src/sys/boot/ficl/Makefile#2 integrate
.. //depot/projects/fast_ipsec/src/sys/boot/ficl/alpha/sysdep.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/boot/ficl/alpha/sysdep.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/boot/ficl/loader.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/boot/forth/loader.4th#2 integrate
.. //depot/projects/fast_ipsec/src/sys/boot/forth/loader.conf#4 integrate
.. //depot/projects/fast_ipsec/src/sys/boot/i386/boot0/boot0.S#2 integrate
.. //depot/projects/fast_ipsec/src/sys/boot/ia64/ski/bootinfo.c#3 integrate
.. //depot/projects/fast_ipsec/src/sys/boot/ia64/ski/conf.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/boot/pc98/Makefile#2 integrate
.. //depot/projects/fast_ipsec/src/sys/boot/pc98/boot2/io.c#3 integrate
.. //depot/projects/fast_ipsec/src/sys/boot/pc98/cdboot/Makefile#1 branch
.. //depot/projects/fast_ipsec/src/sys/boot/pc98/cdboot/cdboot.s#1 branch
.. //depot/projects/fast_ipsec/src/sys/boot/pc98/libpc98/bioscd.c#1 branch
.. //depot/projects/fast_ipsec/src/sys/boot/powerpc/loader/conf.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/cam/cam_debug.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/coda/cnode.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/compat/linprocfs/linprocfs.c#4 integrate
.. //depot/projects/fast_ipsec/src/sys/compat/linsysfs/linsysfs.c#1 branch
.. //depot/projects/fast_ipsec/src/sys/compat/linux/linux_file.c#3 integrate
.. //depot/projects/fast_ipsec/src/sys/compat/linux/linux_ioctl.c#5 integrate
.. //depot/projects/fast_ipsec/src/sys/compat/linux/linux_ioctl.h#3 integrate
.. //depot/projects/fast_ipsec/src/sys/compat/linux/linux_misc.c#5 integrate
.. //depot/projects/fast_ipsec/src/sys/compat/linux/linux_signal.c#4 integrate
.. //depot/projects/fast_ipsec/src/sys/compat/linux/linux_socket.c#5 integrate
.. //depot/projects/fast_ipsec/src/sys/compat/linux/linux_stats.c#4 integrate
.. //depot/projects/fast_ipsec/src/sys/compat/linux/linux_util.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/compat/linux/linux_util.h#3 integrate
.. //depot/projects/fast_ipsec/src/sys/compat/ndis/subr_hal.c#5 integrate
.. //depot/projects/fast_ipsec/src/sys/compat/ndis/subr_ntoskrnl.c#6 integrate
.. //depot/projects/fast_ipsec/src/sys/conf/Makefile.alpha#3 delete
.. //depot/projects/fast_ipsec/src/sys/conf/NOTES#8 integrate
.. //depot/projects/fast_ipsec/src/sys/conf/files#12 integrate
.. //depot/projects/fast_ipsec/src/sys/conf/files.alpha#6 delete
.. //depot/projects/fast_ipsec/src/sys/conf/files.amd64#6 integrate
.. //depot/projects/fast_ipsec/src/sys/conf/files.i386#7 integrate
.. //depot/projects/fast_ipsec/src/sys/conf/files.pc98#7 integrate
.. //depot/projects/fast_ipsec/src/sys/conf/kern.mk#2 integrate
.. //depot/projects/fast_ipsec/src/sys/conf/kern.post.mk#4 integrate
.. //depot/projects/fast_ipsec/src/sys/conf/ldscript.alpha#2 delete
.. //depot/projects/fast_ipsec/src/sys/conf/options#11 integrate
.. //depot/projects/fast_ipsec/src/sys/conf/options.alpha#3 delete
.. //depot/projects/fast_ipsec/src/sys/conf/options.amd64#5 integrate
.. //depot/projects/fast_ipsec/src/sys/conf/options.arm#4 integrate
.. //depot/projects/fast_ipsec/src/sys/conf/options.i386#6 integrate
.. //depot/projects/fast_ipsec/src/sys/conf/options.pc98#6 integrate
.. //depot/projects/fast_ipsec/src/sys/contrib/dev/oltr/if_oltr.c#4 integrate
.. //depot/projects/fast_ipsec/src/sys/contrib/pf/net/pf_ioctl.c#4 integrate
.. //depot/projects/fast_ipsec/src/sys/ddb/db_ps.c#3 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/acpica/Osd/OsdSchedule.c#4 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/acpica/acpi.c#6 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/acpica/acpi_pci.c#4 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/acpica/acpi_resource.c#3 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/aic7xxx/aic79xx_osm.h#3 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/aic7xxx/aic7xxx_osm.h#3 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/amr/amr.c#6 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/amr/amr_linux.c#3 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/amr/amrvar.h#6 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/an/if_an.c#5 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/arcmsr/arcmsr.c#3 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/arl/if_arl.c#3 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/arl/if_arl_isa.c#3 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/asr/asr.c#3 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/ata/ata-all.c#9 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/ata/ata-chipset.c#7 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/ata/ata-pci.c#6 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/ath/if_ath.c#7 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/ath/if_ath_pci.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/ath/if_athvar.h#4 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/atkbdc/atkbd.c#3 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/atkbdc/atkbdc.c#4 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/bce/if_bcereg.h#3 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/bfe/if_bfe.c#8 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/bfe/if_bfereg.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/bge/if_bge.c#10 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/ciss/ciss.c#5 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/cnw/if_cnw.c#3 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/cpufreq/ichss.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/ct/bshw_machdep.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/ctau/if_ct.c#3 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/cx/if_cx.c#5 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/dc/if_dc.c#7 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/de/if_de.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/dec/mc146818reg.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/dev/dec/mcclock.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/dev/dec/mcclock_if.m#2 delete
.. //depot/projects/fast_ipsec/src/sys/dev/dec/mcclockvar.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/dev/dpt/dpt_scsi.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/drm/drm.h#4 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/drm/drm_scatter.c#3 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/drm/i915_drv.c#4 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/drm/mga_drv.c#4 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/drm/r300_cmdbuf.c#4 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/ed/if_ed_cbus.c#4 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/ed/if_ed_pccard.c#4 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/em/if_em_hw.c#5 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/fb/boot_font.c#3 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/fb/gfb.c#3 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/fb/tga.c#3 delete
.. //depot/projects/fast_ipsec/src/sys/dev/fb/tga.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/dev/fxp/if_fxp.c#7 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/gfb/gfb_pci.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/hifn/hifn7751.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/hifn/hifn7751var.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/hptmv/entry.c#3 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/hwpmc/hwpmc_alpha.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/dev/idt/idt.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/ie/if_ie_isa.c#3 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/iir/iir.c#3 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/iir/iir_pci.c#3 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/ipmi/ipmi.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/ips/ips.c#4 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/ipw/if_ipw.c#6 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/isp/isp_freebsd.h#5 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/iwi/if_iwi.c#7 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/ixgb/if_ixgb.h#3 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/ixgb/if_ixgb_osdep.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/le/am7990.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/le/am79900.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/le/if_le_cbus.c#1 branch
.. //depot/projects/fast_ipsec/src/sys/dev/le/if_le_isa.c#1 branch
.. //depot/projects/fast_ipsec/src/sys/dev/le/if_le_ledma.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/le/if_le_pci.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/le/lance.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/le/lancereg.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/le/lancevar.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/lge/if_lge.c#6 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/lge/if_lgereg.h#4 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/lmc/if_lmc.c#3 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/lnc/if_lnc.c#4 delete
.. //depot/projects/fast_ipsec/src/sys/dev/lnc/if_lnc_cbus.c#3 delete
.. //depot/projects/fast_ipsec/src/sys/dev/lnc/if_lnc_isa.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/dev/lnc/if_lnc_pci.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/dev/lnc/if_lncreg.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/dev/lnc/if_lncvar.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/dev/mfi/mfi.c#3 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/mfi/mfi_disk.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/mfi/mfi_ioctl.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/mfi/mfi_linux.c#1 branch
.. //depot/projects/fast_ipsec/src/sys/dev/mfi/mfi_pci.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/mfi/mfireg.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/mfi/mfivar.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/mii/brgphy.c#8 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/mii/ciphy.c#3 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/mii/e1000phy.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/mii/mii_physubr.c#3 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/mii/miivar.h#3 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/mii/nsgphy.c#3 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/mii/rgephy.c#3 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/mii/tdkphy.c#3 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/mii/ukphy_subr.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/mpt/mpt.h#8 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/mpt/mpt_cam.c#8 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/mpt/mpt_pci.c#5 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/mse/mse.c#3 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/mse/mse_cbus.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/mse/mse_isa.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/my/if_my.c#4 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/myri10ge/if_myri10ge.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/ncv/ncr53c500.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/nge/if_nge.c#7 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/nge/if_ngereg.h#3 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/nsp/nsp.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/nve/if_nve.c#6 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/pbio/pbio.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/pccard/pccarddevs#5 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/pccbb/pccbb.c#8 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/pccbb/pccbb_pci.c#3 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/pci/pci.c#7 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/pdq/pdq_freebsd.h#3 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/pdq/pdqvar.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/ppbus/vpoio.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/ppc/ppc.c#6 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/ral/if_ral_pci.c#3 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/ral/rt2560.c#3 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/ral/rt2661.c#4 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/rr232x/os_bsd.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/rr232x/osm_bsd.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/safe/safe.c#3 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/safe/safevar.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/sbsh/if_sbsh.c#3 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/sk/if_sk.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/sk/if_skreg.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/sound/isa/es1888.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/dev/sound/isa/gusc.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/sound/pci/ich.c#7 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/sound/pcm/sound.h#4 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/stg/tmc18c30.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/sym/sym_hipd.c#3 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/syscons/scterm-sc.c#3 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/syscons/scvesactl.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/syscons/scvgarndr.c#3 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/syscons/syscons.c#5 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/syscons/syscons.h#3 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/tga/tga_pci.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/dev/tga/tga_pci.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/dev/trm/trm.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/tx/if_tx.c#5 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/txp/if_txp.c#5 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/uart/uart_cpu_alpha.c#3 delete
.. //depot/projects/fast_ipsec/src/sys/dev/uart/uart_dev_z8530.c#5 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/ubsec/ubsec.c#3 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/ubsec/ubsecvar.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/usb/ehci.c#4 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/usb/if_ural.c#6 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/usb/ohci.c#4 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/usb/uhci.c#3 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/usb/usb_subr.c#4 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/usb/usbdi.c#3 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/wds/wd7000.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/wi/if_wi.c#4 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/wi/if_wi_pci.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/fs/fdescfs/fdesc_vfsops.c#3 integrate
.. //depot/projects/fast_ipsec/src/sys/fs/pseudofs/pseudofs.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/fs/pseudofs/pseudofs.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/fs/smbfs/smbfs_subr.c#3 integrate
.. //depot/projects/fast_ipsec/src/sys/geom/raid3/g_raid3.c#8 integrate
.. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/i386/conf/GENERIC#7 integrate
.. //depot/projects/fast_ipsec/src/sys/i386/conf/GENERIC.hints#2 integrate
.. //depot/projects/fast_ipsec/src/sys/i386/conf/NOTES#9 integrate
.. //depot/projects/fast_ipsec/src/sys/i386/conf/PAE#4 integrate
.. //depot/projects/fast_ipsec/src/sys/i386/cpufreq/est.c#3 integrate
.. //depot/projects/fast_ipsec/src/sys/i386/cpufreq/powernow.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/i386/i386/apic_vector.s#5 integrate
.. //depot/projects/fast_ipsec/src/sys/i386/i386/busdma_machdep.c#4 integrate
.. //depot/projects/fast_ipsec/src/sys/i386/i386/machdep.c#8 integrate
.. //depot/projects/fast_ipsec/src/sys/i386/i386/mp_machdep.c#8 integrate
.. //depot/projects/fast_ipsec/src/sys/i386/i386/pmap.c#10 integrate
.. //depot/projects/fast_ipsec/src/sys/i386/include/apicvar.h#5 integrate
.. //depot/projects/fast_ipsec/src/sys/i386/include/clock.h#3 integrate
.. //depot/projects/fast_ipsec/src/sys/i386/include/cpu.h#3 integrate
.. //depot/projects/fast_ipsec/src/sys/i386/include/mutex.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/i386/include/pcpu.h#3 integrate
.. //depot/projects/fast_ipsec/src/sys/i386/include/pcvt_ioctl.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/i386/include/pmap.h#4 integrate
.. //depot/projects/fast_ipsec/src/sys/i386/include/privatespace.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/i386/include/smp.h#4 integrate
.. //depot/projects/fast_ipsec/src/sys/i386/include/specialreg.h#3 integrate
.. //depot/projects/fast_ipsec/src/sys/i386/isa/npx.c#5 integrate
.. //depot/projects/fast_ipsec/src/sys/i386/isa/pcvt/pcvt_conf.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/i386/isa/pcvt/pcvt_drv.c#3 delete
.. //depot/projects/fast_ipsec/src/sys/i386/isa/pcvt/pcvt_ext.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/i386/isa/pcvt/pcvt_hdr.h#3 delete
.. //depot/projects/fast_ipsec/src/sys/i386/isa/pcvt/pcvt_kbd.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/i386/isa/pcvt/pcvt_kbd.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/i386/isa/pcvt/pcvt_out.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/i386/isa/pcvt/pcvt_sup.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/i386/isa/pcvt/pcvt_tbl.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/i386/isa/pcvt/pcvt_vtf.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/i386/isa/spic.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/i386/linux/linux_dummy.c#3 integrate
.. //depot/projects/fast_ipsec/src/sys/i386/linux/linux_proto.h#4 integrate
.. //depot/projects/fast_ipsec/src/sys/i386/linux/linux_syscall.h#4 integrate
.. //depot/projects/fast_ipsec/src/sys/i386/linux/linux_sysent.c#4 integrate
.. //depot/projects/fast_ipsec/src/sys/i386/linux/linux_sysvec.c#5 integrate
.. //depot/projects/fast_ipsec/src/sys/i386/linux/syscalls.master#4 integrate
.. //depot/projects/fast_ipsec/src/sys/i4b/capi/iavc/iavc_card.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/i4b/capi/iavc/iavc_isa.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/i4b/capi/iavc/iavc_lli.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/i4b/capi/iavc/iavc_pci.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/i4b/layer1/itjc/i4b_itjc_isac.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/i4b/layer1/itjc/i4b_itjc_l1.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/i4b/layer1/itjc/i4b_itjc_l1fsm.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/i4b/layer1/itjc/i4b_itjc_pci.c#3 integrate
.. //depot/projects/fast_ipsec/src/sys/ia64/conf/GENERIC#4 integrate
.. //depot/projects/fast_ipsec/src/sys/ia64/ia64/clock.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/ia64/ia64/mp_machdep.c#3 integrate
.. //depot/projects/fast_ipsec/src/sys/ia64/ia64/trap.c#4 integrate
.. //depot/projects/fast_ipsec/src/sys/ia64/ia64/vm_machdep.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/ia64/include/cpu.h#3 integrate
.. //depot/projects/fast_ipsec/src/sys/isa/isa_common.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/isa/isa_common.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/kern/init_main.c#5 integrate
.. //depot/projects/fast_ipsec/src/sys/kern/kern_conf.c#6 integrate
.. //depot/projects/fast_ipsec/src/sys/kern/kern_exec.c#9 integrate
.. //depot/projects/fast_ipsec/src/sys/kern/kern_mutex.c#6 integrate
.. //depot/projects/fast_ipsec/src/sys/kern/kern_sig.c#9 integrate
.. //depot/projects/fast_ipsec/src/sys/kern/kern_umtx.c#5 integrate
.. //depot/projects/fast_ipsec/src/sys/kern/subr_clock.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/kern/tty_cons.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/kern/vfs_aio.c#6 integrate
.. //depot/projects/fast_ipsec/src/sys/kern/vfs_mount.c#7 integrate
.. //depot/projects/fast_ipsec/src/sys/kern/vfs_subr.c#11 integrate
.. //depot/projects/fast_ipsec/src/sys/kern/vfs_vnops.c#6 integrate
.. //depot/projects/fast_ipsec/src/sys/libkern/alpha/bswap16.S#2 delete
.. //depot/projects/fast_ipsec/src/sys/libkern/alpha/bswap32.S#2 delete
.. //depot/projects/fast_ipsec/src/sys/libkern/alpha/byte_swap_2.S#2 delete
.. //depot/projects/fast_ipsec/src/sys/libkern/alpha/byte_swap_4.S#2 delete
.. //depot/projects/fast_ipsec/src/sys/modules/Makefile#9 integrate
.. //depot/projects/fast_ipsec/src/sys/modules/ath_hal/Makefile#2 integrate
.. //depot/projects/fast_ipsec/src/sys/modules/ip6fw/Makefile#2 delete
.. //depot/projects/fast_ipsec/src/sys/modules/le/Makefile#2 integrate
.. //depot/projects/fast_ipsec/src/sys/modules/linsysfs/Makefile#1 branch
.. //depot/projects/fast_ipsec/src/sys/modules/linux/Makefile#5 integrate
.. //depot/projects/fast_ipsec/src/sys/modules/lnc/Makefile#2 delete
.. //depot/projects/fast_ipsec/src/sys/modules/mfi/Makefile#2 integrate
.. //depot/projects/fast_ipsec/src/sys/modules/mfi/mfi_linux/Makefile#1 branch
.. //depot/projects/fast_ipsec/src/sys/modules/rr232x/Makefile#2 integrate
.. //depot/projects/fast_ipsec/src/sys/modules/sound/driver/ess/Makefile#2 integrate
.. //depot/projects/fast_ipsec/src/sys/net/bpf.c#4 integrate
.. //depot/projects/fast_ipsec/src/sys/net/if.h#4 integrate
.. //depot/projects/fast_ipsec/src/sys/net/if_bridge.c#9 integrate
.. //depot/projects/fast_ipsec/src/sys/net/if_gre.c#5 integrate
.. //depot/projects/fast_ipsec/src/sys/net/if_loop.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/net/if_tap.c#4 integrate
.. //depot/projects/fast_ipsec/src/sys/net/net_osdep.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/net/route.c#4 integrate
.. //depot/projects/fast_ipsec/src/sys/netgraph/bluetooth/include/ng_btsocket.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/netgraph/bluetooth/include/ng_hci.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#3 integrate
.. //depot/projects/fast_ipsec/src/sys/netgraph/ng_socket.c#6 integrate
.. //depot/projects/fast_ipsec/src/sys/netinet/in.h#4 integrate
.. //depot/projects/fast_ipsec/src/sys/netinet/ip_fw.h#5 integrate
.. //depot/projects/fast_ipsec/src/sys/netinet/ip_fw2.c#6 integrate
.. //depot/projects/fast_ipsec/src/sys/netinet/ip_fw_pfil.c#3 integrate
.. //depot/projects/fast_ipsec/src/sys/netinet/ip_gre.c#3 integrate
.. //depot/projects/fast_ipsec/src/sys/netinet/ip_input.c#6 integrate
.. //depot/projects/fast_ipsec/src/sys/netinet/ip_ipsec.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/netinet/ip_mroute.c#6 integrate
.. //depot/projects/fast_ipsec/src/sys/netinet/ip_output.c#6 integrate
.. //depot/projects/fast_ipsec/src/sys/netinet/ip_var.h#3 integrate
.. //depot/projects/fast_ipsec/src/sys/netinet/raw_ip.c#6 integrate
.. //depot/projects/fast_ipsec/src/sys/netinet/tcp_timer.c#4 integrate
.. //depot/projects/fast_ipsec/src/sys/netinet/udp_usrreq.c#8 integrate
.. //depot/projects/fast_ipsec/src/sys/netinet6/frag6.c#4 integrate
.. //depot/projects/fast_ipsec/src/sys/netinet6/ip6_forward.c#3 integrate
.. //depot/projects/fast_ipsec/src/sys/netinet6/ip6_fw.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/netinet6/ip6_fw.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/netinet6/ip6_input.c#4 integrate
.. //depot/projects/fast_ipsec/src/sys/netinet6/ip6_output.c#4 integrate
.. //depot/projects/fast_ipsec/src/sys/netinet6/udp6_usrreq.c#6 integrate
.. //depot/projects/fast_ipsec/src/sys/netipsec/key.c#3 integrate
.. //depot/projects/fast_ipsec/src/sys/netipsec/xform_ah.c#4 integrate
.. //depot/projects/fast_ipsec/src/sys/netipsec/xform_esp.c#4 integrate
.. //depot/projects/fast_ipsec/src/sys/nfs4client/nfs4_dev.c#3 integrate
.. //depot/projects/fast_ipsec/src/sys/nfs4client/nfs4_vfsops.c#3 integrate
.. //depot/projects/fast_ipsec/src/sys/nfsclient/nfs.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/nfsclient/nfs_bio.c#4 integrate
.. //depot/projects/fast_ipsec/src/sys/nfsclient/nfs_nfsiod.c#3 integrate
.. //depot/projects/fast_ipsec/src/sys/nfsclient/nfs_node.c#3 integrate
.. //depot/projects/fast_ipsec/src/sys/nfsclient/nfs_socket.c#7 integrate
.. //depot/projects/fast_ipsec/src/sys/nfsclient/nfs_subs.c#3 integrate
.. //depot/projects/fast_ipsec/src/sys/nfsclient/nfs_vfsops.c#5 integrate
.. //depot/projects/fast_ipsec/src/sys/nfsclient/nfs_vnops.c#6 integrate
.. //depot/projects/fast_ipsec/src/sys/nfsclient/nfsmount.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/nfsclient/nfsnode.h#3 integrate
.. //depot/projects/fast_ipsec/src/sys/opencrypto/criov.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/opencrypto/crypto.c#4 integrate
.. //depot/projects/fast_ipsec/src/sys/opencrypto/cryptodev.c#3 integrate
.. //depot/projects/fast_ipsec/src/sys/opencrypto/cryptodev.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/opencrypto/cryptosoft.c#4 integrate
.. //depot/projects/fast_ipsec/src/sys/opencrypto/cryptosoft.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/opencrypto/xform.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/opencrypto/xform.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/pc98/cbus/cbus.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/pc98/cbus/fdc.c#5 integrate
.. //depot/projects/fast_ipsec/src/sys/pc98/cbus/olpt.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/pc98/cbus/syscons_cbus.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/pc98/conf/GENERIC#5 integrate
.. //depot/projects/fast_ipsec/src/sys/pc98/conf/GENERIC.hints#3 integrate
.. //depot/projects/fast_ipsec/src/sys/pc98/conf/NOTES#7 integrate
.. //depot/projects/fast_ipsec/src/sys/pc98/include/pcvt_ioctl.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/pc98/pc98/canbus.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/pc98/pc98/machdep.c#10 integrate
.. //depot/projects/fast_ipsec/src/sys/pc98/pc98/pc98_machdep.c#3 integrate
.. //depot/projects/fast_ipsec/src/sys/pc98/pc98/pc98_machdep.h#3 integrate
.. //depot/projects/fast_ipsec/src/sys/pci/agp.c#4 integrate
.. //depot/projects/fast_ipsec/src/sys/pci/agp_i810.c#5 integrate
.. //depot/projects/fast_ipsec/src/sys/pci/amdpm.c#3 integrate
.. //depot/projects/fast_ipsec/src/sys/pci/amdsmb.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/pci/if_pcn.c#5 integrate
.. //depot/projects/fast_ipsec/src/sys/pci/if_pcnreg.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/pci/if_sfreg.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/pci/if_stereg.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/pci/if_tl.c#5 integrate
.. //depot/projects/fast_ipsec/src/sys/pci/if_tlreg.h#3 integrate
.. //depot/projects/fast_ipsec/src/sys/pci/if_vrreg.h#3 integrate
.. //depot/projects/fast_ipsec/src/sys/pci/if_wbreg.h#3 integrate
.. //depot/projects/fast_ipsec/src/sys/pci/ncr.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/pci/nfsmb.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/pci/viapm.c#4 integrate
.. //depot/projects/fast_ipsec/src/sys/posix4/ksched.c#3 integrate
.. //depot/projects/fast_ipsec/src/sys/posix4/p1003_1b.c#3 integrate
.. //depot/projects/fast_ipsec/src/sys/powerpc/include/cpu.h#3 integrate
.. //depot/projects/fast_ipsec/src/sys/powerpc/powerpc/clock.c#3 integrate
.. //depot/projects/fast_ipsec/src/sys/powerpc/powerpc/machdep.c#6 integrate
.. //depot/projects/fast_ipsec/src/sys/powerpc/powerpc/mp_machdep.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/powerpc/powerpc/vm_machdep.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/sparc64/include/cpu.h#3 integrate
.. //depot/projects/fast_ipsec/src/sys/sparc64/sparc64/prof_machdep.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/sparc64/sparc64/trap.c#6 integrate
.. //depot/projects/fast_ipsec/src/sys/sys/_timeval.h#3 integrate
.. //depot/projects/fast_ipsec/src/sys/sys/conf.h#3 integrate
.. //depot/projects/fast_ipsec/src/sys/sys/disklabel.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/sys/elf64.h#3 integrate
.. //depot/projects/fast_ipsec/src/sys/sys/file.h#3 integrate
.. //depot/projects/fast_ipsec/src/sys/sys/mount.h#7 integrate
.. //depot/projects/fast_ipsec/src/sys/sys/param.h#8 integrate
.. //depot/projects/fast_ipsec/src/sys/sys/proc.h#8 integrate
.. //depot/projects/fast_ipsec/src/sys/sys/signal.h#5 integrate
.. //depot/projects/fast_ipsec/src/sys/sys/ucontext.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/sys/user.h#3 integrate
.. //depot/projects/fast_ipsec/src/sys/ufs/ffs/ffs_rawread.c#3 integrate
.. //depot/projects/fast_ipsec/src/sys/ufs/ffs/ffs_snapshot.c#7 integrate
.. //depot/projects/fast_ipsec/src/sys/ufs/ffs/ffs_softdep.c#8 integrate
.. //depot/projects/fast_ipsec/src/sys/ufs/ffs/ffs_vfsops.c#9 integrate
.. //depot/projects/fast_ipsec/src/sys/ufs/ffs/ffs_vnops.c#3 integrate
.. //depot/projects/fast_ipsec/src/sys/ufs/ufs/dinode.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/ufs/ufs/ufs_inode.c#4 integrate
.. //depot/projects/fast_ipsec/src/sys/ufs/ufs/ufs_quota.c#6 integrate
.. //depot/projects/fast_ipsec/src/sys/vm/swap_pager.c#6 integrate
.. //depot/projects/fast_ipsec/src/sys/vm/uma_core.c#5 integrate
.. //depot/projects/fast_ipsec/src/sys/vm/vm_fault.c#5 integrate

Differences ...

==== //depot/projects/fast_ipsec/src/sbin/setkey/setkey.8#3 (text+ko) ====

@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/sbin/setkey/setkey.8,v 1.35 2006/01/08 13:59:44 gnn Exp $
+.\" $FreeBSD: src/sbin/setkey/setkey.8,v 1.36 2006/05/13 09:13:58 pjd Exp $
 .\"
 .Dd January 8, 2006
 .Dt SETKEY 8
@@ -622,7 +622,7 @@
 aes-ctr		160/224/288	draft-ietf-ipsec-ciph-aes-ctr-03
 .Ed
 .Pp
-Note that the first 128 bits of a key for
+Note that the first 128/192/256 bits of a key for
 .Li aes-ctr
 will be used as AES key, and remaining 32 bits will be used as nonce.
 .Pp

==== //depot/projects/fast_ipsec/src/sys/amd64/amd64/apic_vector.S#5 (text+ko) ====

@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  *	from: vector.s, 386BSD 0.1 unknown origin
- * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.108 2006/03/13 23:55:31 peter Exp $
+ * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.109 2006/05/01 21:36:46 jhb Exp $
  */
 
 /*
@@ -171,6 +171,25 @@
 	iretq
 
 /*
+ * Invalidate cache.
+ */
+	.text
+	SUPERALIGN_TEXT
+IDTVEC(invlcache)
+	pushq	%rax
+
+	wbinvd
+
+	movq	lapic, %rax
+	movl	$0, LA_EOI(%rax)	/* End Of Interrupt to APIC */
+
+	lock
+	incl	smp_tlb_wait
+
+	popq	%rax
+	iretq
+
+/*
  * Handler for IPIs sent via the per-cpu IPI bitmap.
  */
 	.text

==== //depot/projects/fast_ipsec/src/sys/amd64/amd64/busdma_machdep.c#5 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.73 2006/01/14 17:22:46 scottl Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.74 2006/05/03 04:14:17 scottl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -703,9 +703,10 @@
 	error = _bus_dmamap_load_buffer(dmat, map, buf, buflen, NULL, flags,
 	     &lastaddr, dmat->segments, &nsegs, 1);
 
+	CTR5(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d nsegs %d",
+	    __func__, dmat, dmat->flags, error, nsegs + 1);
+
 	if (error == EINPROGRESS) {
-		CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d",
-		    __func__, dmat, dmat->flags, error);
 		return (error);
 	}
 
@@ -714,8 +715,13 @@
 	else
 		(*callback)(callback_arg, dmat->segments, nsegs + 1, 0);
 
-	CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error 0 nsegs %d",
-	    __func__, dmat, dmat->flags, nsegs + 1);
+	/*
+	 * Return ENOMEM to the caller so that it can pass it up the stack.
+	 * This error only happens when NOWAIT is set, so deferal is disabled.
+	 */
+	if (error == ENOMEM)
+		return (error);
+
 	return (0);
 }
 

==== //depot/projects/fast_ipsec/src/sys/amd64/amd64/machdep.c#8 (text+ko) ====

@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.648 2006/03/14 16:13:54 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.649 2006/05/11 17:29:22 phk Exp $");
 
 #include "opt_atalk.h"
 #include "opt_atpic.h"
@@ -639,13 +639,13 @@
 	return (error);
 }
 
-SYSCTL_PROC(_machdep, CPU_ADJKERNTZ, adjkerntz, CTLTYPE_INT|CTLFLAG_RW,
+SYSCTL_PROC(_machdep, OID_AUTO, adjkerntz, CTLTYPE_INT|CTLFLAG_RW,
 	&adjkerntz, 0, sysctl_machdep_adjkerntz, "I", "");
 
-SYSCTL_INT(_machdep, CPU_DISRTCSET, disable_rtc_set,
+SYSCTL_INT(_machdep, OID_AUTO, disable_rtc_set,
 	CTLFLAG_RW, &disable_rtc_set, 0, "");
 
-SYSCTL_INT(_machdep, CPU_WALLCLOCK, wall_cmos_clock,
+SYSCTL_INT(_machdep, OID_AUTO, wall_cmos_clock,
 	CTLFLAG_RW, &wall_cmos_clock, 0, "");
 
 /*

==== //depot/projects/fast_ipsec/src/sys/amd64/amd64/mp_machdep.c#8 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.273 2006/04/25 00:06:37 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.276 2006/05/16 14:32:16 phk Exp $");
 
 #include "opt_cpu.h"
 #include "opt_kstack_pages.h"
@@ -56,7 +56,6 @@
 #include <vm/vm_extern.h>
 
 #include <machine/apicreg.h>
-#include <machine/clock.h>
 #include <machine/md_var.h>
 #include <machine/mp_watchdog.h>
 #include <machine/pcb.h>
@@ -514,6 +513,9 @@
 	while (!aps_ready)
 		ia32_pause();
 
+	/* Initialize the PAT MSR. */
+	pmap_init_pat();
+
 	/* set up CPU registers and state */
 	cpu_setregs();
 
@@ -875,6 +877,14 @@
 }
 
 void
+smp_cache_flush(void)
+{
+
+	if (smp_started)
+		smp_tlb_shootdown(IPI_INVLCACHE, 0, 0);
+}
+
+void
 smp_invltlb(void)
 {
 

==== //depot/projects/fast_ipsec/src/sys/amd64/amd64/pmap.c#10 (text+ko) ====

@@ -77,7 +77,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.552 2006/04/29 00:59:15 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.554 2006/05/01 22:06:59 jhb Exp $");
 
 /*
  *	Manages physical address maps.
@@ -551,6 +551,51 @@
 	*CMAP1 = 0;
 
 	invltlb();
+
+	/* Initialize the PAT MSR. */
+	pmap_init_pat();
+}
+
+/*
+ * Setup the PAT MSR.
+ */
+void
+pmap_init_pat(void)
+{
+	uint64_t pat_msr;
+
+	/* Bail if this CPU doesn't implement PAT. */
+	if (!(cpu_feature & CPUID_PAT))
+		panic("no PAT??");
+
+#ifdef PAT_WORKS
+	/*
+	 * Leave the indices 0-3 at the default of WB, WT, UC, and UC-.
+	 * Program 4 and 5 as WP and WC.
+	 * Leave 6 and 7 as UC and UC-.
+	 */
+	pat_msr = rdmsr(MSR_PAT);
+	pat_msr &= ~(PAT_MASK(4) | PAT_MASK(5));
+	pat_msr |= PAT_VALUE(4, PAT_WRITE_PROTECTED) |
+	    PAT_VALUE(5, PAT_WRITE_COMBINING);
+#else
+	/*
+	 * Due to some Intel errata, we can only safely use the lower 4
+	 * PAT entries.  Thus, just replace PAT Index 2 with WC instead
+	 * of UC-.
+	 *
+	 *   Intel Pentium III Processor Specification Update
+	 * Errata E.27 (Upper Four PAT Entries Not Usable With Mode B
+	 * or Mode C Paging)
+	 *
+	 *   Intel Pentium IV  Processor Specification Update
+	 * Errata N46 (PAT Index MSB May Be Calculated Incorrectly)
+	 */
+	pat_msr = rdmsr(MSR_PAT);
+	pat_msr &= ~PAT_MASK(2);
+	pat_msr |= PAT_VALUE(2, PAT_WRITE_COMBINING);
+#endif
+	wrmsr(MSR_PAT, pat_msr);
 }
 
 /*
@@ -732,6 +777,30 @@
 	else
 		critical_exit();
 }
+
+void
+pmap_invalidate_cache(void)
+{

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



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