Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 26 May 2009 00:02:23 GMT
From:      Scott Long <scottl@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 162749 for review
Message-ID:  <200905260002.n4Q02Nrl056978@repoman.freebsd.org>

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

Change 162749 by scottl@scottl-y1 on 2009/05/26 00:01:33

	IFC

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/Makefile#15 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/identcpu.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/local_apic.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/machdep.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/mca.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/mp_machdep.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/pmap.c#24 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/trap.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/conf/DEFAULTS#10 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/conf/GENERIC#21 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/conf/GENERIC.hints#6 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/conf/NOTES#16 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/conf/XENHVM#2 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/apicvar.h#15 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/clock.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/mca.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/amd64/include/param.h#10 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/pcpu.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/smp.h#12 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/specialreg.h#12 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/vmparam.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/isa/clock.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux.h#12 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_sysvec.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/pci/pci_cfgreg.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/arm/cpufunc.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/arm/machdep.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/arm/pmap.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/at91/at91.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_cfata.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_spi.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/at91/if_ate.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/conf/AVILA#7 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/conf/BWCT#5 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/conf/CAMBRIA#3 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/conf/CRB#3 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/conf/DB-78XXX#2 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/conf/DB-88F5XXX#2 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/conf/DB-88F6XXX#2 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/conf/EP80219#6 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/conf/GUMSTIX#2 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/conf/HL200#3 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/conf/IQ31244#10 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/conf/KB920X#10 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/conf/NSLU#2 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/conf/NSLU.hints#2 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/conf/SIMICS#10 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/conf/SKYEYE#8 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/include/pmap.h#17 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/if_npe.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/forth/loader.conf#17 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/i386/zfsboot/zfsboot.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/uboot/lib/devicename.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/uboot/lib/disk.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/uboot/lib/libuboot.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/zfs/zfsimpl.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#27 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_pass.c#27 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_sg.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/boot/zfs/README#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/boot/zfs/zfsimpl.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/boot/zfs/zfssubr.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/kern/opensolaris.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/kern/opensolaris_lookup.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/kern/opensolaris_zone.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/mutex.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/rwlock.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/vnode.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/common/atomic/amd64/atomic.S#3 delete
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/common/atomic/amd64/opensolaris_atomic.S#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/common/atomic/i386/atomic.S#3 delete
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/common/atomic/i386/opensolaris_atomic.S#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/common/atomic/ia64/atomic.S#2 delete
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/common/atomic/ia64/opensolaris_atomic.S#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/common/atomic/sparc64/atomic.S#2 delete
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/common/atomic/sparc64/opensolaris_atomic.S#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/vnode.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr_array.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr_mem.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.c#3 delete
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_array.c#3 delete
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_mem.c#2 delete
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/zmod/crc32.c#2 delete
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/zmod/opensolaris_crc32.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_misc.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_proto.h#17 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_syscall.h#17 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_syscalls.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_sysent.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/syscalls.master#18 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_futex.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_futex.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_ioctl.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_mib.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_mib.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_misc.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_misc.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_socket.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_socket.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_stats.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_util.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/ndis/kern_ndis.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/ndis/kern_windrv.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/ndis/subr_ndis.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_ioctl.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_ioctl.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_misc.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_proto.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_stat.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_syscall.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_syscallnames.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_sysent.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_ttold.c#5 delete
.. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_ttold.h#3 delete
.. //depot/projects/scottl-camlock/src/sys/conf/NOTES#27 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files#30 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files.amd64#19 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files.i386#18 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files.pc98#17 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files.powerpc#16 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/kern.post.mk#15 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/options#24 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/altq/altq/altq_subr.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/iwi/Makefile#1 branch
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/iwi/ipw2200-bss.fw.uu#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/iwi/ipw2200-ibss.fw.uu#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/iwi/ipw2200-sniffer.fw.uu#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aac/aac.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/acpi_support/acpi_ibm.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/acpi_support/acpi_sony.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_cpu.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/age/if_age.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aic/aic.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/amr/amr.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/amr/amr_linux.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/arcmsr/arcmsr.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/asr/asr.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.h#13 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-disk.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-pci.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-pci.h#16 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-queue.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-sata.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-usb.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-cam.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-acard.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-ahci.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-promise.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-siliconimage.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/ah_osdep.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/ah_osdep.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ah.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ah.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ah_internal.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5210/ar5210_interrupts.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5211/ar5211_interrupts.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5212/ar5212_interrupts.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5212/ar5212reg.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/if_ath.c#23 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/if_ath_pci.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/if_athvar.h#17 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/bce/if_bce.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/bce/if_bcereg.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/bge/if_bge.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/bwi/bitops.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/bwi/bwimac.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/bwi/bwimac.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/bwi/bwiphy.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/bwi/bwiphy.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/bwi/bwirf.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/bwi/bwirf.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/bwi/if_bwi.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/bwi/if_bwi_pci.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/bwi/if_bwireg.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/bwi/if_bwivar.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/ciss/ciss.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_ael1002.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_common.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_t3_hw.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_adapter.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_main.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_multiq.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_sge.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_em.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ed/if_ed.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ep/if_ep.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/flash/at45d.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/if_ndis/if_ndis.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/if_ndis/if_ndis_usb.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/if_ndis/if_ndisvar.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/iir/iir_ctrl.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/iir/iir_pci.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ipw/if_ipw.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ipw/if_ipwvar.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_freebsd.c#25 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/iwi/if_iwi.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/iwi/if_iwivar.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/iwn/if_iwn.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/iwn/if_iwnvar.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ixgb/if_ixgb.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/lge/if_lge.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/lmc/if_lmc.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/malo/if_malo.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/malo/if_malo.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/malo/if_malo_pci.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/md/md.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mfi/mfi.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mfi/mfi_linux.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mii/e1000phy.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mii/e1000phyreg.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mii/miidevs#13 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_raid.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_user.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/msk/if_msk.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/msk/if_mskreg.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/nfe/if_nfe.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/nge/if_nge.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/nge/if_ngereg.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/pci/pci.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/pci/pci_pci.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/pci/pcib_if.m#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ral/rt2560.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ral/rt2560var.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ral/rt2661.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ral/rt2661var.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/random/nehemiah.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/random/randomdev_soft.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sk/if_sk.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/snp/snp.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/midi/midi.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/emu10kx-midi.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/ich.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/via82c686.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/sbus/cs4231.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/usb/uaudio.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/usb/uaudioreg.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/spibus/spibus.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/syscons/syscons.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/twa/tw_osl_freebsd.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/twe/twe_freebsd.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ubsec/ubsec.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ubsec/ubsecreg.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/README.TXT#2 delete
.. //depot/projects/scottl-camlock/src/sys/dev/usb/bluetooth/ng_ubt.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/bluetooth/ubtbcmfw.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/at91dci.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/at91dci.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/atmegadci.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/atmegadci.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/avr32dci.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/avr32dci.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ehci.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/musb_otg.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/musb_otg.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ohci.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/uhci.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/usb_controller.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/uss820dci.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/uss820dci.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/uss820dci_atmelarm.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/input/uhid.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/input/ukbd.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/input/ums.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/misc/udbp.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/misc/ufm.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/net/if_aue.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/net/if_axe.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/net/if_cdce.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/net/if_cue.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/net/if_kue.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/net/if_rue.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/net/if_udav.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/net/usb_ethernet.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/net/usb_ethernet.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/u3g.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uark.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/ubsa.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/ubser.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uchcom.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/ucycom.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/ufoma.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uftdi.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/ugensa.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uipaq.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/ulpt.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/umct.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/umodem.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/umoscom.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uplcom.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/usb_serial.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uslcom.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uvisor.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uvscom.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/storage/umass.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/storage/urio.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/storage/ustorage_fs.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/template/usb_template.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_bus.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_busdma.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_compat_linux.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_compat_linux.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_controller.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_core.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_debug.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_debug.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_dev.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_device.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_device.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_generic.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_hid.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_hub.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_hub.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_process.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_request.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_revision.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_transfer.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_transfer.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdevs#23 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_rum.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_rumvar.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_uath.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_uathvar.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_upgt.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_upgtvar.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_ural.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_uralvar.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_zyd.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_zydreg.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/usb_wlan.h#2 delete
.. //depot/projects/scottl-camlock/src/sys/dev/vge/if_vge.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/wi/if_wavelan_ieee.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/wi/if_wi.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/wi/if_wireg.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/wi/if_wivar.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/wpi/if_wpi.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/wpi/if_wpivar.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/xen/console/console.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/xen/console/xencons_ring.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/xen/console/xencons_ring.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/xen/netfront/netfront.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/cd9660/cd9660_vfsops.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/coda/coda_vfsops.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/devfs/devfs.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/devfs/devfs_vfsops.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/devfs/devfs_vnops.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/fdescfs/fdesc.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/fdescfs/fdesc_vfsops.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/fdescfs/fdesc_vnops.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/hpfs/hpfs_vfsops.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/msdosfs/msdosfs_vfsops.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfs.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfs_commonacl.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfs_commonkrpc.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfs_commonport.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfs_commonsubs.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfs_var.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfscl.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfsclstate.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfsdport.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfskpiport.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfsm_subs.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfsport.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfsproto.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfsrvcache.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfsrvstate.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfsv4_errstr.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/fs/nfs/rpcv2.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/fs/nfs/xdr_subs.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clbio.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clcomsubs.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clkrpc.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_cllock.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clnfsiod.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clnode.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clport.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clrpcops.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clstate.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clsubs.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clvfsops.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clvnops.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_lock.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfsargs.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfsdiskless.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfsmount.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfsnode.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nlminfo.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/fs/nfsserver/nfs_nfsdcache.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/fs/nfsserver/nfs_nfsdkrpc.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/fs/nfsserver/nfs_nfsdport.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/fs/nfsserver/nfs_nfsdserv.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/fs/nfsserver/nfs_nfsdsocket.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/fs/nfsserver/nfs_nfsdstate.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/fs/nfsserver/nfs_nfsdsubs.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/fs/ntfs/ntfs_vfsops.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nullfs/null_vfsops.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nwfs/nwfs_io.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nwfs/nwfs_vfsops.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/portalfs/portal_vfsops.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/pseudofs/pseudofs.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/pseudofs/pseudofs.h#10 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/smbfs/smbfs_io.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/smbfs/smbfs_vfsops.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/tmpfs/tmpfs.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/tmpfs/tmpfs_subr.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/tmpfs/tmpfs_vfsops.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/tmpfs/tmpfs_vnops.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/udf/udf_vfsops.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/unionfs/union_vfsops.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/concat/g_concat.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/journal/g_journal.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/vinum/geom_vinum.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/vinum/geom_vinum.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/vinum/geom_vinum_events.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/vinum/geom_vinum_plex.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/vinum/geom_vinum_raid5.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/vinum/geom_vinum_rm.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/vinum/geom_vinum_subr.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/vinum/geom_vinum_var.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/FreeBSD/support/debug.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/FreeBSD/xfsdmapistubs.c#2 delete
.. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/FreeBSD/xfsquotasstubs.c#2 delete
.. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/FreeBSD/xfsrtstubs.c#2 delete
.. //depot/projects/scottl-camlock/src/sys/i386/acpica/acpi_machdep.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/bios/apm.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/bios/smapi.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/conf/DEFAULTS#10 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/conf/GENERIC#20 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/conf/GENERIC.hints#7 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/conf/NOTES#19 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/conf/PAE#12 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/conf/XBOX#8 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/conf/XEN#2 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/cpufreq/hwpstate.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/identcpu.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/local_apic.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/machdep.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/mca.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/i386/i386/mp_machdep.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/pmap.c#25 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/trap.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/ibcs2/ibcs2_ioctl.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/ibcs2/ibcs2_isc_syscall.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/ibcs2/ibcs2_isc_sysent.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/ibcs2/ibcs2_proto.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/ibcs2/ibcs2_socksys.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/ibcs2/ibcs2_syscall.h#8 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/ibcs2/ibcs2_sysent.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/ibcs2/ibcs2_xenix.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/ibcs2/ibcs2_xenix_syscall.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/ibcs2/ibcs2_xenix_sysent.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/ibcs2/syscalls.master#8 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/include/apicvar.h#14 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/include/clock.h#10 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/include/mca.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/i386/include/param.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/include/smp.h#11 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/include/specialreg.h#14 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/isa/clock.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/linux/linux.h#14 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/linux/linux_sysvec.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/pci/pci_cfgreg.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/xen/clock.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/xen/mp_machdep.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/conf/DEFAULTS#11 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/conf/NOTES#10 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/ia64/elf_machdep.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/ia64/machdep.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/ia64/pmap.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/include/md_var.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/isa/atrtc.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/isa/rtc.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/init_main.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/init_sysent.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_acct.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_clock.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_conf.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_descrip.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_exit.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_fork.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_intr.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_jail.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_linker.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_lock.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_lockf.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_malloc.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_mib.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_mutex.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_osd.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_poll.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_prot.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_sysctl.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_vimage.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/sched_ule.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/subr_acl_posix1e.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/subr_bus.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/subr_kdb.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/subr_pcpu.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/subr_rman.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/subr_witness.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/sys_generic.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/sys_socket.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/syscalls.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/syscalls.master#15 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/systrace_args.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/tty.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/tty_info.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/tty_inq.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/tty_ttydisc.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/uipc_mqueue.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/uipc_socket.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/uipc_syscalls.c#25 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/uipc_usrreq.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/vfs_acl.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/vfs_bio.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/vfs_default.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/vfs_export.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/vfs_extattr.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/vfs_lookup.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/vfs_mount.c#26 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/vfs_subr.c#22 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/vfs_syscalls.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/vfs_vnops.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/kgssapi/gsstest.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/legacy/dev/usb/if_upgt.c#2 delete
.. //depot/projects/scottl-camlock/src/sys/legacy/dev/usb/if_upgtvar.h#2 delete
.. //depot/projects/scottl-camlock/src/sys/legacy/dev/usb/usb_ethersubr.c#2 delete
.. //depot/projects/scottl-camlock/src/sys/legacy/dev/usb/usb_ethersubr.h#2 delete
.. //depot/projects/scottl-camlock/src/sys/mips/conf/ADM5120#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/conf/IDT#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/conf/MALTA#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/conf/QEMU#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/conf/SENTRY5#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/include/pmap.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/machdep.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/pm_machdep.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/pmap.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/Makefile#26 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/bwi/Makefile#1 branch
.. //depot/projects/scottl-camlock/src/sys/modules/linux/Makefile#11 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/nfs4client/Makefile#5 delete
.. //depot/projects/scottl-camlock/src/sys/modules/nfsclient/Makefile#7 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/opensolaris/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/sound/sound/Makefile#7 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/svr4/Makefile#5 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/usb/Makefile#8 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/usb/upgt/Makefile#1 branch
.. //depot/projects/scottl-camlock/src/sys/modules/wlan/Makefile#8 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/xfs/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/zfs/Makefile#6 integrate
.. //depot/projects/scottl-camlock/src/sys/net/bpf.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/net/ieee8023ad_lacp.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if.c#22 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_bridge.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_clone.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_ethersubr.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_gif.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_gif.h#8 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_lagg.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_llatbl.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_llatbl.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_loop.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_mib.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_var.h#16 integrate
.. //depot/projects/scottl-camlock/src/sys/net/netisr.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/net/netisr.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/net/route.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/net/rtsock.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/net/vnet.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211.h#10 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_adhoc.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_ddb.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_freebsd.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_freebsd.h#10 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_hostap.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_ht.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_ht.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_input.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_ioctl.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_monitor.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_node.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_node.h#11 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_output.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_proto.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_proto.h#12 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_radiotap.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_scan.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_scan.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_scan_sta.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_sta.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_superg.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_superg.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_tdma.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_tdma.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_var.h#15 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_wds.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/netgraph/netflow/ng_netflow.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/netgraph/netgraph.h#12 integrate
.. //depot/projects/scottl-camlock/src/sys/netgraph/ng_base.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/icmp6.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/if_ether.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/igmp.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/in.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/in_mcast.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/in_pcb.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/in_pcb.h#15 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/in_rmx.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/in_var.h#11 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ip_carp.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ip_divert.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ip_fw.h#13 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ip_fw2.c#23 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ip_fw_pfil.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ip_input.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ip_ipsec.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ip_mroute.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ip_output.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/raw_ip.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_crc32.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_os_bsd.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_uio.h#13 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/tcp_hostcache.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/tcp_reass.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/tcp_subr.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/tcp_syncache.c#23 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/tcp_syncache.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/tcp_timewait.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/tcp_var.h#21 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/udp_usrreq.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/udp_var.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/vinet.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/icmp6.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/in6.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/in6.h#11 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/in6_ifattach.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/in6_mcast.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/netinet6/in6_pcb.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/in6_proto.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/in6_rmx.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/in6_var.h#12 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/ip6_input.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/ip6_ipsec.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/ip6_mroute.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/ip6_output.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/ip6_var.h#10 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/mld6.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/mld6.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/netinet6/mld6_var.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/nd6.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/nd6_nbr.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/raw_ip6.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/route6.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/udp6_usrreq.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/vinet6.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/netipsec/ipsec.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/netipsec/ipsec.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/netipsec/ipsec6.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/netipsec/key.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/netipsec/vipsec.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/netipsec/xform_tcp.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/netipx/spx.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/netipx/spx_reass.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/netipx/spx_usrreq.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/netipx/spx_var.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/netnatm/natm.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/nfs/nfs_common.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/nfs4client/nfs4.h#3 delete
.. //depot/projects/scottl-camlock/src/sys/nfs4client/nfs4_dev.c#7 delete
.. //depot/projects/scottl-camlock/src/sys/nfs4client/nfs4_dev.h#4 delete
.. //depot/projects/scottl-camlock/src/sys/nfs4client/nfs4_idmap.c#5 delete
.. //depot/projects/scottl-camlock/src/sys/nfs4client/nfs4_idmap.h#3 delete
.. //depot/projects/scottl-camlock/src/sys/nfs4client/nfs4_socket.c#6 delete
.. //depot/projects/scottl-camlock/src/sys/nfs4client/nfs4_subs.c#5 delete
.. //depot/projects/scottl-camlock/src/sys/nfs4client/nfs4_vfs.h#3 delete
.. //depot/projects/scottl-camlock/src/sys/nfs4client/nfs4_vfs_subs.c#4 delete
.. //depot/projects/scottl-camlock/src/sys/nfs4client/nfs4_vfsops.c#12 delete
.. //depot/projects/scottl-camlock/src/sys/nfs4client/nfs4_vn.h#3 delete
.. //depot/projects/scottl-camlock/src/sys/nfs4client/nfs4_vn_subs.c#6 delete
.. //depot/projects/scottl-camlock/src/sys/nfs4client/nfs4_vnops.c#13 delete
.. //depot/projects/scottl-camlock/src/sys/nfs4client/nfs4m_subs.h#3 delete
.. //depot/projects/scottl-camlock/src/sys/nfsclient/bootp_subr.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/nfsclient/krpc_subr.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs.h#13 integrate
.. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_bio.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_diskless.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_kdtrace.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_krpc.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_lock.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_nfsiod.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_node.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_socket.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_subs.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_vfsops.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_vnops.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/nfsclient/nfsm_subs.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/nfsclient/nfsmount.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/nfsclient/nfsnode.h#11 integrate
.. //depot/projects/scottl-camlock/src/sys/nfsserver/nfs_serv.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/nfsserver/nfs_srvkrpc.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/nfsserver/nfs_srvsubs.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/nlm/nlm.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/nlm/nlm_advlock.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/nlm/nlm_prot_impl.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/opencrypto/cryptodev.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/pc98/cbus/clock.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/pc98/conf/DEFAULTS#9 integrate
.. //depot/projects/scottl-camlock/src/sys/pc98/conf/GENERIC#16 integrate
.. //depot/projects/scottl-camlock/src/sys/pc98/conf/NOTES#14 integrate
.. //depot/projects/scottl-camlock/src/sys/pc98/include/mca.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/pc98/pc98/machdep.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/aim/clock.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/aim/machdep.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/aim/mmu_oea.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/aim/mmu_oea64.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/aim/mp_cpudep.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/aim/ofw_machdep.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/aim/platform_chrp.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/powerpc/aim/vm_machdep.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/booke/clock.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/booke/locore.S#4 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/booke/machdep.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/booke/mp_cpudep.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/powerpc/booke/platform_bare.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/powerpc/booke/pmap.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/booke/trap_subr.S#3 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/booke/vm_machdep.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/conf/GENERIC#18 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/conf/MPC85XX#4 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/conf/NOTES#8 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/include/cpufunc.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/include/md_var.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/include/mutex.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/include/ofw_machdep.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/include/pcpu.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/include/platform.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/powerpc/include/platformvar.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/powerpc/include/pmap.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/include/powerpc.h#3 delete
.. //depot/projects/scottl-camlock/src/sys/powerpc/include/smp.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/include/spr.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/mpc85xx/ocpbus.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/mpc85xx/ocpbus.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/busdma_machdep.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/genassym.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/mp_machdep.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/openpic.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/platform.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/platform_if.m#1 branch
.. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/pmap_dispatch.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/rpc/rpcclnt.c#11 delete
.. //depot/projects/scottl-camlock/src/sys/rpc/rpcclnt.h#4 delete
.. //depot/projects/scottl-camlock/src/sys/security/audit/audit_worker.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/security/mac/mac_atalk.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/security/mac/mac_audit.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/security/mac/mac_cred.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/security/mac/mac_inet.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/security/mac/mac_inet6.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/security/mac/mac_internal.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/security/mac/mac_net.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/security/mac/mac_pipe.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/security/mac/mac_posix_sem.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/security/mac/mac_posix_shm.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/security/mac/mac_priv.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/security/mac/mac_process.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/security/mac/mac_socket.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/security/mac/mac_system.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/security/mac/mac_sysv_msg.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/security/mac/mac_sysv_sem.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/security/mac/mac_sysv_shm.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/security/mac/mac_vfs.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/conf/GENERIC#18 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/machdep.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/vm_machdep.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/sun4v/machdep.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/_null.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/acl.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/buf.h#12 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/buf_ring.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/eventhandler.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/filedesc.h#8 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/interrupt.h#13 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/ioctl.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/ioctl_compat.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/jail.h#8 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/kernel.h#14 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/ktr.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/lockf.h#8 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/mount.h#19 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/osd.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/param.h#21 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/priv.h#10 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/proc.h#22 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/socketvar.h#16 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/syscall.h#15 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/syscall.mk#15 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/syscallsubr.h#14 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/sysctl.h#14 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/sysproto.h#15 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/systm.h#19 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/termios.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/ucred.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/vimage.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/ufs/ffs/ffs_alloc.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/ufs/ffs/ffs_vfsops.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/ufs/ufs/extattr.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/ufs/ufs/ufs_acl.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/ufs/ufs/ufs_extattr.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/ufs/ufs/ufs_extern.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/ufs/ufs/ufs_vfsops.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_contig.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_fault.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_page.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_page.h#12 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_pageout.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vnode_pager.c#13 integrate

Differences ...

==== //depot/projects/scottl-camlock/src/sys/Makefile#15 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/Makefile,v 1.54 2009/02/15 18:19:24 imp Exp $
+# $FreeBSD: src/sys/Makefile,v 1.55 2009/05/22 12:35:12 rwatson Exp $
 
 .include <bsd.own.mk>
 
@@ -11,7 +11,7 @@
 CSCOPEDIRS=	boot bsm cam cddl compat conf contrib crypto ddb dev fs gdb \
 		geom gnu isa kern libkern modules net net80211 netatalk \
 		netgraph netinet netinet6 netipsec netipx netnatm netncp \
-		netsmb nfs nfs4client nfsclient nfsserver nlm opencrypto \
+		netsmb nfs nfsclient nfsserver nlm opencrypto \
 		pci rpc security sys ufs vm xdr ${CSCOPE_ARCHDIR}
 .if defined(ALL_ARCH)
 CSCOPE_ARCHDIR ?= amd64 arm i386 ia64 mips pc98 powerpc sparc64 sun4v

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

@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.172 2009/04/29 06:54:40 jeff Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.173 2009/05/04 18:05:27 jkim Exp $");
 
 #include "opt_cpu.h"
 
@@ -472,6 +472,22 @@
 	cpu_feature = regs[3];
 	cpu_feature2 = regs[2];
 
+	/*
+	 * Clear "Limit CPUID Maxval" bit and get the largest standard CPUID
+	 * function number again if it is set from BIOS.  It is necessary
+	 * for probing correct CPU topology later.
+	 * XXX This is only done on the BSP package.
+	 */
+	if (cpu_vendor_id == CPU_VENDOR_INTEL && cpu_high > 0 && cpu_high < 4) {
+		uint64_t msr;
+		msr = rdmsr(MSR_IA32_MISC_ENABLE);
+		if ((msr & 0x400000ULL) != 0) {
+			wrmsr(MSR_IA32_MISC_ENABLE, msr & ~0x400000ULL);
+			do_cpuid(0, regs);
+			cpu_high = regs[0];
+		}
+	}
+
 	if (cpu_vendor_id == CPU_VENDOR_INTEL ||
 	    cpu_vendor_id == CPU_VENDOR_AMD ||
 	    cpu_vendor_id == CPU_VENDOR_CENTAUR) {

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

@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.52 2009/02/21 23:15:34 jeff Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.55 2009/05/05 01:13:20 mav Exp $");
 
 #include "opt_hwpmc_hooks.h"
 #include "opt_kdtrace.h"
@@ -112,7 +112,7 @@
 	u_long la_stat_ticks;
 	u_long la_prof_ticks;
 	/* Include IDT_SYSCALL to make indexing easier. */
-	u_int la_ioint_irqs[APIC_NUM_IOINTS + 1];
+	int la_ioint_irqs[APIC_NUM_IOINTS + 1];
 } static lapics[MAX_APIC_ID + 1];
 
 /* XXX: should thermal be an NMI? */
@@ -254,6 +254,8 @@
 		lapics[apic_id].la_lvts[i] = lvts[i];
 		lapics[apic_id].la_lvts[i].lvt_active = 0;
 	}
+	for (i = 0; i <= APIC_NUM_IOINTS; i++)
+	    lapics[apic_id].la_ioint_irqs[i] = -1;
 	lapics[apic_id].la_ioint_irqs[IDT_SYSCALL - APIC_IO_INTS] = IRQ_SYSCALL;
 	lapics[apic_id].la_ioint_irqs[APIC_TIMER_INT - APIC_IO_INTS] =
 	    IRQ_TIMER;
@@ -317,7 +319,7 @@
 	}
 
 	/* We don't setup the timer during boot on the BSP until later. */
-	if (!(boot && PCPU_GET(cpuid) == 0)) {
+	if (!(boot && PCPU_GET(cpuid) == 0) && lapic_timer_hz != 0) {
 		KASSERT(lapic_timer_period != 0, ("lapic%u: zero divisor",
 		    lapic_id()));
 		lapic_timer_set_divisor(lapic_timer_divisor);
@@ -363,11 +365,15 @@
 lapic_setup_clock(void)
 {
 	u_long value;
+	int i;
 
 	/* Can't drive the timer without a local APIC. */
 	if (lapic == NULL)
 		return (0);
 
+	if (resource_int_value("apic", 0, "clock", &i) == 0 && i == 0)
+		return (0);
+
 	/* Start off with a divisor of 2 (power on reset default). */
 	lapic_timer_divisor = 2;
 
@@ -807,7 +813,7 @@
 	 */
 	mtx_lock_spin(&icu_lock);
 	for (vector = 0; vector < APIC_NUM_IOINTS; vector++) {
-		if (lapics[apic_id].la_ioint_irqs[vector] != 0)
+		if (lapics[apic_id].la_ioint_irqs[vector] != -1)
 			continue;
 		lapics[apic_id].la_ioint_irqs[vector] = irq;
 		mtx_unlock_spin(&icu_lock);
@@ -847,7 +853,7 @@
 	for (vector = 0; vector < APIC_NUM_IOINTS; vector++) {
 
 		/* Vector is in use, end run. */
-		if (lapics[apic_id].la_ioint_irqs[vector] != 0) {
+		if (lapics[apic_id].la_ioint_irqs[vector] != -1) {
 			run = 0;
 			first = 0;
 			continue;
@@ -932,7 +938,7 @@
 	sched_bind(td, apic_cpuid(apic_id));
 	thread_unlock(td);
 	mtx_lock_spin(&icu_lock);
-	lapics[apic_id].la_ioint_irqs[vector - APIC_IO_INTS] = 0;
+	lapics[apic_id].la_ioint_irqs[vector - APIC_IO_INTS] = -1;
 	mtx_unlock_spin(&icu_lock);
 	thread_lock(td);
 	sched_unbind(td);
@@ -944,11 +950,15 @@
 u_int
 apic_idt_to_irq(u_int apic_id, u_int vector)
 {
+	int irq;
 
 	KASSERT(vector >= APIC_IO_INTS && vector != IDT_SYSCALL &&
 	    vector <= APIC_IO_INTS + APIC_NUM_IOINTS,
 	    ("Vector %u does not map to an IRQ line", vector));
-	return (lapics[apic_id].la_ioint_irqs[vector - APIC_IO_INTS]);
+	irq = lapics[apic_id].la_ioint_irqs[vector - APIC_IO_INTS];
+	if (irq < 0)
+		irq = 0;
+	return (irq);
 }

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



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