PERFORCE change 161975 for review

Zhao Shuai zhaoshuai at FreeBSD.org
Tue May 12 13:54:23 UTC 2009


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

Change 161975 by zhaoshuai at zhaoshuai on 2009/05/12 13:54:13

	integrate with the main tree	

Affected files ...

.. //depot/projects/soc2009/fifo/sys/amd64/amd64/identcpu.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/amd64/amd64/local_apic.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/amd64/amd64/mp_machdep.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/amd64/conf/DEFAULTS#2 integrate
.. //depot/projects/soc2009/fifo/sys/amd64/conf/GENERIC#2 integrate
.. //depot/projects/soc2009/fifo/sys/amd64/conf/NOTES#2 integrate
.. //depot/projects/soc2009/fifo/sys/amd64/conf/XENHVM#2 integrate
.. //depot/projects/soc2009/fifo/sys/amd64/include/apicvar.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/amd64/include/clock.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/amd64/include/pcpu.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/amd64/isa/clock.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/amd64/linux32/linux.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/amd64/linux32/linux32_sysvec.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/arm/arm/cpufunc.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/arm/arm/pmap.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/arm/at91/at91_cfata.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/arm/at91/if_ate.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/arm/conf/AVILA#2 integrate
.. //depot/projects/soc2009/fifo/sys/arm/conf/BWCT#2 integrate
.. //depot/projects/soc2009/fifo/sys/arm/conf/CAMBRIA#2 integrate
.. //depot/projects/soc2009/fifo/sys/arm/conf/CRB#2 integrate
.. //depot/projects/soc2009/fifo/sys/arm/conf/DB-78XXX#2 integrate
.. //depot/projects/soc2009/fifo/sys/arm/conf/DB-88F5XXX#2 integrate
.. //depot/projects/soc2009/fifo/sys/arm/conf/DB-88F6XXX#2 integrate
.. //depot/projects/soc2009/fifo/sys/arm/conf/EP80219#2 integrate
.. //depot/projects/soc2009/fifo/sys/arm/conf/GUMSTIX#2 integrate
.. //depot/projects/soc2009/fifo/sys/arm/conf/HL200#2 integrate
.. //depot/projects/soc2009/fifo/sys/arm/conf/IQ31244#2 integrate
.. //depot/projects/soc2009/fifo/sys/arm/conf/KB920X#2 integrate
.. //depot/projects/soc2009/fifo/sys/arm/conf/NSLU#2 integrate
.. //depot/projects/soc2009/fifo/sys/arm/conf/NSLU.hints#2 integrate
.. //depot/projects/soc2009/fifo/sys/arm/conf/SIMICS#2 integrate
.. //depot/projects/soc2009/fifo/sys/arm/conf/SKYEYE#2 integrate
.. //depot/projects/soc2009/fifo/sys/arm/include/pmap.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/boot/uboot/lib/devicename.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/boot/uboot/lib/disk.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/boot/uboot/lib/libuboot.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/cddl/compat/opensolaris/kern/opensolaris.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/cddl/compat/opensolaris/kern/opensolaris_lookup.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/cddl/compat/opensolaris/kern/opensolaris_zone.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/cddl/compat/opensolaris/sys/vnode.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/cddl/contrib/opensolaris/common/atomic/amd64/atomic.S#2 delete
.. //depot/projects/soc2009/fifo/sys/cddl/contrib/opensolaris/common/atomic/amd64/opensolaris_atomic.S#1 branch
.. //depot/projects/soc2009/fifo/sys/cddl/contrib/opensolaris/common/atomic/i386/atomic.S#2 delete
.. //depot/projects/soc2009/fifo/sys/cddl/contrib/opensolaris/common/atomic/i386/opensolaris_atomic.S#1 branch
.. //depot/projects/soc2009/fifo/sys/cddl/contrib/opensolaris/common/atomic/ia64/atomic.S#2 delete
.. //depot/projects/soc2009/fifo/sys/cddl/contrib/opensolaris/common/atomic/ia64/opensolaris_atomic.S#1 branch
.. //depot/projects/soc2009/fifo/sys/cddl/contrib/opensolaris/common/atomic/sparc64/atomic.S#2 delete
.. //depot/projects/soc2009/fifo/sys/cddl/contrib/opensolaris/common/atomic/sparc64/opensolaris_atomic.S#1 branch
.. //depot/projects/soc2009/fifo/sys/cddl/contrib/opensolaris/uts/common/fs/vnode.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr.c#1 branch
.. //depot/projects/soc2009/fifo/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr_array.c#1 branch
.. //depot/projects/soc2009/fifo/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr_mem.c#1 branch
.. //depot/projects/soc2009/fifo/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.c#2 delete
.. //depot/projects/soc2009/fifo/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_array.c#2 delete
.. //depot/projects/soc2009/fifo/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_mem.c#2 delete
.. //depot/projects/soc2009/fifo/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/cddl/contrib/opensolaris/uts/common/zmod/crc32.c#2 delete
.. //depot/projects/soc2009/fifo/sys/cddl/contrib/opensolaris/uts/common/zmod/opensolaris_crc32.c#1 branch
.. //depot/projects/soc2009/fifo/sys/compat/freebsd32/freebsd32_misc.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/compat/freebsd32/freebsd32_proto.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/compat/freebsd32/freebsd32_syscall.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/compat/freebsd32/freebsd32_syscalls.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/compat/freebsd32/freebsd32_sysent.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/compat/freebsd32/syscalls.master#2 integrate
.. //depot/projects/soc2009/fifo/sys/compat/linux/linux_futex.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/compat/linux/linux_futex.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/compat/linux/linux_ioctl.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/compat/linux/linux_mib.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/compat/linux/linux_mib.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/compat/linux/linux_misc.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/compat/linux/linux_misc.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/compat/linux/linux_socket.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/compat/linux/linux_socket.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/compat/linux/linux_stats.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/compat/linux/linux_util.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/compat/svr4/svr4_ioctl.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/compat/svr4/svr4_ioctl.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/compat/svr4/svr4_proto.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/compat/svr4/svr4_stat.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/compat/svr4/svr4_syscall.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/compat/svr4/svr4_syscallnames.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/compat/svr4/svr4_sysent.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/compat/svr4/svr4_ttold.c#2 delete
.. //depot/projects/soc2009/fifo/sys/compat/svr4/svr4_ttold.h#2 delete
.. //depot/projects/soc2009/fifo/sys/conf/NOTES#2 integrate
.. //depot/projects/soc2009/fifo/sys/conf/files#2 integrate
.. //depot/projects/soc2009/fifo/sys/conf/files.i386#2 integrate
.. //depot/projects/soc2009/fifo/sys/conf/files.pc98#2 integrate
.. //depot/projects/soc2009/fifo/sys/conf/kern.post.mk#2 integrate
.. //depot/projects/soc2009/fifo/sys/conf/options#2 integrate
.. //depot/projects/soc2009/fifo/sys/contrib/dev/iwi/Makefile#1 branch
.. //depot/projects/soc2009/fifo/sys/contrib/dev/iwi/ipw2200-bss.fw.uu#2 integrate
.. //depot/projects/soc2009/fifo/sys/contrib/dev/iwi/ipw2200-ibss.fw.uu#2 integrate
.. //depot/projects/soc2009/fifo/sys/contrib/dev/iwi/ipw2200-sniffer.fw.uu#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/acpica/acpi.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/acpica/acpi_cpu.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/asr/asr.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/ata/ata-all.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/ata/ata-disk.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/ata/ata-pci.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/ata/ata-pci.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/ata/ata-queue.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/ata/ata-sata.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/ata/chipsets/ata-ahci.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/ata/chipsets/ata-siliconimage.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/ath/ah_osdep.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/ath/ah_osdep.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/ath/ath_hal/ar5211/ar5211_interrupts.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/ath/ath_hal/ar5212/ar5212_interrupts.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/ath/if_ath.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/bce/if_bce.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/bce/if_bcereg.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/bwi/bitops.h#1 branch
.. //depot/projects/soc2009/fifo/sys/dev/bwi/bwimac.c#1 branch
.. //depot/projects/soc2009/fifo/sys/dev/bwi/bwimac.h#1 branch
.. //depot/projects/soc2009/fifo/sys/dev/bwi/bwiphy.c#1 branch
.. //depot/projects/soc2009/fifo/sys/dev/bwi/bwiphy.h#1 branch
.. //depot/projects/soc2009/fifo/sys/dev/bwi/bwirf.c#1 branch
.. //depot/projects/soc2009/fifo/sys/dev/bwi/bwirf.h#1 branch
.. //depot/projects/soc2009/fifo/sys/dev/bwi/if_bwi.c#1 branch
.. //depot/projects/soc2009/fifo/sys/dev/bwi/if_bwi_pci.c#1 branch
.. //depot/projects/soc2009/fifo/sys/dev/bwi/if_bwireg.h#1 branch
.. //depot/projects/soc2009/fifo/sys/dev/bwi/if_bwivar.h#1 branch
.. //depot/projects/soc2009/fifo/sys/dev/cxgb/cxgb_multiq.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/if_ndis/if_ndis.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/if_ndis/if_ndisvar.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/ipw/if_ipw.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/ipw/if_ipwvar.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/isp/isp_freebsd.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/iwi/if_iwi.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/iwi/if_iwivar.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/iwn/if_iwn.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/iwn/if_iwnvar.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/sk/if_sk.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/snp/snp.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/sound/pci/ich.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/ubsec/ubsec.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/ubsec/ubsecreg.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/usb/controller/ehci.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/usb/controller/ohci.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/usb/controller/uhci.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/usb/net/if_aue.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/usb/net/if_axe.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/usb/net/if_cdce.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/usb/net/if_cue.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/usb/net/if_kue.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/usb/net/if_rue.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/usb/net/if_udav.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/usb/net/usb_ethernet.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/usb/net/usb_ethernet.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/usb/serial/u3g.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/usb/storage/ustorage_fs.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/usb/usb_compat_linux.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/usb/usb_core.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/usb/usb_device.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/usb/usb_device.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/usb/usb_generic.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/usb/usb_hub.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/usb/usb_revision.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/usb/usb_transfer.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/usb/usbdevs#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/usb/wlan/if_rum.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/usb/wlan/if_rumvar.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/usb/wlan/if_uath.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/usb/wlan/if_uathvar.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/usb/wlan/if_upgt.c#1 branch
.. //depot/projects/soc2009/fifo/sys/dev/usb/wlan/if_upgtvar.h#1 branch
.. //depot/projects/soc2009/fifo/sys/dev/usb/wlan/if_ural.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/usb/wlan/if_uralvar.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/usb/wlan/if_zyd.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/usb/wlan/if_zydreg.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/usb/wlan/usb_wlan.h#2 delete
.. //depot/projects/soc2009/fifo/sys/dev/wi/if_wi.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/wi/if_wivar.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/wpi/if_wpi.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/wpi/if_wpivar.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/xen/console/console.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/xen/console/xencons_ring.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/dev/xen/console/xencons_ring.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/fs/cd9660/cd9660_vfsops.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/fs/coda/coda_vfsops.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/fs/devfs/devfs.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/fs/devfs/devfs_vfsops.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/fs/devfs/devfs_vnops.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/fs/fdescfs/fdesc.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/fs/fdescfs/fdesc_vfsops.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/fs/fdescfs/fdesc_vnops.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/fs/hpfs/hpfs_vfsops.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/fs/msdosfs/msdosfs_vfsops.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/fs/nfs/nfs.h#1 branch
.. //depot/projects/soc2009/fifo/sys/fs/nfs/nfs_commonacl.c#1 branch
.. //depot/projects/soc2009/fifo/sys/fs/nfs/nfs_commonkrpc.c#1 branch
.. //depot/projects/soc2009/fifo/sys/fs/nfs/nfs_commonport.c#1 branch
.. //depot/projects/soc2009/fifo/sys/fs/nfs/nfs_commonsubs.c#1 branch
.. //depot/projects/soc2009/fifo/sys/fs/nfs/nfs_var.h#1 branch
.. //depot/projects/soc2009/fifo/sys/fs/nfs/nfscl.h#1 branch
.. //depot/projects/soc2009/fifo/sys/fs/nfs/nfsclstate.h#1 branch
.. //depot/projects/soc2009/fifo/sys/fs/nfs/nfsdport.h#1 branch
.. //depot/projects/soc2009/fifo/sys/fs/nfs/nfskpiport.h#1 branch
.. //depot/projects/soc2009/fifo/sys/fs/nfs/nfsm_subs.h#1 branch
.. //depot/projects/soc2009/fifo/sys/fs/nfs/nfsport.h#1 branch
.. //depot/projects/soc2009/fifo/sys/fs/nfs/nfsproto.h#1 branch
.. //depot/projects/soc2009/fifo/sys/fs/nfs/nfsrvcache.h#1 branch
.. //depot/projects/soc2009/fifo/sys/fs/nfs/nfsrvstate.h#1 branch
.. //depot/projects/soc2009/fifo/sys/fs/nfs/nfsv4_errstr.h#1 branch
.. //depot/projects/soc2009/fifo/sys/fs/nfs/rpcv2.h#1 branch
.. //depot/projects/soc2009/fifo/sys/fs/nfs/xdr_subs.h#1 branch
.. //depot/projects/soc2009/fifo/sys/fs/nfsclient/nfs.h#1 branch
.. //depot/projects/soc2009/fifo/sys/fs/nfsclient/nfs_clbio.c#1 branch
.. //depot/projects/soc2009/fifo/sys/fs/nfsclient/nfs_clcomsubs.c#1 branch
.. //depot/projects/soc2009/fifo/sys/fs/nfsclient/nfs_clkrpc.c#1 branch
.. //depot/projects/soc2009/fifo/sys/fs/nfsclient/nfs_cllock.c#1 branch
.. //depot/projects/soc2009/fifo/sys/fs/nfsclient/nfs_clnfsiod.c#1 branch
.. //depot/projects/soc2009/fifo/sys/fs/nfsclient/nfs_clnode.c#1 branch
.. //depot/projects/soc2009/fifo/sys/fs/nfsclient/nfs_clport.c#1 branch
.. //depot/projects/soc2009/fifo/sys/fs/nfsclient/nfs_clrpcops.c#1 branch
.. //depot/projects/soc2009/fifo/sys/fs/nfsclient/nfs_clstate.c#1 branch
.. //depot/projects/soc2009/fifo/sys/fs/nfsclient/nfs_clsubs.c#1 branch
.. //depot/projects/soc2009/fifo/sys/fs/nfsclient/nfs_clvfsops.c#1 branch
.. //depot/projects/soc2009/fifo/sys/fs/nfsclient/nfs_clvnops.c#1 branch
.. //depot/projects/soc2009/fifo/sys/fs/nfsclient/nfs_lock.h#1 branch
.. //depot/projects/soc2009/fifo/sys/fs/nfsclient/nfsargs.h#1 branch
.. //depot/projects/soc2009/fifo/sys/fs/nfsclient/nfsdiskless.h#1 branch
.. //depot/projects/soc2009/fifo/sys/fs/nfsclient/nfsmount.h#1 branch
.. //depot/projects/soc2009/fifo/sys/fs/nfsclient/nfsnode.h#1 branch
.. //depot/projects/soc2009/fifo/sys/fs/nfsclient/nlminfo.h#1 branch
.. //depot/projects/soc2009/fifo/sys/fs/nfsserver/nfs_nfsdcache.c#1 branch
.. //depot/projects/soc2009/fifo/sys/fs/nfsserver/nfs_nfsdkrpc.c#1 branch
.. //depot/projects/soc2009/fifo/sys/fs/nfsserver/nfs_nfsdport.c#1 branch
.. //depot/projects/soc2009/fifo/sys/fs/nfsserver/nfs_nfsdserv.c#1 branch
.. //depot/projects/soc2009/fifo/sys/fs/nfsserver/nfs_nfsdsocket.c#1 branch
.. //depot/projects/soc2009/fifo/sys/fs/nfsserver/nfs_nfsdstate.c#1 branch
.. //depot/projects/soc2009/fifo/sys/fs/nfsserver/nfs_nfsdsubs.c#1 branch
.. //depot/projects/soc2009/fifo/sys/fs/ntfs/ntfs_vfsops.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/fs/nullfs/null_vfsops.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/fs/nwfs/nwfs_vfsops.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/fs/portalfs/portal_vfsops.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/fs/pseudofs/pseudofs.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/fs/pseudofs/pseudofs.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/fs/smbfs/smbfs_io.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/fs/smbfs/smbfs_vfsops.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/fs/tmpfs/tmpfs.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/fs/tmpfs/tmpfs_subr.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/fs/tmpfs/tmpfs_vfsops.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/fs/tmpfs/tmpfs_vnops.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/fs/udf/udf_vfsops.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/fs/unionfs/union_vfsops.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/geom/journal/g_journal.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/geom/vinum/geom_vinum.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/geom/vinum/geom_vinum.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/geom/vinum/geom_vinum_events.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/geom/vinum/geom_vinum_plex.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/geom/vinum/geom_vinum_raid5.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/geom/vinum/geom_vinum_rm.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/geom/vinum/geom_vinum_subr.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/geom/vinum/geom_vinum_var.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/gnu/fs/ext2fs/ext2_vfsops.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/i386/bios/apm.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/i386/conf/DEFAULTS#2 integrate
.. //depot/projects/soc2009/fifo/sys/i386/conf/GENERIC#2 integrate
.. //depot/projects/soc2009/fifo/sys/i386/conf/NOTES#2 integrate
.. //depot/projects/soc2009/fifo/sys/i386/conf/PAE#2 integrate
.. //depot/projects/soc2009/fifo/sys/i386/conf/XBOX#2 integrate
.. //depot/projects/soc2009/fifo/sys/i386/conf/XEN#2 integrate
.. //depot/projects/soc2009/fifo/sys/i386/i386/identcpu.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/i386/i386/local_apic.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/i386/i386/mp_machdep.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/i386/ibcs2/ibcs2_ioctl.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/i386/ibcs2/ibcs2_isc_syscall.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/i386/ibcs2/ibcs2_isc_sysent.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/i386/ibcs2/ibcs2_proto.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/i386/ibcs2/ibcs2_socksys.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/i386/ibcs2/ibcs2_syscall.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/i386/ibcs2/ibcs2_sysent.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/i386/ibcs2/ibcs2_xenix.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/i386/ibcs2/ibcs2_xenix_syscall.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/i386/ibcs2/ibcs2_xenix_sysent.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/i386/ibcs2/syscalls.master#2 integrate
.. //depot/projects/soc2009/fifo/sys/i386/include/apicvar.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/i386/include/clock.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/i386/isa/clock.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/i386/linux/linux.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/i386/linux/linux_sysvec.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/i386/xen/clock.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/i386/xen/mp_machdep.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/ia64/conf/DEFAULTS#2 integrate
.. //depot/projects/soc2009/fifo/sys/ia64/conf/NOTES#2 integrate
.. //depot/projects/soc2009/fifo/sys/isa/atrtc.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/isa/rtc.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/kern/init_main.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/kern/init_sysent.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/kern/kern_acct.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/kern/kern_exit.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/kern/kern_fork.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/kern/kern_jail.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/kern/kern_linker.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/kern/kern_malloc.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/kern/kern_mib.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/kern/kern_osd.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/kern/kern_prot.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/kern/kern_sysctl.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/kern/kern_vimage.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/kern/sched_ule.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/kern/subr_kdb.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/kern/subr_pcpu.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/kern/subr_witness.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/kern/sys_socket.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/kern/syscalls.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/kern/syscalls.master#2 integrate
.. //depot/projects/soc2009/fifo/sys/kern/systrace_args.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/kern/tty.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/kern/tty_ttydisc.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/kern/uipc_mqueue.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/kern/uipc_socket.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/kern/uipc_syscalls.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/kern/uipc_usrreq.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/kern/vfs_bio.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/kern/vfs_default.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/kern/vfs_export.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/kern/vfs_extattr.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/kern/vfs_lookup.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/kern/vfs_mount.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/kern/vfs_subr.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/kern/vfs_syscalls.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/kern/vfs_vnops.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/mips/conf/ADM5120#2 integrate
.. //depot/projects/soc2009/fifo/sys/mips/conf/IDT#2 integrate
.. //depot/projects/soc2009/fifo/sys/mips/conf/MALTA#2 integrate
.. //depot/projects/soc2009/fifo/sys/mips/conf/QEMU#2 integrate
.. //depot/projects/soc2009/fifo/sys/mips/conf/SENTRY5#2 integrate
.. //depot/projects/soc2009/fifo/sys/mips/include/pmap.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/mips/mips/pmap.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/modules/Makefile#2 integrate
.. //depot/projects/soc2009/fifo/sys/modules/bwi/Makefile#1 branch
.. //depot/projects/soc2009/fifo/sys/modules/linux/Makefile#2 integrate
.. //depot/projects/soc2009/fifo/sys/modules/opensolaris/Makefile#2 integrate
.. //depot/projects/soc2009/fifo/sys/modules/sound/sound/Makefile#2 integrate
.. //depot/projects/soc2009/fifo/sys/modules/svr4/Makefile#2 integrate
.. //depot/projects/soc2009/fifo/sys/modules/usb/Makefile#2 integrate
.. //depot/projects/soc2009/fifo/sys/modules/usb/upgt/Makefile#1 branch
.. //depot/projects/soc2009/fifo/sys/modules/zfs/Makefile#2 integrate
.. //depot/projects/soc2009/fifo/sys/net/bpf.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/net/ieee8023ad_lacp.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/net/if.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/net/if_bridge.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/net/if_clone.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/net/if_ethersubr.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/net/if_gif.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/net/if_gif.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/net/if_lagg.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/net/if_mib.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/net/if_var.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/net/netisr.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/net/route.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/net/rtsock.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/net/vnet.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/net80211/ieee80211.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/net80211/ieee80211.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/net80211/ieee80211_adhoc.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/net80211/ieee80211_ddb.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/net80211/ieee80211_freebsd.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/net80211/ieee80211_freebsd.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/net80211/ieee80211_ht.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/net80211/ieee80211_ioctl.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/net80211/ieee80211_node.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/net80211/ieee80211_node.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/net80211/ieee80211_proto.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/net80211/ieee80211_scan.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/net80211/ieee80211_scan.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/net80211/ieee80211_scan_sta.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/net80211/ieee80211_superg.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/net80211/ieee80211_superg.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/net80211/ieee80211_var.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/netgraph/netgraph.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/netgraph/ng_base.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/netinet/icmp6.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/netinet/if_ether.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/netinet/igmp.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/netinet/in.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/netinet/in_mcast.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/netinet/in_pcb.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/netinet/in_pcb.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/netinet/in_rmx.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/netinet/in_var.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/netinet/ip_carp.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/netinet/ip_divert.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/netinet/ip_fw.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/netinet/ip_fw2.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/netinet/ip_fw_pfil.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/netinet/ip_input.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/netinet/ip_mroute.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/netinet/raw_ip.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/netinet/sctp_crc32.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/netinet/sctp_os_bsd.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/netinet/sctp_uio.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/netinet/tcp_hostcache.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/netinet/tcp_subr.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/netinet/tcp_syncache.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/netinet/tcp_syncache.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/netinet/tcp_timewait.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/netinet/tcp_var.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/netinet/udp_usrreq.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/netinet/vinet.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/netinet6/icmp6.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/netinet6/in6.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/netinet6/in6.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/netinet6/in6_ifattach.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/netinet6/in6_mcast.c#1 branch
.. //depot/projects/soc2009/fifo/sys/netinet6/in6_pcb.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/netinet6/in6_proto.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/netinet6/in6_rmx.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/netinet6/in6_var.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/netinet6/ip6_input.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/netinet6/ip6_mroute.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/netinet6/ip6_output.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/netinet6/ip6_var.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/netinet6/mld6.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/netinet6/mld6.h#1 branch
.. //depot/projects/soc2009/fifo/sys/netinet6/mld6_var.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/netinet6/nd6.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/netinet6/nd6_nbr.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/netinet6/raw_ip6.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/netinet6/route6.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/netinet6/udp6_usrreq.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/netinet6/vinet6.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/netipsec/ipsec.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/netipsec/key.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/netipsec/vipsec.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/netipsec/xform_tcp.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/nfs4client/nfs4_vfsops.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/nfsclient/nfs.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/nfsclient/nfs_bio.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/nfsclient/nfs_kdtrace.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/nfsclient/nfs_krpc.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/nfsclient/nfs_vfsops.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/nfsclient/nfs_vnops.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/nfsserver/nfs_serv.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/nfsserver/nfs_srvsubs.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/nlm/nlm_advlock.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/nlm/nlm_prot_impl.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/pc98/cbus/clock.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/pc98/conf/DEFAULTS#2 integrate
.. //depot/projects/soc2009/fifo/sys/pc98/conf/GENERIC#2 integrate
.. //depot/projects/soc2009/fifo/sys/pc98/conf/NOTES#2 integrate
.. //depot/projects/soc2009/fifo/sys/powerpc/conf/GENERIC#2 integrate
.. //depot/projects/soc2009/fifo/sys/powerpc/conf/MPC85XX#2 integrate
.. //depot/projects/soc2009/fifo/sys/powerpc/conf/NOTES#2 integrate
.. //depot/projects/soc2009/fifo/sys/security/audit/audit_worker.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/security/mac/mac_atalk.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/security/mac/mac_audit.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/security/mac/mac_cred.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/security/mac/mac_inet.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/security/mac/mac_inet6.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/security/mac/mac_internal.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/security/mac/mac_net.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/security/mac/mac_pipe.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/security/mac/mac_posix_sem.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/security/mac/mac_posix_shm.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/security/mac/mac_priv.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/security/mac/mac_process.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/security/mac/mac_socket.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/security/mac/mac_system.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/security/mac/mac_sysv_msg.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/security/mac/mac_sysv_sem.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/security/mac/mac_sysv_shm.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/security/mac/mac_vfs.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/sparc64/conf/GENERIC#2 integrate
.. //depot/projects/soc2009/fifo/sys/sparc64/sparc64/vm_machdep.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/sys/_null.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/sys/buf_ring.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/sys/ioctl.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/sys/ioctl_compat.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/sys/jail.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/sys/kernel.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/sys/ktr.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/sys/mount.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/sys/osd.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/sys/param.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/sys/priv.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/sys/proc.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/sys/socketvar.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/sys/syscall.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/sys/syscall.mk#2 integrate
.. //depot/projects/soc2009/fifo/sys/sys/syscallsubr.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/sys/sysctl.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/sys/sysproto.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/sys/termios.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/sys/ucred.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/sys/vimage.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/ufs/ffs/ffs_vfsops.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/ufs/ufs/extattr.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/ufs/ufs/ufs_extattr.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/ufs/ufs/ufs_extern.h#2 integrate
.. //depot/projects/soc2009/fifo/sys/ufs/ufs/ufs_vfsops.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/vm/vm_fault.c#2 integrate
.. //depot/projects/soc2009/fifo/sys/vm/vnode_pager.c#2 integrate

Differences ...

==== //depot/projects/soc2009/fifo/sys/amd64/amd64/identcpu.c#2 (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/soc2009/fifo/sys/amd64/amd64/local_apic.c#2 (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);
 }
 
 #ifdef DDB
@@ -974,7 +984,7 @@
 		db_printf("Interrupts bound to lapic %u\n", apic_id);
 		for (i = 0; i < APIC_NUM_IOINTS + 1 && !db_pager_quit; i++) {
 			irq = lapics[apic_id].la_ioint_irqs[i];
-			if (irq == 0 || irq == IRQ_SYSCALL)
+			if (irq == -1 || irq == IRQ_SYSCALL)
 				continue;
 			db_printf("vec 0x%2x -> ", i + APIC_IO_INTS);
 			if (irq == IRQ_TIMER)

==== //depot/projects/soc2009/fifo/sys/amd64/amd64/mp_machdep.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.304 2009/04/29 06:54:40 jeff Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.306 2009/05/02 12:20:43 mav Exp $");
 
 #include "opt_cpu.h"
 #include "opt_kstack_pages.h"
@@ -57,6 +57,7 @@
 #include <vm/vm_extern.h>
 
 #include <machine/apicreg.h>
+#include <machine/clock.h>
 #include <machine/cputypes.h>
 #include <machine/cpufunc.h>
 #include <machine/md_var.h>
@@ -292,6 +293,10 @@
 static void
 topo_probe(void)
 {
+	static int cpu_topo_probed = 0;
+
+	if (cpu_topo_probed)
+		return;
 
 	logical_cpus = logical_cpus_mask = 0;
 	if (cpu_high >= 0xb)
@@ -299,9 +304,10 @@
 	else if (cpu_high)
 		topo_probe_0x4();
 	if (cpu_cores == 0)
-		cpu_cores = mp_ncpus;
+		cpu_cores = mp_ncpus > 0 ? mp_ncpus : 1;
 	if (cpu_logical == 0)
 		cpu_logical = 1;
+	cpu_topo_probed = 1;
 }
 
 struct cpu_group *
@@ -313,6 +319,7 @@
 	 * Determine whether any threading flags are
 	 * necessry.
 	 */
+	topo_probe();
 	if (cpu_logical > 1 && hyperthreading_cpus)
 		cg_flags = CG_FLAG_HTT;
 	else if (cpu_logical > 1)
@@ -1118,6 +1125,15 @@
 		sched_preempt(curthread);
 
 	/* Nothing to do for AST */
+
+	if (ipi_bitmap & (1 << IPI_HARDCLOCK))
+		hardclockintr(&frame);
+
+	if (ipi_bitmap & (1 << IPI_STATCLOCK))
+		statclockintr(&frame);
+
+	if (ipi_bitmap & (1 << IPI_PROFCLOCK))
+		profclockintr(&frame);
 }
 
 /*

==== //depot/projects/soc2009/fifo/sys/amd64/conf/DEFAULTS#2 (text+ko) ====

@@ -1,7 +1,7 @@
 #
 # DEFAULTS -- Default kernel configuration file for FreeBSD/amd64
 #
-# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.17 2009/04/19 00:16:04 kmacy Exp $
+# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.18 2009/05/10 00:00:25 kuriyama Exp $
 
 machine		amd64
 
@@ -21,4 +21,4 @@
 options 	GEOM_PART_EBR_COMPAT
 options 	GEOM_PART_MBR
 
-options		FLOWTABLE
+options 	FLOWTABLE

==== //depot/projects/soc2009/fifo/sys/amd64/conf/GENERIC#2 (text+ko) ====

@@ -16,7 +16,7 @@
 # If you are in doubt as to the purpose or necessity of a line, check first
 # in NOTES.
 #
-# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.523 2009/04/10 00:40:48 jfv Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.525 2009/05/10 00:00:25 kuriyama Exp $
 
 cpu		HAMMER
 ident		GENERIC
@@ -68,7 +68,7 @@
 options 	_KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
 options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
 options 	STOP_NMI		# Stop CPUS using NMI instead of IPI
-options  	HWPMC_HOOKS		# Necessary kernel hooks for hwpmc(4)
+options 	HWPMC_HOOKS		# Necessary kernel hooks for hwpmc(4)
 options 	AUDIT			# Security event auditing
 #options 	KDTRACE_FRAME		# Ensure frames are compiled in
 #options 	KDTRACE_HOOKS		# Kernel DTrace hooks
@@ -114,7 +114,7 @@
 device		amd		# AMD 53C974 (Tekram DC-390(T))
 device		hptiop		# Highpoint RocketRaid 3xxx series
 device		isp		# Qlogic family
-#device 	ispfw		# Firmware for QLogic HBAs- normally a module
+#device		ispfw		# Firmware for QLogic HBAs- normally a module
 device		mpt		# LSI-Logic MPT-Fusion
 #device		ncr		# NCR/Symbios Logic
 device		sym		# NCR/Symbios Logic (newer chipsets + those of `ncr')
@@ -260,7 +260,7 @@
 device		an		# Aironet 4500/4800 802.11 wireless NICs.
 device		ath		# Atheros pci/cardbus NIC's
 device		ath_hal		# pci/cardbus chip support
-options		AH_SUPPORT_AR5416	# enable AR5416 tx/rx descriptors
+options 	AH_SUPPORT_AR5416	# enable AR5416 tx/rx descriptors
 device		ath_rate_sample	# SampleRate tx rate control for ath
 device		ral		# Ralink Technology RT2500 wireless NICs.
 device		wi		# WaveLAN/Intersil/Symbol 802.11 wireless NICs.
@@ -292,8 +292,10 @@
 device		ulpt		# Printer
 device		umass		# Disks/Mass storage - Requires scbus and da
 device		ums		# Mouse
+device		rum		# Ralink Technology RT2501USB wireless NICs
+device		uath		# Atheros AR5523 wireless NICs
 device		ural		# Ralink Technology RT2500USB wireless NICs
-device		rum		# Ralink Technology RT2501USB wireless NICs
+device		zyd		# ZyDAS zb1211/zb1211b wireless NICs
 device		urio		# Diamond Rio 500 MP3 player
 # USB Serial devices
 device		uark		# Technologies ARK3116 based serial adapters

==== //depot/projects/soc2009/fifo/sys/amd64/conf/NOTES#2 (text+ko) ====

@@ -4,7 +4,7 @@
 # This file contains machine dependent kernel configuration notes.  For
 # machine independent notes, look in /sys/conf/NOTES.
 #
-# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.89 2009/03/16 10:36:24 dchagin Exp $
+# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.90 2009/05/10 00:00:25 kuriyama Exp $
 #
 
 #
@@ -33,7 +33,7 @@
 # 
 # Debugging options.
 #
-options		STOP_NMI		# Stop CPUS using NMI instead of IPI
+options 	STOP_NMI		# Stop CPUS using NMI instead of IPI
 
 
 
@@ -82,7 +82,7 @@
 
 # BPF_JITTER adds support for BPF just-in-time compiler.
 
-options		BPF_JITTER
+options 	BPF_JITTER
 
 
 #####################################################################
@@ -153,7 +153,7 @@
 #
 # AGP debugging.
 #
-options		AGP_DEBUG
+options 	AGP_DEBUG
 
 
 #####################################################################
@@ -288,7 +288,7 @@
 
 device		ath			# Atheros pci/cardbus NIC's
 device		ath_hal			# pci/cardbus chip support
-options		AH_SUPPORT_AR5416	# enable AR5416 tx/rx descriptors
+options 	AH_SUPPORT_AR5416	# enable AR5416 tx/rx descriptors
 device		ath_rate_sample		# SampleRate tx rate control for ath
 #device		ath_rate_amrr		# AMRR rate control for ath driver
 #device		ath_rate_onoe		# Onoe rate control for ath driver
@@ -457,7 +457,7 @@
 
 #Enable the linux-like sys filesystem support (requires COMPAT_LINUX32
 # and PSEUDOFS)
-options		LINSYSFS
+options 	LINSYSFS
 
 #
 # SysVR4 ABI emulation

==== //depot/projects/soc2009/fifo/sys/amd64/conf/XENHVM#2 (text+ko) ====

@@ -16,7 +16,7 @@
 # If you are in doubt as to the purpose or necessity of a line, check first
 # in NOTES.
 #
-# $FreeBSD: src/sys/amd64/conf/XENHVM,v 1.1 2009/03/11 15:30:12 dfr Exp $
+# $FreeBSD: src/sys/amd64/conf/XENHVM,v 1.3 2009/05/10 00:00:25 kuriyama Exp $
 
 cpu		HAMMER
 ident		GENERIC
@@ -69,10 +69,12 @@
 options 	_KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
 options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
 options 	STOP_NMI		# Stop CPUS using NMI instead of IPI
-options  	HWPMC_HOOKS		# Necessary kernel hooks for hwpmc(4)
+options 	HWPMC_HOOKS		# Necessary kernel hooks for hwpmc(4)
 options 	AUDIT			# Security event auditing
 #options 	KDTRACE_FRAME		# Ensure frames are compiled in
 #options 	KDTRACE_HOOKS		# Kernel DTrace hooks
+options 	NO_ADAPTIVE_MUTEXES
+options 	NO_ADAPTIVE_RWLOCKS
 
 # Debugging for use in -current
 options 	KDB			# Enable kernel debugger support.
@@ -97,7 +99,7 @@
 device		fdc
 
 # Xen HVM support
-options		XENHVM
+options 	XENHVM
 device		xenpci
 
 # ATA and ATAPI devices

==== //depot/projects/soc2009/fifo/sys/amd64/include/apicvar.h#2 (text+ko) ====

@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/amd64/include/apicvar.h,v 1.28 2009/03/17 00:48:11 jkim Exp $
+ * $FreeBSD: src/sys/amd64/include/apicvar.h,v 1.29 2009/05/02 12:20:43 mav Exp $
  */
 
 #ifndef _MACHINE_APICVAR_H_
@@ -126,7 +126,10 @@
 /* IPIs handled by IPI_BITMAPED_VECTOR  (XXX ups is there a better place?) */
 #define	IPI_AST		0 	/* Generate software trap. */
 #define IPI_PREEMPT     1
-#define IPI_BITMAP_LAST IPI_PREEMPT
+#define IPI_HARDCLOCK   2
+#define IPI_STATCLOCK   3
+#define IPI_PROFCLOCK   4
+#define IPI_BITMAP_LAST IPI_PROFCLOCK
 #define IPI_IS_BITMAPED(x) ((x) <= IPI_BITMAP_LAST)
 
 #define	IPI_STOP	(APIC_IPI_INTS + 7)	/* Stop CPU until restarted. */

==== //depot/projects/soc2009/fifo/sys/amd64/include/clock.h#2 (text+ko) ====

@@ -3,7 +3,7 @@
  * Garrett Wollman, September 1994.
  * This file is in the public domain.
  *
- * $FreeBSD: src/sys/amd64/include/clock.h,v 1.61 2008/10/21 00:38:00 jkim Exp $
+ * $FreeBSD: src/sys/amd64/include/clock.h,v 1.63 2009/05/03 17:47:21 mav Exp $
  */
 
 #ifndef _MACHINE_CLOCK_H_
@@ -15,7 +15,6 @@
  * XXX large parts of the driver and its interface are misplaced.
  */
 extern int	clkintr_pending;
-extern int	statclock_disable;
 extern u_int	i8254_freq;
 extern int	i8254_max_count;
 extern uint64_t	tsc_freq;
@@ -24,6 +23,12 @@
 
 void	i8254_init(void);
 
+struct trapframe;
+
+int	hardclockintr(struct trapframe *frame);
+int	statclockintr(struct trapframe *frame);
+int	profclockintr(struct trapframe *frame);
+
 /*
  * Driver to clock driver interface.
  */

==== //depot/projects/soc2009/fifo/sys/amd64/include/pcpu.h#2 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/amd64/include/pcpu.h,v 1.53 2009/04/01 13:09:26 kib Exp $
+ * $FreeBSD: src/sys/amd64/include/pcpu.h,v 1.54 2009/05/06 17:48:39 dfr Exp $
  */
 
 #ifndef _MACHINE_PCPU_H_
@@ -75,7 +75,7 @@
 	/* Pointer to the CPU LDT descriptor */				\
 	struct system_segment_descriptor *pc_ldt;			\
 	/* Pointer to the CPU TSS descriptor */				\
-	struct system_segment_descriptor *pc_tss
+	struct system_segment_descriptor *pc_tss			\
 	PCPU_XEN_FIELDS
 
 #ifdef _KERNEL

==== //depot/projects/soc2009/fifo/sys/amd64/isa/clock.c#2 (text+ko) ====

@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.243 2008/04/22 19:38:27 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.246 2009/05/03 17:47:21 mav Exp $");
 
 /*
  * Routines to handle clock hardware.
@@ -53,6 +53,7 @@
 #include <sys/kernel.h>
 #include <sys/module.h>
 #include <sys/sched.h>
+#include <sys/smp.h>
 #include <sys/sysctl.h>
 
 #include <machine/clock.h>
@@ -62,6 +63,7 @@
 #include <machine/apicvar.h>
 #include <machine/ppireg.h>
 #include <machine/timerreg.h>
+#include <machine/smp.h>
 
 #include <isa/rtc.h>
 #ifdef DEV_ISA
@@ -74,7 +76,6 @@
 int	clkintr_pending;
 static int pscnt = 1;
 static int psdiv = 1;

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


More information about the p4-projects mailing list