PERFORCE change 85271 for review
George V. Neville-Neil
gnn at FreeBSD.org
Fri Oct 14 04:28:35 PDT 2005
http://perforce.freebsd.org/chv.cgi?CH=85271
Change 85271 by gnn at gnn_laptop_fast_ipsec on 2005/10/14 11:27:47
Integrate from HEAD.
Affected files ...
.. //depot/projects/fast_ipsec/src/sys/alpha/alpha/busdma_machdep.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/alpha/alpha/interrupt.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/alpha/alpha/sgmap.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/alpha/alpha/trap.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/alpha/conf/GENERIC#2 integrate
.. //depot/projects/fast_ipsec/src/sys/alpha/conf/MAC#1 branch
.. //depot/projects/fast_ipsec/src/sys/alpha/include/atomic.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/alpha/include/chipset.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/alpha/include/pmap.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/alpha/isa/isa.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/alpha/mcbus/mcpcia.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/alpha/osf1/osf1_ioctl.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/alpha/osf1/osf1_misc.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/alpha/osf1/osf1_signal.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/alpha/pci/apecs.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/alpha/pci/cia.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/alpha/pci/irongate.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/alpha/pci/lca.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/alpha/pci/pcibus.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/alpha/pci/t2.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/alpha/pci/tsunami.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/alpha/pci/tsunami_pci.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/alpha/tlsb/dwlpx.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/amd64/amd64/cpu_switch.S#2 integrate
.. //depot/projects/fast_ipsec/src/sys/amd64/amd64/elf_machdep.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/amd64/amd64/gdb_machdep.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/amd64/amd64/genassym.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/amd64/amd64/machdep.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/amd64/amd64/mptable_pci.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/amd64/amd64/nexus.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/amd64/amd64/support.S#2 integrate
.. //depot/projects/fast_ipsec/src/sys/amd64/amd64/trap.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/amd64/amd64/vm_machdep.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/amd64/conf/MAC#1 branch
.. //depot/projects/fast_ipsec/src/sys/amd64/conf/NOTES#2 integrate
.. //depot/projects/fast_ipsec/src/sys/amd64/ia32/ia32_reg.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/amd64/ia32/ia32_signal.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/amd64/include/atomic.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/amd64/include/legacyvar.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/amd64/include/pcb.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/amd64/linux32/linux32_sysvec.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/amd64/pci/pci_bus.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/arm/arm/bcopy_page.S#2 integrate
.. //depot/projects/fast_ipsec/src/sys/arm/arm/bcopyinout.S#2 integrate
.. //depot/projects/fast_ipsec/src/sys/arm/arm/bcopyinout_xscale.S#2 integrate
.. //depot/projects/fast_ipsec/src/sys/arm/arm/busdma_machdep.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/arm/arm/dump_machdep.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/arm/arm/elf_trampoline.c#1 branch
.. //depot/projects/fast_ipsec/src/sys/arm/arm/genassym.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/arm/arm/in_cksum.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/arm/arm/in_cksum_arm.S#2 integrate
.. //depot/projects/fast_ipsec/src/sys/arm/arm/inckern.S#1 branch
.. //depot/projects/fast_ipsec/src/sys/arm/arm/intr.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/arm/arm/locore.S#2 integrate
.. //depot/projects/fast_ipsec/src/sys/arm/arm/machdep.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/arm/arm/mem.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/arm/arm/nexus.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/arm/arm/pmap.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/arm/arm/support.S#2 integrate
.. //depot/projects/fast_ipsec/src/sys/arm/arm/swtch.S#2 integrate
.. //depot/projects/fast_ipsec/src/sys/arm/arm/vm_machdep.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/arm/conf/IQ31244#2 integrate
.. //depot/projects/fast_ipsec/src/sys/arm/conf/SIMICS#2 integrate
.. //depot/projects/fast_ipsec/src/sys/arm/include/atomic.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/arm/include/in_cksum.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/arm/include/md_var.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/arm/include/pmap.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/arm/sa11x0/assabet_machdep.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/arm/sa11x0/sa11x0.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/arm/sa11x0/sa11x0_irqhandler.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/arm/sa11x0/sa11x0_var.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/arm/xscale/i80321/files.i80321#2 integrate
.. //depot/projects/fast_ipsec/src/sys/arm/xscale/i80321/i80321_aau.c#1 branch
.. //depot/projects/fast_ipsec/src/sys/arm/xscale/i80321/i80321_dma.c#1 branch
.. //depot/projects/fast_ipsec/src/sys/arm/xscale/i80321/i80321_pci.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/arm/xscale/i80321/i80321_timer.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/arm/xscale/i80321/i80321var.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/arm/xscale/i80321/iq31244_machdep.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/arm/xscale/i80321/iq80321.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/arm/xscale/i80321/obio.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/arm/xscale/i80321/obiovar.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/boot/common/help.common#2 integrate
.. //depot/projects/fast_ipsec/src/sys/boot/common/loader.8#2 integrate
.. //depot/projects/fast_ipsec/src/sys/boot/efi/libefi/bootinfo.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/boot/forth/loader.conf#2 integrate
.. //depot/projects/fast_ipsec/src/sys/boot/i386/boot2/boot2.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/boot/i386/libi386/bootinfo.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/boot/i386/libi386/libi386.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/boot/i386/loader/main.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/boot/ia64/ski/bootinfo.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/boot/pc98/Makefile.inc#2 integrate
.. //depot/projects/fast_ipsec/src/sys/boot/pc98/boot2/io.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/boot/pc98/libpc98/comconsole.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/boot/pc98/loader/main.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/boot/powerpc/loader/metadata.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/boot/sparc64/loader/metadata.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/cam/cam_xpt.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/compat/freebsd32/freebsd32_misc.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/compat/freebsd32/freebsd32_proto.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/compat/freebsd32/freebsd32_syscall.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/compat/freebsd32/freebsd32_syscalls.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/compat/freebsd32/freebsd32_sysent.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/compat/freebsd32/syscalls.master#2 integrate
.. //depot/projects/fast_ipsec/src/sys/compat/linux/linux_socket.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/compat/ndis/kern_ndis.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/compat/ndis/kern_windrv.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/compat/ndis/ndis_var.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/compat/ndis/ntoskrnl_var.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/compat/ndis/subr_hal.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/compat/ndis/subr_ndis.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/compat/ndis/subr_ntoskrnl.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/compat/ndis/winx32_wrap.S#2 integrate
.. //depot/projects/fast_ipsec/src/sys/compat/svr4/svr4_fcntl.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/compat/svr4/svr4_ioctl.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/compat/svr4/svr4_ipc.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/compat/svr4/svr4_misc.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/compat/svr4/svr4_signal.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/compat/svr4/svr4_stat.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/compat/svr4/svr4_stream.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/compat/svr4/svr4_termios.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/compat/svr4/svr4_ttold.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/compat/svr4/svr4_util.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/conf/Makefile.arm#2 integrate
.. //depot/projects/fast_ipsec/src/sys/conf/NOTES#2 integrate
.. //depot/projects/fast_ipsec/src/sys/conf/files#2 integrate
.. //depot/projects/fast_ipsec/src/sys/conf/files.arm#2 integrate
.. //depot/projects/fast_ipsec/src/sys/conf/files.i386#2 integrate
.. //depot/projects/fast_ipsec/src/sys/conf/files.pc98#2 integrate
.. //depot/projects/fast_ipsec/src/sys/conf/kern.pre.mk#2 integrate
.. //depot/projects/fast_ipsec/src/sys/conf/kmod.mk#2 integrate
.. //depot/projects/fast_ipsec/src/sys/conf/options#2 integrate
.. //depot/projects/fast_ipsec/src/sys/contrib/dev/oltr/if_oltr.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/contrib/dev/oltr/if_oltr_pci.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/contrib/pf/net/if_pflog.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/contrib/pf/net/if_pfsync.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/ddb/db_command.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/ddb/db_output.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/aac/aac.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/aac/aac_cam.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/aac/aac_debug.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/aac/aac_pci.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/aac/aac_tables.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/aac/aacreg.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/aac/aacvar.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/acpica/acpi_pcib_acpi.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/adlink/adlink.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/aic/aic_pccard.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/aic7xxx/ahd_pci.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/aic7xxx/aic79xx.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/aic7xxx/aic79xx_osm.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/aic7xxx/aic7xxx_osm.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/aic7xxx/aic7xxx_pci.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/an/if_an.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/an/if_an_pccard.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/arl/if_arl_isa.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/ata/ata-all.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/ata/ata-all.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/ata/ata-card.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/ata/ata-chipset.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/ata/ata-dma.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/ata/ata-lowlevel.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/ata/ata-pci.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/ata/ata-pci.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/ata/ata-queue.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/ata/ata-raid.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/ata/atapi-cd.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/ath/if_ath.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/awi/if_awi_pccard.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/bfe/if_bfe.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/bge/if_bge.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/cardbus/cardbus.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/cm/if_cm_isa.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/cnw/if_cnw.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/cp/if_cp.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/cs/if_cs.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/cs/if_cs_pccard.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/ctau/if_ct.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/cx/if_cx.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/dc/dcphy.c#1 branch
.. //depot/projects/fast_ipsec/src/sys/dev/dc/if_dc.c#1 branch
.. //depot/projects/fast_ipsec/src/sys/dev/dc/if_dcreg.h#1 branch
.. //depot/projects/fast_ipsec/src/sys/dev/dc/pnphy.c#1 branch
.. //depot/projects/fast_ipsec/src/sys/dev/digi/digi.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/ed/ax88x90reg.h#1 branch
.. //depot/projects/fast_ipsec/src/sys/dev/ed/dl100xxreg.h#1 branch
.. //depot/projects/fast_ipsec/src/sys/dev/ed/if_ed.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/ed/if_ed_cbus.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/ed/if_ed_isa.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/ed/if_ed_pccard.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/ed/if_ed_pci.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/ed/if_ed_rtl80x9.c#1 branch
.. //depot/projects/fast_ipsec/src/sys/dev/ed/if_edreg.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/ed/if_edvar.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/ed/rtl80x9reg.h#1 branch
.. //depot/projects/fast_ipsec/src/sys/dev/ed/tc5299jreg.h#1 branch
.. //depot/projects/fast_ipsec/src/sys/dev/em/if_em.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/em/if_em.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/en/if_en_pci.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/ep/if_ep.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/ep/if_ep_pccard.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/ex/if_ex.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/ex/if_ex_pccard.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/exca/exca.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/fatm/if_fatm.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/fb/creator.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/fb/fbreg.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/fb/gfb.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/fb/machfb.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/fb/s3_pci.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/fb/tga.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/fb/vga.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/fe/if_fe.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/fe/if_fe_pccard.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/firewire/00README#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/firewire/if_fwe.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/firewire/if_fwip.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/fxp/if_fxp.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/fxp/if_fxpvar.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/gem/if_gem.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/hatm/if_hatm.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/hatm/if_hatm_intr.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/hwpmc/hwpmc_amd.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/hwpmc/hwpmc_piv.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/ie/if_ie.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/ieee488/pcii.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/ieee488/tnt4882.c#1 branch
.. //depot/projects/fast_ipsec/src/sys/dev/ieee488/upd7210.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/ieee488/upd7210.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/if_ndis/if_ndis.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/if_ndis/if_ndisvar.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/ips/ips.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/ips/ips.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/ips/ips_commands.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/ips/ips_disk.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/ips/ips_ioctl.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/ipw/if_ipw.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/iwi/if_iwi.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/iwi/if_iwireg.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/iwi/if_iwivar.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/ixgb/README#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/ixgb/if_ixgb.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/ixgb/if_ixgb.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/joy/joy_pccard.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/lge/if_lge.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/lge/if_lgereg.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/lmc/if_lmc.c#1 branch
.. //depot/projects/fast_ipsec/src/sys/dev/lmc/if_lmc.h#1 branch
.. //depot/projects/fast_ipsec/src/sys/dev/lnc/if_lnc.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/md/md.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/mii/acphy.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/mii/amphy.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/mii/brgphy.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/mii/ciphy.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/mii/dcphy.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/mii/exphy.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/mii/lxtphy.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/mii/mii_physubr.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/mii/miivar.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/mii/nsgphy.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/mii/nsphy.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/mii/pnaphy.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/mii/pnphy.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/mii/qsphy.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/mii/rgephy.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/mii/rlphy.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/mii/tdkphy.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/mii/tlphy.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/mii/ukphy.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/mii/xmphy.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/mpt/mpt.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/ncv/ncr53c500_pccard.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/nge/if_nge.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/nge/if_ngereg.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/nsp/nsp_pccard.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/nve/if_nve.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/patm/if_patm_attach.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/patm/if_patm_rx.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/pccard/card_if.m#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/pccard/pccard.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/pccard/pccard_cis.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/pccard/pccard_cis_quirks.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/pccard/pccard_device.c#1 branch
.. //depot/projects/fast_ipsec/src/sys/dev/pccard/pccarddevs#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/pccard/pccardvar.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/pccard/pccardvarp.h#1 branch
.. //depot/projects/fast_ipsec/src/sys/dev/pccbb/pccbb.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/pccbb/pccbb_isa.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/pccbb/pccbb_pci.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/pccbb/pccbbdevid.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/pccbb/pccbbvar.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/pci/isa_pci.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/pci/pci.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/puc/puc.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/ral/if_ral.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/ral/if_ral_pccard.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/ray/if_ray.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/re/if_re.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/sbsh/if_sbsh.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/sio/sio.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/sio/sio_pccard.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/sn/if_sn.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/sn/if_sn_pccard.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/sn/if_snreg.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/sn/if_snvar.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/snc/if_snc_pccard.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/snp/snp.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/sound/isa/mss.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/sound/pci/als4000.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/sound/pci/es137x.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/sound/pci/ich.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/sound/pci/maestro3.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/sound/pci/via8233.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/sound/pci/via82c686.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/sound/pcm/ac97.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/sound/pcm/ac97.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/sound/pcm/ac97_patch.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/sound/pcm/ac97_patch.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/sound/pcm/channel.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/sound/pcm/dsp.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/sound/pcm/feeder_volume.c#1 branch
.. //depot/projects/fast_ipsec/src/sys/dev/sound/pcm/mixer.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/sound/pcm/sndstat.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/sound/pcm/sound.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/sound/pcm/sound.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/sound/usb/uaudio.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/sound/usb/uaudio_pcm.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/stg/tmc18c30_pccard.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/syscons/scgfbrndr.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/syscons/scmouse.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/syscons/scvgarndr.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/syscons/scvidctl.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/syscons/syscons.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/syscons/syscons.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/tx/if_tx.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/txp/if_txp.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/txp/if_txpreg.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/uart/uart_bus_pccard.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/usb/ehci_pci.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/usb/ehcireg.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/usb/ehcivar.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/usb/if_aue.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/usb/if_axe.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/usb/if_cdce.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/usb/if_cdcereg.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/usb/if_cue.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/usb/if_kue.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/usb/if_rue.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/usb/if_udav.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/usb/if_ural.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/usb/slhci_pccard.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/usb/usb_port.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/usb/usbdevs#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/usb/uvscom.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/vge/if_vge.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/vx/if_vx.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/vx/if_vx_eisa.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/vx/if_vx_pci.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/vx/if_vxvar.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/watchdog/watchdog.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/wi/if_wi.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/wi/if_wi_pccard.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/wi/if_wivar.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/wl/if_wl.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/xe/if_xe_pccard.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/dev/xe/if_xereg.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/fs/devfs/devfs.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/fs/devfs/devfs_devs.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/fs/devfs/devfs_int.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/fs/devfs/devfs_rule.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/fs/devfs/devfs_vfsops.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/fs/devfs/devfs_vnops.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/fs/fifofs/fifo_vnops.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/fs/msdosfs/bootsect.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/fs/msdosfs/msdosfs_vfsops.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/fs/nullfs/null_vnops.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/fs/nwfs/nwfs_vfsops.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/fs/udf/udf_vfsops.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/geom/geom_ctl.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/geom/geom_disk.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/geom/geom_gpt.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/geom/geom_io.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/geom/geom_slice.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/geom/uzip/g_uzip.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/gnu/fs/ext2fs/ext2_alloc.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/i386/conf/MAC#1 branch
.. //depot/projects/fast_ipsec/src/sys/i386/conf/NOTES#2 integrate
.. //depot/projects/fast_ipsec/src/sys/i386/i386/apic_vector.s#2 integrate
.. //depot/projects/fast_ipsec/src/sys/i386/i386/local_apic.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/i386/i386/mp_machdep.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/i386/i386/mptable_pci.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/i386/i386/sys_machdep.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/i386/i386/trap.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/i386/i386/vm86.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/i386/i386/vm_machdep.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/i386/include/atomic.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/i386/include/legacyvar.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/i386/include/pcb_ext.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/i386/include/smptests.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/i386/include/trap.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/i386/isa/isa.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/i386/isa/vesa.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/i386/pci/pci_bus.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/ia64/conf/MAC#1 branch
.. //depot/projects/fast_ipsec/src/sys/ia64/ia32/ia32_signal.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/ia64/ia64/nexus.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/ia64/ia64/unaligned.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/ia64/include/atomic.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/isa/pnp.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/kern/imgact_elf.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/kern/init_main.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/kern/init_sysent.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/kern/kern_acct.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/kern/kern_acl.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/kern/kern_clock.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/kern/kern_conf.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/kern/kern_cpu.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/kern/kern_descrip.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/kern/kern_environment.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/kern/kern_event.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/kern/kern_exec.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/kern/kern_intr.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/kern/kern_jail.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/kern/kern_kse.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/kern/kern_lock.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/kern/kern_mac.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/kern/kern_mbuf.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/kern/kern_poll.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/kern/kern_proc.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/kern/kern_prot.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/kern/kern_resource.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/kern/kern_shutdown.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/kern/kern_tc.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/kern/kern_thread.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/kern/kern_timeout.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/kern/kern_uuid.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/kern/sched_ule.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/kern/subr_bus.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/kern/subr_kdb.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/kern/subr_pcpu.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/kern/subr_prf.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/kern/subr_rman.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/kern/subr_sleepqueue.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/kern/subr_turnstile.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/kern/subr_witness.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/kern/syscalls.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/kern/syscalls.master#2 integrate
.. //depot/projects/fast_ipsec/src/sys/kern/sysv_shm.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/kern/uipc_socket.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/kern/uipc_socket2.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/kern/uipc_usrreq.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/kern/vfs_aio.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/kern/vfs_bio.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/kern/vfs_export.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/kern/vfs_lookup.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/kern/vfs_subr.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/kern/vfs_syscalls.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/modules/Makefile#2 integrate
.. //depot/projects/fast_ipsec/src/sys/modules/agp/Makefile#2 integrate
.. //depot/projects/fast_ipsec/src/sys/modules/ath/Makefile#2 integrate
.. //depot/projects/fast_ipsec/src/sys/modules/ath_rate_amrr/Makefile#2 integrate
.. //depot/projects/fast_ipsec/src/sys/modules/ath_rate_onoe/Makefile#2 integrate
.. //depot/projects/fast_ipsec/src/sys/modules/ath_rate_sample/Makefile#2 integrate
.. //depot/projects/fast_ipsec/src/sys/modules/aue/Makefile#2 integrate
.. //depot/projects/fast_ipsec/src/sys/modules/axe/Makefile#2 integrate
.. //depot/projects/fast_ipsec/src/sys/modules/bfe/Makefile#2 integrate
.. //depot/projects/fast_ipsec/src/sys/modules/bge/Makefile#2 integrate
.. //depot/projects/fast_ipsec/src/sys/modules/bridge/Makefile#2 delete
.. //depot/projects/fast_ipsec/src/sys/modules/cdce/Makefile#2 integrate
.. //depot/projects/fast_ipsec/src/sys/modules/cue/Makefile#2 integrate
.. //depot/projects/fast_ipsec/src/sys/modules/dc/Makefile#2 integrate
.. //depot/projects/fast_ipsec/src/sys/modules/de/Makefile#2 integrate
.. //depot/projects/fast_ipsec/src/sys/modules/dummynet/Makefile#2 integrate
.. //depot/projects/fast_ipsec/src/sys/modules/ed/Makefile#2 integrate
.. //depot/projects/fast_ipsec/src/sys/modules/em/Makefile#2 integrate
.. //depot/projects/fast_ipsec/src/sys/modules/fxp/Makefile#2 integrate
.. //depot/projects/fast_ipsec/src/sys/modules/geom/geom_bsd/Makefile#2 integrate
.. //depot/projects/fast_ipsec/src/sys/modules/geom/geom_uzip/Makefile#2 integrate
.. //depot/projects/fast_ipsec/src/sys/modules/hifn/Makefile#2 integrate
.. //depot/projects/fast_ipsec/src/sys/modules/if_ndis/Makefile#2 integrate
.. //depot/projects/fast_ipsec/src/sys/modules/ipw/Makefile#2 integrate
.. //depot/projects/fast_ipsec/src/sys/modules/iwi/Makefile#2 integrate
.. //depot/projects/fast_ipsec/src/sys/modules/ixgb/Makefile#2 integrate
.. //depot/projects/fast_ipsec/src/sys/modules/kue/Makefile#2 integrate
.. //depot/projects/fast_ipsec/src/sys/modules/lge/Makefile#2 integrate
.. //depot/projects/fast_ipsec/src/sys/modules/lmc/Makefile#1 branch
.. //depot/projects/fast_ipsec/src/sys/modules/mii/Makefile#2 integrate
.. //depot/projects/fast_ipsec/src/sys/modules/ncv/Makefile#2 integrate
.. //depot/projects/fast_ipsec/src/sys/modules/ndis/Makefile#2 integrate
.. //depot/projects/fast_ipsec/src/sys/modules/nge/Makefile#2 integrate
.. //depot/projects/fast_ipsec/src/sys/modules/nsp/Makefile#2 integrate
.. //depot/projects/fast_ipsec/src/sys/modules/pccard/Makefile#2 integrate
.. //depot/projects/fast_ipsec/src/sys/modules/pcn/Makefile#2 integrate
.. //depot/projects/fast_ipsec/src/sys/modules/ral/Makefile#2 integrate
.. //depot/projects/fast_ipsec/src/sys/modules/re/Makefile#2 integrate
.. //depot/projects/fast_ipsec/src/sys/modules/rl/Makefile#2 integrate
.. //depot/projects/fast_ipsec/src/sys/modules/rue/Makefile#2 integrate
.. //depot/projects/fast_ipsec/src/sys/modules/safe/Makefile#2 integrate
.. //depot/projects/fast_ipsec/src/sys/modules/sf/Makefile#2 integrate
.. //depot/projects/fast_ipsec/src/sys/modules/sis/Makefile#2 integrate
.. //depot/projects/fast_ipsec/src/sys/modules/sk/Makefile#2 integrate
.. //depot/projects/fast_ipsec/src/sys/modules/snc/Makefile#2 integrate
.. //depot/projects/fast_ipsec/src/sys/modules/snp/Makefile#2 integrate
.. //depot/projects/fast_ipsec/src/sys/modules/sound/sound/Makefile#2 integrate
.. //depot/projects/fast_ipsec/src/sys/modules/ste/Makefile#2 integrate
.. //depot/projects/fast_ipsec/src/sys/modules/stg/Makefile#2 integrate
.. //depot/projects/fast_ipsec/src/sys/modules/ti/Makefile#2 integrate
.. //depot/projects/fast_ipsec/src/sys/modules/tl/Makefile#2 integrate
.. //depot/projects/fast_ipsec/src/sys/modules/tx/Makefile#2 integrate
.. //depot/projects/fast_ipsec/src/sys/modules/txp/Makefile#2 integrate
.. //depot/projects/fast_ipsec/src/sys/modules/ubsec/Makefile#2 integrate
.. //depot/projects/fast_ipsec/src/sys/modules/udav/Makefile#2 integrate
.. //depot/projects/fast_ipsec/src/sys/modules/ural/Makefile#2 integrate
.. //depot/projects/fast_ipsec/src/sys/modules/vge/Makefile#2 integrate
.. //depot/projects/fast_ipsec/src/sys/modules/vr/Makefile#2 integrate
.. //depot/projects/fast_ipsec/src/sys/modules/vx/Makefile#2 integrate
.. //depot/projects/fast_ipsec/src/sys/modules/wb/Makefile#2 integrate
.. //depot/projects/fast_ipsec/src/sys/modules/xl/Makefile#2 integrate
.. //depot/projects/fast_ipsec/src/sys/net/bpf.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/net/bridge.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/net/bridge.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/net/bridgestp.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/net/if.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/net/if.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/net/if_bridge.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/net/if_bridgevar.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/net/if_clone.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/net/if_disc.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/net/if_ethersubr.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/net/if_faith.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/net/if_fwsubr.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/net/if_gif.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/net/if_gre.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/net/if_ppp.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/net/if_sl.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/net/if_spppsubr.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/net/if_stf.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/net/if_var.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/net/if_vlan.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/net/netisr.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/net/route.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/net/route.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/net/rtsock.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/netgraph/netgraph.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/netgraph/ng_base.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/netgraph/ng_ether.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/netgraph/ng_iface.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/netgraph/ng_pppoe.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/netgraph/ng_socket.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/netgraph/ng_tty.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/netinet/if_ether.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/netinet/in.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/netinet/in.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/netinet/in_pcb.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/netinet/in_rmx.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/netinet/ip_carp.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/netinet/ip_dummynet.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/netinet/ip_dummynet.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/netinet/ip_fastfwd.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/netinet/ip_fw2.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/netinet/ip_mroute.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/netinet/ip_output.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/netinet/libalias/alias_db.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/netinet/raw_ip.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/netinet/tcp_subr.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/netinet/tcp_syncache.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/netinet/udp_usrreq.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/netinet6/esp_aesctr.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/netinet6/in6_rmx.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/netinet6/nd6_nbr.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/netipsec/ipsec_mbuf.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/netsmb/netbios.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/nfsclient/nfs_diskless.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/nfsclient/nfs_socket.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/nfsserver/nfs_srvsock.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/nfsserver/nfs_srvsubs.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/pc98/cbus/fdc.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/pc98/cbus/gdc.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/pc98/cbus/nmi.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/pc98/cbus/sio.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/pc98/conf/GENERIC#2 integrate
.. //depot/projects/fast_ipsec/src/sys/pc98/conf/GENERIC.hints#2 integrate
.. //depot/projects/fast_ipsec/src/sys/pc98/conf/MAC#1 branch
.. //depot/projects/fast_ipsec/src/sys/pc98/conf/NOTES#2 integrate
.. //depot/projects/fast_ipsec/src/sys/pc98/pc98/epsonio.h#2 delete
.. //depot/projects/fast_ipsec/src/sys/pc98/pc98/machdep.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/pc98/pc98/pc98_machdep.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/pc98/pc98/pc98_machdep.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/pccard/mecia.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/pccard/pccard.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/pccard/pccard_beep.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/pccard/pccard_nbk.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/pccard/pcic.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/pccard/pcic_isa.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/pccard/pcic_pci.c#2 delete
.. //depot/projects/fast_ipsec/src/sys/pci/agp_amd64.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/pci/agp_ati.c#1 branch
.. //depot/projects/fast_ipsec/src/sys/pci/agp_nvidia.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/pci/agpreg.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/pci/if_dc.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/pci/if_pcn.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/pci/if_rl.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/pci/if_rlreg.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/pci/if_sf.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/pci/if_sis.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/pci/if_sisreg.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/pci/if_sk.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/pci/if_ste.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/pci/if_ti.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/pci/if_tireg.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/pci/if_tl.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/pci/if_tlreg.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/pci/if_vr.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/pci/if_wb.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/pci/if_xl.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/powerpc/conf/MAC#1 branch
.. //depot/projects/fast_ipsec/src/sys/powerpc/include/atomic.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/powerpc/ofw/ofw_syscons.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/rpc/rpcclnt.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/security/mac/mac_process.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/security/mac/mac_vfs.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/security/mac_biba/mac_biba.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/security/mac_lomac/mac_lomac.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/security/mac_mls/mac_mls.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/security/mac_none/mac_none.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/security/mac_partition/mac_partition.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/security/mac_seeotheruids/mac_seeotheruids.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/security/mac_stub/mac_stub.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/security/mac_test/mac_test.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/sparc64/conf/MAC#1 branch
.. //depot/projects/fast_ipsec/src/sys/sparc64/include/atomic.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/sys/buf.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/sys/bus.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/sys/cdefs.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/sys/conf.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/sys/event.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/sys/filedesc.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/sys/gpt.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/sys/kerneldump.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/sys/libkern.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/sys/mac.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/sys/mac_policy.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/sys/mchain.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/sys/param.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/sys/proc.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/sys/refcount.h#1 branch
.. //depot/projects/fast_ipsec/src/sys/sys/resourcevar.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/sys/rman.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/sys/signal.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/sys/signalvar.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/sys/snoop.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/sys/socket.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/sys/syscall.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/sys/syscall.mk#2 integrate
.. //depot/projects/fast_ipsec/src/sys/sys/sysproto.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/sys/types.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/sys/ucred.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/sys/uuid.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/sys/vnode.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/tools/bus_macro.sh#1 branch
.. //depot/projects/fast_ipsec/src/sys/ufs/ffs/ffs_alloc.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/ufs/ffs/ffs_snapshot.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/ufs/ffs/ffs_softdep.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/ufs/ffs/ffs_vfsops.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/ufs/ffs/ffs_vnops.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/ufs/ufs/ufs_extattr.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/ufs/ufs/ufs_inode.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/ufs/ufs/ufs_vnops.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/vm/swap_pager.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/vm/uma.h#2 integrate
.. //depot/projects/fast_ipsec/src/sys/vm/uma_core.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/vm/vm_mmap.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/vm/vm_page.c#2 integrate
.. //depot/projects/fast_ipsec/src/sys/vm/vm_zeroidle.c#2 integrate
.. //depot/projects/fast_ipsec/src/usr.sbin/setkey/Makefile#2 delete
.. //depot/projects/fast_ipsec/src/usr.sbin/setkey/parse.y#2 delete
.. //depot/projects/fast_ipsec/src/usr.sbin/setkey/sample.cf#2 delete
.. //depot/projects/fast_ipsec/src/usr.sbin/setkey/scriptdump.pl#2 delete
.. //depot/projects/fast_ipsec/src/usr.sbin/setkey/setkey.8#2 delete
.. //depot/projects/fast_ipsec/src/usr.sbin/setkey/setkey.c#2 delete
.. //depot/projects/fast_ipsec/src/usr.sbin/setkey/test-pfkey.c#2 delete
.. //depot/projects/fast_ipsec/src/usr.sbin/setkey/test-policy.c#2 delete
.. //depot/projects/fast_ipsec/src/usr.sbin/setkey/token.l#2 delete
.. //depot/projects/fast_ipsec/src/usr.sbin/setkey/vchar.h#2 delete
Differences ...
==== //depot/projects/fast_ipsec/src/sys/alpha/alpha/busdma_machdep.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.51 2005/05/25 07:25:12 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.53 2005/09/19 13:50:07 ticso Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -472,8 +472,6 @@
* Map the buffer buf into bus space using the dmamap map.
*/
-vm_offset_t alpha_XXX_dmamap_or = 1024UL*1024UL*1024UL; /*XXX */
-
int
bus_dmamap_load(bus_dma_tag_t dmat, bus_dmamap_t map, void *buf,
bus_size_t buflen, bus_dmamap_callback_t *callback,
@@ -581,7 +579,7 @@
}
if (sg->ds_len == 0) {
- sg->ds_addr = paddr | alpha_XXX_dmamap_or;
+ sg->ds_addr = paddr + chipset.dmoffset;
sg->ds_len = size;
} else if (paddr == nextpaddr) {
sg->ds_len += size;
@@ -591,7 +589,7 @@
seg++;
if (seg > dmat->nsegments)
break;
- sg->ds_addr = paddr | alpha_XXX_dmamap_or;
+ sg->ds_addr = paddr + chipset.dmoffset;
sg->ds_len = size;
}
vaddr += size;
@@ -671,7 +669,7 @@
* previous segment if possible.
*/
if (first) {
- segs[seg].ds_addr = curaddr | alpha_XXX_dmamap_or;
+ segs[seg].ds_addr = curaddr + chipset.dmoffset;
segs[seg].ds_len = sgsize;
first = 0;
} else {
@@ -683,7 +681,7 @@
else {
if (++seg >= dmat->nsegments)
break;
- segs[seg].ds_addr = curaddr | alpha_XXX_dmamap_or;
+ segs[seg].ds_addr = curaddr + chipset.dmoffset;;
segs[seg].ds_len = sgsize;
}
}
@@ -891,6 +889,10 @@
}
}
}
+
+ /* Ensure any pending writes have drained. */
+ if (op & (BUS_DMASYNC_PREWRITE))
+ alpha_mb();
}
static void
==== //depot/projects/fast_ipsec/src/sys/alpha/alpha/interrupt.c#2 (text+ko) ====
@@ -33,7 +33,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
/* __KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.23 1998/02/24 07:38:01 thorpej Exp $");*/
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/interrupt.c,v 1.86 2005/04/12 23:18:53 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/interrupt.c,v 1.87 2005/09/29 19:12:44 jhb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -427,6 +427,13 @@
atomic_add_long(i->cntp, 1);
/*
+ * It seems that we need to return from an interrupt back to PAL
+ * on the same CPU that received the interrupt, so pin the interrupted
+ * thread to the current CPU until we return from the interrupt.
+ */
+ sched_pin();
+
+ /*
* Handle a fast interrupt if there is no actual thread for this
* interrupt by calling the handler directly without Giant. Note
* that this means that any fast interrupt handler must be MP safe.
@@ -435,26 +442,18 @@
if ((ih->ih_flags & IH_FAST) != 0) {
critical_enter();
ih->ih_handler(ih->ih_argument);
- /* XXX */
- curthread->td_owepreempt = 0;
critical_exit();
- return;
- }
+ } else {
+ if (ithd->it_disable) {
+ CTR1(KTR_INTR,
+ "alpha_dispatch_intr: disabling vector 0x%x",
+ i->vector);
+ ithd->it_disable(ithd->it_vector);
+ }
- if (ithd->it_disable) {
- CTR1(KTR_INTR,
- "alpha_dispatch_intr: disabling vector 0x%x", i->vector);
- ithd->it_disable(ithd->it_vector);
+ error = ithread_schedule(ithd);
+ KASSERT(error == 0, ("got an impossible stray interrupt"));
}
-
- /*
- * It seems that we need to return from an interrupt back to PAL
- * on the same CPU that received the interrupt, so pin the interrupted
- * thread to the current CPU until we return from the interrupt.
- */
- sched_pin();
- error = ithread_schedule(ithd);
- KASSERT(error == 0, ("got an impossible stray interrupt"));
sched_unpin();
}
==== //depot/projects/fast_ipsec/src/sys/alpha/alpha/sgmap.c#2 (text+ko) ====
@@ -25,9 +25,8 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/sgmap.c,v 1.7 2004/07/01 15:07:26 gallatin Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/sgmap.c,v 1.8 2005/09/25 20:12:29 phk Exp $");
-#define __RMAN_RESOURCE_VISIBLE
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
==== //depot/projects/fast_ipsec/src/sys/alpha/alpha/trap.c#2 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/trap.c,v 1.123 2005/04/12 23:18:53 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/trap.c,v 1.125 2005/09/28 07:03:01 rwatson Exp $");
/* #include "opt_fix_unaligned_vax_fp.h" */
#include "opt_ddb.h"
==== //depot/projects/fast_ipsec/src/sys/alpha/conf/GENERIC#2 (text+ko) ====
@@ -18,7 +18,7 @@
#
# For hardware specific information check HARDWARE.TXT
#
-# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.187 2005/07/14 15:39:04 kensmith Exp $
+# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.188 2005/09/24 16:47:34 wilko Exp $
machine alpha
cpu EV4
@@ -86,6 +86,9 @@
# To make an SMP kernel, the next line is needed
options SMP # Symmetric MultiProcessor Kernel
+# Alpha's do not appear to react well to probing high EISA slots
+options EISA_SLOTS=2
+
# Standard busses
device isa
device eisa
==== //depot/projects/fast_ipsec/src/sys/alpha/include/atomic.h#2 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/alpha/include/atomic.h,v 1.22 2005/07/15 18:17:57 jhb Exp $
+ * $FreeBSD: src/sys/alpha/include/atomic.h,v 1.24 2005/09/27 17:39:09 jhb Exp $
*/
#ifndef _MACHINE_ATOMIC_H_
@@ -56,12 +56,12 @@
#ifdef __GNUCLIKE_ASM
__asm __volatile (
- "1:\tldl_l %0, %2\n\t" /* load old value */
- "bis %0, %3, %0\n\t" /* calculate new value */
+ "1:\tldl_l %0, %3\n\t" /* load old value */
+ "bis %0, %2, %0\n\t" /* calculate new value */
"stl_c %0, %1\n\t" /* attempt to store */
"beq %0, 1b\n" /* spin if failed */
: "=&r" (temp), "=m" (*p)
- : "m" (*p), "r" (v)
+ : "r" (v), "m" (*p)
: "memory");
#endif
}
@@ -72,12 +72,12 @@
#ifdef __GNUCLIKE_ASM
__asm __volatile (
- "1:\tldl_l %0, %1\n\t" /* load old value */
+ "1:\tldl_l %0, %3\n\t" /* load old value */
"bic %0, %2, %0\n\t" /* calculate new value */
"stl_c %0, %1\n\t" /* attempt to store */
"beq %0, 1b\n" /* spin if failed */
- : "=&r" (temp), "+m" (*p)
- : "r" (v)
+ : "=&r" (temp), "=m" (*p)
+ : "r" (v), "m" (*p)
: "memory");
#endif
}
@@ -88,12 +88,12 @@
#ifdef __GNUCLIKE_ASM
__asm __volatile (
- "1:\tldl_l %0, %1\n\t" /* load old value */
+ "1:\tldl_l %0, %3\n\t" /* load old value */
"addl %0, %2, %0\n\t" /* calculate new value */
"stl_c %0, %1\n\t" /* attempt to store */
"beq %0, 1b\n" /* spin if failed */
- : "=&r" (temp), "+m" (*p)
- : "r" (v)
+ : "=&r" (temp), "=m" (*p)
+ : "r" (v), "m" (*p)
: "memory");
#endif
}
@@ -104,12 +104,12 @@
#ifdef __GNUCLIKE_ASM
__asm __volatile (
- "1:\tldl_l %0, %1\n\t" /* load old value */
+ "1:\tldl_l %0, %3\n\t" /* load old value */
"subl %0, %2, %0\n\t" /* calculate new value */
"stl_c %0, %1\n\t" /* attempt to store */
"beq %0, 1b\n" /* spin if failed */
- : "=&r" (temp), "+m" (*p)
- : "r" (v)
+ : "=&r" (temp), "=m" (*p)
+ : "r" (v), "m" (*p)
: "memory");
#endif
}
@@ -121,12 +121,12 @@
#ifdef __GNUCLIKE_ASM
__asm __volatile (
"wmb\n" /* ensure pending writes have drained */
- "1:\tldl_l %0,%2\n\t" /* load current value, asserting lock */
+ "1:\tldl_l %0,%3\n\t" /* load current value, asserting lock */
"ldiq %1,0\n\t" /* value to store */
"stl_c %1,%2\n\t" /* attempt to store */
"beq %1,1b\n" /* if the store failed, spin */
- : "=&r"(result), "=&r"(temp), "+m" (*addr)
- :
+ : "=&r"(result), "=&r"(temp), "=m" (*addr)
+ : "m" (*addr)
: "memory");
#endif
@@ -139,12 +139,12 @@
#ifdef __GNUCLIKE_ASM
__asm __volatile (
- "1:\tldq_l %0, %1\n\t" /* load old value */
+ "1:\tldq_l %0, %3\n\t" /* load old value */
"bis %0, %2, %0\n\t" /* calculate new value */
"stq_c %0, %1\n\t" /* attempt to store */
"beq %0, 1b\n" /* spin if failed */
- : "=&r" (temp), "+m" (*p)
- : "r" (v)
+ : "=&r" (temp), "=m" (*p)
+ : "r" (v), "m" (*p)
: "memory");
#endif
}
@@ -155,12 +155,12 @@
#ifdef __GNUCLIKE_ASM
__asm __volatile (
- "1:\tldq_l %0, %1\n\t" /* load old value */
+ "1:\tldq_l %0, %3\n\t" /* load old value */
"bic %0, %2, %0\n\t" /* calculate new value */
"stq_c %0, %1\n\t" /* attempt to store */
"beq %0, 1b\n" /* spin if failed */
- : "=&r" (temp), "+m" (*p)
- : "r" (v)
+ : "=&r" (temp), "=m" (*p)
+ : "r" (v), "m" (*p)
: "memory");
#endif
}
@@ -171,12 +171,12 @@
#ifdef __GNUCLIKE_ASM
__asm __volatile (
- "1:\tldq_l %0, %1\n\t" /* load old value */
+ "1:\tldq_l %0, %3\n\t" /* load old value */
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list