Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 2 May 2011 14:56:06 GMT
From:      John Baldwin <jhb@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 192461 for review
Message-ID:  <201105021456.p42Eu69K050416@skunkworks.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@192461?ac=10

Change 192461 by jhb@jhb_jhbbsd on 2011/05/02 14:55:09

	IFC @192460

Affected files ...

.. //depot/projects/pci/sys/amd64/amd64/exception.S#2 integrate
.. //depot/projects/pci/sys/amd64/amd64/genassym.c#2 integrate
.. //depot/projects/pci/sys/amd64/amd64/identcpu.c#3 integrate
.. //depot/projects/pci/sys/amd64/amd64/legacy.c#2 integrate
.. //depot/projects/pci/sys/amd64/amd64/machdep.c#3 integrate
.. //depot/projects/pci/sys/amd64/amd64/minidump_machdep.c#3 integrate
.. //depot/projects/pci/sys/amd64/amd64/pmap.c#2 integrate
.. //depot/projects/pci/sys/amd64/amd64/prof_machdep.c#3 integrate
.. //depot/projects/pci/sys/amd64/amd64/sys_machdep.c#2 integrate
.. //depot/projects/pci/sys/amd64/amd64/trap.c#2 integrate
.. //depot/projects/pci/sys/amd64/conf/GENERIC#3 integrate
.. //depot/projects/pci/sys/amd64/ia32/ia32_exception.S#2 integrate
.. //depot/projects/pci/sys/amd64/include/clock.h#3 integrate
.. //depot/projects/pci/sys/amd64/include/cpufunc.h#2 integrate
.. //depot/projects/pci/sys/amd64/include/pmap.h#3 integrate
.. //depot/projects/pci/sys/amd64/include/specialreg.h#2 integrate
.. //depot/projects/pci/sys/amd64/pci/pci_bus.c#4 integrate
.. //depot/projects/pci/sys/arm/arm/dump_machdep.c#2 integrate
.. //depot/projects/pci/sys/arm/arm/minidump_machdep.c#2 integrate
.. //depot/projects/pci/sys/arm/arm/nexus.c#3 integrate
.. //depot/projects/pci/sys/arm/at91/at91_wdt.c#2 integrate
.. //depot/projects/pci/sys/arm/conf/AVILA#3 integrate
.. //depot/projects/pci/sys/arm/conf/CAMBRIA#3 integrate
.. //depot/projects/pci/sys/arm/conf/CRB#2 integrate
.. //depot/projects/pci/sys/arm/conf/DB-78XXX#2 integrate
.. //depot/projects/pci/sys/arm/conf/DB-88F5XXX#2 integrate
.. //depot/projects/pci/sys/arm/conf/DB-88F6XXX#2 integrate
.. //depot/projects/pci/sys/arm/conf/EP80219#2 integrate
.. //depot/projects/pci/sys/arm/conf/IQ31244#2 integrate
.. //depot/projects/pci/sys/arm/conf/TS7800#1 branch
.. //depot/projects/pci/sys/arm/econa/ehci_ebus.c#3 integrate
.. //depot/projects/pci/sys/arm/mv/orion/files.ts7800#1 branch
.. //depot/projects/pci/sys/arm/mv/orion/std.ts7800#1 branch
.. //depot/projects/pci/sys/arm/xscale/i8134x/crb_machdep.c#2 integrate
.. //depot/projects/pci/sys/boot/fdt/dts/ts7800.dts#1 branch
.. //depot/projects/pci/sys/boot/forth/loader.conf#3 integrate
.. //depot/projects/pci/sys/boot/i386/boot2/Makefile#3 integrate
.. //depot/projects/pci/sys/boot/i386/boot2/boot2.c#3 integrate
.. //depot/projects/pci/sys/boot/i386/common/drv.c#2 integrate
.. //depot/projects/pci/sys/boot/i386/gptzfsboot/Makefile#2 integrate
.. //depot/projects/pci/sys/boot/i386/zfsboot/Makefile#3 integrate
.. //depot/projects/pci/sys/boot/i386/zfsboot/zfsldr.S#3 integrate
.. //depot/projects/pci/sys/boot/ia64/common/copy.c#3 integrate
.. //depot/projects/pci/sys/boot/ia64/efi/efimd.c#3 integrate
.. //depot/projects/pci/sys/boot/pc98/boot2/Makefile#2 integrate
.. //depot/projects/pci/sys/boot/pc98/boot2/boot2.c#3 integrate
.. //depot/projects/pci/sys/cam/ata/ata_all.c#2 integrate
.. //depot/projects/pci/sys/cam/ata/ata_all.h#2 integrate
.. //depot/projects/pci/sys/cam/ata/ata_da.c#2 integrate
.. //depot/projects/pci/sys/cam/ata/ata_pmp.c#2 integrate
.. //depot/projects/pci/sys/cam/ata/ata_xpt.c#2 integrate
.. //depot/projects/pci/sys/cam/cam_ccb.h#2 integrate
.. //depot/projects/pci/sys/cam/cam_periph.c#2 integrate
.. //depot/projects/pci/sys/cam/cam_xpt.c#2 integrate
.. //depot/projects/pci/sys/cam/cam_xpt.h#2 integrate
.. //depot/projects/pci/sys/cam/scsi/scsi_cd.c#2 integrate
.. //depot/projects/pci/sys/cam/scsi/scsi_ch.c#2 integrate
.. //depot/projects/pci/sys/cam/scsi/scsi_da.c#2 integrate
.. //depot/projects/pci/sys/cam/scsi/scsi_pass.c#2 integrate
.. //depot/projects/pci/sys/cam/scsi/scsi_pt.c#2 integrate
.. //depot/projects/pci/sys/cam/scsi/scsi_sa.c#2 integrate
.. //depot/projects/pci/sys/cam/scsi/scsi_sg.c#2 integrate
.. //depot/projects/pci/sys/cddl/compat/opensolaris/sys/sunddi.h#2 integrate
.. //depot/projects/pci/sys/cddl/contrib/opensolaris/common/atomic/ia64/opensolaris_atomic.S#2 integrate
.. //depot/projects/pci/sys/cddl/contrib/opensolaris/common/zfs/zfs_ioctl_compat.c#2 integrate
.. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#2 integrate
.. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#2 integrate
.. //depot/projects/pci/sys/cddl/dev/dtrace/amd64/dtrace_subr.c#2 integrate
.. //depot/projects/pci/sys/cddl/dev/dtrace/i386/dtrace_subr.c#2 integrate
.. //depot/projects/pci/sys/cddl/dev/systrace/systrace.c#3 integrate
.. //depot/projects/pci/sys/compat/freebsd32/freebsd32_misc.c#3 integrate
.. //depot/projects/pci/sys/compat/freebsd32/freebsd32_proto.h#3 integrate
.. //depot/projects/pci/sys/compat/freebsd32/freebsd32_syscall.h#3 integrate
.. //depot/projects/pci/sys/compat/freebsd32/freebsd32_syscalls.c#3 integrate
.. //depot/projects/pci/sys/compat/freebsd32/freebsd32_sysent.c#3 integrate
.. //depot/projects/pci/sys/compat/freebsd32/freebsd32_systrace_args.c#2 integrate
.. //depot/projects/pci/sys/compat/freebsd32/syscalls.master#3 integrate
.. //depot/projects/pci/sys/compat/linprocfs/linprocfs.c#3 integrate
.. //depot/projects/pci/sys/compat/linux/linux_misc.c#3 integrate
.. //depot/projects/pci/sys/compat/svr4/imgact_svr4.c#2 integrate
.. //depot/projects/pci/sys/conf/NOTES#3 integrate
.. //depot/projects/pci/sys/conf/files#4 integrate
.. //depot/projects/pci/sys/conf/files.amd64#2 integrate
.. //depot/projects/pci/sys/conf/files.arm#2 integrate
.. //depot/projects/pci/sys/conf/files.i386#2 integrate
.. //depot/projects/pci/sys/conf/files.ia64#3 integrate
.. //depot/projects/pci/sys/conf/files.mips#3 integrate
.. //depot/projects/pci/sys/conf/files.pc98#2 integrate
.. //depot/projects/pci/sys/conf/files.powerpc#2 integrate
.. //depot/projects/pci/sys/conf/files.sparc64#3 integrate
.. //depot/projects/pci/sys/conf/files.sun4v#3 integrate
.. //depot/projects/pci/sys/conf/kern.mk#2 integrate
.. //depot/projects/pci/sys/conf/kern.pre.mk#3 integrate
.. //depot/projects/pci/sys/conf/kmod.mk#2 integrate
.. //depot/projects/pci/sys/conf/ldscript.ia64#3 integrate
.. //depot/projects/pci/sys/conf/options#4 integrate
.. //depot/projects/pci/sys/conf/options.mips#2 integrate
.. //depot/projects/pci/sys/contrib/altq/altq/altq_subr.c#3 integrate
.. //depot/projects/pci/sys/contrib/dev/acpica/acpica_prep.sh#2 integrate
.. //depot/projects/pci/sys/contrib/dev/acpica/changes.txt#3 integrate
.. //depot/projects/pci/sys/contrib/dev/acpica/common/dmtable.c#3 integrate
.. //depot/projects/pci/sys/contrib/dev/acpica/common/dmtbdump.c#3 integrate
.. //depot/projects/pci/sys/contrib/dev/acpica/compiler/aslanalyze.c#2 integrate
.. //depot/projects/pci/sys/contrib/dev/acpica/compiler/aslcompiler.h#2 integrate
.. //depot/projects/pci/sys/contrib/dev/acpica/compiler/aslcompiler.y#3 integrate
.. //depot/projects/pci/sys/contrib/dev/acpica/compiler/asldefine.h#2 integrate
.. //depot/projects/pci/sys/contrib/dev/acpica/compiler/aslglobal.h#2 integrate
.. //depot/projects/pci/sys/contrib/dev/acpica/compiler/asllookup.c#2 integrate
.. //depot/projects/pci/sys/contrib/dev/acpica/compiler/aslmain.c#2 integrate
.. //depot/projects/pci/sys/contrib/dev/acpica/compiler/aslmap.c#2 integrate
.. //depot/projects/pci/sys/contrib/dev/acpica/compiler/aslmessages.h#2 integrate
.. //depot/projects/pci/sys/contrib/dev/acpica/compiler/aslpredef.c#2 integrate
.. //depot/projects/pci/sys/contrib/dev/acpica/compiler/asltypes.h#2 integrate
.. //depot/projects/pci/sys/contrib/dev/acpica/compiler/aslutils.c#2 integrate
.. //depot/projects/pci/sys/contrib/dev/acpica/compiler/aslwalks.c#2 integrate
.. //depot/projects/pci/sys/contrib/dev/acpica/compiler/dtcompile.c#2 integrate
.. //depot/projects/pci/sys/contrib/dev/acpica/compiler/dtcompiler.h#3 integrate
.. //depot/projects/pci/sys/contrib/dev/acpica/compiler/dtexpress.c#2 integrate
.. //depot/projects/pci/sys/contrib/dev/acpica/compiler/dtfield.c#2 integrate
.. //depot/projects/pci/sys/contrib/dev/acpica/compiler/dtio.c#3 integrate
.. //depot/projects/pci/sys/contrib/dev/acpica/compiler/dtparser.l#1 branch
.. //depot/projects/pci/sys/contrib/dev/acpica/compiler/dtparser.y#1 branch
.. //depot/projects/pci/sys/contrib/dev/acpica/compiler/dtsubtable.c#2 integrate
.. //depot/projects/pci/sys/contrib/dev/acpica/compiler/dttable.c#3 integrate
.. //depot/projects/pci/sys/contrib/dev/acpica/compiler/dttemplate.c#2 integrate
.. //depot/projects/pci/sys/contrib/dev/acpica/compiler/dttemplate.h#3 integrate
.. //depot/projects/pci/sys/contrib/dev/acpica/compiler/dtutils.c#3 integrate
.. //depot/projects/pci/sys/contrib/dev/acpica/debugger/dbdisply.c#2 integrate
.. //depot/projects/pci/sys/contrib/dev/acpica/dispatcher/dswload.c#2 integrate
.. //depot/projects/pci/sys/contrib/dev/acpica/dispatcher/dswload2.c#2 integrate
.. //depot/projects/pci/sys/contrib/dev/acpica/events/evglock.c#1 branch
.. //depot/projects/pci/sys/contrib/dev/acpica/events/evmisc.c#3 integrate
.. //depot/projects/pci/sys/contrib/dev/acpica/events/evregion.c#2 integrate
.. //depot/projects/pci/sys/contrib/dev/acpica/events/evrgnini.c#2 integrate
.. //depot/projects/pci/sys/contrib/dev/acpica/events/evxfregn.c#2 integrate
.. //depot/projects/pci/sys/contrib/dev/acpica/executer/excreate.c#2 integrate
.. //depot/projects/pci/sys/contrib/dev/acpica/include/acconfig.h#2 integrate
.. //depot/projects/pci/sys/contrib/dev/acpica/include/acevents.h#2 integrate
.. //depot/projects/pci/sys/contrib/dev/acpica/include/acpixf.h#3 integrate
.. //depot/projects/pci/sys/contrib/dev/acpica/include/actypes.h#2 integrate
.. //depot/projects/pci/sys/contrib/dev/acpica/include/amlcode.h#2 integrate
.. //depot/projects/pci/sys/contrib/dev/acpica/namespace/nsrepair.c#2 integrate
.. //depot/projects/pci/sys/contrib/dev/acpica/utilities/utdecode.c#2 integrate
.. //depot/projects/pci/sys/contrib/dev/iwn/iwlwifi-1000-128.50.3.1.fw.uu#2 delete
.. //depot/projects/pci/sys/contrib/dev/iwn/iwlwifi-1000-39.31.5.1.fw.uu#1 branch
.. //depot/projects/pci/sys/contrib/dev/iwn/iwlwifi-5000-8.24.2.12.fw.uu#2 delete
.. //depot/projects/pci/sys/contrib/dev/iwn/iwlwifi-5000-8.83.5.1.fw.uu#1 branch
.. //depot/projects/pci/sys/contrib/dev/iwn/iwlwifi-6000g2a-17.168.5.2.fw.uu#1 branch
.. //depot/projects/pci/sys/contrib/dev/iwn/iwlwifi-6000g2b-17.168.5.2.fw.uu#1 branch
.. //depot/projects/pci/sys/contrib/dev/iwn/iwlwifi-6050-41.28.5.1.fw.uu#1 branch
.. //depot/projects/pci/sys/contrib/dev/iwn/iwlwifi-6050-9.201.4.1.fw.uu#2 delete
.. //depot/projects/pci/sys/contrib/pf/net/if_pflog.c#2 integrate
.. //depot/projects/pci/sys/contrib/pf/net/pf.c#2 integrate
.. //depot/projects/pci/sys/contrib/pf/net/pf_ioctl.c#2 integrate
.. //depot/projects/pci/sys/ddb/db_command.c#2 integrate
.. //depot/projects/pci/sys/ddb/db_ps.c#2 integrate
.. //depot/projects/pci/sys/dev/acpica/acpi.c#3 integrate
.. //depot/projects/pci/sys/dev/acpica/acpi_cpu.c#2 integrate
.. //depot/projects/pci/sys/dev/acpica/acpi_pcib_acpi.c#9 integrate
.. //depot/projects/pci/sys/dev/acpica/acpi_thermal.c#2 integrate
.. //depot/projects/pci/sys/dev/acpica/acpi_timer.c#3 integrate
.. //depot/projects/pci/sys/dev/ahci/ahci.c#3 integrate
.. //depot/projects/pci/sys/dev/ahci/ahci.h#2 integrate
.. //depot/projects/pci/sys/dev/aic7xxx/aicasm/Makefile#2 integrate
.. //depot/projects/pci/sys/dev/arcmsr/arcmsr.c#2 integrate
.. //depot/projects/pci/sys/dev/arcmsr/arcmsr.h#2 integrate
.. //depot/projects/pci/sys/dev/ata/ata-all.c#2 integrate
.. //depot/projects/pci/sys/dev/ata/ata-all.h#2 integrate
.. //depot/projects/pci/sys/dev/ata/ata-lowlevel.c#2 integrate
.. //depot/projects/pci/sys/dev/ata/ata-pci.h#2 integrate
.. //depot/projects/pci/sys/dev/ata/chipsets/ata-intel.c#2 integrate
.. //depot/projects/pci/sys/dev/ath/ah_osdep.c#3 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ah.c#3 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ah.h#3 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ah_debug.h#2 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ah_decode.h#2 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ah_desc.h#2 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ah_devid.h#2 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ah_eeprom_v14.c#3 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ah_eeprom_v14.h#3 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ah_eeprom_v4k.h#2 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ah_internal.h#3 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar5212/ar5212_recv.c#3 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar5416/ar2133.c#3 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar5416/ar5416.h#3 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c#3 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c#3 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c#3 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c#3 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar5416/ar5416_power.c#2 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#3 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar5416/ar5416reg.h#3 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar9001/ar9130.ini#1 branch
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar9001/ar9130_attach.c#1 branch
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar9001/ar9130_eeprom.c#1 branch
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar9001/ar9130_eeprom.h#1 branch
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar9001/ar9130_phy.c#1 branch
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar9001/ar9130_phy.h#1 branch
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar9001/ar9130reg.h#1 branch
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar9002/ar9002phy.h#2 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar9002/ar9285.h#3 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c#3 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar9002/ar9285_diversity.c#1 branch
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar9002/ar9285_diversity.h#1 branch
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar9002/ar9285_phy.c#1 branch
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar9002/ar9285_phy.h#1 branch
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar9002/ar9285_reset.c#3 integrate
.. //depot/projects/pci/sys/dev/ath/if_ath.c#3 integrate
.. //depot/projects/pci/sys/dev/ath/if_ath_ahb.c#2 integrate
.. //depot/projects/pci/sys/dev/ath/if_ath_sysctl.c#3 integrate
.. //depot/projects/pci/sys/dev/ath/if_athioctl.h#3 integrate
.. //depot/projects/pci/sys/dev/ath/if_athvar.h#3 integrate
.. //depot/projects/pci/sys/dev/bge/if_bge.c#3 integrate
.. //depot/projects/pci/sys/dev/bge/if_bgereg.h#2 integrate
.. //depot/projects/pci/sys/dev/bxe/bxe_debug.h#2 integrate
.. //depot/projects/pci/sys/dev/bxe/bxe_include.h#2 integrate
.. //depot/projects/pci/sys/dev/bxe/if_bxe.c#2 integrate
.. //depot/projects/pci/sys/dev/bxe/if_bxe.h#2 integrate
.. //depot/projects/pci/sys/dev/cas/if_cas.c#2 integrate
.. //depot/projects/pci/sys/dev/cxgbe/adapter.h#3 integrate
.. //depot/projects/pci/sys/dev/cxgbe/common/t4_hw.c#2 integrate
.. //depot/projects/pci/sys/dev/cxgbe/osdep.h#2 integrate
.. //depot/projects/pci/sys/dev/cxgbe/t4_ioctl.h#2 integrate
.. //depot/projects/pci/sys/dev/cxgbe/t4_main.c#3 integrate
.. //depot/projects/pci/sys/dev/cxgbe/t4_sge.c#3 integrate
.. //depot/projects/pci/sys/dev/drm/drm_sysctl.c#2 integrate
.. //depot/projects/pci/sys/dev/e1000/if_igb.c#3 integrate
.. //depot/projects/pci/sys/dev/e1000/if_igb.h#3 integrate
.. //depot/projects/pci/sys/dev/esp/ncr53c9x.c#2 integrate
.. //depot/projects/pci/sys/dev/fdt/fdtbus.c#3 integrate
.. //depot/projects/pci/sys/dev/gem/if_gem.c#2 integrate
.. //depot/projects/pci/sys/dev/hme/if_hme.c#2 integrate
.. //depot/projects/pci/sys/dev/hme/if_hmereg.h#2 integrate
.. //depot/projects/pci/sys/dev/ichwd/ichwd.c#2 integrate
.. //depot/projects/pci/sys/dev/ichwd/ichwd.h#2 integrate
.. //depot/projects/pci/sys/dev/ipmi/ipmi.c#2 integrate
.. //depot/projects/pci/sys/dev/iwn/if_iwn.c#3 integrate
.. //depot/projects/pci/sys/dev/iwn/if_iwnreg.h#2 integrate
.. //depot/projects/pci/sys/dev/iwn/if_iwnvar.h#2 integrate
.. //depot/projects/pci/sys/dev/ixgbe/ixgbe.c#2 integrate
.. //depot/projects/pci/sys/dev/ixgbe/ixgbe.h#2 integrate
.. //depot/projects/pci/sys/dev/md/md.c#2 integrate
.. //depot/projects/pci/sys/dev/mii/brgphyreg.h#2 integrate
.. //depot/projects/pci/sys/dev/mii/ciphyreg.h#2 integrate
.. //depot/projects/pci/sys/dev/mii/e1000phy.c#2 integrate
.. //depot/projects/pci/sys/dev/mii/e1000phyreg.h#2 integrate
.. //depot/projects/pci/sys/dev/mii/mii_physubr.c#2 integrate
.. //depot/projects/pci/sys/dev/mii/miivar.h#2 integrate
.. //depot/projects/pci/sys/dev/mii/rgephyreg.h#2 integrate
.. //depot/projects/pci/sys/dev/mii/xmphyreg.h#2 integrate
.. //depot/projects/pci/sys/dev/mpt/mpt.c#3 integrate
.. //depot/projects/pci/sys/dev/mpt/mpt.h#2 integrate
.. //depot/projects/pci/sys/dev/mpt/mpt_cam.c#3 integrate
.. //depot/projects/pci/sys/dev/mpt/mpt_debug.c#2 integrate
.. //depot/projects/pci/sys/dev/mpt/mpt_pci.c#2 integrate
.. //depot/projects/pci/sys/dev/msk/if_msk.c#3 integrate
.. //depot/projects/pci/sys/dev/mvs/mvs.c#2 integrate
.. //depot/projects/pci/sys/dev/mvs/mvs.h#2 integrate
.. //depot/projects/pci/sys/dev/mwl/if_mwl.c#2 integrate
.. //depot/projects/pci/sys/dev/mxge/if_mxge.c#3 integrate
.. //depot/projects/pci/sys/dev/mxge/mxge_lro.c#2 integrate
.. //depot/projects/pci/sys/dev/pci/pci.c#17 integrate
.. //depot/projects/pci/sys/dev/pci/pci_pci.c#18 integrate
.. //depot/projects/pci/sys/dev/puc/pucdata.c#2 integrate
.. //depot/projects/pci/sys/dev/ral/rt2560.c#2 integrate
.. //depot/projects/pci/sys/dev/ral/rt2661.c#2 integrate
.. //depot/projects/pci/sys/dev/siis/siis.c#2 integrate
.. //depot/projects/pci/sys/dev/siis/siis.h#2 integrate
.. //depot/projects/pci/sys/dev/sound/usb/uaudio.c#2 integrate
.. //depot/projects/pci/sys/dev/sym/README.sym#2 integrate
.. //depot/projects/pci/sys/dev/sym/sym_fw1.h#2 integrate
.. //depot/projects/pci/sys/dev/sym/sym_fw2.h#2 integrate
.. //depot/projects/pci/sys/dev/sym/sym_hipd.c#2 integrate
.. //depot/projects/pci/sys/dev/usb/controller/ehci.c#3 integrate
.. //depot/projects/pci/sys/dev/usb/controller/ehci_ixp4xx.c#3 integrate
.. //depot/projects/pci/sys/dev/usb/controller/ehci_mv.c#3 integrate
.. //depot/projects/pci/sys/dev/usb/controller/ehci_pci.c#3 integrate
.. //depot/projects/pci/sys/dev/usb/net/if_cdcereg.h#2 integrate
.. //depot/projects/pci/sys/dev/usb/net/if_mos.c#2 integrate
.. //depot/projects/pci/sys/dev/usb/storage/umass.c#2 integrate
.. //depot/projects/pci/sys/dev/usb/wlan/if_rum.c#2 integrate
.. //depot/projects/pci/sys/dev/vxge/LICENSE#1 branch
.. //depot/projects/pci/sys/dev/vxge/README#1 branch
.. //depot/projects/pci/sys/dev/vxge/include/build-version.h#1 branch
.. //depot/projects/pci/sys/dev/vxge/include/vxge-debug.h#1 branch
.. //depot/projects/pci/sys/dev/vxge/include/vxge-defs.h#1 branch
.. //depot/projects/pci/sys/dev/vxge/include/vxge-list.h#1 branch
.. //depot/projects/pci/sys/dev/vxge/include/vxge-os-debug.h#1 branch
.. //depot/projects/pci/sys/dev/vxge/include/vxge-os-pal.h#1 branch
.. //depot/projects/pci/sys/dev/vxge/include/vxge-queue.h#1 branch
.. //depot/projects/pci/sys/dev/vxge/include/vxgehal-config.h#1 branch
.. //depot/projects/pci/sys/dev/vxge/include/vxgehal-ll.h#1 branch
.. //depot/projects/pci/sys/dev/vxge/include/vxgehal-mgmt.h#1 branch
.. //depot/projects/pci/sys/dev/vxge/include/vxgehal-mgmtaux.h#1 branch
.. //depot/projects/pci/sys/dev/vxge/include/vxgehal-stats.h#1 branch
.. //depot/projects/pci/sys/dev/vxge/include/vxgehal-status.h#1 branch
.. //depot/projects/pci/sys/dev/vxge/include/vxgehal-types.h#1 branch
.. //depot/projects/pci/sys/dev/vxge/include/vxgehal-version.h#1 branch
.. //depot/projects/pci/sys/dev/vxge/vxge-firmware.h#1 branch
.. //depot/projects/pci/sys/dev/vxge/vxge-osdep.h#1 branch
.. //depot/projects/pci/sys/dev/vxge/vxge.c#1 branch
.. //depot/projects/pci/sys/dev/vxge/vxge.h#1 branch
.. //depot/projects/pci/sys/dev/vxge/vxgehal/vxge-queue.c#1 branch
.. //depot/projects/pci/sys/dev/vxge/vxgehal/vxgehal-blockpool.c#1 branch
.. //depot/projects/pci/sys/dev/vxge/vxgehal/vxgehal-blockpool.h#1 branch
.. //depot/projects/pci/sys/dev/vxge/vxgehal/vxgehal-channel.c#1 branch
.. //depot/projects/pci/sys/dev/vxge/vxgehal/vxgehal-channel.h#1 branch
.. //depot/projects/pci/sys/dev/vxge/vxgehal/vxgehal-common-reg.h#1 branch
.. //depot/projects/pci/sys/dev/vxge/vxgehal/vxgehal-config-priv.h#1 branch
.. //depot/projects/pci/sys/dev/vxge/vxgehal/vxgehal-config.c#1 branch
.. //depot/projects/pci/sys/dev/vxge/vxgehal/vxgehal-debug.h#1 branch
.. //depot/projects/pci/sys/dev/vxge/vxgehal/vxgehal-device.c#1 branch
.. //depot/projects/pci/sys/dev/vxge/vxgehal/vxgehal-device.h#1 branch
.. //depot/projects/pci/sys/dev/vxge/vxgehal/vxgehal-doorbells.c#1 branch
.. //depot/projects/pci/sys/dev/vxge/vxgehal/vxgehal-doorbells.h#1 branch
.. //depot/projects/pci/sys/dev/vxge/vxgehal/vxgehal-driver.c#1 branch
.. //depot/projects/pci/sys/dev/vxge/vxgehal/vxgehal-driver.h#1 branch
.. //depot/projects/pci/sys/dev/vxge/vxgehal/vxgehal-fifo.c#1 branch
.. //depot/projects/pci/sys/dev/vxge/vxgehal/vxgehal-fifo.h#1 branch
.. //depot/projects/pci/sys/dev/vxge/vxgehal/vxgehal-ifmsg.c#1 branch
.. //depot/projects/pci/sys/dev/vxge/vxgehal/vxgehal-ifmsg.h#1 branch
.. //depot/projects/pci/sys/dev/vxge/vxgehal/vxgehal-legacy-reg.h#1 branch
.. //depot/projects/pci/sys/dev/vxge/vxgehal/vxgehal-memrepair-reg.h#1 branch
.. //depot/projects/pci/sys/dev/vxge/vxgehal/vxgehal-mgmt.c#1 branch
.. //depot/projects/pci/sys/dev/vxge/vxgehal/vxgehal-mgmtaux.c#1 branch
.. //depot/projects/pci/sys/dev/vxge/vxgehal/vxgehal-mm.c#1 branch
.. //depot/projects/pci/sys/dev/vxge/vxgehal/vxgehal-mm.h#1 branch
.. //depot/projects/pci/sys/dev/vxge/vxgehal/vxgehal-mrpcim-reg.h#1 branch
.. //depot/projects/pci/sys/dev/vxge/vxgehal/vxgehal-mrpcim.c#1 branch
.. //depot/projects/pci/sys/dev/vxge/vxgehal/vxgehal-mrpcim.h#1 branch
.. //depot/projects/pci/sys/dev/vxge/vxgehal/vxgehal-pcicfgmgmt-reg.h#1 branch
.. //depot/projects/pci/sys/dev/vxge/vxgehal/vxgehal-regdefs.h#1 branch
.. //depot/projects/pci/sys/dev/vxge/vxgehal/vxgehal-regs.h#1 branch
.. //depot/projects/pci/sys/dev/vxge/vxgehal/vxgehal-ring.c#1 branch
.. //depot/projects/pci/sys/dev/vxge/vxgehal/vxgehal-ring.h#1 branch
.. //depot/projects/pci/sys/dev/vxge/vxgehal/vxgehal-srpcim-reg.h#1 branch
.. //depot/projects/pci/sys/dev/vxge/vxgehal/vxgehal-srpcim.c#1 branch
.. //depot/projects/pci/sys/dev/vxge/vxgehal/vxgehal-srpcim.h#1 branch
.. //depot/projects/pci/sys/dev/vxge/vxgehal/vxgehal-swapper.c#1 branch
.. //depot/projects/pci/sys/dev/vxge/vxgehal/vxgehal-swapper.h#1 branch
.. //depot/projects/pci/sys/dev/vxge/vxgehal/vxgehal-toc-reg.h#1 branch
.. //depot/projects/pci/sys/dev/vxge/vxgehal/vxgehal-virtualpath.c#1 branch
.. //depot/projects/pci/sys/dev/vxge/vxgehal/vxgehal-virtualpath.h#1 branch
.. //depot/projects/pci/sys/dev/vxge/vxgehal/vxgehal-vpath-reg.h#1 branch
.. //depot/projects/pci/sys/dev/vxge/vxgehal/vxgehal-vpmgmt-reg.h#1 branch
.. //depot/projects/pci/sys/dev/vxge/vxgehal/vxgehal.h#1 branch
.. //depot/projects/pci/sys/dev/vxge/vxgell-version.h#1 branch
.. //depot/projects/pci/sys/dev/watchdog/watchdog.c#2 integrate
.. //depot/projects/pci/sys/dev/wpi/if_wpi.c#2 integrate
.. //depot/projects/pci/sys/dev/xen/netfront/netfront.c#2 integrate
.. //depot/projects/pci/sys/fs/ext2fs/ext2_alloc.c#2 integrate
.. //depot/projects/pci/sys/fs/ext2fs/ext2_balloc.c#2 integrate
.. //depot/projects/pci/sys/fs/ext2fs/ext2_dinode.h#2 integrate
.. //depot/projects/pci/sys/fs/ext2fs/ext2_dir.h#2 integrate
.. //depot/projects/pci/sys/fs/ext2fs/ext2_extern.h#2 integrate
.. //depot/projects/pci/sys/fs/ext2fs/ext2_inode.c#2 integrate
.. //depot/projects/pci/sys/fs/ext2fs/ext2_lookup.c#2 integrate
.. //depot/projects/pci/sys/fs/ext2fs/ext2_readwrite.c#2 integrate
.. //depot/projects/pci/sys/fs/ext2fs/ext2_vfsops.c#2 integrate
.. //depot/projects/pci/sys/fs/ext2fs/ext2_vnops.c#2 integrate
.. //depot/projects/pci/sys/fs/ext2fs/ext2fs.h#2 integrate
.. //depot/projects/pci/sys/fs/ext2fs/inode.h#2 integrate
.. //depot/projects/pci/sys/fs/fdescfs/fdesc_vfsops.c#2 integrate
.. //depot/projects/pci/sys/fs/fdescfs/fdesc_vnops.c#2 integrate
.. //depot/projects/pci/sys/fs/nfs/nfs.h#2 integrate
.. //depot/projects/pci/sys/fs/nfs/nfs_commonacl.c#2 integrate
.. //depot/projects/pci/sys/fs/nfs/nfs_commonkrpc.c#2 integrate
.. //depot/projects/pci/sys/fs/nfs/nfs_commonport.c#2 integrate
.. //depot/projects/pci/sys/fs/nfs/nfs_commonsubs.c#2 integrate
.. //depot/projects/pci/sys/fs/nfs/nfs_var.h#2 integrate
.. //depot/projects/pci/sys/fs/nfs/nfsport.h#2 integrate
.. //depot/projects/pci/sys/fs/nfsclient/nfs.h#2 integrate
.. //depot/projects/pci/sys/fs/nfsclient/nfs_clbio.c#2 integrate
.. //depot/projects/pci/sys/fs/nfsclient/nfs_clnfsiod.c#2 integrate
.. //depot/projects/pci/sys/fs/nfsclient/nfs_clnode.c#2 integrate
.. //depot/projects/pci/sys/fs/nfsclient/nfs_clport.c#3 integrate
.. //depot/projects/pci/sys/fs/nfsclient/nfs_clrpcops.c#3 integrate
.. //depot/projects/pci/sys/fs/nfsclient/nfs_clstate.c#2 integrate
.. //depot/projects/pci/sys/fs/nfsclient/nfs_clsubs.c#2 integrate
.. //depot/projects/pci/sys/fs/nfsclient/nfs_clvfsops.c#2 integrate
.. //depot/projects/pci/sys/fs/nfsclient/nfs_clvnops.c#2 integrate
.. //depot/projects/pci/sys/fs/nfsclient/nfsargs.h#2 delete
.. //depot/projects/pci/sys/fs/nfsclient/nfsdiskless.h#2 delete
.. //depot/projects/pci/sys/fs/nfsclient/nfsnode.h#2 integrate
.. //depot/projects/pci/sys/fs/nfsserver/nfs_nfsdport.c#2 integrate
.. //depot/projects/pci/sys/fs/nfsserver/nfs_nfsdserv.c#2 integrate
.. //depot/projects/pci/sys/fs/nfsserver/nfs_nfsdstate.c#2 integrate
.. //depot/projects/pci/sys/geom/concat/g_concat.c#2 integrate
.. //depot/projects/pci/sys/geom/eli/g_eli.c#3 integrate
.. //depot/projects/pci/sys/geom/eli/g_eli.h#2 integrate
.. //depot/projects/pci/sys/geom/eli/g_eli_ctl.c#2 integrate
.. //depot/projects/pci/sys/geom/eli/g_eli_integrity.c#2 integrate
.. //depot/projects/pci/sys/geom/eli/g_eli_key.c#2 integrate
.. //depot/projects/pci/sys/geom/eli/g_eli_key_cache.c#1 branch
.. //depot/projects/pci/sys/geom/eli/g_eli_privacy.c#2 integrate
.. //depot/projects/pci/sys/geom/geom.h#3 integrate
.. //depot/projects/pci/sys/geom/geom_dev.c#3 integrate
.. //depot/projects/pci/sys/geom/geom_map.c#1 branch
.. //depot/projects/pci/sys/geom/geom_subr.c#2 integrate
.. //depot/projects/pci/sys/geom/journal/g_journal.c#2 integrate
.. //depot/projects/pci/sys/geom/mirror/g_mirror.c#2 integrate
.. //depot/projects/pci/sys/geom/part/g_part_apm.c#2 integrate
.. //depot/projects/pci/sys/geom/raid/g_raid.c#2 integrate
.. //depot/projects/pci/sys/geom/raid3/g_raid3.c#2 integrate
.. //depot/projects/pci/sys/geom/shsec/g_shsec.c#2 integrate
.. //depot/projects/pci/sys/geom/stripe/g_stripe.c#2 integrate
.. //depot/projects/pci/sys/geom/virstor/g_virstor.c#2 integrate
.. //depot/projects/pci/sys/i386/bios/apm.c#2 integrate
.. //depot/projects/pci/sys/i386/conf/GENERIC#3 integrate
.. //depot/projects/pci/sys/i386/conf/XBOX#2 integrate
.. //depot/projects/pci/sys/i386/i386/genassym.c#2 integrate
.. //depot/projects/pci/sys/i386/i386/identcpu.c#3 integrate
.. //depot/projects/pci/sys/i386/i386/legacy.c#2 integrate
.. //depot/projects/pci/sys/i386/i386/machdep.c#3 integrate
.. //depot/projects/pci/sys/i386/i386/minidump_machdep.c#2 integrate
.. //depot/projects/pci/sys/i386/i386/perfmon.c#2 integrate
.. //depot/projects/pci/sys/i386/i386/pmap.c#2 integrate
.. //depot/projects/pci/sys/i386/i386/trap.c#2 integrate
.. //depot/projects/pci/sys/i386/include/atomic.h#2 integrate
.. //depot/projects/pci/sys/i386/include/clock.h#3 integrate
.. //depot/projects/pci/sys/i386/include/cpu.h#3 integrate
.. //depot/projects/pci/sys/i386/include/cpufunc.h#2 integrate
.. //depot/projects/pci/sys/i386/include/pmap.h#2 integrate
.. //depot/projects/pci/sys/i386/include/specialreg.h#2 integrate
.. //depot/projects/pci/sys/i386/isa/prof_machdep.c#3 integrate
.. //depot/projects/pci/sys/i386/linux/imgact_linux.c#2 integrate
.. //depot/projects/pci/sys/i386/pci/pci_bus.c#4 integrate
.. //depot/projects/pci/sys/ia64/conf/GENERIC#3 integrate
.. //depot/projects/pci/sys/ia64/ia64/dump_machdep.c#2 integrate
.. //depot/projects/pci/sys/ia64/ia64/efi.c#3 integrate
.. //depot/projects/pci/sys/ia64/ia64/exception.S#3 integrate
.. //depot/projects/pci/sys/ia64/ia64/genassym.c#3 integrate
.. //depot/projects/pci/sys/ia64/ia64/locore.S#3 integrate
.. //depot/projects/pci/sys/ia64/ia64/machdep.c#3 integrate
.. //depot/projects/pci/sys/ia64/ia64/mp_locore.S#1 branch
.. //depot/projects/pci/sys/ia64/ia64/mp_machdep.c#2 integrate
.. //depot/projects/pci/sys/ia64/ia64/nexus.c#3 integrate
.. //depot/projects/pci/sys/ia64/ia64/pmap.c#3 integrate
.. //depot/projects/pci/sys/ia64/ia64/sal.c#2 integrate
.. //depot/projects/pci/sys/ia64/include/ia64_cpu.h#2 integrate
.. //depot/projects/pci/sys/ia64/include/pmap.h#3 integrate
.. //depot/projects/pci/sys/ia64/include/smp.h#2 integrate
.. //depot/projects/pci/sys/ia64/include/vmparam.h#3 integrate
.. //depot/projects/pci/sys/kern/bus_if.m#3 integrate
.. //depot/projects/pci/sys/kern/imgact_aout.c#3 integrate
.. //depot/projects/pci/sys/kern/imgact_elf.c#2 integrate
.. //depot/projects/pci/sys/kern/imgact_gzip.c#2 integrate
.. //depot/projects/pci/sys/kern/init_sysent.c#3 integrate
.. //depot/projects/pci/sys/kern/kern_clock.c#2 integrate
.. //depot/projects/pci/sys/kern/kern_descrip.c#3 integrate
.. //depot/projects/pci/sys/kern/kern_exit.c#3 integrate
.. //depot/projects/pci/sys/kern/kern_hhook.c#2 integrate
.. //depot/projects/pci/sys/kern/kern_intr.c#3 integrate
.. //depot/projects/pci/sys/kern/kern_khelp.c#2 integrate
.. //depot/projects/pci/sys/kern/kern_ktrace.c#3 integrate
.. //depot/projects/pci/sys/kern/kern_racct.c#2 integrate
.. //depot/projects/pci/sys/kern/kern_rctl.c#2 integrate
.. //depot/projects/pci/sys/kern/kern_resource.c#3 integrate
.. //depot/projects/pci/sys/kern/kern_shutdown.c#2 integrate
.. //depot/projects/pci/sys/kern/kern_sig.c#3 integrate
.. //depot/projects/pci/sys/kern/kern_timeout.c#2 integrate
.. //depot/projects/pci/sys/kern/link_elf.c#2 integrate
.. //depot/projects/pci/sys/kern/link_elf_obj.c#2 integrate
.. //depot/projects/pci/sys/kern/sched_4bsd.c#3 integrate
.. //depot/projects/pci/sys/kern/subr_bus.c#5 integrate
.. //depot/projects/pci/sys/kern/subr_rman.c#8 integrate
.. //depot/projects/pci/sys/kern/subr_taskqueue.c#2 integrate
.. //depot/projects/pci/sys/kern/syscalls.c#3 integrate
.. //depot/projects/pci/sys/kern/syscalls.master#3 integrate
.. //depot/projects/pci/sys/kern/systrace_args.c#3 integrate
.. //depot/projects/pci/sys/kern/sysv_msg.c#2 integrate
.. //depot/projects/pci/sys/kern/sysv_sem.c#2 integrate
.. //depot/projects/pci/sys/kern/sysv_shm.c#2 integrate
.. //depot/projects/pci/sys/kern/uipc_sockbuf.c#2 integrate
.. //depot/projects/pci/sys/kern/vfs_default.c#2 integrate
.. //depot/projects/pci/sys/kern/vfs_mount.c#3 integrate
.. //depot/projects/pci/sys/kern/vfs_subr.c#3 integrate
.. //depot/projects/pci/sys/kern/vfs_syscalls.c#3 integrate
.. //depot/projects/pci/sys/kern/vnode_if.src#2 integrate
.. //depot/projects/pci/sys/mips/atheros/apb.c#2 integrate
.. //depot/projects/pci/sys/mips/atheros/ar71xx_chip.c#2 integrate
.. //depot/projects/pci/sys/mips/atheros/ar71xx_cpudef.h#2 integrate
.. //depot/projects/pci/sys/mips/atheros/ar71xx_ehci.c#3 integrate
.. //depot/projects/pci/sys/mips/atheros/ar71xx_pci.c#2 integrate
.. //depot/projects/pci/sys/mips/atheros/ar724x_chip.c#3 integrate
.. //depot/projects/pci/sys/mips/atheros/ar724x_pci.c#1 branch
.. //depot/projects/pci/sys/mips/atheros/ar724xreg.h#3 integrate
.. //depot/projects/pci/sys/mips/atheros/ar91xx_chip.c#3 integrate
.. //depot/projects/pci/sys/mips/atheros/files.ar71xx#2 integrate
.. //depot/projects/pci/sys/mips/atheros/if_arge.c#3 integrate
.. //depot/projects/pci/sys/mips/atheros/if_argevar.h#3 integrate
.. //depot/projects/pci/sys/mips/conf/AR71XX#3 integrate
.. //depot/projects/pci/sys/mips/conf/AR91XX_BASE#2 integrate
.. //depot/projects/pci/sys/mips/conf/MALTA#2 integrate
.. //depot/projects/pci/sys/mips/conf/MALTA64#2 integrate
.. //depot/projects/pci/sys/mips/conf/OCTEON1#3 integrate
.. //depot/projects/pci/sys/mips/conf/PB92#1 branch
.. //depot/projects/pci/sys/mips/conf/PB92.hints#1 branch
.. //depot/projects/pci/sys/mips/conf/std.SWARM#2 integrate
.. //depot/projects/pci/sys/mips/malta/std.malta#2 integrate
.. //depot/projects/pci/sys/mips/mips/dump_machdep.c#2 integrate
.. //depot/projects/pci/sys/mips/mips/mainbus.c#3 integrate
.. //depot/projects/pci/sys/mips/mips/nexus.c#3 integrate
.. //depot/projects/pci/sys/mips/rmi/xlr_pci.c#3 integrate
.. //depot/projects/pci/sys/mips/rmi/xls_ehci.c#3 integrate
.. //depot/projects/pci/sys/modules/Makefile#3 integrate
.. //depot/projects/pci/sys/modules/acpi/acpi/Makefile#2 integrate
.. //depot/projects/pci/sys/modules/arcnet/Makefile#2 integrate
.. //depot/projects/pci/sys/modules/ath/Makefile#3 integrate
.. //depot/projects/pci/sys/modules/bxe/Makefile#2 integrate
.. //depot/projects/pci/sys/modules/cam/Makefile#2 integrate
.. //depot/projects/pci/sys/modules/dtrace/dtraceall/Makefile#3 integrate
.. //depot/projects/pci/sys/modules/dtrace/systrace_linux32/Makefile#2 integrate
.. //depot/projects/pci/sys/modules/ext2fs/Makefile#2 integrate
.. //depot/projects/pci/sys/modules/firewire/fwip/Makefile#2 integrate
.. //depot/projects/pci/sys/modules/geom/geom_eli/Makefile#2 integrate
.. //depot/projects/pci/sys/modules/if_carp/Makefile#2 integrate
.. //depot/projects/pci/sys/modules/iwnfw/Makefile#2 integrate
.. //depot/projects/pci/sys/modules/iwnfw/iwn1000/Makefile#2 integrate
.. //depot/projects/pci/sys/modules/iwnfw/iwn5000/Makefile#2 integrate
.. //depot/projects/pci/sys/modules/iwnfw/iwn6000g2a/Makefile#1 branch
.. //depot/projects/pci/sys/modules/iwnfw/iwn6000g2b/Makefile#1 branch
.. //depot/projects/pci/sys/modules/iwnfw/iwn6050/Makefile#2 integrate
.. //depot/projects/pci/sys/modules/netgraph/atm/ccatm/Makefile#2 integrate
.. //depot/projects/pci/sys/modules/nfscl/Makefile#2 integrate
.. //depot/projects/pci/sys/modules/nfsclient/Makefile#2 integrate
.. //depot/projects/pci/sys/modules/vxge/Makefile#1 branch
.. //depot/projects/pci/sys/net/if_enc.c#2 integrate
.. //depot/projects/pci/sys/net/if_lagg.c#3 integrate
.. //depot/projects/pci/sys/net80211/_ieee80211.h#3 integrate
.. //depot/projects/pci/sys/net80211/ieee80211_alq.c#1 branch
.. //depot/projects/pci/sys/net80211/ieee80211_alq.h#1 branch
.. //depot/projects/pci/sys/net80211/ieee80211_input.c#2 integrate
.. //depot/projects/pci/sys/net80211/ieee80211_node.c#3 integrate
.. //depot/projects/pci/sys/net80211/ieee80211_node.h#2 integrate
.. //depot/projects/pci/sys/net80211/ieee80211_output.c#3 integrate
.. //depot/projects/pci/sys/net80211/ieee80211_proto.h#2 integrate
.. //depot/projects/pci/sys/netgraph/atm/ccatm/ng_ccatm.c#2 integrate
.. //depot/projects/pci/sys/netgraph/atm/sscfu/ng_sscfu.c#2 integrate
.. //depot/projects/pci/sys/netgraph/atm/sscop/ng_sscop.c#2 integrate
.. //depot/projects/pci/sys/netgraph/atm/uni/ng_uni.c#2 integrate
.. //depot/projects/pci/sys/netgraph/bluetooth/hci/ng_hci_main.c#2 integrate
.. //depot/projects/pci/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c#2 integrate
.. //depot/projects/pci/sys/netgraph/netflow/netflow.c#2 integrate
.. //depot/projects/pci/sys/netgraph/netflow/ng_netflow.c#2 integrate
.. //depot/projects/pci/sys/netgraph/netflow/ng_netflow.h#2 integrate
.. //depot/projects/pci/sys/netgraph/ng_UI.c#2 integrate
.. //depot/projects/pci/sys/netgraph/ng_async.c#2 integrate
.. //depot/projects/pci/sys/netgraph/ng_atmllc.c#2 integrate
.. //depot/projects/pci/sys/netgraph/ng_base.c#3 integrate
.. //depot/projects/pci/sys/netgraph/ng_bridge.c#2 integrate
.. //depot/projects/pci/sys/netgraph/ng_car.c#2 integrate
.. //depot/projects/pci/sys/netgraph/ng_cisco.c#2 integrate
.. //depot/projects/pci/sys/netgraph/ng_device.c#2 integrate
.. //depot/projects/pci/sys/netgraph/ng_eiface.c#2 integrate
.. //depot/projects/pci/sys/netgraph/ng_etf.c#2 integrate
.. //depot/projects/pci/sys/netgraph/ng_fec.c#2 integrate
.. //depot/projects/pci/sys/netgraph/ng_frame_relay.c#2 integrate
.. //depot/projects/pci/sys/netgraph/ng_gif_demux.c#2 integrate
.. //depot/projects/pci/sys/netgraph/ng_hub.c#2 integrate
.. //depot/projects/pci/sys/netgraph/ng_iface.c#3 integrate
.. //depot/projects/pci/sys/netgraph/ng_ksocket.c#2 integrate
.. //depot/projects/pci/sys/netgraph/ng_l2tp.c#2 integrate
.. //depot/projects/pci/sys/netgraph/ng_lmi.c#2 integrate
.. //depot/projects/pci/sys/netgraph/ng_mppc.c#2 integrate
.. //depot/projects/pci/sys/netgraph/ng_nat.c#2 integrate
.. //depot/projects/pci/sys/netgraph/ng_one2many.c#2 integrate
.. //depot/projects/pci/sys/netgraph/ng_patch.c#2 integrate
.. //depot/projects/pci/sys/netgraph/ng_pipe.c#2 integrate
.. //depot/projects/pci/sys/netgraph/ng_ppp.c#2 integrate
.. //depot/projects/pci/sys/netgraph/ng_pppoe.c#2 integrate
.. //depot/projects/pci/sys/netgraph/ng_pptpgre.c#2 integrate
.. //depot/projects/pci/sys/netgraph/ng_rfc1490.c#2 integrate
.. //depot/projects/pci/sys/netgraph/ng_sample.c#2 integrate
.. //depot/projects/pci/sys/netgraph/ng_source.c#2 integrate
.. //depot/projects/pci/sys/netgraph/ng_split.c#2 integrate
.. //depot/projects/pci/sys/netgraph/ng_sppp.c#2 integrate
.. //depot/projects/pci/sys/netgraph/ng_tee.c#2 integrate
.. //depot/projects/pci/sys/netgraph/ng_tty.c#2 integrate
.. //depot/projects/pci/sys/netgraph/ng_vjc.c#2 integrate
.. //depot/projects/pci/sys/netgraph/ng_vlan.c#2 integrate
.. //depot/projects/pci/sys/netinet/cc.h#2 integrate
.. //depot/projects/pci/sys/netinet/cc/cc.c#2 integrate
.. //depot/projects/pci/sys/netinet/cc/cc_chd.c#2 integrate
.. //depot/projects/pci/sys/netinet/cc/cc_cubic.c#2 integrate
.. //depot/projects/pci/sys/netinet/cc/cc_cubic.h#2 integrate
.. //depot/projects/pci/sys/netinet/cc/cc_hd.c#2 integrate
.. //depot/projects/pci/sys/netinet/cc/cc_htcp.c#2 integrate
.. //depot/projects/pci/sys/netinet/cc/cc_module.h#2 integrate
.. //depot/projects/pci/sys/netinet/cc/cc_newreno.c#2 integrate
.. //depot/projects/pci/sys/netinet/cc/cc_vegas.c#2 integrate
.. //depot/projects/pci/sys/netinet/in_pcb.c#3 integrate
.. //depot/projects/pci/sys/netinet/in_pcb.h#3 integrate
.. //depot/projects/pci/sys/netinet/in_proto.c#2 integrate
.. //depot/projects/pci/sys/netinet/ip_carp.c#2 integrate
.. //depot/projects/pci/sys/netinet/ip_fw.h#2 integrate
.. //depot/projects/pci/sys/netinet/ip_icmp.c#2 integrate
.. //depot/projects/pci/sys/netinet/ip_input.c#2 integrate
.. //depot/projects/pci/sys/netinet/ip_output.c#2 integrate
.. //depot/projects/pci/sys/netinet/ip_var.h#2 integrate
.. //depot/projects/pci/sys/netinet/ipfw/ip_dn_io.c#2 integrate
.. //depot/projects/pci/sys/netinet/ipfw/ip_dummynet.c#3 integrate
.. //depot/projects/pci/sys/netinet/ipfw/ip_fw2.c#3 integrate
.. //depot/projects/pci/sys/netinet/ipfw/ip_fw_nat.c#2 integrate
.. //depot/projects/pci/sys/netinet/ipfw/ip_fw_private.h#2 integrate
.. //depot/projects/pci/sys/netinet/khelp/h_ertt.c#2 integrate
.. //depot/projects/pci/sys/netinet/khelp/h_ertt.h#2 integrate
.. //depot/projects/pci/sys/netinet/libalias/alias_db.c#2 integrate
.. //depot/projects/pci/sys/netinet/raw_ip.c#2 integrate
.. //depot/projects/pci/sys/netinet/sctp_asconf.c#2 integrate
.. //depot/projects/pci/sys/netinet/sctp_bsd_addr.c#2 integrate
.. //depot/projects/pci/sys/netinet/sctp_input.c#3 integrate
.. //depot/projects/pci/sys/netinet/sctp_os_bsd.h#2 integrate
.. //depot/projects/pci/sys/netinet/sctp_output.c#3 integrate
.. //depot/projects/pci/sys/netinet/sctp_pcb.c#3 integrate
.. //depot/projects/pci/sys/netinet/sctp_sysctl.c#3 integrate
.. //depot/projects/pci/sys/netinet/sctp_usrreq.c#2 integrate
.. //depot/projects/pci/sys/netinet/sctp_var.h#2 integrate
.. //depot/projects/pci/sys/netinet/sctputil.c#3 integrate
.. //depot/projects/pci/sys/netinet/siftr.c#2 integrate
.. //depot/projects/pci/sys/netinet/tcp_input.c#3 integrate
.. //depot/projects/pci/sys/netinet/tcp_lro.c#2 integrate
.. //depot/projects/pci/sys/netinet/tcp_output.c#2 integrate
.. //depot/projects/pci/sys/netinet/tcp_subr.c#2 integrate
.. //depot/projects/pci/sys/netinet/tcp_syncache.c#2 integrate
.. //depot/projects/pci/sys/netinet/tcp_timer.c#2 integrate
.. //depot/projects/pci/sys/netinet/tcp_timewait.c#2 integrate
.. //depot/projects/pci/sys/netinet/tcp_usrreq.c#2 integrate
.. //depot/projects/pci/sys/netinet/tcp_var.h#2 integrate
.. //depot/projects/pci/sys/netinet/udp_usrreq.c#2 integrate
.. //depot/projects/pci/sys/netinet6/in6.h#2 integrate
.. //depot/projects/pci/sys/netinet6/in6_pcb.c#3 integrate
.. //depot/projects/pci/sys/netinet6/in6_proto.c#2 integrate
.. //depot/projects/pci/sys/netinet6/ip6_ipsec.c#2 integrate
.. //depot/projects/pci/sys/netinet6/nd6_nbr.c#3 integrate
.. //depot/projects/pci/sys/netinet6/sctp6_usrreq.c#2 integrate
.. //depot/projects/pci/sys/netinet6/udp6_usrreq.c#3 integrate
.. //depot/projects/pci/sys/netipsec/ipsec_input.c#2 integrate
.. //depot/projects/pci/sys/netipsec/ipsec_output.c#3 integrate
.. //depot/projects/pci/sys/netipsec/key.c#3 integrate
.. //depot/projects/pci/sys/netipsec/xform_ah.c#3 integrate
.. //depot/projects/pci/sys/netipsec/xform_esp.c#3 integrate
.. //depot/projects/pci/sys/netipsec/xform_ipcomp.c#3 integrate
.. //depot/projects/pci/sys/netipsec/xform_ipip.c#2 integrate
.. //depot/projects/pci/sys/nfs/bootp_subr.c#1 branch
.. //depot/projects/pci/sys/nfs/krpc.h#1 branch
.. //depot/projects/pci/sys/nfs/krpc_subr.c#1 branch
.. //depot/projects/pci/sys/nfs/nfs_diskless.c#1 branch
.. //depot/projects/pci/sys/nfs/nfsdiskless.h#1 branch
.. //depot/projects/pci/sys/nfs/nfssvc.h#2 integrate
.. //depot/projects/pci/sys/nfsclient/bootp_subr.c#2 delete
.. //depot/projects/pci/sys/nfsclient/krpc.h#2 delete
.. //depot/projects/pci/sys/nfsclient/krpc_subr.c#2 delete
.. //depot/projects/pci/sys/nfsclient/nfs_diskless.c#2 delete
.. //depot/projects/pci/sys/nfsclient/nfs_subs.c#2 integrate
.. //depot/projects/pci/sys/nfsclient/nfs_vfsops.c#2 integrate
.. //depot/projects/pci/sys/nfsclient/nfsargs.h#2 integrate
.. //depot/projects/pci/sys/nfsclient/nfsdiskless.h#2 delete
.. //depot/projects/pci/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c#2 integrate
.. //depot/projects/pci/sys/ofed/include/linux/file.h#2 integrate
.. //depot/projects/pci/sys/ofed/include/linux/workqueue.h#2 integrate
.. //depot/projects/pci/sys/pc98/conf/GENERIC#3 integrate
.. //depot/projects/pci/sys/pc98/pc98/machdep.c#3 integrate
.. //depot/projects/pci/sys/powerpc/aim/machdep.c#3 integrate
.. //depot/projects/pci/sys/powerpc/aim/mmu_oea.c#2 integrate
.. //depot/projects/pci/sys/powerpc/aim/mmu_oea64.c#2 integrate
.. //depot/projects/pci/sys/powerpc/conf/GENERIC#2 integrate
.. //depot/projects/pci/sys/powerpc/conf/GENERIC64#2 integrate
.. //depot/projects/pci/sys/powerpc/conf/MPC85XX#2 integrate
.. //depot/projects/pci/sys/powerpc/powerpc/dump_machdep.c#2 integrate
.. //depot/projects/pci/sys/powerpc/powerpc/exec_machdep.c#2 integrate
.. //depot/projects/pci/sys/powerpc/powerpc/mp_machdep.c#2 integrate
.. //depot/projects/pci/sys/rpc/clnt.h#2 integrate
.. //depot/projects/pci/sys/rpc/clnt_dg.c#2 integrate
.. //depot/projects/pci/sys/rpc/clnt_rc.c#2 integrate
.. //depot/projects/pci/sys/rpc/clnt_vc.c#2 integrate
.. //depot/projects/pci/sys/rpc/rpcb_clnt.c#2 integrate
.. //depot/projects/pci/sys/sparc64/conf/GENERIC#3 integrate
.. //depot/projects/pci/sys/sparc64/include/cpufunc.h#2 integrate
.. //depot/projects/pci/sys/sparc64/sbus/lsi64854.c#3 integrate
.. //depot/projects/pci/sys/sparc64/sbus/ofw_sbus.h#3 integrate
.. //depot/projects/pci/sys/sparc64/sparc64/exception.S#2 integrate
.. //depot/projects/pci/sys/sparc64/sparc64/iommu.c#3 integrate
.. //depot/projects/pci/sys/sparc64/sparc64/machdep.c#3 integrate
.. //depot/projects/pci/sys/sparc64/sparc64/pmap.c#3 integrate
.. //depot/projects/pci/sys/sun4v/conf/GENERIC#3 integrate
.. //depot/projects/pci/sys/sun4v/include/cddl/mdesc_impl.h#2 integrate
.. //depot/projects/pci/sys/sun4v/include/cpufunc.h#2 integrate
.. //depot/projects/pci/sys/sun4v/sun4v/tte_hash.c#2 integrate
.. //depot/projects/pci/sys/sys/_callout.h#1 branch
.. //depot/projects/pci/sys/sys/acl.h#3 integrate
.. //depot/projects/pci/sys/sys/ata.h#2 integrate
.. //depot/projects/pci/sys/sys/bus.h#4 integrate
.. //depot/projects/pci/sys/sys/callout.h#2 integrate
.. //depot/projects/pci/sys/sys/eventhandler.h#3 integrate
.. //depot/projects/pci/sys/sys/fcntl.h#3 integrate
.. //depot/projects/pci/sys/sys/hhook.h#2 integrate
.. //depot/projects/pci/sys/sys/khelp.h#2 integrate
.. //depot/projects/pci/sys/sys/module_khelp.h#2 integrate
.. //depot/projects/pci/sys/sys/msg.h#2 integrate
.. //depot/projects/pci/sys/sys/param.h#3 integrate
.. //depot/projects/pci/sys/sys/priv.h#3 integrate
.. //depot/projects/pci/sys/sys/proc.h#3 integrate
.. //depot/projects/pci/sys/sys/rctl.h#2 integrate
.. //depot/projects/pci/sys/sys/rman.h#6 integrate
.. //depot/projects/pci/sys/sys/sem.h#2 integrate
.. //depot/projects/pci/sys/sys/shm.h#2 integrate
.. //depot/projects/pci/sys/sys/socket.h#2 integrate
.. //depot/projects/pci/sys/sys/syscall.h#3 integrate
.. //depot/projects/pci/sys/sys/syscall.mk#3 integrate
.. //depot/projects/pci/sys/sys/sysproto.h#3 integrate
.. //depot/projects/pci/sys/sys/systm.h#3 integrate
.. //depot/projects/pci/sys/sys/taskqueue.h#2 integrate
.. //depot/projects/pci/sys/sys/vnode.h#2 integrate
.. //depot/projects/pci/sys/sys/watchdog.h#2 integrate
.. //depot/projects/pci/sys/ufs/ffs/ffs_alloc.c#3 integrate
.. //depot/projects/pci/sys/ufs/ffs/ffs_extern.h#3 integrate
.. //depot/projects/pci/sys/ufs/ffs/ffs_softdep.c#3 integrate
.. //depot/projects/pci/sys/ufs/ffs/ffs_vnops.c#2 integrate
.. //depot/projects/pci/sys/ufs/ffs/softdep.h#2 integrate
.. //depot/projects/pci/sys/ufs/ufs/ufs_extern.h#2 integrate
.. //depot/projects/pci/sys/ufs/ufs/ufs_inode.c#2 integrate
.. //depot/projects/pci/sys/vm/swap_pager.c#2 integrate
.. //depot/projects/pci/sys/vm/vm_glue.c#2 integrate
.. //depot/projects/pci/sys/vm/vm_map.c#3 integrate
.. //depot/projects/pci/sys/vm/vm_mmap.c#2 integrate
.. //depot/projects/pci/sys/vm/vm_object.c#2 integrate
.. //depot/projects/pci/sys/vm/vm_pageout.c#3 integrate
.. //depot/projects/pci/sys/vm/vm_unix.c#2 integrate
.. //depot/projects/pci/sys/x86/cpufreq/est.c#2 integrate
.. //depot/projects/pci/sys/x86/cpufreq/powernow.c#2 integrate
.. //depot/projects/pci/sys/x86/isa/clock.c#3 integrate
.. //depot/projects/pci/sys/x86/x86/dump_machdep.c#2 integrate
.. //depot/projects/pci/sys/x86/x86/mptable_pci.c#4 integrate
.. //depot/projects/pci/sys/x86/x86/nexus.c#7 integrate
.. //depot/projects/pci/sys/x86/x86/tsc.c#3 integrate

Differences ...

==== //depot/projects/pci/sys/amd64/amd64/exception.S#2 (text+ko) ====

@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.151 2010/12/22 19:57:03 jkim Exp $
+ * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.155 2011/04/08 21:26:50 kib Exp $
  */
 
 #include "opt_atpic.h"
@@ -339,6 +339,9 @@
  * and the new privilige level.  We are still running on the old user stack
  * pointer.  We have to juggle a few things around to find our stack etc.
  * swapgs gives us access to our PCPU space only.
+ *
+ * We do not support invoking this from a custom %cs or %ss (e.g. using
+ * entries from an LDT).
  */
 IDTVEC(fast_syscall)
 	swapgs
@@ -379,7 +382,38 @@
 	FAKE_MCOUNT(TF_RIP(%rsp))
 	movq	%rsp,%rdi
 	call	syscall
-	movq	PCPU(CURPCB),%rax
+1:	movq	PCPU(CURPCB),%rax
+	/* Disable interrupts before testing PCB_FULL_IRET. */
+	cli
+	testl	$PCB_FULL_IRET,PCB_FLAGS(%rax)
+	jnz	3f
+	/* Check for and handle AST's on return to userland. */
+	movq	PCPU(CURTHREAD),%rax
+	testl	$TDF_ASTPENDING | TDF_NEEDRESCHED,TD_FLAGS(%rax)
+	je	2f
+	sti
+	movq	%rsp, %rdi
+	call	ast
+	jmp	1b
+2:	/* Restore preserved registers. */
+	MEXITCOUNT
+	movq	TF_RDI(%rsp),%rdi	/* bonus; preserve arg 1 */
+	movq	TF_RSI(%rsp),%rsi	/* bonus: preserve arg 2 */
+	movq	TF_RDX(%rsp),%rdx	/* return value 2 */
+	movq	TF_RAX(%rsp),%rax	/* return value 1 */
+	movq	TF_RBX(%rsp),%rbx	/* C preserved */
+	movq	TF_RBP(%rsp),%rbp	/* C preserved */
+	movq	TF_R12(%rsp),%r12	/* C preserved */
+	movq	TF_R13(%rsp),%r13	/* C preserved */
+	movq	TF_R14(%rsp),%r14	/* C preserved */
+	movq	TF_R15(%rsp),%r15	/* C preserved */
+	movq	TF_RFLAGS(%rsp),%r11	/* original %rflags */
+	movq	TF_RIP(%rsp),%rcx	/* original %rip */
+	movq	TF_RSP(%rsp),%r9	/* user stack pointer */
+	movq	%r9,%rsp		/* original %rsp */
+	swapgs
+	sysretq
+3:	/* Requested full context restore, use doreti for that. */
 	MEXITCOUNT
 	jmp	doreti
 
@@ -628,7 +662,7 @@
 doreti_ast:
 	/*
 	 * Check for ASTs atomically with returning.  Disabling CPU
-	 * interrupts provides sufficient locking eve in the SMP case,
+	 * interrupts provides sufficient locking even in the SMP case,
 	 * since we will be informed of any new ASTs by an IPI.
 	 */
 	cli
@@ -649,8 +683,7 @@
 	 */
 doreti_exit:
 	MEXITCOUNT
-	movq	PCPU(CURTHREAD),%r8
-	movq	TD_PCB(%r8),%r8
+	movq	PCPU(CURPCB),%r8
 
 	/*
 	 * Do not reload segment registers for kernel.

==== //depot/projects/pci/sys/amd64/amd64/genassym.c#2 (text+ko) ====

@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.184 2010/12/22 00:18:42 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.185 2011/04/25 22:22:51 rmacklem Exp $");
 
 #include "opt_compat.h"
 #include "opt_hwpmc_hooks.h"
@@ -65,7 +65,7 @@
 #include <netinet/in.h>
 #include <nfs/nfsproto.h>
 #include <nfsclient/nfs.h>
-#include <nfsclient/nfsdiskless.h>
+#include <nfs/nfsdiskless.h>
 #include <x86/apicreg.h>
 #include <machine/cpu.h>
 #include <machine/pcb.h>

==== //depot/projects/pci/sys/amd64/amd64/identcpu.c#3 (text+ko) ====

@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.188 2011/03/26 02:02:07 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.190 2011/04/28 22:23:39 jkim Exp $");
 
 #include "opt_cpu.h"
 
@@ -296,7 +296,7 @@
 				"\035<b28>"
 				"\036<b29>"
 				"\037<b30>"
-				"\040<b31>"
+				"\040HV"	/* Hypervisor */
 				);
 			}
 
@@ -396,8 +396,11 @@
 			 * If this CPU supports P-state invariant TSC then
 			 * mention the capability.
 			 */
-			if (tsc_is_invariant)
+			if (tsc_is_invariant) {
 				printf("\n  TSC: P-state invariant");
+				if (tsc_perf_stat)
+					printf(", performance statistics");
+			}
 
 		}
 	}

==== //depot/projects/pci/sys/amd64/amd64/legacy.c#2 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/legacy.c,v 1.66 2010/12/14 20:07:51 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/legacy.c,v 1.67 2011/04/07 23:28:28 jkim Exp $");
 
 /*
  * This code implements a system driver for legacy systems that do not
@@ -321,7 +321,8 @@
 		break;
 	case CPU_IVAR_NOMINAL_MHZ:
 		if (tsc_is_invariant) {
-			*result = (uintptr_t)(tsc_freq / 1000000);
+			*result = (uintptr_t)(atomic_load_acq_64(&tsc_freq) /
+			    1000000);
 			break;
 		}
 		/* FALLTHROUGH */

==== //depot/projects/pci/sys/amd64/amd64/machdep.c#3 (text+ko) ====

@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.746 2011/03/28 06:35:17 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.749 2011/04/12 23:49:07 jkim Exp $");
 
 #include "opt_atalk.h"
 #include "opt_atpic.h"
@@ -545,22 +545,20 @@
 int
 cpu_est_clockrate(int cpu_id, uint64_t *rate)
 {
+	uint64_t tsc1, tsc2;
+	uint64_t acnt, mcnt, perf;
 	register_t reg;
-	uint64_t tsc1, tsc2;
 
 	if (pcpu_find(cpu_id) == NULL || rate == NULL)
 		return (EINVAL);
 
-	/* If TSC is P-state invariant, DELAY(9) based logic fails. */
-	if (tsc_is_invariant && tsc_freq != 0)
+	/*
+	 * If TSC is P-state invariant and APERF/MPERF MSRs do not exist,
+	 * DELAY(9) based logic fails.
+	 */
+	if (tsc_is_invariant && !tsc_perf_stat)
 		return (EOPNOTSUPP);
 
-	/* If we're booting, trust the rate calibrated moments ago. */
-	if (cold && tsc_freq != 0) {
-		*rate = tsc_freq;
-		return (0);
-	}
-
 #ifdef SMP
 	if (smp_cpus > 1) {
 		/* Schedule ourselves on the indicated cpu. */
@@ -572,10 +570,24 @@
 
 	/* Calibrate by measuring a short delay. */
 	reg = intr_disable();
-	tsc1 = rdtsc();
-	DELAY(1000);
-	tsc2 = rdtsc();
-	intr_restore(reg);
+	if (tsc_is_invariant) {
+		wrmsr(MSR_MPERF, 0);
+		wrmsr(MSR_APERF, 0);
+		tsc1 = rdtsc();
+		DELAY(1000);
+		mcnt = rdmsr(MSR_MPERF);
+		acnt = rdmsr(MSR_APERF);
+		tsc2 = rdtsc();
+		intr_restore(reg);
+		perf = 1000 * acnt / mcnt;
+		*rate = (tsc2 - tsc1) * perf;
+	} else {
+		tsc1 = rdtsc();
+		DELAY(1000);
+		tsc2 = rdtsc();
+		intr_restore(reg);
+		*rate = (tsc2 - tsc1) * 1000;
+	}
 
 #ifdef SMP
 	if (smp_cpus > 1) {
@@ -585,17 +597,6 @@
 	}
 #endif
 
-	tsc2 -= tsc1;
-	if (tsc_freq != 0) {
-		*rate = tsc2 * 1000;
-		return (0);
-	}
-
-	/*
-	 * Subtract 0.5% of the total.  Empirical testing has shown that
-	 * overhead in DELAY() works out to approximately this value.
-	 */
-	*rate = tsc2 * 1000 - tsc2 * 5;
 	return (0);
 }
 

==== //depot/projects/pci/sys/amd64/amd64/minidump_machdep.c#3 (text) ====

@@ -25,7 +25,9 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.12 2011/03/26 06:21:05 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.14 2011/04/28 16:02:05 attilio Exp $");

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



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