Date: Thu, 2 Sep 2010 03:32:25 GMT From: Andrew Thompson <thompsa@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 183214 for review Message-ID: <201009020332.o823WPmH011509@skunkworks.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@183214?ac=10 Change 183214 by thompsa@thompsa_pea on 2010/09/02 03:31:53 IFC Affected files ... .. //depot/projects/usb/src/lib/libusb/libusb20.3#11 integrate .. //depot/projects/usb/src/sys/amd64/acpica/acpi_wakeup.c#9 integrate .. //depot/projects/usb/src/sys/amd64/amd64/cpu_switch.S#15 integrate .. //depot/projects/usb/src/sys/amd64/amd64/exception.S#17 integrate .. //depot/projects/usb/src/sys/amd64/amd64/machdep.c#33 integrate .. //depot/projects/usb/src/sys/amd64/amd64/mp_machdep.c#28 integrate .. //depot/projects/usb/src/sys/amd64/amd64/pmap.c#41 integrate .. //depot/projects/usb/src/sys/amd64/amd64/trap.c#26 integrate .. //depot/projects/usb/src/sys/amd64/amd64/vm_machdep.c#19 integrate .. //depot/projects/usb/src/sys/amd64/ia32/ia32_syscall.c#8 integrate .. //depot/projects/usb/src/sys/amd64/include/elf.h#7 integrate .. //depot/projects/usb/src/sys/amd64/include/segments.h#6 integrate .. //depot/projects/usb/src/sys/amd64/include/trap.h#2 integrate .. //depot/projects/usb/src/sys/arm/include/elf.h#7 integrate .. //depot/projects/usb/src/sys/arm/include/pmap.h#13 integrate .. //depot/projects/usb/src/sys/boot/Makefile#13 integrate .. //depot/projects/usb/src/sys/boot/Makefile.amd64#1 branch .. //depot/projects/usb/src/sys/boot/Makefile.arm#1 branch .. //depot/projects/usb/src/sys/boot/Makefile.i386#1 branch .. //depot/projects/usb/src/sys/boot/Makefile.ia64#1 branch .. //depot/projects/usb/src/sys/boot/Makefile.pc98#1 branch .. //depot/projects/usb/src/sys/boot/Makefile.powerpc#1 branch .. //depot/projects/usb/src/sys/boot/Makefile.sparc64#1 branch .. //depot/projects/usb/src/sys/boot/arm/ixp425/boot2/Makefile#2 integrate .. //depot/projects/usb/src/sys/boot/arm/uboot/Makefile#5 integrate .. //depot/projects/usb/src/sys/boot/common/Makefile.inc#7 integrate .. //depot/projects/usb/src/sys/boot/common/ufsread.c#5 integrate .. //depot/projects/usb/src/sys/boot/efi/libefi/Makefile#4 integrate .. //depot/projects/usb/src/sys/boot/ficl/Makefile#6 integrate .. //depot/projects/usb/src/sys/boot/i386/Makefile.inc#4 integrate .. //depot/projects/usb/src/sys/boot/i386/boot2/Makefile#4 integrate .. //depot/projects/usb/src/sys/boot/i386/efi/Makefile#2 integrate .. //depot/projects/usb/src/sys/boot/i386/gptboot/Makefile#2 integrate .. //depot/projects/usb/src/sys/boot/i386/gptzfsboot/Makefile#3 integrate .. //depot/projects/usb/src/sys/boot/i386/libfirewire/Makefile#2 integrate .. //depot/projects/usb/src/sys/boot/i386/libi386/Makefile#7 integrate .. //depot/projects/usb/src/sys/boot/i386/libi386/pxe.c#4 integrate .. //depot/projects/usb/src/sys/boot/i386/loader/Makefile#10 integrate .. //depot/projects/usb/src/sys/boot/i386/zfsboot/Makefile#3 integrate .. //depot/projects/usb/src/sys/boot/i386/zfsloader/Makefile#2 integrate .. //depot/projects/usb/src/sys/boot/ia64/common/Makefile#4 integrate .. //depot/projects/usb/src/sys/boot/ia64/efi/Makefile#5 integrate .. //depot/projects/usb/src/sys/boot/ia64/ski/Makefile#5 integrate .. //depot/projects/usb/src/sys/boot/ofw/libofw/Makefile#6 integrate .. //depot/projects/usb/src/sys/boot/pc98/boot2/Makefile#5 integrate .. //depot/projects/usb/src/sys/boot/pc98/boot2/boot2.c#2 integrate .. //depot/projects/usb/src/sys/boot/uboot/lib/Makefile#4 integrate .. //depot/projects/usb/src/sys/boot/zfs/Makefile#4 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_da.c#21 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#5 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#8 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/misc.h#4 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/policy.h#6 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/Makefile.files#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#8 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#13 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#4 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/rrwlock.c#2 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#6 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c#4 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#4 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#5 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#6 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#8 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#6 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#5 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#4 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#10 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#11 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#14 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#21 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#14 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#8 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h#2 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h#2 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/fasttrap.h#2 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/fasttrap_impl.h#2 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#6 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h#6 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c#2 integrate .. //depot/projects/usb/src/sys/cddl/dev/dtrace/amd64/dtrace_isa.c#3 integrate .. //depot/projects/usb/src/sys/cddl/dev/dtrace/amd64/instr_size.c#2 integrate .. //depot/projects/usb/src/sys/cddl/dev/dtrace/amd64/regset.h#1 branch .. //depot/projects/usb/src/sys/cddl/dev/dtrace/dtrace_cddl.h#2 integrate .. //depot/projects/usb/src/sys/cddl/dev/dtrace/dtrace_ioctl.c#3 integrate .. //depot/projects/usb/src/sys/cddl/dev/dtrace/dtrace_load.c#4 integrate .. //depot/projects/usb/src/sys/cddl/dev/dtrace/dtrace_unload.c#3 integrate .. //depot/projects/usb/src/sys/cddl/dev/dtrace/i386/dtrace_isa.c#2 integrate .. //depot/projects/usb/src/sys/cddl/dev/dtrace/i386/instr_size.c#2 integrate .. //depot/projects/usb/src/sys/cddl/dev/dtrace/i386/regset.h#1 branch .. //depot/projects/usb/src/sys/cddl/dev/systrace/systrace.c#4 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_misc.c#25 integrate .. //depot/projects/usb/src/sys/compat/x86bios/x86bios.c#7 integrate .. //depot/projects/usb/src/sys/compat/x86bios/x86bios.h#4 integrate .. //depot/projects/usb/src/sys/conf/files.amd64#31 integrate .. //depot/projects/usb/src/sys/conf/files.i386#36 integrate .. //depot/projects/usb/src/sys/conf/files.powerpc#30 integrate .. //depot/projects/usb/src/sys/conf/kern.mk#15 integrate .. //depot/projects/usb/src/sys/conf/kern.post.mk#12 integrate .. //depot/projects/usb/src/sys/conf/kern.pre.mk#19 integrate .. //depot/projects/usb/src/sys/conf/kmod.mk#18 integrate .. //depot/projects/usb/src/sys/conf/makeLINT.mk#3 integrate .. //depot/projects/usb/src/sys/conf/options.mips#7 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi.c#29 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi_pcib.c#5 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi_pcib_acpi.c#10 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi_pcib_pci.c#6 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi_pcibvar.h#3 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpivar.h#17 integrate .. //depot/projects/usb/src/sys/dev/age/if_age.c#14 integrate .. //depot/projects/usb/src/sys/dev/ahci/ahci.c#16 integrate .. //depot/projects/usb/src/sys/dev/aic7xxx/aicasm/Makefile#4 integrate .. //depot/projects/usb/src/sys/dev/alc/if_alc.c#9 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-pci.h#29 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-ahci.c#14 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-intel.c#13 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5212/ar5212.h#6 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c#5 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c#5 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar5416_cal_iq.c#3 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#11 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar9160.ini#3 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar9285_reset.c#3 integrate .. //depot/projects/usb/src/sys/dev/ath/if_ath.c#40 integrate .. //depot/projects/usb/src/sys/dev/ath/if_athioctl.h#8 integrate .. //depot/projects/usb/src/sys/dev/bge/if_bge.c#32 integrate .. //depot/projects/usb/src/sys/dev/bge/if_bgereg.h#17 integrate .. //depot/projects/usb/src/sys/dev/bwi/if_bwi.c#9 integrate .. //depot/projects/usb/src/sys/dev/bwn/if_bwn.c#6 integrate .. //depot/projects/usb/src/sys/dev/cfe/cfe_env.c#2 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_common.h#16 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_t3_hw.c#18 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_xgmac.c#12 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_main.c#32 integrate .. //depot/projects/usb/src/sys/dev/e1000/if_em.c#22 integrate .. //depot/projects/usb/src/sys/dev/e1000/if_em.h#9 integrate .. //depot/projects/usb/src/sys/dev/e1000/if_igb.c#22 integrate .. //depot/projects/usb/src/sys/dev/e1000/if_igb.h#9 integrate .. //depot/projects/usb/src/sys/dev/e1000/if_lem.c#4 integrate .. //depot/projects/usb/src/sys/dev/e1000/if_lem.h#2 integrate .. //depot/projects/usb/src/sys/dev/ed/if_ed.c#12 integrate .. //depot/projects/usb/src/sys/dev/ed/if_ed_isa.c#4 integrate .. //depot/projects/usb/src/sys/dev/ed/if_ed_novell.c#3 integrate .. //depot/projects/usb/src/sys/dev/ed/if_ed_pci.c#5 integrate .. //depot/projects/usb/src/sys/dev/fb/vesa.c#12 integrate .. //depot/projects/usb/src/sys/dev/flash/mx25l.c#3 integrate .. //depot/projects/usb/src/sys/dev/ichsmb/ichsmb_pci.c#6 integrate .. //depot/projects/usb/src/sys/dev/ichwd/ichwd.c#13 integrate .. //depot/projects/usb/src/sys/dev/ichwd/ichwd.h#6 integrate .. //depot/projects/usb/src/sys/dev/if_ndis/if_ndis_usb.c#27 integrate .. //depot/projects/usb/src/sys/dev/iscsi/initiator/iscsi.c#6 integrate .. //depot/projects/usb/src/sys/dev/iwn/if_iwn.c#21 integrate .. //depot/projects/usb/src/sys/dev/ixgb/if_ixgb.c#10 integrate .. //depot/projects/usb/src/sys/dev/ixgb/if_ixgb.h#4 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe.c#21 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe.h#12 integrate .. //depot/projects/usb/src/sys/dev/pci/pci.c#37 integrate .. //depot/projects/usb/src/sys/dev/pci/pci_pci.c#12 integrate .. //depot/projects/usb/src/sys/dev/pci/pci_private.h#8 integrate .. //depot/projects/usb/src/sys/dev/pci/pcib_if.m#5 integrate .. //depot/projects/usb/src/sys/dev/ral/rt2560.c#17 integrate .. //depot/projects/usb/src/sys/dev/ral/rt2661.c#16 integrate .. //depot/projects/usb/src/sys/dev/sis/if_sis.c#8 integrate .. //depot/projects/usb/src/sys/dev/sis/if_sisreg.h#3 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/hda/hdac.c#44 integrate .. //depot/projects/usb/src/sys/dev/tpm/tpm.c#1 branch .. //depot/projects/usb/src/sys/dev/tpm/tpm_acpi.c#1 branch .. //depot/projects/usb/src/sys/dev/tpm/tpm_isa.c#1 branch .. //depot/projects/usb/src/sys/dev/tpm/tpmvar.h#1 branch .. //depot/projects/usb/src/sys/dev/twa/tw_cl.h#4 integrate .. //depot/projects/usb/src/sys/dev/twa/tw_cl_externs.h#3 integrate .. //depot/projects/usb/src/sys/dev/twa/tw_cl_fwif.h#4 integrate .. //depot/projects/usb/src/sys/dev/twa/tw_cl_init.c#6 integrate .. //depot/projects/usb/src/sys/dev/twa/tw_cl_intr.c#5 integrate .. //depot/projects/usb/src/sys/dev/twa/tw_cl_io.c#6 integrate .. //depot/projects/usb/src/sys/dev/twa/tw_cl_misc.c#5 integrate .. //depot/projects/usb/src/sys/dev/twa/tw_cl_share.h#6 integrate .. //depot/projects/usb/src/sys/dev/twa/tw_osl.h#7 integrate .. //depot/projects/usb/src/sys/dev/twa/tw_osl_cam.c#9 integrate .. //depot/projects/usb/src/sys/dev/twa/tw_osl_freebsd.c#11 integrate .. //depot/projects/usb/src/sys/dev/twa/tw_osl_share.h#7 integrate .. //depot/projects/usb/src/sys/dev/usb/input/atp.c#9 integrate .. //depot/projects/usb/src/sys/dev/usb/input/uep.c#3 integrate .. //depot/projects/usb/src/sys/dev/usb/input/uhid.c#21 integrate .. //depot/projects/usb/src/sys/dev/usb/input/ukbd.c#52 integrate .. //depot/projects/usb/src/sys/dev/usb/input/ums.c#32 integrate .. //depot/projects/usb/src/sys/dev/usb/misc/udbp.c#16 integrate .. //depot/projects/usb/src/sys/dev/usb/misc/ufm.c#13 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_aue.c#22 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_axe.c#26 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_cue.c#19 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_kue.c#19 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_rue.c#20 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_udav.c#18 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/u3g.c#36 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/uark.c#15 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/ubsa.c#16 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/ubser.c#21 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/uchcom.c#19 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/ucycom.c#18 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/ufoma.c#17 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/uftdi.c#32 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/ugensa.c#19 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/uipaq.c#22 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/ulpt.c#22 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/umct.c#21 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/umoscom.c#16 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/uplcom.c#21 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/uvisor.c#22 integrate .. //depot/projects/usb/src/sys/dev/usb/storage/umass.c#55 integrate .. //depot/projects/usb/src/sys/dev/usb/storage/urio.c#19 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#57 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_hub.c#58 integrate .. //depot/projects/usb/src/sys/dev/usb/usbdevs#138 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_rum.c#32 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_run.c#19 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_uath.c#24 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_ural.c#26 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_urtw.c#18 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_zyd.c#32 integrate .. //depot/projects/usb/src/sys/dev/vr/if_vr.c#7 integrate .. //depot/projects/usb/src/sys/dev/wpi/if_wpi.c#19 integrate .. //depot/projects/usb/src/sys/dev/xl/if_xl.c#9 integrate .. //depot/projects/usb/src/sys/dev/xl/if_xlreg.h#2 integrate .. //depot/projects/usb/src/sys/fs/devfs/devfs.h#5 integrate .. //depot/projects/usb/src/sys/fs/devfs/devfs_devs.c#17 integrate .. //depot/projects/usb/src/sys/fs/devfs/devfs_vnops.c#26 integrate .. //depot/projects/usb/src/sys/fs/ext2fs/ext2_alloc.c#2 integrate .. //depot/projects/usb/src/sys/fs/nfs/nfs_commonsubs.c#5 integrate .. //depot/projects/usb/src/sys/fs/nfs/nfs_var.h#11 integrate .. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clnode.c#7 integrate .. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clport.c#8 integrate .. //depot/projects/usb/src/sys/fs/nfsserver/nfs_nfsdsocket.c#5 integrate .. //depot/projects/usb/src/sys/fs/nfsserver/nfs_nfsdstate.c#13 integrate .. //depot/projects/usb/src/sys/fs/nullfs/null_vnops.c#17 integrate .. //depot/projects/usb/src/sys/fs/nwfs/nwfs_node.c#7 integrate .. //depot/projects/usb/src/sys/fs/pseudofs/pseudofs_vncache.c#10 integrate .. //depot/projects/usb/src/sys/fs/smbfs/smbfs_node.c#11 integrate .. //depot/projects/usb/src/sys/fs/tmpfs/tmpfs.h#10 integrate .. //depot/projects/usb/src/sys/fs/tmpfs/tmpfs_subr.c#14 integrate .. //depot/projects/usb/src/sys/fs/tmpfs/tmpfs_vnops.c#16 integrate .. //depot/projects/usb/src/sys/fs/unionfs/union_subr.c#15 integrate .. //depot/projects/usb/src/sys/geom/eli/g_eli.c#11 integrate .. //depot/projects/usb/src/sys/geom/eli/g_eli.h#5 integrate .. //depot/projects/usb/src/sys/geom/mirror/g_mirror.c#13 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd_iget.c#4 integrate .. //depot/projects/usb/src/sys/i386/acpica/Makefile#4 integrate .. //depot/projects/usb/src/sys/i386/i386/exception.s#8 integrate .. //depot/projects/usb/src/sys/i386/i386/machdep.c#29 integrate .. //depot/projects/usb/src/sys/i386/i386/mp_machdep.c#23 integrate .. //depot/projects/usb/src/sys/i386/i386/pmap.c#37 integrate .. //depot/projects/usb/src/sys/i386/i386/trap.c#21 integrate .. //depot/projects/usb/src/sys/i386/i386/vm_machdep.c#18 integrate .. //depot/projects/usb/src/sys/i386/include/elf.h#6 integrate .. //depot/projects/usb/src/sys/i386/include/segments.h#4 integrate .. //depot/projects/usb/src/sys/i386/include/trap.h#4 integrate .. //depot/projects/usb/src/sys/i386/include/vm86.h#3 integrate .. //depot/projects/usb/src/sys/i386/xen/pmap.c#25 integrate .. //depot/projects/usb/src/sys/ia64/ia64/trap.c#13 integrate .. //depot/projects/usb/src/sys/ia64/include/elf.h#7 integrate .. //depot/projects/usb/src/sys/kern/Makefile#5 integrate .. //depot/projects/usb/src/sys/kern/imgact_elf.c#20 integrate .. //depot/projects/usb/src/sys/kern/init_sysent.c#20 integrate .. //depot/projects/usb/src/sys/kern/kern_dtrace.c#3 integrate .. //depot/projects/usb/src/sys/kern/kern_exec.c#28 integrate .. //depot/projects/usb/src/sys/kern/kern_exit.c#27 integrate .. //depot/projects/usb/src/sys/kern/kern_fork.c#21 integrate .. //depot/projects/usb/src/sys/kern/kern_ktrace.c#14 integrate .. //depot/projects/usb/src/sys/kern/kern_lock.c#24 integrate .. //depot/projects/usb/src/sys/kern/kern_malloc.c#16 integrate .. //depot/projects/usb/src/sys/kern/kern_priv.c#8 integrate .. //depot/projects/usb/src/sys/kern/kern_proc.c#31 integrate .. //depot/projects/usb/src/sys/kern/kern_rmlock.c#7 integrate .. //depot/projects/usb/src/sys/kern/kern_sig.c#28 integrate .. //depot/projects/usb/src/sys/kern/kern_thr.c#18 integrate .. //depot/projects/usb/src/sys/kern/kern_timeout.c#14 integrate .. //depot/projects/usb/src/sys/kern/kern_umtx.c#18 integrate .. //depot/projects/usb/src/sys/kern/sched_ule.c#27 integrate .. //depot/projects/usb/src/sys/kern/subr_acl_nfs4.c#7 integrate .. //depot/projects/usb/src/sys/kern/subr_acl_posix1e.c#9 integrate .. //depot/projects/usb/src/sys/kern/subr_autoconf.c#6 integrate .. //depot/projects/usb/src/sys/kern/subr_bus.c#40 integrate .. //depot/projects/usb/src/sys/kern/subr_rtc.c#5 integrate .. //depot/projects/usb/src/sys/kern/subr_sleepqueue.c#17 integrate .. //depot/projects/usb/src/sys/kern/subr_taskqueue.c#13 integrate .. //depot/projects/usb/src/sys/kern/subr_trap.c#15 integrate .. //depot/projects/usb/src/sys/kern/sys_generic.c#22 integrate .. //depot/projects/usb/src/sys/kern/syscalls.c#19 integrate .. //depot/projects/usb/src/sys/kern/syscalls.master#20 integrate .. //depot/projects/usb/src/sys/kern/systrace_args.c#16 integrate .. //depot/projects/usb/src/sys/kern/vfs_bio.c#30 integrate .. //depot/projects/usb/src/sys/kern/vfs_cache.c#29 integrate .. //depot/projects/usb/src/sys/kern/vfs_default.c#20 integrate .. //depot/projects/usb/src/sys/kern/vfs_lookup.c#24 integrate .. //depot/projects/usb/src/sys/kern/vfs_mount.c#36 integrate .. //depot/projects/usb/src/sys/kern/vfs_subr.c#35 integrate .. //depot/projects/usb/src/sys/kern/vfs_syscalls.c#35 integrate .. //depot/projects/usb/src/sys/mips/atheros/ar71xx_chip.c#1 branch .. //depot/projects/usb/src/sys/mips/atheros/ar71xx_chip.h#1 branch .. //depot/projects/usb/src/sys/mips/atheros/ar71xx_cpudef.h#1 branch .. //depot/projects/usb/src/sys/mips/atheros/ar71xx_machdep.c#3 integrate .. //depot/projects/usb/src/sys/mips/atheros/ar71xx_pci.c#4 integrate .. //depot/projects/usb/src/sys/mips/atheros/ar71xx_setup.c#1 branch .. //depot/projects/usb/src/sys/mips/atheros/ar71xx_setup.h#1 branch .. //depot/projects/usb/src/sys/mips/atheros/ar71xx_wdog.c#3 integrate .. //depot/projects/usb/src/sys/mips/atheros/ar71xxreg.h#5 integrate .. //depot/projects/usb/src/sys/mips/atheros/ar724x_chip.c#1 branch .. //depot/projects/usb/src/sys/mips/atheros/ar724x_chip.h#1 branch .. //depot/projects/usb/src/sys/mips/atheros/ar724xreg.h#1 branch .. //depot/projects/usb/src/sys/mips/atheros/ar91xx_chip.c#1 branch .. //depot/projects/usb/src/sys/mips/atheros/ar91xx_chip.h#1 branch .. //depot/projects/usb/src/sys/mips/atheros/ar91xxreg.h#1 branch .. //depot/projects/usb/src/sys/mips/atheros/files.ar71xx#3 integrate .. //depot/projects/usb/src/sys/mips/atheros/if_arge.c#5 integrate .. //depot/projects/usb/src/sys/mips/atheros/if_argevar.h#3 integrate .. //depot/projects/usb/src/sys/mips/atheros/uart_bus_ar71xx.c#2 integrate .. //depot/projects/usb/src/sys/mips/atheros/uart_cpu_ar71xx.c#2 integrate .. //depot/projects/usb/src/sys/mips/conf/XLR#6 integrate .. //depot/projects/usb/src/sys/mips/conf/XLR64#2 integrate .. //depot/projects/usb/src/sys/mips/conf/XLRN32#2 integrate .. //depot/projects/usb/src/sys/mips/include/atomic.h#4 integrate .. //depot/projects/usb/src/sys/mips/include/bus.h#6 integrate .. //depot/projects/usb/src/sys/mips/include/cpuregs.h#7 integrate .. //depot/projects/usb/src/sys/mips/include/elf.h#7 integrate .. //depot/projects/usb/src/sys/mips/include/endian.h#3 integrate .. //depot/projects/usb/src/sys/mips/include/intr_machdep.h#4 integrate .. //depot/projects/usb/src/sys/mips/include/locore.h#4 integrate .. //depot/projects/usb/src/sys/mips/include/memdev.h#3 integrate .. //depot/projects/usb/src/sys/mips/include/pcb.h#5 integrate .. //depot/projects/usb/src/sys/mips/include/pmap.h#12 integrate .. //depot/projects/usb/src/sys/mips/include/pte.h#6 integrate .. //depot/projects/usb/src/sys/mips/include/regnum.h#4 integrate .. //depot/projects/usb/src/sys/mips/include/ucontext.h#4 integrate .. //depot/projects/usb/src/sys/mips/include/vmparam.h#5 integrate .. //depot/projects/usb/src/sys/mips/mips/exception.S#8 integrate .. //depot/projects/usb/src/sys/mips/mips/locore.S#7 integrate .. //depot/projects/usb/src/sys/mips/mips/machdep.c#15 integrate .. //depot/projects/usb/src/sys/mips/mips/mpboot.S#5 integrate .. //depot/projects/usb/src/sys/mips/mips/pm_machdep.c#7 integrate .. //depot/projects/usb/src/sys/mips/mips/pmap.c#22 integrate .. //depot/projects/usb/src/sys/mips/mips/trap.c#10 integrate .. //depot/projects/usb/src/sys/mips/mips/vm_machdep.c#7 integrate .. //depot/projects/usb/src/sys/mips/rmi/board.c#4 integrate .. //depot/projects/usb/src/sys/mips/rmi/board.h#3 integrate .. //depot/projects/usb/src/sys/mips/rmi/clock.c#4 delete .. //depot/projects/usb/src/sys/mips/rmi/clock.h#2 delete .. //depot/projects/usb/src/sys/mips/rmi/debug.h#2 delete .. //depot/projects/usb/src/sys/mips/rmi/dev/nlge/if_nlge.c#1 branch .. //depot/projects/usb/src/sys/mips/rmi/dev/nlge/if_nlge.h#1 branch .. //depot/projects/usb/src/sys/mips/rmi/dev/xlr/debug.h#1 branch .. //depot/projects/usb/src/sys/mips/rmi/dev/xlr/rge.c#6 integrate .. //depot/projects/usb/src/sys/mips/rmi/files.xlr#5 integrate .. //depot/projects/usb/src/sys/mips/rmi/fmn.c#1 branch .. //depot/projects/usb/src/sys/mips/rmi/interrupt.h#4 integrate .. //depot/projects/usb/src/sys/mips/rmi/intr_machdep.c#6 integrate .. //depot/projects/usb/src/sys/mips/rmi/iodi.c#5 integrate .. //depot/projects/usb/src/sys/mips/rmi/iomap.h#2 integrate .. //depot/projects/usb/src/sys/mips/rmi/msgring.h#2 integrate .. //depot/projects/usb/src/sys/mips/rmi/on_chip.c#5 delete .. //depot/projects/usb/src/sys/mips/rmi/pic.h#5 integrate .. //depot/projects/usb/src/sys/mips/rmi/rmi_boot_info.h#1 branch .. //depot/projects/usb/src/sys/mips/rmi/rmi_mips_exts.h#2 integrate .. //depot/projects/usb/src/sys/mips/rmi/shared_structs.h#2 delete .. //depot/projects/usb/src/sys/mips/rmi/shared_structs_func.h#2 delete .. //depot/projects/usb/src/sys/mips/rmi/shared_structs_offsets.h#2 delete .. //depot/projects/usb/src/sys/mips/rmi/std.xlr#2 integrate .. //depot/projects/usb/src/sys/mips/rmi/tick.c#3 integrate .. //depot/projects/usb/src/sys/mips/rmi/xlr_machdep.c#6 integrate .. //depot/projects/usb/src/sys/mips/rmi/xlr_pci.c#5 integrate .. //depot/projects/usb/src/sys/mips/rmi/xlr_pcmcia.c#1 branch .. //depot/projects/usb/src/sys/mips/rmi/xlrconfig.h#4 delete .. //depot/projects/usb/src/sys/modules/Makefile#54 integrate .. //depot/projects/usb/src/sys/modules/aac/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/acpi/acpi/Makefile#15 integrate .. //depot/projects/usb/src/sys/modules/agp/Makefile#6 integrate .. //depot/projects/usb/src/sys/modules/amr/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/asr/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/bge/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/cpufreq/Makefile#7 integrate .. //depot/projects/usb/src/sys/modules/cxgb/Makefile#8 integrate .. //depot/projects/usb/src/sys/modules/cyclic/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/dtrace/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/dtrace/Makefile.inc#2 integrate .. //depot/projects/usb/src/sys/modules/dtrace/dtrace/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/dtrace/dtraceall/dtraceall.c#4 integrate .. //depot/projects/usb/src/sys/modules/dtrace/fasttrap/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/em/Makefile#9 integrate .. //depot/projects/usb/src/sys/modules/hptmv/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/hptrr/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/hwpmc/Makefile#8 integrate .. //depot/projects/usb/src/sys/modules/i2c/controllers/pcf/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/if_carp/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/igb/Makefile#6 integrate .. //depot/projects/usb/src/sys/modules/io/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/ixgbe/Makefile#8 integrate .. //depot/projects/usb/src/sys/modules/le/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/linprocfs/Makefile#6 integrate .. //depot/projects/usb/src/sys/modules/linsysfs/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/linux/Makefile#13 integrate .. //depot/projects/usb/src/sys/modules/mem/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/mfi/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/ndis/Makefile#8 integrate .. //depot/projects/usb/src/sys/modules/ppc/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/procfs/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/sem/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/send/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/smbfs/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/sound/driver/Makefile#7 integrate .. //depot/projects/usb/src/sys/modules/svr4/Makefile#8 integrate .. //depot/projects/usb/src/sys/modules/syscons/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/tpm/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/uart/Makefile#6 integrate .. //depot/projects/usb/src/sys/modules/usb/Makefile#29 integrate .. //depot/projects/usb/src/sys/modules/vx/Makefile#2 integrate .. //depot/projects/usb/src/sys/net/if.c#50 integrate .. //depot/projects/usb/src/sys/net/if_bridge.c#26 integrate .. //depot/projects/usb/src/sys/net/if_epair.c#7 integrate .. //depot/projects/usb/src/sys/net/if_ethersubr.c#30 integrate .. //depot/projects/usb/src/sys/net/if_lagg.c#18 integrate .. //depot/projects/usb/src/sys/net/vnet.c#9 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211.c#34 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_node.c#30 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_sta.c#18 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_var.h#30 integrate .. //depot/projects/usb/src/sys/netinet/if_ether.c#37 integrate .. //depot/projects/usb/src/sys/netinet/in.c#46 integrate .. //depot/projects/usb/src/sys/netinet/in.h#18 integrate .. //depot/projects/usb/src/sys/netinet/in_proto.c#18 integrate .. //depot/projects/usb/src/sys/netinet/ip_carp.c#23 integrate .. //depot/projects/usb/src/sys/netinet/ip_carp.h#4 integrate .. //depot/projects/usb/src/sys/netinet/ip_divert.c#30 integrate .. //depot/projects/usb/src/sys/netinet/ip_icmp.c#22 integrate .. //depot/projects/usb/src/sys/netinet/ip_input.c#37 integrate .. //depot/projects/usb/src/sys/netinet/ipfw/ip_fw_log.c#8 integrate .. //depot/projects/usb/src/sys/netinet/raw_ip.c#36 integrate .. //depot/projects/usb/src/sys/netinet/sctp.h#14 integrate .. //depot/projects/usb/src/sys/netinet/sctp_cc_functions.c#6 integrate .. //depot/projects/usb/src/sys/netinet/sctp_crc32.c#11 integrate .. //depot/projects/usb/src/sys/netinet/sctp_crc32.h#7 integrate .. //depot/projects/usb/src/sys/netinet/sctp_indata.c#29 integrate .. //depot/projects/usb/src/sys/netinet/sctp_input.c#27 integrate .. //depot/projects/usb/src/sys/netinet/sctp_os_bsd.h#24 integrate .. //depot/projects/usb/src/sys/netinet/sctp_output.c#33 integrate .. //depot/projects/usb/src/sys/netinet/sctp_pcb.c#27 integrate .. //depot/projects/usb/src/sys/netinet/sctp_pcb.h#18 integrate .. //depot/projects/usb/src/sys/netinet/sctp_peeloff.c#8 integrate .. //depot/projects/usb/src/sys/netinet/sctp_sysctl.c#20 integrate .. //depot/projects/usb/src/sys/netinet/sctp_sysctl.h#13 integrate .. //depot/projects/usb/src/sys/netinet/sctp_timer.c#18 integrate .. //depot/projects/usb/src/sys/netinet/sctp_usrreq.c#24 integrate .. //depot/projects/usb/src/sys/netinet/sctputil.c#34 integrate .. //depot/projects/usb/src/sys/netinet/tcp_input.c#33 integrate .. //depot/projects/usb/src/sys/netinet/tcp_output.c#24 integrate .. //depot/projects/usb/src/sys/netinet/tcp_subr.c#33 integrate .. //depot/projects/usb/src/sys/netinet/tcp_syncache.c#30 integrate .. //depot/projects/usb/src/sys/netinet/tcp_var.h#27 integrate .. //depot/projects/usb/src/sys/netinet/udp_usrreq.c#30 integrate .. //depot/projects/usb/src/sys/netinet6/icmp6.c#31 integrate .. //depot/projects/usb/src/sys/netinet6/in6_proto.c#25 integrate .. //depot/projects/usb/src/sys/netinet6/nd6.c#34 integrate .. //depot/projects/usb/src/sys/netinet6/nd6_nbr.c#22 integrate .. //depot/projects/usb/src/sys/netinet6/raw_ip6.c#29 integrate .. //depot/projects/usb/src/sys/netinet6/sctp6_usrreq.c#14 integrate .. //depot/projects/usb/src/sys/netinet6/send.c#1 branch .. //depot/projects/usb/src/sys/netinet6/send.h#1 branch .. //depot/projects/usb/src/sys/nfsclient/nfs_diskless.c#15 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs_node.c#12 integrate .. //depot/projects/usb/src/sys/nfsserver/nfs_serv.c#19 integrate .. //depot/projects/usb/src/sys/opencrypto/cryptodev.c#10 integrate .. //depot/projects/usb/src/sys/opencrypto/deflate.c#4 integrate .. //depot/projects/usb/src/sys/pci/if_rl.c#15 integrate .. //depot/projects/usb/src/sys/powerpc/aim/machdep.c#19 integrate .. //depot/projects/usb/src/sys/powerpc/aim/mmu_oea.c#15 integrate .. //depot/projects/usb/src/sys/powerpc/aim/mmu_oea64.c#15 integrate .. //depot/projects/usb/src/sys/powerpc/aim/ofw_machdep.c#10 integrate .. //depot/projects/usb/src/sys/powerpc/aim/platform_chrp.c#6 delete .. //depot/projects/usb/src/sys/powerpc/aim/trap.c#9 integrate .. //depot/projects/usb/src/sys/powerpc/aim/trap_subr.S#9 delete .. //depot/projects/usb/src/sys/powerpc/aim/vm_machdep.c#8 integrate .. //depot/projects/usb/src/sys/powerpc/booke/platform_bare.c#5 integrate .. //depot/projects/usb/src/sys/powerpc/booke/trap.c#7 integrate .. //depot/projects/usb/src/sys/powerpc/conf/Makefile#3 integrate .. //depot/projects/usb/src/sys/powerpc/conf/NOTES#16 integrate .. //depot/projects/usb/src/sys/powerpc/include/elf.h#7 integrate .. //depot/projects/usb/src/sys/powerpc/include/ofw_machdep.h#5 integrate .. //depot/projects/usb/src/sys/powerpc/include/pmap.h#12 integrate .. //depot/projects/usb/src/sys/powerpc/mpc85xx/mpc85xx.c#5 integrate .. //depot/projects/usb/src/sys/powerpc/powermac/cuda.c#6 integrate .. //depot/projects/usb/src/sys/powerpc/powermac/platform_powermac.c#1 branch .. //depot/projects/usb/src/sys/powerpc/powermac/pmu.c#7 integrate .. //depot/projects/usb/src/sys/powerpc/powermac/smu.c#6 integrate .. //depot/projects/usb/src/sys/powerpc/powerpc/platform.c#2 integrate .. //depot/projects/usb/src/sys/powerpc/powerpc/platform_if.m#2 integrate .. //depot/projects/usb/src/sys/rpc/replay.c#2 integrate .. //depot/projects/usb/src/sys/security/mac/mac_framework.c#12 integrate .. //depot/projects/usb/src/sys/security/mac/mac_internal.h#13 integrate .. //depot/projects/usb/src/sys/sparc64/include/elf.h#7 integrate .. //depot/projects/usb/src/sys/sparc64/include/pmap.h#7 integrate .. //depot/projects/usb/src/sys/sparc64/include/smp.h#10 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/mp_machdep.c#14 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/pmap.c#20 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/trap.c#17 integrate .. //depot/projects/usb/src/sys/sun4v/include/elf.h#6 integrate .. //depot/projects/usb/src/sys/sun4v/include/smp.h#6 integrate .. //depot/projects/usb/src/sys/sun4v/sun4v/mp_machdep.c#8 integrate .. //depot/projects/usb/src/sys/sun4v/sun4v/pmap.c#14 integrate .. //depot/projects/usb/src/sys/sun4v/sun4v/trap.c#10 integrate .. //depot/projects/usb/src/sys/sys/_rmlock.h#2 integrate .. //depot/projects/usb/src/sys/sys/cdefs.h#11 integrate .. //depot/projects/usb/src/sys/sys/dtrace_bsd.h#4 integrate .. //depot/projects/usb/src/sys/sys/imgact.h#9 integrate .. //depot/projects/usb/src/sys/sys/ktrace.h#6 integrate .. //depot/projects/usb/src/sys/sys/link_elf.h#5 integrate .. //depot/projects/usb/src/sys/sys/lockmgr.h#10 integrate .. //depot/projects/usb/src/sys/sys/mbuf.h#18 integrate .. //depot/projects/usb/src/sys/sys/mman.h#5 integrate .. //depot/projects/usb/src/sys/sys/mount.h#24 integrate .. //depot/projects/usb/src/sys/sys/param.h#55 integrate .. //depot/projects/usb/src/sys/sys/rmlock.h#3 integrate .. //depot/projects/usb/src/sys/sys/sdt.h#4 integrate .. //depot/projects/usb/src/sys/sys/signal.h#6 integrate .. //depot/projects/usb/src/sys/sys/syscall.h#19 integrate .. //depot/projects/usb/src/sys/sys/syscall.mk#19 integrate .. //depot/projects/usb/src/sys/sys/sysent.h#15 integrate .. //depot/projects/usb/src/sys/sys/sysproto.h#21 integrate .. //depot/projects/usb/src/sys/sys/vnode.h#32 integrate .. //depot/projects/usb/src/sys/tools/vnode_if.awk#5 integrate .. //depot/projects/usb/src/sys/ufs/ffs/ffs_softdep.c#19 integrate .. //depot/projects/usb/src/sys/ufs/ffs/ffs_vfsops.c#26 integrate .. //depot/projects/usb/src/sys/vm/memguard.c#4 integrate .. //depot/projects/usb/src/sys/vm/memguard.h#3 integrate .. //depot/projects/usb/src/sys/vm/uma.h#8 integrate .. //depot/projects/usb/src/sys/vm/uma_core.c#15 integrate .. //depot/projects/usb/src/sys/vm/vm_extern.h#14 integrate .. //depot/projects/usb/src/sys/vm/vm_kern.c#15 integrate .. //depot/projects/usb/src/sys/vm/vm_mmap.c#26 integrate .. //depot/projects/usb/src/sys/x86/pci/qpi.c#1 branch .. //depot/projects/usb/src/sys/x86/x86/local_apic.c#2 integrate Differences ... ==== //depot/projects/usb/src/lib/libusb/libusb20.3#11 (text+ko) ==== @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libusb/libusb20.3,v 1.6 2010/01/29 02:44:06 thompsa Exp $ +.\" $FreeBSD: src/lib/libusb/libusb20.3,v 1.7 2010/08/16 15:18:30 joel Exp $ .\" .Dd November 18, 2009 .Dt LIBUSB20 3 @@ -526,7 +526,7 @@ .Pp . .Fn libusb20_dev_get_info -retrives the BSD specific usb_device_info structure into the memory location given by +retrieves the BSD specific usb_device_info structure into the memory location given by .Fa pinfo . The USB device given by .Fa pdev ==== //depot/projects/usb/src/sys/amd64/acpica/acpi_wakeup.c#9 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_wakeup.c,v 1.35 2010/08/06 17:21:32 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_wakeup.c,v 1.37 2010/08/13 22:08:42 jkim Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -278,6 +278,8 @@ for (;;) ia32_pause(); } else { + PCPU_SET(switchtime, 0); + PCPU_SET(switchticks, ticks); #ifdef SMP if (wakeup_cpus != 0) acpi_wakeup_cpus(sc, wakeup_cpus); ==== //depot/projects/usb/src/sys/amd64/amd64/cpu_switch.S#15 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.177 2010/08/03 15:32:08 jkim Exp $ + * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.178 2010/08/30 21:19:42 jkim Exp $ */ #include <machine/asmacros.h> @@ -338,19 +338,16 @@ movl $MSR_FSBASE,%ecx rdmsr - shlq $32,%rdx - leaq (%rax,%rdx),%rax - movq %rax,PCB_FSBASE(%rdi) + movl %eax,PCB_FSBASE(%rdi) + movl %edx,PCB_FSBASE+4(%rdi) movl $MSR_GSBASE,%ecx rdmsr - shlq $32,%rdx - leaq (%rax,%rdx),%rax - movq %rax,PCB_GSBASE(%rdi) + movl %eax,PCB_GSBASE(%rdi) + movl %edx,PCB_GSBASE+4(%rdi) movl $MSR_KGSBASE,%ecx rdmsr - shlq $32,%rdx - leaq (%rax,%rdx),%rax - movq %rax,PCB_KGSBASE(%rdi) + movl %eax,PCB_KGSBASE(%rdi) + movl %edx,PCB_KGSBASE+4(%rdi) sgdt PCB_GDT(%rdi) sidt PCB_IDT(%rdi) ==== //depot/projects/usb/src/sys/amd64/amd64/exception.S#17 (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.147 2010/06/23 20:44:07 kib Exp $ + * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.148 2010/08/28 08:03:29 rpaulo Exp $ */ #include "opt_atpic.h" @@ -108,6 +108,10 @@ TRAP_NOEN(T_TRCTRAP) IDTVEC(bpt) TRAP_NOEN(T_BPTFLT) +#ifdef KDTRACE_HOOKS +IDTVEC(dtrace_ret) + TRAP_NOEN(T_DTRACE_RET) +#endif /* Regular traps; The cpu does not supply tf_err for these. */ #define TRAP(a) \ ==== //depot/projects/usb/src/sys/amd64/amd64/machdep.c#33 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.722 2010/06/30 18:03:42 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.723 2010/08/28 08:03:29 rpaulo Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -54,6 +54,7 @@ #include "opt_msgbuf.h" #include "opt_perfmon.h" #include "opt_sched.h" +#include "opt_kdtrace.h" #include <sys/param.h> #include <sys/proc.h> @@ -1089,6 +1090,9 @@ IDTVEC(tss), IDTVEC(missing), IDTVEC(stk), IDTVEC(prot), IDTVEC(page), IDTVEC(mchk), IDTVEC(rsvd), IDTVEC(fpu), IDTVEC(align), IDTVEC(xmm), IDTVEC(dblfault), +#ifdef KDTRACE_HOOKS + IDTVEC(dtrace_ret), +#endif IDTVEC(fast_syscall), IDTVEC(fast_syscall32); #ifdef DDB @@ -1617,6 +1621,9 @@ setidt(IDT_AC, &IDTVEC(align), SDT_SYSIGT, SEL_KPL, 0); setidt(IDT_MC, &IDTVEC(mchk), SDT_SYSIGT, SEL_KPL, 0); setidt(IDT_XF, &IDTVEC(xmm), SDT_SYSIGT, SEL_KPL, 0); +#ifdef KDTRACE_HOOKS + setidt(IDT_DTRACE_RET, &IDTVEC(dtrace_ret), SDT_SYSIGT, SEL_UPL, 0); +#endif r_idt.rd_limit = sizeof(idt0) - 1; r_idt.rd_base = (long) idt; ==== //depot/projects/usb/src/sys/amd64/amd64/mp_machdep.c#28 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.323 2010/08/09 20:25:06 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.331 2010/08/19 22:37:43 attilio Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -1053,7 +1053,7 @@ int ncpu, othercpus; othercpus = mp_ncpus - 1; - if (mask == (u_int)-1) { + if (mask == (cpumask_t)-1) { ncpu = othercpus; if (ncpu < 1) return; @@ -1078,7 +1078,7 @@ smp_tlb_addr1 = addr1; smp_tlb_addr2 = addr2; atomic_store_rel_int(&smp_tlb_wait, 0); - if (mask == (u_int)-1) + if (mask == (cpumask_t)-1) ipi_all_but_self(vector); else ipi_selected(mask, vector); @@ -1321,8 +1321,11 @@ void cpustop_handler(void) { - int cpu = PCPU_GET(cpuid); - int cpumask = PCPU_GET(cpumask); + cpumask_t cpumask; + u_int cpu; + + cpu = PCPU_GET(cpuid); + cpumask = PCPU_GET(cpumask); savectx(&stoppcbs[cpu]); @@ -1349,9 +1352,12 @@ void cpususpend_handler(void) { + cpumask_t cpumask; register_t cr3, rf; - int cpu = PCPU_GET(cpuid); - int cpumask = PCPU_GET(cpumask); + u_int cpu; + + cpu = PCPU_GET(cpuid); + cpumask = PCPU_GET(cpumask); rf = intr_disable(); cr3 = rcr3(); @@ -1359,6 +1365,9 @@ if (savectx(susppcbs[cpu])) { wbinvd(); atomic_set_int(&stopped_cpus, cpumask); + } else { + PCPU_SET(switchtime, 0); + PCPU_SET(switchticks, ticks); } /* Wait for resume */ @@ -1523,19 +1532,23 @@ int mp_grab_cpu_hlt(void) { - u_int mask = PCPU_GET(cpumask); + cpumask_t mask; #ifdef MP_WATCHDOG - u_int cpuid = PCPU_GET(cpuid); + u_int cpuid; #endif int retval; + mask = PCPU_GET(cpumask); #ifdef MP_WATCHDOG + cpuid = PCPU_GET(cpuid); ap_watchdog(cpuid); #endif - retval = mask & hlt_cpus_mask; - while (mask & hlt_cpus_mask) + retval = 0; + while (mask & hlt_cpus_mask) { + retval = 1; __asm __volatile("sti; hlt" : : : "memory"); + } return (retval); } ==== //depot/projects/usb/src/sys/amd64/amd64/pmap.c#41 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.709 2010/07/15 16:25:51 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.711 2010/08/17 12:17:24 gahr Exp $"); /* * Manages physical address maps. @@ -620,7 +620,8 @@ if (sysenv != NULL) { if (strncmp(sysenv, "MacBook5,1", 10) == 0 || strncmp(sysenv, "MacBookPro5,5", 13) == 0 || - strncmp(sysenv, "Macmini3,1", 10) == 0) + strncmp(sysenv, "Macmini3,1", 10) == 0 || + strncmp(sysenv, "iMac9,1", 7) == 0) pat_works = 0; freeenv(sysenv); } @@ -926,8 +927,7 @@ void pmap_invalidate_page(pmap_t pmap, vm_offset_t va) { - u_int cpumask; - u_int other_cpus; + cpumask_t cpumask, other_cpus; sched_pin(); if (pmap == kernel_pmap || pmap->pm_active == all_cpus) { @@ -947,8 +947,7 @@ void pmap_invalidate_range(pmap_t pmap, vm_offset_t sva, vm_offset_t eva) { - u_int cpumask; - u_int other_cpus; + cpumask_t cpumask, other_cpus; vm_offset_t addr; sched_pin(); @@ -972,8 +971,7 @@ void pmap_invalidate_all(pmap_t pmap) { - u_int cpumask; - u_int other_cpus; + cpumask_t cpumask, other_cpus; sched_pin(); if (pmap == kernel_pmap || pmap->pm_active == all_cpus) { ==== //depot/projects/usb/src/sys/amd64/amd64/trap.c#26 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.346 2010/07/12 20:45:37 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.348 2010/08/25 09:10:32 rpaulo Exp $"); /* * AMD64 Trap and System call handling @@ -50,7 +50,6 @@ #include "opt_isa.h" #include "opt_kdb.h" #include "opt_kdtrace.h" -#include "opt_ktrace.h" #include <sys/param.h> #include <sys/bus.h> @@ -70,9 +69,6 @@ #include <sys/sysent.h> #include <sys/uio.h> #include <sys/vmmeter.h> -#ifdef KTRACE -#include <sys/ktrace.h> -#endif #ifdef HWPMC_HOOKS #include <sys/pmckern.h> #endif @@ -113,6 +109,13 @@ * implementation opaque. */ systrace_probe_func_t systrace_probe_func; + +/* + * These hooks are necessary for the pid, usdt and fasttrap providers. + */ +dtrace_fasttrap_probe_ptr_t dtrace_fasttrap_probe_ptr; +dtrace_pid_probe_ptr_t dtrace_pid_probe_ptr; +dtrace_return_probe_ptr_t dtrace_return_probe_ptr; #endif extern void trap(struct trapframe *frame); @@ -243,6 +246,55 @@ if (dtrace_trap_func != NULL) if ((*dtrace_trap_func)(frame, type)) goto out; + if (type == T_DTRACE_PROBE || type == T_DTRACE_RET || + type == T_BPTFLT) { + struct reg regs; + + regs.r_r15 = frame->tf_r15; + regs.r_r14 = frame->tf_r14; + regs.r_r13 = frame->tf_r13; + regs.r_r12 = frame->tf_r12; + regs.r_r11 = frame->tf_r11; + regs.r_r10 = frame->tf_r10; + regs.r_r9 = frame->tf_r9; + regs.r_r8 = frame->tf_r8; + regs.r_rdi = frame->tf_rdi; + regs.r_rsi = frame->tf_rsi; + regs.r_rbp = frame->tf_rbp; + regs.r_rbx = frame->tf_rbx; + regs.r_rdx = frame->tf_rdx; + regs.r_rcx = frame->tf_rcx; + regs.r_rax = frame->tf_rax; + regs.r_rip = frame->tf_rip; + regs.r_cs = frame->tf_cs; + regs.r_rflags = frame->tf_rflags; + regs.r_rsp = frame->tf_rsp; + regs.r_ss = frame->tf_ss; + if (frame->tf_flags & TF_HASSEGS) { + regs.r_ds = frame->tf_ds; + regs.r_es = frame->tf_es; + regs.r_fs = frame->tf_fs; + regs.r_gs = frame->tf_gs; + } else { + regs.r_ds = 0; + regs.r_es = 0; + regs.r_fs = 0; + regs.r_gs = 0; + } + if (type == T_DTRACE_PROBE && + dtrace_fasttrap_probe_ptr != NULL && + dtrace_fasttrap_probe_ptr(®s) == 0) + goto out; + if (type == T_BPTFLT && + dtrace_pid_probe_ptr != NULL && + dtrace_pid_probe_ptr(®s) == 0) + goto out; + if (type == T_DTRACE_RET && + dtrace_return_probe_ptr != NULL && + dtrace_return_probe_ptr(®s) == 0) + goto out; + + } #endif if ((frame->tf_rflags & PSL_I) == 0) { ==== //depot/projects/usb/src/sys/amd64/amd64/vm_machdep.c#19 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.270 2010/06/15 09:19:33 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.271 2010/08/11 23:22:53 jhb Exp $"); #include "opt_isa.h" #include "opt_cpu.h" @@ -527,7 +527,8 @@ cpu_reset() { #ifdef SMP - u_int cnt, map; + cpumask_t map; + u_int cnt; if (smp_active) { map = PCPU_GET(other_cpus) & ~stopped_cpus; ==== //depot/projects/usb/src/sys/amd64/ia32/ia32_syscall.c#8 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_syscall.c,v 1.22 2010/05/23 18:32:02 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_syscall.c,v 1.23 2010/08/19 16:41:27 jhb Exp $"); /* * 386 Trap and System call handling @@ -45,7 +45,6 @@ #include "opt_clock.h" #include "opt_cpu.h" #include "opt_isa.h" -#include "opt_ktrace.h" #include <sys/param.h> #include <sys/bus.h> @@ -65,9 +64,6 @@ #include <sys/sysent.h> #include <sys/uio.h> #include <sys/vmmeter.h> -#ifdef KTRACE -#include <sys/ktrace.h> -#endif #include <security/audit/audit.h> #include <vm/vm.h> ==== //depot/projects/usb/src/sys/amd64/include/elf.h#7 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201009020332.o823WPmH011509>