Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 22 Apr 2009 07:09:44 GMT
From:      Hans Petter Selasky <hselasky@FreeBSD.org>
To:        Perforce Change Reviews <perforce@FreeBSD.org>
Subject:   PERFORCE change 160925 for review
Message-ID:  <200904220709.n3M79iVZ082506@repoman.freebsd.org>

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

Change 160925 by hselasky@hselasky_laptop001 on 2009/04/22 07:09:19

	
	IFC @ 160922

Affected files ...

.. //depot/projects/usb/src/sys/amd64/amd64/busdma_machdep.c#13 integrate
.. //depot/projects/usb/src/sys/amd64/amd64/elf_machdep.c#6 integrate
.. //depot/projects/usb/src/sys/amd64/amd64/machdep.c#17 integrate
.. //depot/projects/usb/src/sys/amd64/conf/DEFAULTS#9 integrate
.. //depot/projects/usb/src/sys/amd64/conf/GENERIC#23 integrate
.. //depot/projects/usb/src/sys/amd64/include/cpufunc.h#5 integrate
.. //depot/projects/usb/src/sys/amd64/include/endian.h#2 integrate
.. //depot/projects/usb/src/sys/amd64/include/metadata.h#2 integrate
.. //depot/projects/usb/src/sys/amd64/include/param.h#5 integrate
.. //depot/projects/usb/src/sys/amd64/include/pc/bios.h#3 integrate
.. //depot/projects/usb/src/sys/amd64/linux32/linux32_sysvec.c#18 integrate
.. //depot/projects/usb/src/sys/arm/arm/busdma_machdep.c#17 integrate
.. //depot/projects/usb/src/sys/arm/arm/cpufunc_asm_armv5_ec.S#2 integrate
.. //depot/projects/usb/src/sys/arm/arm/cpufunc_asm_sheeva.S#2 integrate
.. //depot/projects/usb/src/sys/arm/arm/elf_machdep.c#7 integrate
.. //depot/projects/usb/src/sys/arm/arm/trap.c#8 integrate
.. //depot/projects/usb/src/sys/arm/at91/files.at91#9 integrate
.. //depot/projects/usb/src/sys/arm/conf/AVILA.hints#5 integrate
.. //depot/projects/usb/src/sys/arm/conf/BWCT#8 integrate
.. //depot/projects/usb/src/sys/arm/conf/BWCT.hints#2 integrate
.. //depot/projects/usb/src/sys/arm/conf/CAMBRIA.hints#3 integrate
.. //depot/projects/usb/src/sys/arm/include/param.h#3 integrate
.. //depot/projects/usb/src/sys/arm/mv/common.c#4 integrate
.. //depot/projects/usb/src/sys/arm/mv/gpio.c#3 integrate
.. //depot/projects/usb/src/sys/arm/mv/ic.c#2 integrate
.. //depot/projects/usb/src/sys/arm/mv/mv_pci.c#5 integrate
.. //depot/projects/usb/src/sys/arm/mv/mvreg.h#4 integrate
.. //depot/projects/usb/src/sys/boot/forth/loader.conf#17 integrate
.. //depot/projects/usb/src/sys/boot/i386/libi386/Makefile#4 integrate
.. //depot/projects/usb/src/sys/boot/i386/libi386/biosdisk.c#9 integrate
.. //depot/projects/usb/src/sys/boot/i386/libi386/biossmap.c#5 integrate
.. //depot/projects/usb/src/sys/boot/i386/libi386/smbios.c#4 integrate
.. //depot/projects/usb/src/sys/boot/sparc64/loader/main.c#8 integrate
.. //depot/projects/usb/src/sys/bsm/audit.h#11 integrate
.. //depot/projects/usb/src/sys/bsm/audit_domain.h#2 integrate
.. //depot/projects/usb/src/sys/bsm/audit_fcntl.h#1 branch
.. //depot/projects/usb/src/sys/bsm/audit_kevents.h#12 integrate
.. //depot/projects/usb/src/sys/bsm/audit_record.h#11 integrate
.. //depot/projects/usb/src/sys/cam/cam_xpt.c#17 integrate
.. //depot/projects/usb/src/sys/cam/scsi/scsi_sa.c#8 integrate
.. //depot/projects/usb/src/sys/cam/scsi/scsi_ses.c#8 integrate
.. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/vnode.h#4 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#5 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#7 integrate
.. //depot/projects/usb/src/sys/compat/ia32/ia32_sysvec.c#10 integrate
.. //depot/projects/usb/src/sys/compat/linux/linux_emul.c#6 integrate
.. //depot/projects/usb/src/sys/compat/linux/linux_emul.h#6 integrate
.. //depot/projects/usb/src/sys/compat/linux/linux_futex.c#9 integrate
.. //depot/projects/usb/src/sys/compat/ndis/subr_usbd.c#11 integrate
.. //depot/projects/usb/src/sys/conf/NOTES#32 integrate
.. //depot/projects/usb/src/sys/conf/files#59 integrate
.. //depot/projects/usb/src/sys/conf/files.powerpc#20 integrate
.. //depot/projects/usb/src/sys/conf/options#25 integrate
.. //depot/projects/usb/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#11 integrate
.. //depot/projects/usb/src/sys/contrib/pf/net/if_pflog.c#4 integrate
.. //depot/projects/usb/src/sys/contrib/pf/net/if_pfsync.c#7 integrate
.. //depot/projects/usb/src/sys/contrib/pf/net/pf.c#11 integrate
.. //depot/projects/usb/src/sys/dev/agp/agp.c#8 integrate
.. //depot/projects/usb/src/sys/dev/ar/if_ar.c#4 delete
.. //depot/projects/usb/src/sys/dev/ar/if_ar.h#2 delete
.. //depot/projects/usb/src/sys/dev/ar/if_ar_isa.c#2 delete
.. //depot/projects/usb/src/sys/dev/ar/if_ar_pci.c#2 delete
.. //depot/projects/usb/src/sys/dev/ar/if_arregs.h#2 delete
.. //depot/projects/usb/src/sys/dev/ata/ata-queue.c#13 integrate
.. //depot/projects/usb/src/sys/dev/ath/ath_hal/ah.c#5 integrate
.. //depot/projects/usb/src/sys/dev/ath/ath_hal/ah_internal.h#4 integrate
.. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5210/ar5210_phy.c#2 integrate
.. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5211/ar5211_phy.c#2 integrate
.. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5212/ar5212_phy.c#3 integrate
.. //depot/projects/usb/src/sys/dev/ath/ath_rate/sample/sample.c#9 integrate
.. //depot/projects/usb/src/sys/dev/ath/if_ath.c#22 integrate
.. //depot/projects/usb/src/sys/dev/ath/if_athvar.h#18 integrate
.. //depot/projects/usb/src/sys/dev/atkbdc/atkbd.c#4 integrate
.. //depot/projects/usb/src/sys/dev/cxgb/cxgb_sge.c#12 integrate
.. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#9 integrate
.. //depot/projects/usb/src/sys/dev/dcons/dcons_os.c#11 integrate
.. //depot/projects/usb/src/sys/dev/drm/drm_drv.c#11 integrate
.. //depot/projects/usb/src/sys/dev/drm/r300_cmdbuf.c#3 integrate
.. //depot/projects/usb/src/sys/dev/drm/r300_reg.h#3 integrate
.. //depot/projects/usb/src/sys/dev/drm/radeon_cp.c#9 integrate
.. //depot/projects/usb/src/sys/dev/drm/radeon_drv.h#6 integrate
.. //depot/projects/usb/src/sys/dev/e1000/e1000_80003es2lan.c#3 integrate
.. //depot/projects/usb/src/sys/dev/e1000/e1000_82540.c#3 integrate
.. //depot/projects/usb/src/sys/dev/e1000/e1000_82541.c#3 integrate
.. //depot/projects/usb/src/sys/dev/e1000/e1000_82571.c#3 integrate
.. //depot/projects/usb/src/sys/dev/e1000/e1000_82575.c#3 integrate
.. //depot/projects/usb/src/sys/dev/e1000/e1000_82575.h#3 integrate
.. //depot/projects/usb/src/sys/dev/e1000/e1000_api.c#3 integrate
.. //depot/projects/usb/src/sys/dev/e1000/e1000_api.h#3 integrate
.. //depot/projects/usb/src/sys/dev/e1000/e1000_defines.h#3 integrate
.. //depot/projects/usb/src/sys/dev/e1000/e1000_hw.h#3 integrate
.. //depot/projects/usb/src/sys/dev/e1000/e1000_ich8lan.c#3 integrate
.. //depot/projects/usb/src/sys/dev/e1000/e1000_ich8lan.h#3 integrate
.. //depot/projects/usb/src/sys/dev/e1000/e1000_mac.c#3 integrate
.. //depot/projects/usb/src/sys/dev/e1000/e1000_mac.h#3 integrate
.. //depot/projects/usb/src/sys/dev/e1000/e1000_nvm.c#3 integrate
.. //depot/projects/usb/src/sys/dev/e1000/e1000_nvm.h#2 integrate
.. //depot/projects/usb/src/sys/dev/e1000/e1000_phy.c#3 integrate
.. //depot/projects/usb/src/sys/dev/e1000/e1000_phy.h#3 integrate
.. //depot/projects/usb/src/sys/dev/e1000/e1000_regs.h#3 integrate
.. //depot/projects/usb/src/sys/dev/e1000/if_em.c#4 integrate
.. //depot/projects/usb/src/sys/dev/e1000/if_em.h#3 integrate
.. //depot/projects/usb/src/sys/dev/e1000/if_igb.c#6 integrate
.. //depot/projects/usb/src/sys/dev/e1000/if_igb.h#3 integrate
.. //depot/projects/usb/src/sys/dev/ed/if_ed.c#7 integrate
.. //depot/projects/usb/src/sys/dev/ed/if_ed_cbus.c#3 integrate
.. //depot/projects/usb/src/sys/dev/ed/if_ed_isa.c#3 integrate
.. //depot/projects/usb/src/sys/dev/ed/if_ed_pccard.c#9 integrate
.. //depot/projects/usb/src/sys/dev/ed/if_ed_pci.c#4 integrate
.. //depot/projects/usb/src/sys/dev/ed/if_edreg.h#3 integrate
.. //depot/projects/usb/src/sys/dev/ed/if_edvar.h#4 integrate
.. //depot/projects/usb/src/sys/dev/ep/if_ep.c#3 integrate
.. //depot/projects/usb/src/sys/dev/ep/if_ep_pccard.c#3 integrate
.. //depot/projects/usb/src/sys/dev/ep/if_epreg.h#2 integrate
.. //depot/projects/usb/src/sys/dev/ep/if_epvar.h#2 integrate
.. //depot/projects/usb/src/sys/dev/fb/creator.c#7 integrate
.. //depot/projects/usb/src/sys/dev/fb/machfb.c#4 integrate
.. //depot/projects/usb/src/sys/dev/firewire/firewire.c#12 integrate
.. //depot/projects/usb/src/sys/dev/firewire/sbp.h#2 integrate
.. //depot/projects/usb/src/sys/dev/fxp/if_fxp.c#10 integrate
.. //depot/projects/usb/src/sys/dev/hptmv/access601.h#2 integrate
.. //depot/projects/usb/src/sys/dev/hptmv/amd64-elf.raid.o.uu#2 integrate
.. //depot/projects/usb/src/sys/dev/hptmv/array.h#2 integrate
.. //depot/projects/usb/src/sys/dev/hptmv/command.h#2 integrate
.. //depot/projects/usb/src/sys/dev/hptmv/entry.c#6 integrate
.. //depot/projects/usb/src/sys/dev/hptmv/global.h#2 integrate
.. //depot/projects/usb/src/sys/dev/hptmv/gui_lib.c#2 integrate
.. //depot/projects/usb/src/sys/dev/hptmv/hptintf.h#2 integrate
.. //depot/projects/usb/src/sys/dev/hptmv/hptproc.c#2 integrate
.. //depot/projects/usb/src/sys/dev/hptmv/i386-elf.raid.o.uu#2 integrate
.. //depot/projects/usb/src/sys/dev/hptmv/ioctl.c#4 integrate
.. //depot/projects/usb/src/sys/dev/hptmv/mvOs.h#2 integrate
.. //depot/projects/usb/src/sys/dev/hptmv/mvSata.h#2 integrate
.. //depot/projects/usb/src/sys/dev/hptmv/mvStorageDev.h#2 integrate
.. //depot/projects/usb/src/sys/dev/hptmv/osbsd.h#2 integrate
.. //depot/projects/usb/src/sys/dev/hptmv/raid5n.h#2 integrate
.. //depot/projects/usb/src/sys/dev/hptmv/readme.txt#2 integrate
.. //depot/projects/usb/src/sys/dev/hptmv/vdevice.h#2 integrate
.. //depot/projects/usb/src/sys/dev/if_ndis/if_ndis.c#23 integrate
.. //depot/projects/usb/src/sys/dev/iicbus/ds133x.c#2 integrate
.. //depot/projects/usb/src/sys/dev/iicbus/ds1672.c#4 integrate
.. //depot/projects/usb/src/sys/dev/iicbus/if_ic.c#6 integrate
.. //depot/projects/usb/src/sys/dev/ipw/if_ipw.c#10 integrate
.. //depot/projects/usb/src/sys/dev/ixgbe/LICENSE#3 integrate
.. //depot/projects/usb/src/sys/dev/ixgbe/README#2 integrate
.. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe.c#6 integrate
.. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe.h#7 integrate
.. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_82598.c#6 integrate
.. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_82599.c#1 branch
.. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_api.c#6 integrate
.. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_api.h#6 integrate
.. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_common.c#6 integrate
.. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_common.h#6 integrate
.. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_osdep.h#5 integrate
.. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_phy.c#6 integrate
.. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_phy.h#6 integrate
.. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_type.h#6 integrate
.. //depot/projects/usb/src/sys/dev/joy/joy.c#3 integrate
.. //depot/projects/usb/src/sys/dev/kbd/kbdreg.h#3 integrate
.. //depot/projects/usb/src/sys/dev/kbdmux/kbdmux.c#10 integrate
.. //depot/projects/usb/src/sys/dev/lmc/if_lmc.c#10 integrate
.. //depot/projects/usb/src/sys/dev/lmc/if_lmc.h#6 integrate
.. //depot/projects/usb/src/sys/dev/mge/if_mge.c#3 integrate
.. //depot/projects/usb/src/sys/dev/mlx/mlx.c#5 integrate
.. //depot/projects/usb/src/sys/dev/mly/mly.c#6 integrate
.. //depot/projects/usb/src/sys/dev/mse/mse.c#4 integrate
.. //depot/projects/usb/src/sys/dev/pccard/pccarddevs#14 integrate
.. //depot/projects/usb/src/sys/dev/pccbb/pccbb_pci.c#11 integrate
.. //depot/projects/usb/src/sys/dev/pci/pci.c#20 integrate
.. //depot/projects/usb/src/sys/dev/pci/pcireg.h#13 integrate
.. //depot/projects/usb/src/sys/dev/powermac_nvram/powermac_nvram.c#5 integrate
.. //depot/projects/usb/src/sys/dev/ppbus/if_plip.c#9 integrate
.. //depot/projects/usb/src/sys/dev/ray/if_ray.c#6 delete
.. //depot/projects/usb/src/sys/dev/ray/if_raydbg.h#2 delete
.. //depot/projects/usb/src/sys/dev/ray/if_raymib.h#2 delete
.. //depot/projects/usb/src/sys/dev/ray/if_rayreg.h#2 delete
.. //depot/projects/usb/src/sys/dev/ray/if_rayvar.h#3 delete
.. //depot/projects/usb/src/sys/dev/re/if_re.c#18 integrate
.. //depot/projects/usb/src/sys/dev/sound/pci/envy24.c#8 integrate
.. //depot/projects/usb/src/sys/dev/sound/pci/envy24ht.c#7 integrate
.. //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#39 integrate
.. //depot/projects/usb/src/sys/dev/sr/if_sr.c#4 delete
.. //depot/projects/usb/src/sys/dev/sr/if_sr.h#2 delete
.. //depot/projects/usb/src/sys/dev/sr/if_sr_isa.c#2 delete
.. //depot/projects/usb/src/sys/dev/sr/if_sr_pci.c#2 delete
.. //depot/projects/usb/src/sys/dev/sr/if_srregs.h#2 delete
.. //depot/projects/usb/src/sys/dev/syscons/syscons.c#12 integrate
.. //depot/projects/usb/src/sys/dev/tdfx/tdfx_pci.c#4 integrate
.. //depot/projects/usb/src/sys/dev/twa/tw_osl_freebsd.c#8 integrate
.. //depot/projects/usb/src/sys/dev/twe/twe_freebsd.c#4 integrate
.. //depot/projects/usb/src/sys/dev/uart/uart_cpu_powerpc.c#6 integrate
.. //depot/projects/usb/src/sys/dev/uart/uart_dev_ns8250.c#6 integrate
.. //depot/projects/usb/src/sys/dev/usb/bluetooth/ng_ubt.c#5 integrate
.. //depot/projects/usb/src/sys/dev/usb/bluetooth/ubtbcmfw.c#5 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/at91dci.c#13 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/at91dci.h#4 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/at91dci_atmelarm.c#5 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.c#20 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.h#8 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/atmegadci_atmelarm.c#7 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#15 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/ehci.h#6 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/ehci_ixp4xx.c#6 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/ehci_mbus.c#5 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/ehci_pci.c#6 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/musb_otg.c#11 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/musb_otg.h#3 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/musb_otg_atmelarm.c#7 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/ohci.c#13 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/ohci.h#5 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/ohci_atmelarm.c#5 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/ohci_pci.c#6 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/uhci.c#10 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/uhci.h#5 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/uhci_pci.c#6 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/usb_controller.c#13 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/uss820dci.c#12 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/uss820dci.h#4 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/uss820dci_atmelarm.c#5 integrate
.. //depot/projects/usb/src/sys/dev/usb/input/uhid.c#7 integrate
.. //depot/projects/usb/src/sys/dev/usb/input/ukbd.c#4 integrate
.. //depot/projects/usb/src/sys/dev/usb/input/ums.c#10 integrate
.. //depot/projects/usb/src/sys/dev/usb/misc/udbp.c#6 integrate
.. //depot/projects/usb/src/sys/dev/usb/net/if_aue.c#4 integrate
.. //depot/projects/usb/src/sys/dev/usb/net/if_axe.c#5 integrate
.. //depot/projects/usb/src/sys/dev/usb/net/if_cdce.c#7 integrate
.. //depot/projects/usb/src/sys/dev/usb/net/if_cdcereg.h#3 integrate
.. //depot/projects/usb/src/sys/dev/usb/net/if_cue.c#4 integrate
.. //depot/projects/usb/src/sys/dev/usb/net/if_kue.c#4 integrate
.. //depot/projects/usb/src/sys/dev/usb/net/if_rue.c#4 integrate
.. //depot/projects/usb/src/sys/dev/usb/net/if_udav.c#4 integrate
.. //depot/projects/usb/src/sys/dev/usb/serial/u3g.c#8 integrate
.. //depot/projects/usb/src/sys/dev/usb/serial/uark.c#4 integrate
.. //depot/projects/usb/src/sys/dev/usb/serial/ubsa.c#4 integrate
.. //depot/projects/usb/src/sys/dev/usb/serial/ubser.c#7 integrate
.. //depot/projects/usb/src/sys/dev/usb/serial/uchcom.c#4 integrate
.. //depot/projects/usb/src/sys/dev/usb/serial/ucycom.c#7 integrate
.. //depot/projects/usb/src/sys/dev/usb/serial/ufoma.c#6 integrate
.. //depot/projects/usb/src/sys/dev/usb/serial/uftdi.c#5 integrate
.. //depot/projects/usb/src/sys/dev/usb/serial/ugensa.c#6 integrate
.. //depot/projects/usb/src/sys/dev/usb/serial/uipaq.c#4 integrate
.. //depot/projects/usb/src/sys/dev/usb/serial/ulpt.c#8 integrate
.. //depot/projects/usb/src/sys/dev/usb/serial/umct.c#6 integrate
.. //depot/projects/usb/src/sys/dev/usb/serial/umodem.c#9 integrate
.. //depot/projects/usb/src/sys/dev/usb/serial/umoscom.c#4 integrate
.. //depot/projects/usb/src/sys/dev/usb/serial/uplcom.c#6 integrate
.. //depot/projects/usb/src/sys/dev/usb/serial/usb_serial.c#3 integrate
.. //depot/projects/usb/src/sys/dev/usb/serial/usb_serial.h#3 integrate
.. //depot/projects/usb/src/sys/dev/usb/serial/uslcom.c#4 integrate
.. //depot/projects/usb/src/sys/dev/usb/serial/uvisor.c#6 integrate
.. //depot/projects/usb/src/sys/dev/usb/serial/uvscom.c#4 integrate
.. //depot/projects/usb/src/sys/dev/usb/storage/umass.c#12 integrate
.. //depot/projects/usb/src/sys/dev/usb/storage/urio.c#7 integrate
.. //depot/projects/usb/src/sys/dev/usb/storage/ustorage_fs.c#10 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb.h#39 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_bus.h#8 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#34 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_controller.h#6 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_core.h#11 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_dev.c#17 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_device.c#26 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_device.h#16 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_endian.h#6 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_generic.c#11 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_handle_request.c#6 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_hid.c#30 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_hid.h#18 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_hub.c#14 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_hub.h#8 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_msctest.c#7 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_parse.c#3 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_parse.h#3 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_request.c#11 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_request.h#5 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#141 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_transfer.h#7 integrate
.. //depot/projects/usb/src/sys/dev/usb/usbdevs#53 integrate
.. //depot/projects/usb/src/sys/dev/usb/wlan/if_rum.c#9 integrate
.. //depot/projects/usb/src/sys/dev/usb/wlan/if_uath.c#2 integrate
.. //depot/projects/usb/src/sys/dev/usb/wlan/if_ural.c#9 integrate
.. //depot/projects/usb/src/sys/dev/usb/wlan/if_zyd.c#9 integrate
.. //depot/projects/usb/src/sys/dev/xl/if_xl.c#3 integrate
.. //depot/projects/usb/src/sys/fs/devfs/devfs_vnops.c#19 integrate
.. //depot/projects/usb/src/sys/fs/fifofs/fifo_vnops.c#10 integrate
.. //depot/projects/usb/src/sys/fs/pseudofs/pseudofs_vnops.c#12 integrate
.. //depot/projects/usb/src/sys/fs/unionfs/union_subr.c#11 integrate
.. //depot/projects/usb/src/sys/fs/unionfs/union_vnops.c#13 integrate
.. //depot/projects/usb/src/sys/geom/geom.h#8 integrate
.. //depot/projects/usb/src/sys/geom/geom_disk.c#9 integrate
.. //depot/projects/usb/src/sys/geom/geom_disk.h#5 integrate
.. //depot/projects/usb/src/sys/geom/geom_subr.c#11 integrate
.. //depot/projects/usb/src/sys/geom/journal/g_journal.c#10 integrate
.. //depot/projects/usb/src/sys/geom/mirror/g_mirror.c#7 integrate
.. //depot/projects/usb/src/sys/geom/part/g_part.c#18 integrate
.. //depot/projects/usb/src/sys/geom/part/g_part_ebr.c#6 integrate
.. //depot/projects/usb/src/sys/geom/part/g_part_if.m#5 integrate
.. //depot/projects/usb/src/sys/geom/raid3/g_raid3.c#7 integrate
.. //depot/projects/usb/src/sys/geom/vinum/geom_vinum.c#5 integrate
.. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_rename.c#5 integrate
.. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_share.c#5 integrate
.. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_share.h#3 integrate
.. //depot/projects/usb/src/sys/i386/conf/DEFAULTS#10 integrate
.. //depot/projects/usb/src/sys/i386/i386/busdma_machdep.c#16 integrate
.. //depot/projects/usb/src/sys/i386/i386/elf_machdep.c#6 integrate
.. //depot/projects/usb/src/sys/i386/i386/machdep.c#15 integrate
.. //depot/projects/usb/src/sys/i386/include/cpufunc.h#8 integrate
.. //depot/projects/usb/src/sys/i386/include/endian.h#2 integrate
.. //depot/projects/usb/src/sys/i386/include/metadata.h#2 integrate
.. //depot/projects/usb/src/sys/i386/include/param.h#5 integrate
.. //depot/projects/usb/src/sys/i386/include/pc/bios.h#3 integrate
.. //depot/projects/usb/src/sys/i386/linux/linux_sysvec.c#13 integrate
.. //depot/projects/usb/src/sys/ia64/ia64/busdma_machdep.c#12 integrate
.. //depot/projects/usb/src/sys/ia64/ia64/elf_machdep.c#7 integrate
.. //depot/projects/usb/src/sys/ia64/include/param.h#3 integrate
.. //depot/projects/usb/src/sys/kern/imgact_elf.c#12 integrate
.. //depot/projects/usb/src/sys/kern/kern_acct.c#9 integrate
.. //depot/projects/usb/src/sys/kern/kern_alq.c#8 integrate
.. //depot/projects/usb/src/sys/kern/kern_conf.c#15 integrate
.. //depot/projects/usb/src/sys/kern/kern_descrip.c#18 integrate
.. //depot/projects/usb/src/sys/kern/kern_exit.c#14 integrate
.. //depot/projects/usb/src/sys/kern/kern_ktrace.c#10 integrate
.. //depot/projects/usb/src/sys/kern/kern_malloc.c#12 integrate
.. //depot/projects/usb/src/sys/kern/kern_sig.c#13 integrate
.. //depot/projects/usb/src/sys/kern/kern_tc.c#6 integrate
.. //depot/projects/usb/src/sys/kern/kern_time.c#10 integrate
.. //depot/projects/usb/src/sys/kern/kern_umtx.c#11 integrate
.. //depot/projects/usb/src/sys/kern/kern_uuid.c#8 integrate
.. //depot/projects/usb/src/sys/kern/kern_vimage.c#2 integrate
.. //depot/projects/usb/src/sys/kern/tty.c#19 integrate
.. //depot/projects/usb/src/sys/kern/uipc_domain.c#9 integrate
.. //depot/projects/usb/src/sys/kern/uipc_sockbuf.c#10 integrate
.. //depot/projects/usb/src/sys/kern/uipc_syscalls.c#11 integrate
.. //depot/projects/usb/src/sys/kern/uipc_usrreq.c#14 integrate
.. //depot/projects/usb/src/sys/kern/vfs_acl.c#4 integrate
.. //depot/projects/usb/src/sys/kern/vfs_bio.c#17 integrate
.. //depot/projects/usb/src/sys/kern/vfs_cache.c#22 integrate
.. //depot/projects/usb/src/sys/kern/vfs_default.c#10 integrate
.. //depot/projects/usb/src/sys/kern/vfs_extattr.c#6 integrate
.. //depot/projects/usb/src/sys/kern/vfs_lookup.c#14 integrate
.. //depot/projects/usb/src/sys/kern/vfs_mount.c#21 integrate
.. //depot/projects/usb/src/sys/kern/vfs_syscalls.c#18 integrate
.. //depot/projects/usb/src/sys/kern/vfs_vnops.c#17 integrate
.. //depot/projects/usb/src/sys/kern/vnode_if.src#13 integrate
.. //depot/projects/usb/src/sys/legacy/dev/usb/if_aue.c#2 delete
.. //depot/projects/usb/src/sys/legacy/dev/usb/if_auereg.h#2 delete
.. //depot/projects/usb/src/sys/legacy/dev/usb/if_axe.c#2 delete
.. //depot/projects/usb/src/sys/legacy/dev/usb/if_axereg.h#2 delete
.. //depot/projects/usb/src/sys/legacy/dev/usb/if_cdce.c#2 delete
.. //depot/projects/usb/src/sys/legacy/dev/usb/if_cdcereg.h#2 delete
.. //depot/projects/usb/src/sys/legacy/dev/usb/if_cue.c#2 delete
.. //depot/projects/usb/src/sys/legacy/dev/usb/if_cuereg.h#2 delete
.. //depot/projects/usb/src/sys/legacy/dev/usb/if_kue.c#2 delete
.. //depot/projects/usb/src/sys/legacy/dev/usb/if_kuereg.h#2 delete
.. //depot/projects/usb/src/sys/legacy/dev/usb/if_rue.c#2 delete
.. //depot/projects/usb/src/sys/legacy/dev/usb/if_ruereg.h#2 delete
.. //depot/projects/usb/src/sys/legacy/dev/usb/if_rum.c#2 delete
.. //depot/projects/usb/src/sys/legacy/dev/usb/if_rumreg.h#2 delete
.. //depot/projects/usb/src/sys/legacy/dev/usb/if_rumvar.h#2 delete
.. //depot/projects/usb/src/sys/legacy/dev/usb/if_udav.c#2 delete
.. //depot/projects/usb/src/sys/legacy/dev/usb/if_udavreg.h#2 delete
.. //depot/projects/usb/src/sys/legacy/dev/usb/if_ural.c#2 delete
.. //depot/projects/usb/src/sys/legacy/dev/usb/if_uralreg.h#2 delete
.. //depot/projects/usb/src/sys/legacy/dev/usb/if_uralvar.h#2 delete
.. //depot/projects/usb/src/sys/legacy/dev/usb/if_zyd.c#2 delete
.. //depot/projects/usb/src/sys/legacy/dev/usb/if_zydfw.h#2 delete
.. //depot/projects/usb/src/sys/legacy/dev/usb/if_zydreg.h#2 delete
.. //depot/projects/usb/src/sys/legacy/dev/usb/kue_fw.h#2 delete
.. //depot/projects/usb/src/sys/mips/include/param.h#3 integrate
.. //depot/projects/usb/src/sys/mips/mips/elf64_machdep.c#3 integrate
.. //depot/projects/usb/src/sys/mips/mips/elf_machdep.c#6 integrate
.. //depot/projects/usb/src/sys/mips/mips/pmap.c#8 integrate
.. //depot/projects/usb/src/sys/modules/Makefile#30 integrate
.. //depot/projects/usb/src/sys/modules/ar/Makefile#3 delete
.. //depot/projects/usb/src/sys/modules/ixgbe/Makefile#5 integrate
.. //depot/projects/usb/src/sys/modules/netgraph/sync_ar/Makefile#3 delete
.. //depot/projects/usb/src/sys/modules/netgraph/sync_sr/Makefile#3 delete
.. //depot/projects/usb/src/sys/modules/nfsclient/Makefile#4 integrate
.. //depot/projects/usb/src/sys/modules/nfssvc/Makefile#1 branch
.. //depot/projects/usb/src/sys/modules/ray/Makefile#2 delete
.. //depot/projects/usb/src/sys/modules/sr/Makefile#3 delete
.. //depot/projects/usb/src/sys/modules/usb/Makefile#16 integrate
.. //depot/projects/usb/src/sys/modules/usb/usb/Makefile#2 integrate
.. //depot/projects/usb/src/sys/net/bsd_comp.c#5 delete
.. //depot/projects/usb/src/sys/net/ethernet.h#9 integrate
.. //depot/projects/usb/src/sys/net/flowtable.c#1 branch
.. //depot/projects/usb/src/sys/net/flowtable.h#1 branch
.. //depot/projects/usb/src/sys/net/if.c#22 integrate
.. //depot/projects/usb/src/sys/net/if.h#9 integrate
.. //depot/projects/usb/src/sys/net/if_arc.h#2 integrate
.. //depot/projects/usb/src/sys/net/if_arcsubr.c#5 integrate
.. //depot/projects/usb/src/sys/net/if_atm.h#2 integrate
.. //depot/projects/usb/src/sys/net/if_atmsubr.c#8 integrate
.. //depot/projects/usb/src/sys/net/if_bridge.c#14 integrate
.. //depot/projects/usb/src/sys/net/if_disc.c#5 integrate
.. //depot/projects/usb/src/sys/net/if_enc.c#6 integrate
.. //depot/projects/usb/src/sys/net/if_ethersubr.c#16 integrate
.. //depot/projects/usb/src/sys/net/if_faith.c#6 integrate
.. //depot/projects/usb/src/sys/net/if_fddisubr.c#9 integrate
.. //depot/projects/usb/src/sys/net/if_fwsubr.c#12 integrate
.. //depot/projects/usb/src/sys/net/if_gif.c#12 integrate
.. //depot/projects/usb/src/sys/net/if_gif.h#6 integrate
.. //depot/projects/usb/src/sys/net/if_gre.c#11 integrate
.. //depot/projects/usb/src/sys/net/if_iso88025subr.c#10 integrate
.. //depot/projects/usb/src/sys/net/if_lagg.c#12 integrate
.. //depot/projects/usb/src/sys/net/if_lagg.h#5 integrate
.. //depot/projects/usb/src/sys/net/if_llatbl.c#3 integrate
.. //depot/projects/usb/src/sys/net/if_llatbl.h#2 integrate
.. //depot/projects/usb/src/sys/net/if_loop.c#17 integrate
.. //depot/projects/usb/src/sys/net/if_mib.c#6 integrate
.. //depot/projects/usb/src/sys/net/if_ppp.c#9 delete
.. //depot/projects/usb/src/sys/net/if_ppp.h#2 delete
.. //depot/projects/usb/src/sys/net/if_pppvar.h#3 delete
.. //depot/projects/usb/src/sys/net/if_sl.c#6 delete
.. //depot/projects/usb/src/sys/net/if_slvar.h#2 delete
.. //depot/projects/usb/src/sys/net/if_spppsubr.c#10 integrate
.. //depot/projects/usb/src/sys/net/if_stf.c#10 integrate
.. //depot/projects/usb/src/sys/net/if_tun.c#12 integrate
.. //depot/projects/usb/src/sys/net/if_var.h#14 integrate
.. //depot/projects/usb/src/sys/net/if_vlan.c#13 integrate
.. //depot/projects/usb/src/sys/net/iso88025.h#2 integrate
.. //depot/projects/usb/src/sys/net/ppp_comp.h#2 delete
.. //depot/projects/usb/src/sys/net/ppp_deflate.c#3 delete
.. //depot/projects/usb/src/sys/net/ppp_tty.c#3 delete
.. //depot/projects/usb/src/sys/net/radix_mpath.c#5 integrate
.. //depot/projects/usb/src/sys/net/route.c#15 integrate
.. //depot/projects/usb/src/sys/net/route.h#9 integrate
.. //depot/projects/usb/src/sys/net/rtsock.c#19 integrate
.. //depot/projects/usb/src/sys/net/slip.h#2 delete
.. //depot/projects/usb/src/sys/net/vnet.h#6 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211.c#19 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_node.c#20 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_output.c#21 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_proto.h#14 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_tdma.c#8 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_var.h#19 integrate
.. //depot/projects/usb/src/sys/netatalk/at_control.c#4 integrate
.. //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#25 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_eiface.c#8 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_fec.c#5 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_iface.c#10 integrate
.. //depot/projects/usb/src/sys/netinet/icmp6.h#4 integrate
.. //depot/projects/usb/src/sys/netinet/icmp_var.h#4 integrate
.. //depot/projects/usb/src/sys/netinet/if_ether.c#18 integrate
.. //depot/projects/usb/src/sys/netinet/igmp.c#13 integrate
.. //depot/projects/usb/src/sys/netinet/igmp_var.h#4 integrate
.. //depot/projects/usb/src/sys/netinet/in.c#20 integrate
.. //depot/projects/usb/src/sys/netinet/in_gif.c#11 integrate
.. //depot/projects/usb/src/sys/netinet/in_mcast.c#12 integrate
.. //depot/projects/usb/src/sys/netinet/in_pcb.c#20 integrate
.. //depot/projects/usb/src/sys/netinet/in_pcb.h#17 integrate
.. //depot/projects/usb/src/sys/netinet/in_var.h#11 integrate
.. //depot/projects/usb/src/sys/netinet/ip_carp.c#13 integrate
.. //depot/projects/usb/src/sys/netinet/ip_carp.h#3 integrate
.. //depot/projects/usb/src/sys/netinet/ip_divert.c#14 integrate
.. //depot/projects/usb/src/sys/netinet/ip_dummynet.c#12 integrate
.. //depot/projects/usb/src/sys/netinet/ip_dummynet.h#5 integrate
.. //depot/projects/usb/src/sys/netinet/ip_fastfwd.c#10 integrate
.. //depot/projects/usb/src/sys/netinet/ip_fw.h#14 integrate
.. //depot/projects/usb/src/sys/netinet/ip_fw2.c#21 integrate
.. //depot/projects/usb/src/sys/netinet/ip_fw_nat.c#7 integrate
.. //depot/projects/usb/src/sys/netinet/ip_icmp.c#13 integrate
.. //depot/projects/usb/src/sys/netinet/ip_input.c#18 integrate
.. //depot/projects/usb/src/sys/netinet/ip_ipsec.c#11 integrate
.. //depot/projects/usb/src/sys/netinet/ip_mroute.c#11 integrate
.. //depot/projects/usb/src/sys/netinet/ip_mroute.h#6 integrate
.. //depot/projects/usb/src/sys/netinet/ip_options.c#12 integrate
.. //depot/projects/usb/src/sys/netinet/ip_output.c#16 integrate
.. //depot/projects/usb/src/sys/netinet/ip_var.h#9 integrate
.. //depot/projects/usb/src/sys/netinet/libalias/alias.c#7 integrate
.. //depot/projects/usb/src/sys/netinet/libalias/alias_cuseeme.c#3 integrate
.. //depot/projects/usb/src/sys/netinet/libalias/alias_dummy.c#2 integrate
.. //depot/projects/usb/src/sys/netinet/libalias/alias_ftp.c#7 integrate
.. //depot/projects/usb/src/sys/netinet/libalias/alias_irc.c#6 integrate
.. //depot/projects/usb/src/sys/netinet/libalias/alias_mod.c#2 integrate
.. //depot/projects/usb/src/sys/netinet/libalias/alias_mod.h#2 integrate
.. //depot/projects/usb/src/sys/netinet/libalias/alias_nbt.c#4 integrate
.. //depot/projects/usb/src/sys/netinet/libalias/alias_pptp.c#3 integrate
.. //depot/projects/usb/src/sys/netinet/libalias/alias_skinny.c#4 integrate
.. //depot/projects/usb/src/sys/netinet/libalias/alias_smedia.c#4 integrate
.. //depot/projects/usb/src/sys/netinet/pim_var.h#2 integrate
.. //depot/projects/usb/src/sys/netinet/raw_ip.c#20 integrate
.. //depot/projects/usb/src/sys/netinet/sctp_bsd_addr.c#10 integrate
.. //depot/projects/usb/src/sys/netinet/sctp_indata.c#17 integrate
.. //depot/projects/usb/src/sys/netinet/sctp_structs.h#12 integrate
.. //depot/projects/usb/src/sys/netinet/sctp_sysctl.c#13 integrate
.. //depot/projects/usb/src/sys/netinet/sctp_uio.h#15 integrate
.. //depot/projects/usb/src/sys/netinet/tcp_hostcache.c#10 integrate
.. //depot/projects/usb/src/sys/netinet/tcp_input.c#20 integrate
.. //depot/projects/usb/src/sys/netinet/tcp_output.c#16 integrate
.. //depot/projects/usb/src/sys/netinet/tcp_reass.c#8 integrate
.. //depot/projects/usb/src/sys/netinet/tcp_sack.c#9 integrate
.. //depot/projects/usb/src/sys/netinet/tcp_subr.c#21 integrate
.. //depot/projects/usb/src/sys/netinet/tcp_syncache.c#19 integrate
.. //depot/projects/usb/src/sys/netinet/tcp_timer.c#14 integrate
.. //depot/projects/usb/src/sys/netinet/tcp_timewait.c#11 integrate
.. //depot/projects/usb/src/sys/netinet/tcp_usrreq.c#17 integrate
.. //depot/projects/usb/src/sys/netinet/tcp_var.h#16 integrate
.. //depot/projects/usb/src/sys/netinet/udp_usrreq.c#19 integrate
.. //depot/projects/usb/src/sys/netinet/udp_var.h#6 integrate
.. //depot/projects/usb/src/sys/netinet/vinet.h#8 integrate
.. //depot/projects/usb/src/sys/netinet6/frag6.c#13 integrate
.. //depot/projects/usb/src/sys/netinet6/icmp6.c#16 integrate
.. //depot/projects/usb/src/sys/netinet6/in6.c#19 integrate
.. //depot/projects/usb/src/sys/netinet6/in6.h#6 integrate
.. //depot/projects/usb/src/sys/netinet6/in6_ifattach.c#16 integrate
.. //depot/projects/usb/src/sys/netinet6/in6_src.c#16 integrate
.. //depot/projects/usb/src/sys/netinet6/in6_var.h#7 integrate
.. //depot/projects/usb/src/sys/netinet6/ip6_input.c#18 integrate
.. //depot/projects/usb/src/sys/netinet6/mld6.c#12 integrate
.. //depot/projects/usb/src/sys/netinet6/nd6.c#15 integrate
.. //depot/projects/usb/src/sys/netinet6/nd6.h#6 integrate
.. //depot/projects/usb/src/sys/netinet6/nd6_nbr.c#13 integrate
.. //depot/projects/usb/src/sys/netinet6/nd6_rtr.c#14 integrate
.. //depot/projects/usb/src/sys/netinet6/raw_ip6.c#18 integrate
.. //depot/projects/usb/src/sys/netinet6/scope6.c#10 integrate
.. //depot/projects/usb/src/sys/netinet6/udp6_usrreq.c#17 integrate
.. //depot/projects/usb/src/sys/netipsec/ipsec.c#16 integrate
.. //depot/projects/usb/src/sys/netipsec/key.c#14 integrate
.. //depot/projects/usb/src/sys/netipsec/xform_ah.c#8 integrate
.. //depot/projects/usb/src/sys/netipsec/xform_esp.c#8 integrate
.. //depot/projects/usb/src/sys/netipsec/xform_ipcomp.c#7 integrate
.. //depot/projects/usb/src/sys/netipsec/xform_ipip.c#12 integrate
.. //depot/projects/usb/src/sys/netipx/ipx_outputfl.c#4 integrate
.. //depot/projects/usb/src/sys/nfs/nfs_nfssvc.c#1 branch
.. //depot/projects/usb/src/sys/nfs/nfssvc.h#1 branch
.. //depot/projects/usb/src/sys/nfs4client/nfs4_socket.c#4 integrate
.. //depot/projects/usb/src/sys/nfs4client/nfs4_vnops.c#10 integrate
.. //depot/projects/usb/src/sys/nfsclient/nfs.h#8 integrate
.. //depot/projects/usb/src/sys/nfsclient/nfs_krpc.c#3 integrate
.. //depot/projects/usb/src/sys/nfsclient/nfs_socket.c#10 integrate
.. //depot/projects/usb/src/sys/nfsclient/nfs_subs.c#9 integrate
.. //depot/projects/usb/src/sys/nfsclient/nfs_vnops.c#21 integrate
.. //depot/projects/usb/src/sys/nfsserver/nfs.h#9 integrate
.. //depot/projects/usb/src/sys/nfsserver/nfs_srvkrpc.c#5 integrate
.. //depot/projects/usb/src/sys/nfsserver/nfs_srvsubs.c#14 integrate
.. //depot/projects/usb/src/sys/nfsserver/nfs_syscalls.c#12 integrate
.. //depot/projects/usb/src/sys/pc98/cbus/olpt.c#4 integrate
.. //depot/projects/usb/src/sys/pc98/pc98/machdep.c#12 integrate
.. //depot/projects/usb/src/sys/pci/if_rlreg.h#15 integrate
.. //depot/projects/usb/src/sys/powerpc/aim/machdep.c#8 integrate
.. //depot/projects/usb/src/sys/powerpc/aim/trap.c#4 integrate
.. //depot/projects/usb/src/sys/powerpc/aim/trap_subr.S#6 integrate
.. //depot/projects/usb/src/sys/powerpc/booke/machdep.c#9 integrate
.. //depot/projects/usb/src/sys/powerpc/include/hid.h#4 integrate
.. //depot/projects/usb/src/sys/powerpc/include/param.h#4 integrate
.. //depot/projects/usb/src/sys/powerpc/include/spr.h#8 integrate
.. //depot/projects/usb/src/sys/powerpc/include/trap_aim.h#2 integrate
.. //depot/projects/usb/src/sys/powerpc/include/vmparam.h#8 integrate
.. //depot/projects/usb/src/sys/powerpc/ofw/ofw_real.c#1 branch
.. //depot/projects/usb/src/sys/powerpc/powerpc/elf_machdep.c#6 integrate
.. //depot/projects/usb/src/sys/powerpc/powerpc/intr_machdep.c#11 integrate
.. //depot/projects/usb/src/sys/rpc/svc.h#3 integrate
.. //depot/projects/usb/src/sys/security/audit/audit.c#13 integrate
.. //depot/projects/usb/src/sys/security/audit/audit_bsm.c#14 integrate
.. //depot/projects/usb/src/sys/security/audit/audit_bsm_domain.c#2 integrate
.. //depot/projects/usb/src/sys/security/audit/audit_bsm_fcntl.c#1 branch
.. //depot/projects/usb/src/sys/security/audit/audit_bsm_token.c#13 integrate
.. //depot/projects/usb/src/sys/security/audit/audit_pipe.c#14 integrate
.. //depot/projects/usb/src/sys/security/audit/audit_private.h#10 integrate
.. //depot/projects/usb/src/sys/security/audit/audit_syscalls.c#13 integrate
.. //depot/projects/usb/src/sys/sparc64/include/param.h#4 integrate
.. //depot/projects/usb/src/sys/sparc64/sparc64/elf_machdep.c#8 integrate
.. //depot/projects/usb/src/sys/sun4v/include/param.h#3 integrate
.. //depot/projects/usb/src/sys/sys/acl.h#3 integrate
.. //depot/projects/usb/src/sys/sys/elf_common.h#13 integrate
.. //depot/projects/usb/src/sys/sys/imgact_elf.h#5 integrate
.. //depot/projects/usb/src/sys/sys/kernel.h#12 integrate
.. //depot/projects/usb/src/sys/sys/malloc.h#6 integrate
.. //depot/projects/usb/src/sys/sys/mbuf.h#12 integrate
.. //depot/projects/usb/src/sys/sys/param.h#27 integrate
.. //depot/projects/usb/src/sys/sys/systm.h#15 integrate
.. //depot/projects/usb/src/sys/sys/vimage.h#7 integrate
.. //depot/projects/usb/src/sys/sys/vnode.h#19 integrate
.. //depot/projects/usb/src/sys/ufs/ffs/ffs_snapshot.c#13 integrate
.. //depot/projects/usb/src/sys/ufs/ufs/ufs_extern.h#2 integrate
.. //depot/projects/usb/src/sys/ufs/ufs/ufs_lookup.c#12 integrate
.. //depot/projects/usb/src/sys/ufs/ufs/ufs_vnops.c#13 integrate
.. //depot/projects/usb/src/sys/vm/vm_fault.c#11 integrate
.. //depot/projects/usb/src/sys/vm/vm_map.c#14 integrate
.. //depot/projects/usb/src/sys/vm/vm_map.h#9 integrate
.. //depot/projects/usb/src/sys/vm/vm_pageout.c#13 integrate
.. //depot/projects/usb/src/sys/vm/vm_reserv.c#2 integrate
.. //depot/projects/usb/src/sys/vm/vm_unix.c#4 integrate

Differences ...

==== //depot/projects/usb/src/sys/amd64/amd64/busdma_machdep.c#13 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.88 2009/02/09 18:03:31 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.90 2009/04/17 13:22:18 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -606,7 +606,10 @@
 		vendaddr = (vm_offset_t)buf + buflen;
 
 		while (vaddr < vendaddr) {
-			paddr = pmap_kextract(vaddr);
+			if (pmap)
+				paddr = pmap_extract(pmap, vaddr);
+			else
+				paddr = pmap_kextract(vaddr);
 			if (run_filter(dmat, paddr) != 0)
 				map->pagesneeded++;
 			vaddr += (PAGE_SIZE - ((vm_offset_t)vaddr & PAGE_MASK));
@@ -1134,9 +1137,7 @@
 	mtx_unlock(&bounce_lock);
 
 	if (dmat->flags & BUS_DMA_KEEP_PG_OFFSET) {
-		/* page offset needs to be preserved */
-		bpage->vaddr &= ~PAGE_MASK;
-		bpage->busaddr &= ~PAGE_MASK;
+		/* Page offset needs to be preserved. */
 		bpage->vaddr |= vaddr & PAGE_MASK;
 		bpage->busaddr |= vaddr & PAGE_MASK;
 	}
@@ -1155,6 +1156,15 @@
 	bz = dmat->bounce_zone;
 	bpage->datavaddr = 0;
 	bpage->datacount = 0;
+	if (dmat->flags & BUS_DMA_KEEP_PG_OFFSET) {
+		/*
+		 * Reset the bounce page to start at offset 0.  Other uses
+		 * of this bounce page may need to store a full page of
+		 * data and/or assume it starts on a page boundary.
+		 */
+		bpage->vaddr &= ~PAGE_MASK;
+		bpage->busaddr &= ~PAGE_MASK;
+	}
 
 	mtx_lock(&bounce_lock);
 	STAILQ_INSERT_HEAD(&bz->bounce_page_list, bpage, links);

==== //depot/projects/usb/src/sys/amd64/amd64/elf_machdep.c#6 (text+ko) ====

@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.29 2009/03/13 16:40:51 dchagin Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.30 2009/04/05 09:27:19 dchagin Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -85,7 +85,7 @@
 	.sysvec		= &elf64_freebsd_sysvec,
 	.interp_newpath	= NULL,
 	.brand_note	= &elf64_freebsd_brandnote,
-	.flags		= BI_CAN_EXEC_DYN
+	.flags		= BI_CAN_EXEC_DYN | BI_BRAND_NOTE
 };
 
 SYSINIT(elf64, SI_SUB_EXEC, SI_ORDER_ANY,
@@ -101,7 +101,7 @@
 	.sysvec		= &elf64_freebsd_sysvec,
 	.interp_newpath	= NULL,
 	.brand_note	= &elf64_freebsd_brandnote,
-	.flags		= BI_CAN_EXEC_DYN
+	.flags		= BI_CAN_EXEC_DYN | BI_BRAND_NOTE
 };
 
 SYSINIT(oelf64, SI_SUB_EXEC, SI_ORDER_ANY,

==== //depot/projects/usb/src/sys/amd64/amd64/machdep.c#17 (text+ko) ====

@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.698 2009/04/01 13:09:26 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.699 2009/04/11 14:01:01 ed Exp $");
 
 #include "opt_atalk.h"
 #include "opt_atpic.h"
@@ -2178,45 +2178,24 @@
 #ifdef KDB
 
 /*
- * Provide inb() and outb() as functions.  They are normally only
- * available as macros calling inlined functions, thus cannot be
- * called from the debugger.
- *
- * The actual code is stolen from <machine/cpufunc.h>, and de-inlined.
+ * Provide inb() and outb() as functions.  They are normally only available as
+ * inline functions, thus cannot be called from the debugger.
  */
 
-#undef inb
-#undef outb
-
 /* silence compiler warnings */
-u_char inb(u_int);
-void outb(u_int, u_char);
+u_char inb_(u_short);
+void outb_(u_short, u_char);
 
 u_char
-inb(u_int port)
+inb_(u_short port)
 {
-	u_char	data;
-	/*
-	 * We use %%dx and not %1 here because i/o is done at %dx and not at
-	 * %edx, while gcc generates inferior code (movw instead of movl)
-	 * if we tell it to load (u_short) port.
-	 */
-	__asm __volatile("inb %%dx,%0" : "=a" (data) : "d" (port));
-	return (data);
+	return inb(port);
 }
 
 void
-outb(u_int port, u_char data)
+outb_(u_short port, u_char data)
 {
-	u_char	al;
-	/*
-	 * Use an unnecessary assignment to help gcc's register allocator.
-	 * This make a large difference for gcc-1.40 and a tiny difference
-	 * for gcc-2.6.0.  For gcc-1.40, al had to be ``asm("ax")'' for
-	 * best results.  gcc-2.6.0 can't handle this.
-	 */
-	al = data;
-	__asm __volatile("outb %0,%%dx" : : "a" (al), "d" (port));
+	outb(port, data);
 }
 
 #endif /* KDB */

==== //depot/projects/usb/src/sys/amd64/conf/DEFAULTS#9 (text+ko) ====

@@ -1,7 +1,7 @@
 #
 # DEFAULTS -- Default kernel configuration file for FreeBSD/amd64
 #
-# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.15 2009/02/10 00:08:39 marcel Exp $
+# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.17 2009/04/19 00:16:04 kmacy Exp $
 
 machine		amd64
 
@@ -18,4 +18,7 @@
 # Default partitioning schemes
 options 	GEOM_PART_BSD
 options 	GEOM_PART_EBR
+options 	GEOM_PART_EBR_COMPAT
 options 	GEOM_PART_MBR
+
+options		FLOWTABLE

==== //depot/projects/usb/src/sys/amd64/conf/GENERIC#23 (text+ko) ====

@@ -16,7 +16,7 @@
 # If you are in doubt as to the purpose or necessity of a line, check first
 # in NOTES.
 #
-# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.522 2009/03/19 20:33:26 thompsa Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.523 2009/04/10 00:40:48 jfv Exp $
 
 cpu		HAMMER
 ident		GENERIC
@@ -200,7 +200,7 @@
 device		de		# DEC/Intel DC21x4x (``Tulip'')
 device		em		# Intel PRO/1000 Gigabit Ethernet Family
 device		igb		# Intel PRO/1000 PCIE Server Gigabit Family
-device		ixgb		# Intel PRO/10GbE Ethernet Card
+device		ixgbe		# Intel PRO/10GbE PCIE Ethernet Family
 device		le		# AMD Am7900 LANCE and Am79C9xx PCnet
 device		ti		# Alteon Networks Tigon I/II gigabit Ethernet
 device		txp		# 3Com 3cR990 (``Typhoon'')

==== //depot/projects/usb/src/sys/amd64/include/cpufunc.h#5 (text+ko) ====

@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/amd64/include/cpufunc.h,v 1.151 2009/01/31 11:37:21 obrien Exp $
+ * $FreeBSD: src/sys/amd64/include/cpufunc.h,v 1.153 2009/04/11 14:01:01 ed Exp $
  */
 
 /*
@@ -164,79 +164,21 @@
 	__asm __volatile("hlt");
 }
 
-#if !defined(__GNUCLIKE_BUILTIN_CONSTANT_P) || __GNUCLIKE_ASM < 3
-
-#define	inb(port)		inbv(port)
-#define	outb(port, data)	outbv(port, data)
-
-#else /* __GNUCLIKE_BUILTIN_CONSTANT_P && __GNUCLIKE_ASM >= 3 */
-
-/*
- * The following complications are to get around gcc not having a
- * constraint letter for the range 0..255.  We still put "d" in the
- * constraint because "i" isn't a valid constraint when the port
- * isn't constant.  This only matters for -O0 because otherwise
- * the non-working version gets optimized away.
- * 
- * Use an expression-statement instead of a conditional expression
- * because gcc-2.6.0 would promote the operands of the conditional
- * and produce poor code for "if ((inb(var) & const1) == const2)".
- *
- * The unnecessary test `(port) < 0x10000' is to generate a warning if
- * the `port' has type u_short or smaller.  Such types are pessimal.
- * This actually only works for signed types.  The range check is
- * careful to avoid generating warnings.
- */
-#define	inb(port) __extension__ ({					\
-	u_char	_data;							\
-	if (__builtin_constant_p(port) && ((port) & 0xffff) < 0x100	\
-	    && (port) < 0x10000)					\
-		_data = inbc(port);					\
-	else								\
-		_data = inbv(port);					\
-	_data; })
-
-#define	outb(port, data) (						\
-	__builtin_constant_p(port) && ((port) & 0xffff) < 0x100		\
-	&& (port) < 0x10000						\
-	? outbc(port, data) : outbv(port, data))
-
 static __inline u_char
-inbc(u_int port)
+inb(u_int port)
 {
 	u_char	data;
 
-	__asm __volatile("inb %1,%0" : "=a" (data) : "id" ((u_short)(port)));
+	__asm volatile("inb %w1, %0" : "=a" (data) : "Nd" (port));
 	return (data);
 }
 
-static __inline void
-outbc(u_int port, u_char data)
-{
-	__asm __volatile("outb %0,%1" : : "a" (data), "id" ((u_short)(port)));
-}
-
-#endif /* __GNUCLIKE_BUILTIN_CONSTANT_P  && __GNUCLIKE_ASM >= 3*/
-
-static __inline u_char
-inbv(u_int port)
-{
-	u_char	data;
-	/*
-	 * We use %%dx and not %1 here because i/o is done at %dx and not at
-	 * %edx, while gcc generates inferior code (movw instead of movl)
-	 * if we tell it to load (u_short) port.
-	 */
-	__asm __volatile("inb %%dx,%0" : "=a" (data) : "d" (port));
-	return (data);
-}
-
 static __inline u_int
 inl(u_int port)
 {
 	u_int	data;
 
-	__asm __volatile("inl %%dx,%0" : "=a" (data) : "d" (port));
+	__asm volatile("inl %w1, %0" : "=a" (data) : "Nd" (port));
 	return (data);
 }
 
@@ -278,33 +220,20 @@
 {
 	u_short	data;
 
-	__asm __volatile("inw %%dx,%0" : "=a" (data) : "d" (port));
+	__asm volatile("inw %w1, %0" : "=a" (data) : "Nd" (port));
 	return (data);
 }
 
 static __inline void
-outbv(u_int port, u_char data)
+outb(u_int port, u_char data)
 {
-	u_char	al;
-	/*
-	 * Use an unnecessary assignment to help gcc's register allocator.
-	 * This make a large difference for gcc-1.40 and a tiny difference
-	 * for gcc-2.6.0.  For gcc-1.40, al had to be ``asm("ax")'' for
-	 * best results.  gcc-2.6.0 can't handle this.
-	 */
-	al = data;
-	__asm __volatile("outb %0,%%dx" : : "a" (al), "d" (port));
+	__asm volatile("outb %0, %w1" : : "a" (data), "Nd" (port));
 }
 
 static __inline void
 outl(u_int port, u_int data)
 {
-	/*
-	 * outl() and outw() aren't used much so we haven't looked at
-	 * possible micro-optimizations such as the unnecessary
-	 * assignment for them.
-	 */
-	__asm __volatile("outl %0,%%dx" : : "a" (data), "d" (port));
+	__asm volatile("outl %0, %w1" : : "a" (data), "Nd" (port));
 }
 
 static __inline void
@@ -334,7 +263,7 @@
 static __inline void
 outw(u_int port, u_short data)
 {
-	__asm __volatile("outw %0,%%dx" : : "a" (data), "d" (port));
+	__asm volatile("outw %0, %w1" : : "a" (data), "Nd" (port));
 }
 
 static __inline void
@@ -535,12 +464,9 @@
 static __inline void
 load_fs(u_int sel)
 {
-	register u_int32_t fsbase __asm("ecx");
-
 	/* Preserve the fsbase value across the selector load */
-	fsbase = MSR_FSBASE;
-        __asm __volatile("rdmsr; mov %0,%%fs; wrmsr"
-            : : "rm" (sel), "c" (fsbase) : "eax", "edx");
+	__asm __volatile("rdmsr; mov %0,%%fs; wrmsr"
+	    : : "rm" (sel), "c" (MSR_FSBASE) : "eax", "edx");
 }
 
 #ifndef	MSR_GSBASE
@@ -549,16 +475,13 @@
 static __inline void
 load_gs(u_int sel)
 {
-	register u_int32_t gsbase __asm("ecx");
-
 	/*
 	 * Preserve the gsbase value across the selector load.
 	 * Note that we have to disable interrupts because the gsbase
 	 * being trashed happens to be the kernel gsbase at the time.
 	 */
-	gsbase = MSR_GSBASE;
-        __asm __volatile("pushfq; cli; rdmsr; mov %0,%%gs; wrmsr; popfq"
-            : : "rm" (sel), "c" (gsbase) : "eax", "edx");
+	__asm __volatile("pushfq; cli; rdmsr; mov %0,%%gs; wrmsr; popfq"
+	    : : "rm" (sel), "c" (MSR_GSBASE) : "eax", "edx");
 }
 #else
 /* Usable by userland */

==== //depot/projects/usb/src/sys/amd64/include/endian.h#2 (text+ko) ====

@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)endian.h	7.8 (Berkeley) 4/3/91
- * $FreeBSD: src/sys/amd64/include/endian.h,v 1.8 2005/03/11 21:46:01 peter Exp $
+ * $FreeBSD: src/sys/amd64/include/endian.h,v 1.10 2009/04/08 19:10:20 ed Exp $
  */
 
 #ifndef _MACHINE_ENDIAN_H_
@@ -69,25 +69,6 @@
 
 #if defined(__GNUCLIKE_ASM) && defined(__GNUCLIKE_BUILTIN_CONSTANT_P)
 
-#define __word_swap_int_var(x) \
-__extension__ ({ register __uint32_t __X = (x); \
-   __asm ("rorl $16, %0" : "+r" (__X)); \
-   __X; })
-
-#ifdef __OPTIMIZE__
-
-#define	__word_swap_int_const(x) \
-	((((x) & 0xffff0000) >> 16) | \
-	 (((x) & 0x0000ffff) << 16))
-#define	__word_swap_int(x) (__builtin_constant_p(x) ? \
-	__word_swap_int_const(x) : __word_swap_int_var(x))
-
-#else	/* __OPTIMIZE__ */
-
-#define	__word_swap_int(x) __word_swap_int_var(x)
-
-#endif	/* __OPTIMIZE__ */
-
 #define __byte_swap_int_var(x) \
 __extension__ ({ register __uint32_t __X = (x); \
    __asm ("bswap %0" : "+r" (__X)); \
@@ -135,26 +116,6 @@
 
 #endif	/* __OPTIMIZE__ */
 
-#define __byte_swap_word_var(x) \
-__extension__ ({ register __uint16_t __X = (x); \

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



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