PERFORCE change 113127 for review

Scott Long scottl at FreeBSD.org
Thu Jan 18 18:23:44 UTC 2007


http://perforce.freebsd.org/chv.cgi?CH=113127

Change 113127 by scottl at scottl-x64 on 2007/01/18 18:22:25

	IFC.  This also brings in the CAM_NEW_TRAN changes

Affected files ...

.. //depot/projects/scottl-camlock/src/sbin/camcontrol/camcontrol.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/apic_vector.S#8 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/cpu_switch.S#5 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/exception.S#6 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/genassym.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/identcpu.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/intr_machdep.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/local_apic.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/machdep.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/minidump_machdep.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/mp_machdep.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/mptable_pci.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/nexus.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/pmap.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/trap.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/conf/GENERIC#14 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/ia32/ia32_exception.S#3 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/ia32/ia32_syscall.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/apicvar.h#11 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/atomic.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/intr_machdep.h#8 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/md_var.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/pmap.h#11 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/setjmp.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/specialreg.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/isa/atpic.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/isa/atpic_vector.S#5 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/isa/clock.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/isa/icu.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_dummy.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_machdep.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_proto.h#11 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_syscall.h#11 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_sysent.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_sysvec.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/linux32/syscalls.master#11 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/pci/pci_bus.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/arm/busdma_machdep.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/arm/cpufunc.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/arm/genassym.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/arm/pmap.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/arm/vm_machdep.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_mci.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_pioreg.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_pmc.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_spireg.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_st.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/at91/files.at91#5 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/at91/if_ate.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/at91/kb920x_machdep.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/at91/uart_dev_at91usart.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/conf/BWCT#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/conf/BWCT.hints#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/include/atomic.h#8 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/include/bus_dma.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/include/cpuconf.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/include/md_var.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/include/pmap.h#13 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/sa11x0/assabet_machdep.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/i80321/ep80219_machdep.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/i80321/i80321_space.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/i80321/i80321_wdog.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/i80321/iq31244_machdep.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/avila_machdep.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/files.ixp425#2 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/if_npe.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/ixdp425reg.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/ixp425.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/ixp425_pci.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/ixp425var.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/Makefile.inc#5 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/boot0spi/main.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/arm_init.S#2 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/eeprom.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/emac.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/emac_init.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/lib.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/spi_flash.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/spi_flash.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/common/bootstrap.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/common/pnp.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/common/pnpdata#2 delete
.. //depot/projects/scottl-camlock/src/sys/boot/forth/loader.conf#10 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/i386/btx/btx/btx.S#5 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/sparc64/loader/main.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/bsm/audit.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/bsm/audit_internal.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/bsm/audit_kevents.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/bsm/audit_record.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/cam_ccb.h#12 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#48 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_all.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_ch.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_da.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_pass.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_pt.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_sa.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_ses.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_targ_bh.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_target.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_misc.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_proto.h#13 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_syscall.h#13 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_syscalls.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_sysent.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/syscalls.master#13 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linsysfs/linsysfs.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_emul.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_emul.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_file.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_ipc.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_ipc.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_mib.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_mib.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_misc.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_misc.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_signal.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_stats.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_time.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/ndis/subr_ntoskrnl.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/NOTES#17 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files#16 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files.amd64#13 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files.arm#8 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files.i386#13 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files.pc98#12 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files.powerpc#10 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files.sparc64#10 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files.sun4v#3 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/kern.post.mk#11 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/options#15 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/options.arm#11 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/ah.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/ah_desc.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/ah_devid.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#3 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/alpha-elf.inc#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/ap30.hal.o.uu#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/ap43.hal.o.uu#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/ap51.hal.o.uu#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/ap61.hal.o.uu#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#4 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#4 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#4 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/armv4-be-elf.inc#4 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#4 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/armv4-le-elf.inc#4 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#4 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#4 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#4 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#4 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#4 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#4 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#4 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#4 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#3 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#4 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#4 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/sparc-be-elf.hal.o.uu#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#3 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/wackelf.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#4 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#4 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/xscale-be-elf.inc#4 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#4 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/xscale-le-elf.inc#4 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/version.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_state.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/if_pfsync.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/pf.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/pf_ioctl.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/ddb/db_command.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/ddb/db_ps.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/ddb/db_thread.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aac/aac_cam.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aac/aac_linux.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aac/aac_pci.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_battery.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_cpu.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_package.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_pcib_acpi.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_perf.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_throttle.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpivar.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/advansys/adv_eisa.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/advansys/adv_isa.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/advansys/adv_pci.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/advansys/advansys.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/advansys/adw_pci.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/advansys/adwcam.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aha/aha.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aha/aha_isa.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aha/aha_mca.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ahb/ahb.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx.seq#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aicasm/aicasm_gram.y#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/amd/amd.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/amr/amr_pci.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/arcmsr/arcmsr.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/arcmsr/arcmsr.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/arl/if_arl.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/asr/asr.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-chipset.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-pci.h#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-queue.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_rate/amrr/amrr.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_rate/onoe/onoe.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_rate/sample/sample.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_rate/sample/sample.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/if_ath.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/if_ath_pci.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/if_athrate.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/if_athvar.h#12 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/atkbdc/psm.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/awi/awivar.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/bce/if_bce.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/bce/if_bcereg.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/bge/if_bge.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/bge/if_bgereg.h#12 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/bktr/bktr_i2c.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/buslogic/bt.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/buslogic/bt_eisa.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/buslogic/bt_isa.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/buslogic/bt_mca.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/buslogic/bt_pci.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ce/if_ce.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ciss/ciss.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/cp/if_cp.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ctau/if_ct.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/cx/if_cx.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/cy/cy_isa.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/dc/if_dc.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/dc/if_dcreg.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/dpt/dpt.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/dpt/dpt_eisa.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/dpt/dpt_isa.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/dpt/dpt_pci.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/dpt/dpt_scsi.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/drm/drm_agpsupport.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/en/midway.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ep/if_ep.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/esp/esp_sbus.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/fb/boot_font.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/fb/creator.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/fb/creatorreg.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/fb/fbreg.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/fb/gallant12x22.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/fb/gfb.c#5 delete
.. //depot/projects/scottl-camlock/src/sys/dev/fb/gfb.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/firewire/fwdev.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/firewire/if_fwip.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/fxp/if_fxp.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/fxp/if_fxpvar.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/gem/if_gem.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/gem/if_gemvar.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/gfb/gfb_pci.c#7 delete
.. //depot/projects/scottl-camlock/src/sys/dev/gfb/gfb_pci.h#3 delete
.. //depot/projects/scottl-camlock/src/sys/dev/hme/if_hme.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/hme/if_hmevar.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/hptmv/entry.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ichsmb/ichsmb.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ichsmb/ichsmb_pci.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ichwd/ichwd.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/idt/idtreg.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/if_ndis/if_ndis.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/iicbus/iicbb.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/iicbus/iicbus_if.m#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/iicbus/iiconf.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/iicbus/iiconf.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/iir/iir_pci.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ipmi/ipmi.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/isp/isp.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_freebsd.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_freebsd.h#12 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_pci.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_sbus.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_target.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/isp/ispmbox.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/isp/ispvar.h#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ispfw/ispfw.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/iwi/if_iwi.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/le/am7990.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/le/am79900.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/le/lance.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/le/lancevar.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/md/md.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mfi/mfi.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mfi/mfi_ioctl.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mfi/mfi_pci.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mfi/mfireg.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mii/acphy.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mii/acphyreg.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mii/amphy.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mii/bmtphy.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mii/brgphy.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mii/ciphy.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mii/e1000phy.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mii/e1000phyreg.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mii/exphy.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mii/inphy.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mii/ip1000phy.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mii/lxtphy.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mii/mii_physubr.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mii/miidevs#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mii/miivar.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mii/mlphy.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mii/nsgphy.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mii/nsphy.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mii/pnaphy.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mii/qsphy.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mii/rgephy.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mii/rlphy.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mii/rlswitch.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/mii/ruephy.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mii/tdkphy.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mii/tlphy.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mii/xmphy.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mk48txx/mk48txx.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mly/mly.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt.h#16 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_cam.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_debug.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_pci.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_raid.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/msk/if_msk.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/msk/if_mskreg.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/mxge/if_mxge.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/my/if_my.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/nve/if_nvereg.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/pci/pci.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/pci/pci_pci.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/pci/pci_private.h#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/pci/pcib_private.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/pci/pcireg.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/pci/pcivar.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ppbus/if_plip.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ppbus/vpo.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ral/rt2560.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ral/rt2560var.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ral/rt2661.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ral/rt2661var.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/re/if_re.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/si/si.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sk/if_sk.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sk/if_skreg.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/emu10kx-pcm.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/emu10kx.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/emu10kx.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/envy24.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/envy24ht.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/envy24ht.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/hda/hdac.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/hda/hdac_private.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/ich.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/channel.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/dsp.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/feeder.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/usb/uaudio.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/syscons/scvesactl.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/trm/trm.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/twa/tw_osl_freebsd.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/if_aue.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/if_auereg.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/ums.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/uplcom.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_ethersubr.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_ethersubr.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdi_util.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/vge/if_vge.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/watchdog/watchdog.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/wds/wd7000.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/wi/if_wi.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/wi/if_wivar.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/msdosfs/bpb.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/msdosfs/denode.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/msdosfs/msdosfs_fat.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/msdosfs/msdosfs_vfsops.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/msdosfs/msdosfs_vnops.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/procfs/procfs_status.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/pseudofs/pseudofs_vncache.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/udf/udf_vfsops.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/udf/udf_vnops.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/unionfs/union.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/unionfs/union_subr.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/unionfs/union_vfsops.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/unionfs/union_vnops.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/journal/g_journal.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/conf/GENERIC#14 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/apic_vector.s#6 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/elan-mmcr.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/exception.s#7 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/genassym.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/identcpu.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/intr_machdep.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/local_apic.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/machdep.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/mp_machdep.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/mptable_pci.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/nexus.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/pmap.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/swtch.s#6 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/trap.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/vm86.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/vm86bios.s#3 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/ibcs2/ibcs2_sysvec.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/include/apicvar.h#10 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/include/atomic.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/include/intr_machdep.h#8 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/include/setjmp.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/include/specialreg.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/isa/atpic.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/isa/atpic_vector.s#5 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/isa/clock.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/isa/icu.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/linux/linux.h#8 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/linux/linux_dummy.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/linux/linux_machdep.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/linux/linux_proto.h#14 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/linux/linux_syscall.h#14 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/linux/linux_sysent.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/linux/syscalls.master#14 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/pci/pci_bus.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/pci/pci_cfgreg.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/i4b/driver/i4b_ipr.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/ia64/machdep.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/include/exec.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/include/floatingpoint.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/include/reloc.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/isa/pnpparse.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/isofs/cd9660/cd9660_node.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/imgact_elf.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/init_main.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_acct.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_acl.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_clock.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_condvar.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_descrip.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_fork.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_idle.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_intr.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_kse.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_ktrace.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_mac.c#10 delete
.. //depot/projects/scottl-camlock/src/sys/kern/kern_mutex.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_ntptime.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_poll.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_proc.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_prot.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_resource.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_sig.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_subr.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_switch.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_synch.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_thr.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_thread.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_umtx.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/ksched.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/link_elf_obj.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/sched_4bsd.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/sched_core.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/sched_ule.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/subr_lock.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/subr_prf.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/subr_rman.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/subr_sleepqueue.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/subr_trap.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/subr_turnstile.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/subr_witness.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/sys_pipe.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/sysv_ipc.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/sysv_msg.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/tty.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/tty_pts.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/uipc_mbuf.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/uipc_socket.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/uipc_usrreq.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/vfs_bio.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/vfs_export.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/vfs_extattr.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/kern/vfs_mount.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/vfs_syscalls.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/Makefile#16 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/acpi/Makefile#7 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/acpi/acpi/Makefile#7 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/isp/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/msk/Makefile#1 branch
.. //depot/projects/scottl-camlock/src/sys/modules/netgraph/Makefile#8 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/netgraph/deflate/Makefile#1 branch
.. //depot/projects/scottl-camlock/src/sys/modules/netgraph/pred1/Makefile#1 branch
.. //depot/projects/scottl-camlock/src/sys/modules/sound/driver/emu10kx/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/ufs/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/sys/net/bridgestp.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/net/bridgestp.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/net/ethernet.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_atmsubr.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_bridge.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_bridgevar.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_enc.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_ethersubr.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_llc.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_media.h#8 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_ppp.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_pppvar.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_spppsubr.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_vlan.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/net/ppp_tty.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/_ieee80211.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_freebsd.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_freebsd.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_input.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_node.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_output.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_proto.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_proto.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_var.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/netatalk/COPYRIGHT#4 integrate
.. //depot/projects/scottl-camlock/src/sys/netatalk/aarp.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/netatalk/aarp.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/netatalk/at.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/netatalk/at_extern.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/netatalk/at_proto.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/netatalk/at_rmx.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/netatalk/at_var.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/netatalk/ddp.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/netatalk/ddp_input.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/netatalk/ddp_output.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/netatalk/ddp_pcb.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/netatalk/ddp_pcb.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/netatalk/ddp_usrreq.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/netatalk/ddp_var.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/netgraph/ng_deflate.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/netgraph/ng_deflate.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/netgraph/ng_nat.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/netgraph/ng_ppp.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/netgraph/ng_ppp.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/netgraph/ng_pred1.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/netgraph/ng_pred1.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/netgraph/ng_sppp.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/netgraph/ng_tcpmss.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/if_ether.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/igmp.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/in.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/in_pcb.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ip.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ip_carp.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ip_divert.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ip_fw.h#8 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ip_fw2.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ip_fw_pfil.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ip_output.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/libalias/alias.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/libalias/alias.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/libalias/alias_db.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/libalias/alias_local.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/libalias/alias_mod.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/libalias/alias_proxy.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/libalias/alias_util.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/raw_ip.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_asconf.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_asconf.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_auth.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_bsd_addr.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_bsd_addr.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_constants.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_crc32.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_crc32.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_indata.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_indata.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_input.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_input.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_lock_bsd.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_os.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_os_bsd.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_output.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_output.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_pcb.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_pcb.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_peeloff.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_peeloff.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_structs.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_timer.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_timer.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_uio.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_usrreq.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_var.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctputil.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctputil.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/tcp_hostcache.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/tcp_input.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/tcp_subr.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/tcp_syncache.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/udp_usrreq.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/esp_aesctr.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/frag6.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/icmp6.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/in6.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/in6_cksum.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/in6_gif.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/in6_src.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/in6_var.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/ip6_forward.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/ip6_input.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/ip6_mroute.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/ipsec.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/mld6.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/nd6.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/nd6_nbr.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/nd6_rtr.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/scope6.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/sctp6_usrreq.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/sctp6_var.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/udp6_usrreq.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/netipsec/ipsec.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/netipsec/ipsec_input.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/netipx/ipx.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/netipx/ipx.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/netipx/ipx_cksum.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/netipx/ipx_if.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/netipx/ipx_input.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/netipx/ipx_ip.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/netipx/ipx_ip.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/netipx/ipx_outputfl.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/netipx/ipx_pcb.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/netipx/ipx_pcb.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/netipx/ipx_proto.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/netipx/ipx_usrreq.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/netipx/ipx_var.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/netipx/spx.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/netipx/spx_debug.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/netipx/spx_debug.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/netipx/spx_timer.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/netipx/spx_usrreq.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/netipx/spx_var.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/netnatm/natm.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/netnatm/natm.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/netnatm/natm_pcb.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/netnatm/natm_proto.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/nfsclient/bootp_subr.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_diskless.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_socket.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_vfsops.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/nfsclient/nfsdiskless.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/nfsserver/nfs_srvsubs.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/nfsserver/nfs_syscalls.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/nfsserver/nfsm_subs.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/pc98/pc98/machdep.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/pci/agp_intel.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/pci/agpreg.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/pci/alpm.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/pci/amdpm.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/pci/amdsmb.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/pci/if_pcn.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/pci/if_rl.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/pci/if_rlreg.h#12 integrate
.. //depot/projects/scottl-camlock/src/sys/pci/if_xl.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/pci/if_xlreg.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/pci/intpm.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/pci/intpmreg.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/pci/nfsmb.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/pci/viapm.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/conf/NOTES#4 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/include/bus.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/include/pmap.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/include/reloc.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/cpu.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/genassym.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/intr_machdep.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/machdep.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/mmu_if.m#6 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/mmu_oea.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/ofw_machdep.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/pmap_dispatch.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/uio_machdep.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/vm_machdep.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/security/audit/audit.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/security/audit/audit_arg.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/security/audit/audit_bsm_klib.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/security/audit/audit_bsm_token.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/security/audit/audit_syscalls.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/security/audit/audit_trigger.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/security/audit/audit_worker.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/security/mac/mac_framework.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/security/mac/mac_framework.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/security/mac/mac_inet.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/security/mac/mac_internal.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/security/mac/mac_label.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/security/mac/mac_net.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/security/mac/mac_pipe.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/security/mac/mac_policy.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/security/mac/mac_posix_sem.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/security/mac/mac_priv.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/security/mac/mac_process.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/security/mac/mac_socket.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/security/mac/mac_syscalls.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/security/mac/mac_system.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/security/mac/mac_sysv_msg.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/security/mac/mac_sysv_sem.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/security/mac/mac_sysv_shm.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/security/mac/mac_vfs.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/security/mac_biba/mac_biba.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/security/mac_bsdextended/mac_bsdextended.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/security/mac_ifoff/mac_ifoff.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/security/mac_lomac/mac_lomac.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/security/mac_mls/mac_mls.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/security/mac_none/mac_none.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/security/mac_partition/mac_partition.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/security/mac_portacl/mac_portacl.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/security/mac_seeotheruids/mac_seeotheruids.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/security/mac_stub/mac_stub.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/security/mac_test/mac_test.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/creator/creator.h#4 delete
.. //depot/projects/scottl-camlock/src/sys/sparc64/creator/creator_upa.c#5 delete
.. //depot/projects/scottl-camlock/src/sys/sparc64/include/bus.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/include/ofw_nexus.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/sparc64/include/param.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/include/reloc.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/include/setjmp.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/isa/isa.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/pci/ofw_pci_if.m#4 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/pci/ofw_pcibus.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/pci/psycho.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/pci/psychoreg.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/sbus/sbus.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/elf_machdep.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/genassym.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/machdep.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/ofw_machdep.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/upa.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/sun4v/conf/GENERIC#3 integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/include/bus.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/include/cddl/mdesc.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/include/pcpu.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/include/reloc.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/include/setjmp.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/include/smp.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/include/trap.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/include/tsb.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/mdesc/mdesc_init.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/mdesc/mdesc_vdevfindnode.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/sun4v/mdesc/mdesc_vdevfindval.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/sun4v/exception.S#3 integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/sun4v/hcall.S#3 integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/sun4v/hv_pci.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/sun4v/interrupt.S#3 integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/sun4v/machdep.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/sun4v/mp_machdep.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/sun4v/pmap.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/sun4v/tick.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/sun4v/trap.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/sun4v/tsb.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/sun4v/tte.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/sun4v/tte_hash.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/sun4v/uio_machdep.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/sun4v/vm_machdep.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/sun4v/vnex.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/sun4v/wbuf.S#3 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/copyright.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/file.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/interrupt.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/lock_profile.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/mac_policy.h#10 delete
.. //depot/projects/scottl-camlock/src/sys/sys/mount.h#12 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/mouse.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/mutex.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/param.h#12 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/pcpu.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/priority.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/proc.h#13 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/rtprio.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/runq.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/sched.h#11 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/sleepqueue.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/syscallsubr.h#10 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/sysent.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/systm.h#12 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/uio.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/umtx.h#10 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/unpcb.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/vnode.h#10 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/watchdog.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/ufs/ffs/ffs_alloc.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/ufs/ufs/ufs_acl.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/ufs/ufs/ufs_vnops.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/swap_pager.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/uma.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/uma_core.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_glue.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_kern.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_object.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_page.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_pageout.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_zeroidle.c#8 integrate

Differences ...

==== //depot/projects/scottl-camlock/src/sbin/camcontrol/camcontrol.c#4 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/camcontrol/camcontrol.c,v 1.55 2006/11/02 00:54:32 mjacob Exp $");
+__FBSDID("$FreeBSD: src/sbin/camcontrol/camcontrol.c,v 1.56 2006/12/03 07:11:55 mjacob Exp $");
 
 #include <sys/ioctl.h>
 #include <sys/stdint.h>
@@ -955,10 +955,9 @@
 		struct ccb_trans_settings_scsi *scsi =
 		    &ccb->cts.proto_specific.scsi;
 		if (scsi->valid & CTS_SCSI_VALID_TQ) {
-			if (scsi->flags & CTS_SCSI_FLAGS_TAG_ENB)
+			if (scsi->flags & CTS_SCSI_FLAGS_TAG_ENB) {
 				fprintf(stdout, ", Command Queueing Enabled");
-			else
-				fprintf(stdout, ", Command Queueing Supported");
+			}
 		}
 	}
 

==== //depot/projects/scottl-camlock/src/sys/amd64/amd64/apic_vector.S#8 (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.109 2006/05/01 21:36:46 jhb Exp $
+ * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.110 2006/12/17 06:48:39 kmacy Exp $
  */
 
 /*
@@ -60,6 +60,7 @@
 	jz	2f ;							\
 	addl	$(32 * index),%eax ;					\
 1: ;									\
+	movq	%rsp, %rsi	;                                       \
 	movl	%eax, %edi ;	/* pass the IRQ */			\
 	call	lapic_handle_intr ;					\
 	MEXITCOUNT ;							\
@@ -98,7 +99,7 @@
 IDTVEC(timerint)
 	PUSH_FRAME
 	FAKE_MCOUNT(TF_RIP(%rsp))
-
+	movq	%rsp, %rdi
 	call	lapic_handle_timer
 	MEXITCOUNT
 	jmp	doreti

==== //depot/projects/scottl-camlock/src/sys/amd64/amd64/cpu_switch.S#5 (text+ko) ====

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.154 2005/10/17 23:10:31 davidxu Exp $
+ * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.155 2006/12/20 04:40:38 davidxu Exp $
  */
 
 #include <machine/asmacros.h>
@@ -206,6 +206,11 @@
 	movq	%rbx, (%rax)
 	movq	%rbx, PCPU(RSP0)
 
+	movl	TD_TID(%rsi), %eax
+	movq	%r8, PCPU(CURPCB)
+	movl	%eax, PCPU(CURTID)
+	movq	%rsi, PCPU(CURTHREAD)		/* into next thread */
+
 	/* Restore context. */
 	movq	PCB_RBX(%r8),%rbx
 	movq	PCB_RSP(%r8),%rsp
@@ -217,9 +222,6 @@
 	movq	PCB_RIP(%r8),%rax
 	movq	%rax,(%rsp)
 
-	movq	%r8, PCPU(CURPCB)
-	movq	%rsi, PCPU(CURTHREAD)		/* into next thread */
-
 	/* Test if debug registers should be restored. */
 	testl	$PCB_DBREGS,PCB_FLAGS(%r8)
 	jz	1f

==== //depot/projects/scottl-camlock/src/sys/amd64/amd64/exception.S#6 (text+ko) ====

@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.127 2005/08/27 16:03:40 jkoshy Exp $
+ * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.129 2006/12/23 03:30:50 davidxu Exp $
  */
 
 #include "opt_atpic.h"
@@ -165,6 +165,7 @@
 	.globl	calltrap
 	.type	calltrap, at function
 calltrap:
+	movq	%rsp, %rdi
 	call	trap
 	MEXITCOUNT
 	jmp	doreti			/* Handle any pending ASTs */
@@ -267,6 +268,7 @@
 	movq	%r14,TF_R14(%rsp)	/* C preserved */
 	movq	%r15,TF_R15(%rsp)	/* C preserved */
 	FAKE_MCOUNT(TF_RIP(%rsp))
+	movq	%rsp, %rdi
 	call	syscall
 	movq	PCPU(CURPCB),%rax
 	testq	$PCB_FULLCTX,PCB_FLAGS(%rax)
@@ -363,6 +365,7 @@
 /* Note: this label is also used by ddb and gdb: */
 nmi_calltrap:
 	FAKE_MCOUNT(TF_RIP(%rsp))
+	movq	%rsp, %rdi
 	call	trap
 	MEXITCOUNT
 	testl	%ebx,%ebx

==== //depot/projects/scottl-camlock/src/sys/amd64/amd64/genassym.c#6 (text+ko) ====

@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.158 2006/11/01 04:54:49 jb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.160 2006/12/20 04:40:38 davidxu Exp $");
 
 #include "opt_compat.h"
 #include "opt_kstack_pages.h"
@@ -79,6 +79,7 @@
 ASSYM(TD_FLAGS, offsetof(struct thread, td_flags));
 ASSYM(TD_PCB, offsetof(struct thread, td_pcb));
 ASSYM(TD_PROC, offsetof(struct thread, td_proc));
+ASSYM(TD_TID, offsetof(struct thread, td_tid));
 
 ASSYM(TDF_ASTPENDING, TDF_ASTPENDING);
 ASSYM(TDF_NEEDRESCHED, TDF_NEEDRESCHED);
@@ -185,12 +186,12 @@
 ASSYM(PC_FPCURTHREAD, offsetof(struct pcpu, pc_fpcurthread));
 ASSYM(PC_IDLETHREAD, offsetof(struct pcpu, pc_idlethread));
 ASSYM(PC_CURPCB, offsetof(struct pcpu, pc_curpcb));
-ASSYM(PC_CONS_BUFR, offsetof(struct pcpu, pc_cons_bufr));
 ASSYM(PC_CPUID, offsetof(struct pcpu, pc_cpuid));
 ASSYM(PC_SCRATCH_RSP, offsetof(struct pcpu, pc_scratch_rsp));
 ASSYM(PC_CURPMAP, offsetof(struct pcpu, pc_curpmap));
 ASSYM(PC_TSSP, offsetof(struct pcpu, pc_tssp));
 ASSYM(PC_RSP0, offsetof(struct pcpu, pc_rsp0));
+ASSYM(PC_CURTID, offsetof(struct pcpu, pc_curtid));
  
 ASSYM(LA_VER, offsetof(struct LAPIC, version));
 ASSYM(LA_TPR, offsetof(struct LAPIC, tpr));

==== //depot/projects/scottl-camlock/src/sys/amd64/amd64/identcpu.c#8 (text+ko) ====

@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.148 2006/08/01 01:23:39 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.149 2007/01/09 19:23:21 jkim Exp $");
 
 #include "opt_cpu.h"
 
@@ -228,8 +228,8 @@
 				"\007<b6>"
 				"\010EST"	/* Enhanced SpeedStep */
 				"\011TM2"	/* Thermal Monitor 2 */
-				"\012<b9>"
-				"\013CNTX-ID"	/* L1 context ID available */
+				"\012SSSE3"	/* SSSE3 */
+				"\013CNXT-ID"	/* L1 context ID available */
 				"\014<b11>"
 				"\015<b12>"
 				"\016CX16"	/* CMPXCHG16B Instruction */

==== //depot/projects/scottl-camlock/src/sys/amd64/amd64/intr_machdep.c#11 (text+ko) ====

@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *

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


More information about the p4-projects mailing list