Date: Wed, 23 Dec 2009 00:48:45 GMT From: Andrew Thompson <thompsa@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 172119 for review Message-ID: <200912230048.nBN0mjWK011392@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/chv.cgi?CH=172119 Change 172119 by thompsa@thompsa_pea on 2009/12/23 00:48:09 IFC @172117 Affected files ... .. //depot/projects/usb/src/lib/libusb/libusb10.c#20 integrate .. //depot/projects/usb/src/sys/amd64/acpica/acpi_switch.S#3 integrate .. //depot/projects/usb/src/sys/amd64/amd64/mca.c#3 integrate .. //depot/projects/usb/src/sys/amd64/amd64/vm_machdep.c#15 integrate .. //depot/projects/usb/src/sys/amd64/conf/DEFAULTS#12 integrate .. //depot/projects/usb/src/sys/amd64/conf/NOTES#24 integrate .. //depot/projects/usb/src/sys/amd64/ia32/ia32_syscall.c#5 integrate .. //depot/projects/usb/src/sys/amd64/include/mca.h#2 integrate .. //depot/projects/usb/src/sys/arm/conf/AVILA#18 integrate .. //depot/projects/usb/src/sys/arm/conf/CAMBRIA#10 integrate .. //depot/projects/usb/src/sys/arm/conf/DEFAULTS#3 integrate .. //depot/projects/usb/src/sys/arm/mv/mv_sata.c#3 integrate .. //depot/projects/usb/src/sys/boot/common/Makefile.inc#5 integrate .. //depot/projects/usb/src/sys/boot/common/md.c#1 branch .. //depot/projects/usb/src/sys/boot/i386/Makefile#7 integrate .. //depot/projects/usb/src/sys/boot/i386/gptboot/gptboot.c#5 integrate .. //depot/projects/usb/src/sys/boot/i386/libi386/biosacpi.c#4 integrate .. //depot/projects/usb/src/sys/boot/i386/libi386/biosdisk.c#13 integrate .. //depot/projects/usb/src/sys/boot/i386/libi386/biosmem.c#3 integrate .. //depot/projects/usb/src/sys/boot/i386/libi386/libi386.h#4 integrate .. //depot/projects/usb/src/sys/boot/i386/loader/main.c#9 integrate .. //depot/projects/usb/src/sys/boot/i386/zfsboot/zfsboot.c#7 integrate .. //depot/projects/usb/src/sys/boot/pc98/boot2/Makefile#3 integrate .. //depot/projects/usb/src/sys/boot/pc98/boot2/bios.S#2 integrate .. //depot/projects/usb/src/sys/boot/pc98/boot2/boot.c#5 integrate .. //depot/projects/usb/src/sys/boot/pc98/boot2/boot.h#2 integrate .. //depot/projects/usb/src/sys/boot/pc98/boot2/disk.c#2 integrate .. //depot/projects/usb/src/sys/boot/pc98/boot2/io.c#2 integrate .. //depot/projects/usb/src/sys/boot/pc98/boot2/serial_16550.S#2 integrate .. //depot/projects/usb/src/sys/boot/pc98/boot2/sys.c#3 integrate .. //depot/projects/usb/src/sys/boot/pc98/btx/btx/btx.S#4 integrate .. //depot/projects/usb/src/sys/boot/pc98/kgzldr/crt.s#2 integrate .. //depot/projects/usb/src/sys/boot/pc98/libpc98/biosdisk.c#6 integrate .. //depot/projects/usb/src/sys/boot/pc98/libpc98/biosmem.c#2 integrate .. //depot/projects/usb/src/sys/boot/pc98/loader/main.c#7 integrate .. //depot/projects/usb/src/sys/boot/uboot/lib/glue.c#6 integrate .. //depot/projects/usb/src/sys/boot/zfs/zfsimpl.c#6 integrate .. //depot/projects/usb/src/sys/cam/ata/ata_all.c#6 integrate .. //depot/projects/usb/src/sys/cam/ata/ata_all.h#5 integrate .. //depot/projects/usb/src/sys/cam/ata/ata_da.c#8 integrate .. //depot/projects/usb/src/sys/cam/ata/ata_pmp.c#3 integrate .. //depot/projects/usb/src/sys/cam/ata/ata_xpt.c#8 integrate .. //depot/projects/usb/src/sys/cam/cam_periph.h#7 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_cd.c#14 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#4 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#4 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#5 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#6 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#17 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#4 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#5 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_proto.h#23 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_syscall.h#22 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_syscalls.c#22 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_sysent.c#23 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/syscalls.master#22 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_ioctl.c#20 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_ioctl.h#5 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_signal.c#6 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_videodev.h#1 branch .. //depot/projects/usb/src/sys/compat/linux/linux_videodev_compat.h#1 branch .. //depot/projects/usb/src/sys/compat/x86bios/x86bios.c#3 integrate .. //depot/projects/usb/src/sys/conf/NOTES#51 integrate .. //depot/projects/usb/src/sys/conf/files#88 integrate .. //depot/projects/usb/src/sys/conf/options#44 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/changes.txt#5 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslcompile.c#6 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/debugger/dbutils.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/disassembler/dmwalk.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/dispatcher/dsmethod.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/dispatcher/dswload.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/events/evregion.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/events/evrgnini.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/events/evxface.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/events/evxfevnt.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/events/evxfregn.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/executer/exmutex.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acnamesp.h#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acobject.h#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acoutput.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acpixf.h#5 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nsaccess.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nsdump.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nseval.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nsnames.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nspredef.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nsrepair.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nsrepair2.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nsutils.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nsxfeval.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nsxfname.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nsxfobj.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/parser/psxface.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/resources/rsxface.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/tools/acpiexec/aecommon.h#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/utilities/utcopy.c#2 integrate .. //depot/projects/usb/src/sys/dev/aac/aac.c#12 integrate .. //depot/projects/usb/src/sys/dev/aac/aac_cam.c#9 integrate .. //depot/projects/usb/src/sys/dev/aac/aacvar.h#7 integrate .. //depot/projects/usb/src/sys/dev/agp/agp_via.c#5 integrate .. //depot/projects/usb/src/sys/dev/ahci/ahci.c#8 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-all.c#22 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-all.h#17 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-disk.c#19 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-dma.c#12 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-lowlevel.c#7 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-pci.c#17 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-pci.h#25 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-queue.c#17 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-sata.c#7 integrate .. //depot/projects/usb/src/sys/dev/ata/ata_if.m#4 integrate .. //depot/projects/usb/src/sys/dev/ata/atapi-cd.c#14 integrate .. //depot/projects/usb/src/sys/dev/ata/atapi-cd.h#5 integrate .. //depot/projects/usb/src/sys/dev/ata/atapi-fd.c#10 integrate .. //depot/projects/usb/src/sys/dev/ata/atapi-tape.c#12 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-acard.c#5 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-acerlabs.c#7 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-ahci.c#12 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-amd.c#3 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-ati.c#5 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-cenatek.c#3 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-cypress.c#3 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-cyrix.c#3 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-highpoint.c#4 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-intel.c#10 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-ite.c#3 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-jmicron.c#6 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-marvell.c#11 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-micron.c#3 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-national.c#3 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-netcell.c#4 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-nvidia.c#10 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-promise.c#9 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-serverworks.c#6 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-siliconimage.c#9 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-sis.c#7 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-via.c#7 integrate .. //depot/projects/usb/src/sys/dev/atkbdc/psm.c#13 integrate .. //depot/projects/usb/src/sys/dev/auxio/auxio.c#2 integrate .. //depot/projects/usb/src/sys/dev/bge/if_bge.c#25 integrate .. //depot/projects/usb/src/sys/dev/bge/if_bgereg.h#14 integrate .. //depot/projects/usb/src/sys/dev/ciss/ciss.c#18 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_common.h#12 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_t3fw.h#4 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#5 integrate .. //depot/projects/usb/src/sys/dev/dpms/dpms.c#5 integrate .. //depot/projects/usb/src/sys/dev/e1000/LICENSE#2 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_80003es2lan.c#4 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_80003es2lan.h#2 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_82541.c#5 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_82543.c#3 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_82571.c#5 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_82575.c#5 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_82575.h#5 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_api.c#5 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_defines.h#5 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_hw.h#5 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_ich8lan.c#6 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_ich8lan.h#5 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_mac.c#5 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_manage.c#3 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_osdep.h#3 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_phy.c#5 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_phy.h#5 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_regs.h#5 integrate .. //depot/projects/usb/src/sys/dev/e1000/if_em.c#14 integrate .. //depot/projects/usb/src/sys/dev/e1000/if_em.h#6 integrate .. //depot/projects/usb/src/sys/dev/e1000/if_igb.c#16 integrate .. //depot/projects/usb/src/sys/dev/e1000/if_igb.h#5 integrate .. //depot/projects/usb/src/sys/dev/fdc/fdc_acpi.c#3 integrate .. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_intel.c#5 integrate .. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_x86.c#9 integrate .. //depot/projects/usb/src/sys/dev/ichsmb/ichsmb_pci.c#5 integrate .. //depot/projects/usb/src/sys/dev/if_ndis/if_ndis.c#35 integrate .. //depot/projects/usb/src/sys/dev/if_ndis/if_ndis_usb.c#24 integrate .. //depot/projects/usb/src/sys/dev/iir/iir_ctrl.c#5 integrate .. //depot/projects/usb/src/sys/dev/ipmi/ipmi.c#6 integrate .. //depot/projects/usb/src/sys/dev/ips/ips_pci.c#5 integrate .. //depot/projects/usb/src/sys/dev/isp/isp_freebsd.c#13 integrate .. //depot/projects/usb/src/sys/dev/isp/isp_freebsd.h#10 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe.c#15 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe.h#9 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_82598.c#8 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_82599.c#3 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_api.c#8 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_api.h#8 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_common.c#8 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_common.h#7 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_osdep.h#7 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_phy.c#8 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_phy.h#8 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_type.h#8 integrate .. //depot/projects/usb/src/sys/dev/mfi/mfi.c#19 integrate .. //depot/projects/usb/src/sys/dev/mii/ip1000phy.c#5 integrate .. //depot/projects/usb/src/sys/dev/mxge/if_mxge.c#19 integrate .. //depot/projects/usb/src/sys/dev/pci/pci.c#31 integrate .. //depot/projects/usb/src/sys/dev/pci/pci_pci.c#11 integrate .. //depot/projects/usb/src/sys/dev/puc/puc.c#5 integrate .. //depot/projects/usb/src/sys/dev/puc/pucdata.c#14 integrate .. //depot/projects/usb/src/sys/dev/siis/siis.c#8 integrate .. //depot/projects/usb/src/sys/dev/siis/siis.h#4 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/hda/hdac.c#39 integrate .. //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#66 integrate .. //depot/projects/usb/src/sys/dev/ste/if_ste.c#5 integrate .. //depot/projects/usb/src/sys/dev/ste/if_stereg.h#3 integrate .. //depot/projects/usb/src/sys/dev/uart/uart_bus_acpi.c#2 integrate .. //depot/projects/usb/src/sys/dev/uart/uart_bus_pci.c#7 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ehci_pci.c#24 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ohci_pci.c#14 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/uhci_pci.c#17 integrate .. //depot/projects/usb/src/sys/dev/usb/input/atp.c#5 integrate .. //depot/projects/usb/src/sys/dev/usb/input/uhid.c#17 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_axe.c#21 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_cdce.c#26 integrate .. //depot/projects/usb/src/sys/dev/usb/quirk/usb_quirk.c#11 integrate .. //depot/projects/usb/src/sys/dev/usb/quirk/usb_quirk.h#6 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/u3g.c#25 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/uftdi.c#21 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/umodem.c#20 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_device.c#60 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_dynamic.c#10 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_dynamic.h#8 integrate .. //depot/projects/usb/src/sys/dev/usb/usbdevs#90 integrate .. //depot/projects/usb/src/sys/dev/usb/usbdi.h#17 integrate .. //depot/projects/usb/src/sys/dev/vge/if_vge.c#13 integrate .. //depot/projects/usb/src/sys/dev/vge/if_vgereg.h#2 integrate .. //depot/projects/usb/src/sys/dev/vge/if_vgevar.h#4 integrate .. //depot/projects/usb/src/sys/dev/wpi/if_wpi.c#16 integrate .. //depot/projects/usb/src/sys/fs/devfs/devfs_vnops.c#24 integrate .. //depot/projects/usb/src/sys/fs/nfs/nfs_commonacl.c#5 integrate .. //depot/projects/usb/src/sys/fs/nfs/nfs_commonport.c#4 integrate .. //depot/projects/usb/src/sys/fs/nfs/nfs_commonsubs.c#3 integrate .. //depot/projects/usb/src/sys/fs/nfs/nfs_var.h#6 integrate .. //depot/projects/usb/src/sys/fs/nfs/nfsport.h#9 integrate .. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clrpcops.c#5 integrate .. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clvnops.c#13 integrate .. //depot/projects/usb/src/sys/fs/nfsserver/nfs_nfsdcache.c#2 integrate .. //depot/projects/usb/src/sys/fs/ntfs/ntfs.h#3 integrate .. //depot/projects/usb/src/sys/fs/ntfs/ntfs_subr.c#6 integrate .. //depot/projects/usb/src/sys/fs/ntfs/ntfs_vfsops.c#8 integrate .. //depot/projects/usb/src/sys/fs/portalfs/portal_vnops.c#9 integrate .. //depot/projects/usb/src/sys/geom/mirror/g_mirror.c#9 integrate .. //depot/projects/usb/src/sys/geom/mirror/g_mirror.h#4 integrate .. //depot/projects/usb/src/sys/geom/part/g_part.c#22 integrate .. //depot/projects/usb/src/sys/geom/part/g_part.h#9 integrate .. //depot/projects/usb/src/sys/geom/part/g_part_gpt.c#17 integrate .. //depot/projects/usb/src/sys/geom/raid3/g_raid3.c#9 integrate .. //depot/projects/usb/src/sys/geom/raid3/g_raid3.h#4 integrate .. //depot/projects/usb/src/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#9 integrate .. //depot/projects/usb/src/sys/i386/conf/DEFAULTS#13 integrate .. //depot/projects/usb/src/sys/i386/conf/NOTES#29 integrate .. //depot/projects/usb/src/sys/i386/i386/dump_machdep.c#6 integrate .. //depot/projects/usb/src/sys/i386/i386/machdep.c#25 integrate .. //depot/projects/usb/src/sys/i386/i386/mca.c#3 integrate .. //depot/projects/usb/src/sys/i386/i386/minidump_machdep.c#8 integrate .. //depot/projects/usb/src/sys/i386/include/mca.h#2 integrate .. //depot/projects/usb/src/sys/i386/xen/pmap.c#18 integrate .. //depot/projects/usb/src/sys/ia64/conf/DEFAULTS#9 integrate .. //depot/projects/usb/src/sys/ia64/ia64/clock.c#6 integrate .. //depot/projects/usb/src/sys/ia64/ia64/exception.S#6 integrate .. //depot/projects/usb/src/sys/ia64/ia64/genassym.c#4 integrate .. //depot/projects/usb/src/sys/ia64/ia64/interrupt.c#12 integrate .. //depot/projects/usb/src/sys/ia64/ia64/machdep.c#16 integrate .. //depot/projects/usb/src/sys/ia64/ia64/mp_machdep.c#12 integrate .. //depot/projects/usb/src/sys/ia64/ia64/pmap.c#17 integrate .. //depot/projects/usb/src/sys/ia64/include/bus.h#2 integrate .. //depot/projects/usb/src/sys/ia64/include/cpufunc.h#3 integrate .. //depot/projects/usb/src/sys/ia64/include/ia64_cpu.h#5 integrate .. //depot/projects/usb/src/sys/ia64/include/kdb.h#4 integrate .. //depot/projects/usb/src/sys/ia64/include/param.h#8 integrate .. //depot/projects/usb/src/sys/ia64/include/pcpu.h#7 integrate .. //depot/projects/usb/src/sys/ia64/include/pmap.h#5 integrate .. //depot/projects/usb/src/sys/isa/vga_isa.c#5 integrate .. //depot/projects/usb/src/sys/kern/kern_exit.c#25 integrate .. //depot/projects/usb/src/sys/kern/kern_jail.c#34 integrate .. //depot/projects/usb/src/sys/kern/kern_lock.c#22 integrate .. //depot/projects/usb/src/sys/kern/kern_proc.c#24 integrate .. //depot/projects/usb/src/sys/kern/kern_sig.c#22 integrate .. //depot/projects/usb/src/sys/kern/kern_sx.c#20 integrate .. //depot/projects/usb/src/sys/kern/kern_timeout.c#12 integrate .. //depot/projects/usb/src/sys/kern/subr_acl_nfs4.c#3 integrate .. //depot/projects/usb/src/sys/kern/subr_bus.c#35 integrate .. //depot/projects/usb/src/sys/kern/subr_eventhandler.c#3 integrate .. //depot/projects/usb/src/sys/kern/subr_sleepqueue.c#14 integrate .. //depot/projects/usb/src/sys/kern/subr_turnstile.c#10 integrate .. //depot/projects/usb/src/sys/kern/tty_pts.c#20 integrate .. //depot/projects/usb/src/sys/kern/uipc_syscalls.c#23 integrate .. //depot/projects/usb/src/sys/kern/vfs_acl.c#9 integrate .. //depot/projects/usb/src/sys/kern/vfs_subr.c#28 integrate .. //depot/projects/usb/src/sys/kern/vfs_syscalls.c#30 integrate .. //depot/projects/usb/src/sys/kern/vfs_vnops.c#25 integrate .. //depot/projects/usb/src/sys/mips/adm5120/if_admsw.c#7 integrate .. //depot/projects/usb/src/sys/mips/conf/DEFAULTS#3 integrate .. //depot/projects/usb/src/sys/modules/ipfw/Makefile#6 integrate .. //depot/projects/usb/src/sys/net/if_bridge.c#21 integrate .. //depot/projects/usb/src/sys/net/if_ethersubr.c#25 integrate .. //depot/projects/usb/src/sys/net/if_var.h#31 integrate .. //depot/projects/usb/src/sys/net/radix.c#4 integrate .. //depot/projects/usb/src/sys/net/radix.h#4 integrate .. //depot/projects/usb/src/sys/net/route.c#27 integrate .. //depot/projects/usb/src/sys/net/rtsock.c#33 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_hostap.c#16 integrate .. //depot/projects/usb/src/sys/netgraph/ng_bridge.c#7 integrate .. //depot/projects/usb/src/sys/netgraph/ng_ipfw.c#5 integrate .. //depot/projects/usb/src/sys/netgraph/ng_ipfw.h#3 integrate .. //depot/projects/usb/src/sys/netinet/in.h#15 integrate .. //depot/projects/usb/src/sys/netinet/ip_carp.c#20 integrate .. //depot/projects/usb/src/sys/netinet/ip_divert.c#25 integrate .. //depot/projects/usb/src/sys/netinet/ip_dummynet.h#8 integrate .. //depot/projects/usb/src/sys/netinet/ip_fw.h#20 integrate .. //depot/projects/usb/src/sys/netinet/ipfw/ip_dummynet.c#5 integrate .. //depot/projects/usb/src/sys/netinet/ipfw/ip_fw2.c#13 integrate .. //depot/projects/usb/src/sys/netinet/ipfw/ip_fw_dynamic.c#1 branch .. //depot/projects/usb/src/sys/netinet/ipfw/ip_fw_log.c#1 branch .. //depot/projects/usb/src/sys/netinet/ipfw/ip_fw_nat.c#6 integrate .. //depot/projects/usb/src/sys/netinet/ipfw/ip_fw_pfil.c#6 integrate .. //depot/projects/usb/src/sys/netinet/ipfw/ip_fw_private.h#1 branch .. //depot/projects/usb/src/sys/netinet/ipfw/ip_fw_sockopt.c#1 branch .. //depot/projects/usb/src/sys/netinet/ipfw/ip_fw_table.c#1 branch .. //depot/projects/usb/src/sys/netinet/raw_ip.c#32 integrate .. //depot/projects/usb/src/sys/netinet/tcp.h#7 integrate .. //depot/projects/usb/src/sys/netinet/tcp_usrreq.c#25 integrate .. //depot/projects/usb/src/sys/netinet6/mld6.c#23 integrate .. //depot/projects/usb/src/sys/netinet6/mld6_var.h#4 integrate .. //depot/projects/usb/src/sys/netinet6/raw_ip6.c#27 integrate .. //depot/projects/usb/src/sys/nfsclient/bootp_subr.c#20 integrate .. //depot/projects/usb/src/sys/nfsclient/krpc_subr.c#7 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs_vfsops.c#21 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs_vnops.c#32 integrate .. //depot/projects/usb/src/sys/nfsserver/nfs_serv.c#18 integrate .. //depot/projects/usb/src/sys/pc98/conf/DEFAULTS#8 integrate .. //depot/projects/usb/src/sys/pc98/conf/NOTES#20 integrate .. //depot/projects/usb/src/sys/powerpc/aim/machdep.c#15 integrate .. //depot/projects/usb/src/sys/powerpc/booke/clock.c#5 integrate .. //depot/projects/usb/src/sys/powerpc/conf/DEFAULTS#8 integrate .. //depot/projects/usb/src/sys/powerpc/include/vmparam.h#9 integrate .. //depot/projects/usb/src/sys/powerpc/powermac/ata_dbdma.c#2 integrate .. //depot/projects/usb/src/sys/powerpc/powermac/ata_kauai.c#4 integrate .. //depot/projects/usb/src/sys/powerpc/powermac/ata_macio.c#5 integrate .. //depot/projects/usb/src/sys/powerpc/psim/ata_iobus.c#3 integrate .. //depot/projects/usb/src/sys/sparc64/central/central.c#5 integrate .. //depot/projects/usb/src/sys/sparc64/conf/DEFAULTS#8 integrate .. //depot/projects/usb/src/sys/sparc64/ebus/ebus.c#5 integrate .. //depot/projects/usb/src/sys/sparc64/fhc/fhc.c#8 integrate .. //depot/projects/usb/src/sys/sparc64/include/bus_common.h#4 integrate .. //depot/projects/usb/src/sys/sparc64/isa/ofw_isa.c#4 integrate .. //depot/projects/usb/src/sys/sparc64/pci/apb.c#6 integrate .. //depot/projects/usb/src/sys/sparc64/pci/ofw_pcib.c#7 integrate .. //depot/projects/usb/src/sys/sparc64/pci/ofw_pcibus.c#10 integrate .. //depot/projects/usb/src/sys/sparc64/sbus/dma_sbus.c#5 integrate .. //depot/projects/usb/src/sys/sparc64/sbus/sbus.c#11 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/nexus.c#6 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/stack_machdep.c#4 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/trap.c#12 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/upa.c#7 integrate .. //depot/projects/usb/src/sys/sun4v/conf/DEFAULTS#5 integrate .. //depot/projects/usb/src/sys/sun4v/sun4v/stack_machdep.c#3 integrate .. //depot/projects/usb/src/sys/sys/_lockmgr.h#3 integrate .. //depot/projects/usb/src/sys/sys/acl.h#6 integrate .. //depot/projects/usb/src/sys/sys/apm.h#4 integrate .. //depot/projects/usb/src/sys/sys/ata.h#10 integrate .. //depot/projects/usb/src/sys/sys/bio.h#4 integrate .. //depot/projects/usb/src/sys/sys/bus.h#13 integrate .. //depot/projects/usb/src/sys/sys/gpt.h#5 integrate .. //depot/projects/usb/src/sys/sys/jail.h#20 integrate .. //depot/projects/usb/src/sys/sys/mount.h#22 integrate .. //depot/projects/usb/src/sys/sys/param.h#48 integrate .. //depot/projects/usb/src/sys/sys/proc.h#24 integrate .. //depot/projects/usb/src/sys/sys/sleepqueue.h#7 integrate .. //depot/projects/usb/src/sys/sys/sysproto.h#19 integrate .. //depot/projects/usb/src/sys/sys/vnode.h#27 integrate .. //depot/projects/usb/src/sys/ufs/ffs/ffs_rawread.c#4 integrate .. //depot/projects/usb/src/sys/ufs/ffs/ffs_vfsops.c#21 integrate .. //depot/projects/usb/src/sys/ufs/ffs/fs.h#4 integrate .. //depot/projects/usb/src/sys/ufs/ufs/acl.h#2 integrate .. //depot/projects/usb/src/sys/ufs/ufs/ufs_acl.c#6 integrate .. //depot/projects/usb/src/sys/ufs/ufs/ufs_lookup.c#14 integrate .. //depot/projects/usb/src/sys/ufs/ufs/ufs_vnops.c#21 integrate .. //depot/projects/usb/src/sys/vm/uma_int.h#4 integrate .. //depot/projects/usb/src/sys/vm/vm_object.c#22 integrate .. //depot/projects/usb/src/sys/vm/vm_object.h#11 integrate Differences ... ==== //depot/projects/usb/src/lib/libusb/libusb10.c#20 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb/libusb10.c,v 1.5 2009/11/20 08:57:25 thompsa Exp $ */ +/* $FreeBSD: src/lib/libusb/libusb10.c,v 1.6 2009/12/12 00:24:30 scf Exp $ */ /*- * Copyright (c) 2009 Sylvestre Gallon. All rights reserved. * Copyright (c) 2009 Hans Petter Selasky. All rights reserved. @@ -379,8 +379,6 @@ if ((i = libusb_get_device_list(ctx, &devs)) < 0) return (NULL); - pdev = NULL; - for (j = 0; j < i; j++) { pdev = devs[j]->os_priv; pdesc = libusb20_dev_get_device_desc(pdev); @@ -396,6 +394,8 @@ break; } } + if (j == i) + pdev = NULL; libusb_free_device_list(devs, 1); DPRINTF(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_open_device_width_vid_pid leave"); ==== //depot/projects/usb/src/sys/amd64/acpica/acpi_switch.S#3 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/acpica/acpi_switch.S,v 1.4 2009/04/02 01:46:57 jkim Exp $ + * $FreeBSD: src/sys/amd64/acpica/acpi_switch.S,v 1.5 2009/12/08 22:38:42 jkim Exp $ */ #include <machine/asmacros.h> @@ -34,20 +34,7 @@ #include "acpi_wakedata.h" #include "assym.s" -#define WAKEUP_DECL(member) \ - .set WAKEUP_ ## member, wakeup_ ## member - wakeup_ctx - - WAKEUP_DECL(xpcb) - WAKEUP_DECL(gdt) - WAKEUP_DECL(efer) - WAKEUP_DECL(pat) - WAKEUP_DECL(star) - WAKEUP_DECL(lstar) - WAKEUP_DECL(cstar) - WAKEUP_DECL(sfmask) - WAKEUP_DECL(cpu) - -#define WAKEUP_CTX(member) WAKEUP_ ## member (%rdi) +#define WAKEUP_CTX(member) wakeup_ ## member - wakeup_ctx(%rdi) #define WAKEUP_PCB(member) PCB_ ## member(%r11) #define WAKEUP_XPCB(member) XPCB_ ## member(%r11) ==== //depot/projects/usb/src/sys/amd64/amd64/mca.c#3 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mca.c,v 1.3 2009/05/20 16:11:22 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mca.c,v 1.5 2009/12/03 16:10:21 avg Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -43,6 +43,7 @@ #include <sys/sysctl.h> #include <sys/systm.h> #include <sys/taskqueue.h> +#include <machine/cputypes.h> #include <machine/mca.h> #include <machine/md_var.h> #include <machine/specialreg.h> @@ -117,48 +118,6 @@ return (SYSCTL_OUT(req, &record, sizeof(record))); } -static struct mca_record * -mca_record_entry(int bank) -{ - struct mca_internal *rec; - uint64_t status; - u_int p[4]; - - status = rdmsr(MSR_MC_STATUS(bank)); - if (!(status & MC_STATUS_VAL)) - return (NULL); - - rec = malloc(sizeof(*rec), M_MCA, M_NOWAIT | M_ZERO); - if (rec == NULL) { - printf("MCA: Unable to allocate space for an event.\n"); - return (NULL); - } - - /* Save exception information. */ - rec->rec.mr_status = status; - if (status & MC_STATUS_ADDRV) - rec->rec.mr_addr = rdmsr(MSR_MC_ADDR(bank)); - if (status & MC_STATUS_MISCV) - rec->rec.mr_misc = rdmsr(MSR_MC_MISC(bank)); - rec->rec.mr_tsc = rdtsc(); - rec->rec.mr_apic_id = PCPU_GET(apic_id); - - /* - * Clear machine check. Don't do this for uncorrectable - * errors so that the BIOS can see them. - */ - if (!(rec->rec.mr_status & (MC_STATUS_PCC | MC_STATUS_UC))) { - wrmsr(MSR_MC_STATUS(bank), 0); - do_cpuid(0, p); - } - - mtx_lock_spin(&mca_lock); - STAILQ_INSERT_TAIL(&mca_records, rec, link); - mca_count++; - mtx_unlock_spin(&mca_lock); - return (&rec->rec); -} - static const char * mca_error_ttype(uint16_t mca_error) { @@ -219,11 +178,13 @@ } /* Dump details about a single machine check. */ -static void -mca_log(struct mca_record *rec) +static void __nonnull(1) +mca_log(const struct mca_record *rec) { uint16_t mca_error; + printf("MCA: bank %d, status 0x%016llx\n", rec->mr_bank, + (long long)rec->mr_status); printf("MCA: CPU %d ", rec->mr_apic_id); if (rec->mr_status & MC_STATUS_UC) printf("UNCOR "); @@ -329,6 +290,59 @@ printf("MCA: Address 0x%llx\n", (long long)rec->mr_addr); } +static int __nonnull(2) +mca_check_status(int bank, struct mca_record *rec) +{ + uint64_t status; + u_int p[4]; + + status = rdmsr(MSR_MC_STATUS(bank)); + if (!(status & MC_STATUS_VAL)) + return (0); + + /* Save exception information. */ + rec->mr_status = status; + rec->mr_bank = bank; + rec->mr_addr = 0; + if (status & MC_STATUS_ADDRV) + rec->mr_addr = rdmsr(MSR_MC_ADDR(bank)); + rec->mr_misc = 0; + if (status & MC_STATUS_MISCV) + rec->mr_misc = rdmsr(MSR_MC_MISC(bank)); + rec->mr_tsc = rdtsc(); + rec->mr_apic_id = PCPU_GET(apic_id); + + /* + * Clear machine check. Don't do this for uncorrectable + * errors so that the BIOS can see them. + */ + if (!(rec->mr_status & (MC_STATUS_PCC | MC_STATUS_UC))) { + wrmsr(MSR_MC_STATUS(bank), 0); + do_cpuid(0, p); + } + return (1); +} + +static void __nonnull(1) +mca_record_entry(const struct mca_record *record) +{ + struct mca_internal *rec; + + rec = malloc(sizeof(*rec), M_MCA, M_NOWAIT); + if (rec == NULL) { + printf("MCA: Unable to allocate space for an event.\n"); + mca_log(record); + return; + } + + rec->rec = *record; + rec->logged = 0; + mtx_lock_spin(&mca_lock); + STAILQ_INSERT_TAIL(&mca_records, rec, link); + mca_count++; + mtx_unlock_spin(&mca_lock); +} + /* * This scans all the machine check banks of the current CPU to see if * there are any machine checks. Any non-recoverable errors are @@ -341,7 +355,7 @@ static int mca_scan(int mcip) { - struct mca_record *rec; + struct mca_record rec; uint64_t mcg_cap, ucmask; int count, i, recoverable; @@ -354,13 +368,13 @@ ucmask |= MC_STATUS_OVER; mcg_cap = rdmsr(MSR_MCG_CAP); for (i = 0; i < (mcg_cap & MCG_CAP_COUNT); i++) { - rec = mca_record_entry(i); - if (rec != NULL) { + if (mca_check_status(i, &rec)) { count++; - if (rec->mr_status & ucmask) { + if (rec.mr_status & ucmask) { recoverable = 0; - mca_log(rec); + mca_log(&rec); } + mca_record_entry(&rec); } } return (mcip ? recoverable : count); @@ -465,6 +479,8 @@ mca_init(void) { uint64_t mcg_cap; + uint64_t ctl; + int skip; int i; /* MCE is required. */ @@ -482,15 +498,26 @@ wrmsr(MSR_MCG_CTL, MCG_CTL_ENABLE); for (i = 0; i < (mcg_cap & MCG_CAP_COUNT); i++) { - /* - * Enable logging of all errors. For P6 - * processors, MC0_CTL is always enabled. - * - * XXX: Better CPU test needed here? - */ - if (!(i == 0 && (cpu_id & 0xf00) == 0x600)) - wrmsr(MSR_MC_CTL(i), 0xffffffffffffffffUL); + /* By default enable logging of all errors. */ + ctl = 0xffffffffffffffffUL; + skip = 0; + + if (cpu_vendor_id == CPU_VENDOR_INTEL) { + /* + * For P6 models before Nehalem MC0_CTL is + * always enabled and reserved. + */ + if (i == 0 && CPUID_TO_FAMILY(cpu_id) == 0x6 + && CPUID_TO_MODEL(cpu_id) < 0x1a) + skip = 1; + } else if (cpu_vendor_id == CPU_VENDOR_AMD) { + /* BKDG for Family 10h: unset GartTblWkEn. */ + if (i == 4 && CPUID_TO_FAMILY(cpu_id) >= 0xf) + ctl &= ~(1UL << 10); + } + if (!skip) + wrmsr(MSR_MC_CTL(i), ctl); /* Clear all errors. */ wrmsr(MSR_MC_STATUS(i), 0); } ==== //depot/projects/usb/src/sys/amd64/amd64/vm_machdep.c#15 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.265 2009/11/10 11:43:07 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.266 2009/12/12 20:11:31 kib Exp $"); #include "opt_isa.h" #include "opt_cpu.h" @@ -330,10 +330,14 @@ case ERESTART: /* - * Reconstruct pc, we know that 'syscall' is 2 bytes. + * Reconstruct pc, we know that 'syscall' is 2 bytes, + * lcall $X,y is 7 bytes, int 0x80 is 2 bytes. + * We saved this in tf_err. * We have to do a full context restore so that %r10 * (which was holding the value of %rcx) is restored * for the next iteration. + * r10 restore is only required for freebsd/amd64 processes, + * but shall be innocent for any ia32 ABI. */ td->td_frame->tf_rip -= td->td_frame->tf_err; td->td_frame->tf_r10 = td->td_frame->tf_rcx; ==== //depot/projects/usb/src/sys/amd64/conf/DEFAULTS#12 (text+ko) ==== @@ -1,7 +1,7 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/amd64 # -# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.19 2009/06/09 20:26:52 kmacy Exp $ +# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.20 2009/12/16 02:17:43 dougb Exp $ machine amd64 @@ -21,3 +21,9 @@ options GEOM_PART_EBR_COMPAT options GEOM_PART_MBR +# Store the plain version of the configuration file in the kernel itself. +# To store the entire file, including comments, put this in /etc/src.conf: +# CONFIGARGS= -C +# See config(8) for more details. +# +options INCLUDE_CONFIG_FILE # Include this file in kernel ==== //depot/projects/usb/src/sys/amd64/conf/NOTES#24 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.98 2009/11/30 11:44:03 avg Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.99 2009/12/18 16:13:21 jhb Exp $ # # @@ -277,7 +277,6 @@ # iwn: Intel Wireless WiFi Link 4965AGN 802.11 network adapters # nfe: nVidia nForce MCP on-board Ethernet Networking (BSD open source) # nve: nVidia nForce MCP on-board Ethernet Networking -# ral: Ralink Technology IEEE 802.11 wireless adapter # wpi: Intel 3945ABG Wireless LAN controller device ed @@ -289,16 +288,8 @@ device ipw device nfe device nve -device ral device wpi -device ath # Atheros pci/cardbus NIC's -device ath_hal # pci/cardbus chip support -options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors -device ath_rate_sample # SampleRate tx rate control for ath -#device ath_rate_amrr # AMRR rate control for ath driver -#device ath_rate_onoe # Onoe rate control for ath driver - # #XXX this stores pointers in a 32bit field that is defined by the hardware #device pst ==== //depot/projects/usb/src/sys/amd64/ia32/ia32_syscall.c#5 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_syscall.c,v 1.19 2007/06/10 21:59:12 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_syscall.c,v 1.20 2009/12/12 20:11:31 kib Exp $"); /* * 386 Trap and System call handling @@ -183,35 +183,7 @@ AUDIT_SYSCALL_EXIT(error, td); } - switch (error) { - case 0: - frame->tf_rax = td->td_retval[0]; - frame->tf_rdx = td->td_retval[1]; - frame->tf_rflags &= ~PSL_C; - break; - - case ERESTART: - /* - * Reconstruct pc, assuming lcall $X,y is 7 bytes, - * int 0x80 is 2 bytes. We saved this in tf_err. - */ - frame->tf_rip -= frame->tf_err; - break; - - case EJUSTRETURN: - break; - - default: - if (p->p_sysent->sv_errsize) { - if (error >= p->p_sysent->sv_errsize) - error = -1; /* XXX */ - else - error = p->p_sysent->sv_errtbl[error]; - } - frame->tf_rax = error; - frame->tf_rflags |= PSL_C; - break; - } + cpu_set_syscall_retval(td, error); /* * Traced syscall. ==== //depot/projects/usb/src/sys/amd64/include/mca.h#2 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/mca.h,v 1.1 2009/05/13 17:53:04 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/mca.h,v 1.2 2009/12/02 15:45:55 avg Exp $ */ #ifndef __MACHINE_MCA_H__ @@ -36,6 +36,7 @@ uint64_t mr_misc; uint64_t mr_tsc; int mr_apic_id; + int mr_bank; }; #ifdef _KERNEL ==== //depot/projects/usb/src/sys/arm/conf/AVILA#18 (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/arm/conf/AVILA,v 1.33 2009/07/17 18:35:45 rpaulo Exp $ +# $FreeBSD: src/sys/arm/conf/AVILA,v 1.34 2009/12/02 00:38:11 thompsa Exp $ ident AVILA @@ -132,6 +132,7 @@ device ath_ar5416 options AH_SUPPORT_AR5416 device ath_ar9160 +device ath_ar9280 device usb #options USB_DEBUG ==== //depot/projects/usb/src/sys/arm/conf/CAMBRIA#10 (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/arm/conf/CAMBRIA,v 1.14 2009/08/27 17:55:44 sam Exp $ +# $FreeBSD: src/sys/arm/conf/CAMBRIA,v 1.15 2009/12/02 00:37:03 thompsa Exp $ ident CAMBRIA @@ -135,11 +135,8 @@ # #device ath_ar5416 #options AH_SUPPORT_AR5416 # NB: for 11n descriptor format -#device ath_rf2133 #device ath_ar9160 #device ath_ar9280 -#device ath_rf9280 -#device ath_ar9285 # NB: 2 USB 2.0 ports standard device usb ==== //depot/projects/usb/src/sys/arm/conf/DEFAULTS#3 (text+ko) ==== @@ -1,7 +1,7 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/arm # -# $FreeBSD: src/sys/arm/conf/DEFAULTS,v 1.2 2008/12/17 17:43:22 marcel Exp $ +# $FreeBSD: src/sys/arm/conf/DEFAULTS,v 1.3 2009/12/16 02:17:43 dougb Exp $ machine arm @@ -9,3 +9,10 @@ options GEOM_PART_BSD options GEOM_PART_MBR + +# Store the plain version of the configuration file in the kernel itself. +# To store the entire file, including comments, put this in /etc/src.conf: +# CONFIGARGS= -C +# See config(8) for more details. +# +options INCLUDE_CONFIG_FILE # Include this file in kernel ==== //depot/projects/usb/src/sys/arm/mv/mv_sata.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/mv/mv_sata.c,v 1.2 2009/10/31 13:24:14 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/mv/mv_sata.c,v 1.4 2009/12/08 21:42:04 mav Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -136,7 +136,8 @@ static int sata_channel_begin_transaction(struct ata_request *request); static int sata_channel_end_transaction(struct ata_request *request); static int sata_channel_status(device_t dev); -static void sata_channel_setmode(device_t parent, device_t dev); +static int sata_channel_setmode(device_t dev, int target, int mode); +static int sata_channel_getrev(device_t dev, int target); static void sata_channel_reset(device_t dev); static void sata_channel_dmasetprd(void *xsc, bus_dma_segment_t *segs, int nsegs, int error); @@ -423,7 +424,7 @@ ch->dev = dev; ch->unit = device_get_unit(dev); - ch->flags |= ATA_USE_16BIT | ATA_NO_SLAVE; + ch->flags |= ATA_USE_16BIT | ATA_NO_SLAVE | ATA_SATA; /* Set legacy ATA resources. */ for (i = ATA_DATA; i <= ATA_COMMAND; i++) { @@ -748,19 +749,22 @@ SATA_OUTL(sc, SATA_EDMA_IEMR(ch->unit), 0xFFFFFFFF); } -static void -sata_channel_setmode(device_t parent, device_t dev) +static int +sata_channel_setmode(device_t parent, int target, int mode) { - struct ata_device *atadev; + + /* Disable EDMA before using legacy registers */ + sata_edma_ctrl(parent, 0); + return (ata_sata_setmode(parent, target, mode)); +} - atadev = device_get_softc(dev); +static int +sata_channel_getrev(device_t parent, int target) +{ /* Disable EDMA before using legacy registers */ sata_edma_ctrl(parent, 0); - - ata_sata_setmode(dev, ATA_PIO_MAX); - if (atadev->mode >= ATA_DMA) - ata_sata_setmode(dev, atadev->mode); + return (ata_sata_getrev(parent, target)); } static void @@ -849,6 +853,7 @@ /* ATA channel interface */ DEVMETHOD(ata_reset, sata_channel_reset), DEVMETHOD(ata_setmode, sata_channel_setmode), + DEVMETHOD(ata_getrev, sata_channel_getrev), { 0, 0 } }; ==== //depot/projects/usb/src/sys/boot/common/Makefile.inc#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/common/Makefile.inc,v 1.25 2009/11/12 01:30:17 attilio Exp $ +# $FreeBSD: src/sys/boot/common/Makefile.inc,v 1.26 2009/12/13 01:20:32 marcel Exp $ SRCS+= boot.c commands.c console.c devopen.c interp.c SRCS+= interp_backslash.c interp_parse.c ls.c misc.c @@ -23,6 +23,11 @@ SRCS+= bcache.c .endif +.if defined(MD_IMAGE_SIZE) +CFLAGS+= -DMD_IMAGE_SIZE=${MD_IMAGE_SIZE} +SRCS+= md.c +.endif + # Machine-independant ISA PnP .if defined(HAVE_ISABUS) SRCS+= isapnp.c ==== //depot/projects/usb/src/sys/boot/i386/Makefile#7 (text+ko) ==== @@ -1,9 +1,15 @@ -# $FreeBSD: src/sys/boot/i386/Makefile,v 1.27 2009/11/23 16:00:16 rnoland Exp $ +# $FreeBSD: src/sys/boot/i386/Makefile,v 1.28 2009/12/22 20:56:33 jhb Exp $ + +.include <bsd.own.mk> -SUBDIR= mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot zfsboot \ - gptzfsboot kgzldr libi386 libfirewire loader zfsloader +SUBDIR= mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot kgzldr \ + libi386 libfirewire loader # special boot programs, 'self-extracting boot2+loader' SUBDIR+= pxeldr +.if ${MK_ZFS} != "no" >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200912230048.nBN0mjWK011392>