Date: Mon, 17 May 2010 04:26:27 GMT From: Andrew Thompson <thompsa@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 178366 for review Message-ID: <201005170426.o4H4QRjx041857@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@178366?ac=10 Change 178366 by thompsa@thompsa_pea on 2010/05/17 04:25:44 IFC @178363 Affected files ... .. //depot/projects/usb_buf/src/lib/libusb/libusb.h#2 integrate .. //depot/projects/usb_buf/src/lib/libusb/libusb10.c#2 integrate .. //depot/projects/usb_buf/src/lib/libusb/libusb10_desc.c#2 integrate .. //depot/projects/usb_buf/src/lib/libusb/libusb10_io.c#2 integrate .. //depot/projects/usb_buf/src/lib/libusb/libusb20_compat01.c#3 integrate .. //depot/projects/usb_buf/src/lib/libusbhid/data.c#3 integrate .. //depot/projects/usb_buf/src/lib/libusbhid/usbhid.h#3 integrate .. //depot/projects/usb_buf/src/sys/amd64/amd64/apic_vector.S#3 integrate .. //depot/projects/usb_buf/src/sys/amd64/amd64/exception.S#3 integrate .. //depot/projects/usb_buf/src/sys/amd64/amd64/identcpu.c#3 integrate .. //depot/projects/usb_buf/src/sys/amd64/amd64/pmap.c#4 integrate .. //depot/projects/usb_buf/src/sys/amd64/amd64/trap.c#4 integrate .. //depot/projects/usb_buf/src/sys/amd64/include/specialreg.h#4 integrate .. //depot/projects/usb_buf/src/sys/amd64/include/xen/xenfunc.h#2 integrate .. //depot/projects/usb_buf/src/sys/amd64/include/xen/xenvar.h#2 integrate .. //depot/projects/usb_buf/src/sys/arm/arm/identcpu.c#3 integrate .. //depot/projects/usb_buf/src/sys/arm/arm/pmap.c#3 integrate .. //depot/projects/usb_buf/src/sys/arm/include/disassem.h#2 integrate .. //depot/projects/usb_buf/src/sys/arm/include/md_var.h#3 integrate .. //depot/projects/usb_buf/src/sys/boot/common/module.c#3 integrate .. //depot/projects/usb_buf/src/sys/boot/forth/loader.conf.5#3 integrate .. //depot/projects/usb_buf/src/sys/cam/scsi/scsi_sg.c#3 integrate .. //depot/projects/usb_buf/src/sys/cddl/boot/zfs/zfsimpl.h#4 integrate .. //depot/projects/usb_buf/src/sys/cddl/compat/opensolaris/kern/opensolaris_taskq.c#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/compat/opensolaris/sys/dnlc.h#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/compat/opensolaris/sys/sysmacros.h#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#3 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#3 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#3 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#3 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#3 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#3 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scrub.c#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#3 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#3 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#3 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#3 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#3 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#3 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#3 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#4 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#5 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#3 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#4 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#3 integrate .. //depot/projects/usb_buf/src/sys/conf/files#8 integrate .. //depot/projects/usb_buf/src/sys/conf/files.powerpc#6 integrate .. //depot/projects/usb_buf/src/sys/conf/options#6 integrate .. //depot/projects/usb_buf/src/sys/contrib/dev/run/rt2870.fw.uu#2 integrate .. //depot/projects/usb_buf/src/sys/ddb/db_output.c#2 integrate .. //depot/projects/usb_buf/src/sys/ddb/ddb.h#3 integrate .. //depot/projects/usb_buf/src/sys/dev/ata/chipsets/ata-serverworks.c#3 integrate .. //depot/projects/usb_buf/src/sys/dev/bce/if_bce.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/bwn/if_bwn.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/cxgb/cxgb_adapter.h#4 integrate .. //depot/projects/usb_buf/src/sys/dev/cxgb/cxgb_main.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/cxgb/cxgb_sge.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/cxgb/sys/mvec.h#3 integrate .. //depot/projects/usb_buf/src/sys/dev/cxgb/sys/uipc_mvec.c#3 integrate .. //depot/projects/usb_buf/src/sys/dev/e1000/if_em.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/e1000/if_igb.c#3 integrate .. //depot/projects/usb_buf/src/sys/dev/e1000/if_lem.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/esp/esp_sbus.c#3 integrate .. //depot/projects/usb_buf/src/sys/dev/fxp/if_fxp.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/fxp/if_fxpreg.h#2 integrate .. //depot/projects/usb_buf/src/sys/dev/fxp/if_fxpvar.h#3 integrate .. //depot/projects/usb_buf/src/sys/dev/ipw/if_ipw.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/isp/isp_freebsd.c#3 integrate .. //depot/projects/usb_buf/src/sys/dev/isp/ispvar.h#3 integrate .. //depot/projects/usb_buf/src/sys/dev/iwn/if_iwn.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/ixgbe/ixgbe.c#3 integrate .. //depot/projects/usb_buf/src/sys/dev/mvs/mvs.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/mxge/if_mxge.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/ofw/ofw_if.m#3 integrate .. //depot/projects/usb_buf/src/sys/dev/ofw/ofw_standard.c#3 integrate .. //depot/projects/usb_buf/src/sys/dev/ofw/openfirm.c#3 integrate .. //depot/projects/usb_buf/src/sys/dev/ofw/openfirm.h#3 integrate .. //depot/projects/usb_buf/src/sys/dev/pci/pci.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/re/if_re.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/sge/if_sge.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/sge/if_sgereg.h#2 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/controller/ehci.c#14 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/controller/usb_controller.c#10 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/input/ums.c#10 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/net/uhso.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/quirk/usb_quirk.c#6 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/serial/u3g.c#10 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/serial/uftdi.c#10 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_dev.c#11 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_device.c#15 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_device.h#10 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_generic.c#16 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_hid.c#9 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_hub.c#14 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_request.c#15 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usbdevs#7 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usbhid.h#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_rum.c#13 integrate .. //depot/projects/usb_buf/src/sys/dev/xen/netfront/netfront.c#5 integrate .. //depot/projects/usb_buf/src/sys/fs/devfs/devfs_devs.c#3 integrate .. //depot/projects/usb_buf/src/sys/fs/devfs/devfs_int.h#3 integrate .. //depot/projects/usb_buf/src/sys/fs/ext2fs/ext2_readwrite.c#2 integrate .. //depot/projects/usb_buf/src/sys/fs/ext2fs/ext2_vnops.c#2 integrate .. //depot/projects/usb_buf/src/sys/fs/msdosfs/msdosfs_vnops.c#3 integrate .. //depot/projects/usb_buf/src/sys/fs/nfs/nfs_commonkrpc.c#5 integrate .. //depot/projects/usb_buf/src/sys/fs/nfs/nfskpiport.h#2 integrate .. //depot/projects/usb_buf/src/sys/fs/nfs/nfsport.h#6 integrate .. //depot/projects/usb_buf/src/sys/fs/nfsclient/nfs_clbio.c#6 integrate .. //depot/projects/usb_buf/src/sys/fs/nullfs/null_vnops.c#4 integrate .. //depot/projects/usb_buf/src/sys/fs/nwfs/nwfs_io.c#4 integrate .. //depot/projects/usb_buf/src/sys/fs/procfs/procfs_ctl.c#2 integrate .. //depot/projects/usb_buf/src/sys/fs/smbfs/smbfs_io.c#5 integrate .. //depot/projects/usb_buf/src/sys/fs/tmpfs/tmpfs_vnops.c#4 integrate .. //depot/projects/usb_buf/src/sys/geom/geom.h#3 integrate .. //depot/projects/usb_buf/src/sys/geom/geom_subr.c#4 integrate .. //depot/projects/usb_buf/src/sys/geom/multipath/g_multipath.c#3 integrate .. //depot/projects/usb_buf/src/sys/geom/part/g_part_apm.c#3 integrate .. //depot/projects/usb_buf/src/sys/geom/vinum/geom_vinum.c#3 integrate .. //depot/projects/usb_buf/src/sys/geom/vinum/geom_vinum.h#2 integrate .. //depot/projects/usb_buf/src/sys/geom/vinum/geom_vinum_events.c#3 integrate .. //depot/projects/usb_buf/src/sys/geom/vinum/geom_vinum_var.h#2 integrate .. //depot/projects/usb_buf/src/sys/geom/zero/g_zero.c#2 integrate .. //depot/projects/usb_buf/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#3 integrate .. //depot/projects/usb_buf/src/sys/i386/i386/geode.c#2 integrate .. //depot/projects/usb_buf/src/sys/i386/i386/identcpu.c#3 integrate .. //depot/projects/usb_buf/src/sys/i386/i386/pmap.c#4 integrate .. //depot/projects/usb_buf/src/sys/i386/include/specialreg.h#4 integrate .. //depot/projects/usb_buf/src/sys/i386/include/xen/xenfunc.h#2 integrate .. //depot/projects/usb_buf/src/sys/i386/include/xen/xenvar.h#2 integrate .. //depot/projects/usb_buf/src/sys/i386/xen/pmap.c#3 integrate .. //depot/projects/usb_buf/src/sys/ia64/ia64/pmap.c#4 integrate .. //depot/projects/usb_buf/src/sys/kern/kern_conf.c#5 integrate .. //depot/projects/usb_buf/src/sys/kern/kern_exec.c#3 integrate .. //depot/projects/usb_buf/src/sys/kern/kern_mutex.c#6 integrate .. //depot/projects/usb_buf/src/sys/kern/kern_proc.c#5 integrate .. //depot/projects/usb_buf/src/sys/kern/sched_ule.c#3 integrate .. //depot/projects/usb_buf/src/sys/kern/subr_bufring.c#2 integrate .. //depot/projects/usb_buf/src/sys/kern/subr_pcpu.c#3 integrate .. //depot/projects/usb_buf/src/sys/kern/subr_smp.c#3 integrate .. //depot/projects/usb_buf/src/sys/kern/subr_uio.c#2 integrate .. //depot/projects/usb_buf/src/sys/kern/subr_witness.c#4 integrate .. //depot/projects/usb_buf/src/sys/kern/sys_pipe.c#3 integrate .. //depot/projects/usb_buf/src/sys/kern/uipc_cow.c#3 integrate .. //depot/projects/usb_buf/src/sys/kern/uipc_syscalls.c#5 integrate .. //depot/projects/usb_buf/src/sys/kern/vfs_bio.c#7 integrate .. //depot/projects/usb_buf/src/sys/kern/vfs_default.c#4 integrate .. //depot/projects/usb_buf/src/sys/kern/vfs_subr.c#5 integrate .. //depot/projects/usb_buf/src/sys/kern/vfs_vnops.c#3 integrate .. //depot/projects/usb_buf/src/sys/kern/vnode_if.src#4 integrate .. //depot/projects/usb_buf/src/sys/mips/adm5120/if_admsw.c#3 integrate .. //depot/projects/usb_buf/src/sys/mips/conf/XLR#2 integrate .. //depot/projects/usb_buf/src/sys/mips/include/locore.h#3 integrate .. //depot/projects/usb_buf/src/sys/mips/include/param.h#3 integrate .. //depot/projects/usb_buf/src/sys/mips/include/pmap.h#3 integrate .. //depot/projects/usb_buf/src/sys/mips/include/smp.h#3 integrate .. //depot/projects/usb_buf/src/sys/mips/mips/cpu.c#3 integrate .. //depot/projects/usb_buf/src/sys/mips/mips/elf_machdep.c#3 integrate .. //depot/projects/usb_buf/src/sys/mips/mips/machdep.c#4 integrate .. //depot/projects/usb_buf/src/sys/mips/mips/mp_machdep.c#3 integrate .. //depot/projects/usb_buf/src/sys/mips/mips/mpboot.S#2 integrate .. //depot/projects/usb_buf/src/sys/mips/mips/pmap.c#4 integrate .. //depot/projects/usb_buf/src/sys/mips/rmi/dev/xlr/rge.c#2 integrate .. //depot/projects/usb_buf/src/sys/mips/rmi/files.xlr#2 integrate .. //depot/projects/usb_buf/src/sys/mips/rmi/interrupt.h#2 integrate .. //depot/projects/usb_buf/src/sys/mips/rmi/intr_machdep.c#2 integrate .. //depot/projects/usb_buf/src/sys/mips/rmi/iodi.c#2 integrate .. //depot/projects/usb_buf/src/sys/mips/rmi/on_chip.c#2 integrate .. //depot/projects/usb_buf/src/sys/mips/rmi/pic.h#2 integrate .. //depot/projects/usb_buf/src/sys/mips/rmi/xlr_machdep.c#2 integrate .. //depot/projects/usb_buf/src/sys/mips/rmi/xlr_pci.c#2 integrate .. //depot/projects/usb_buf/src/sys/mips/rmi/xlrconfig.h#2 integrate .. //depot/projects/usb_buf/src/sys/modules/Makefile#5 integrate .. //depot/projects/usb_buf/src/sys/modules/cas/Makefile#2 integrate .. //depot/projects/usb_buf/src/sys/modules/mvs/Makefile#2 integrate .. //depot/projects/usb_buf/src/sys/modules/zfs/Makefile#5 integrate .. //depot/projects/usb_buf/src/sys/net/bpf_zerocopy.c#3 integrate .. //depot/projects/usb_buf/src/sys/net/flowtable.c#3 integrate .. //depot/projects/usb_buf/src/sys/net/flowtable.h#3 integrate .. //depot/projects/usb_buf/src/sys/net/vnet.c#2 integrate .. //depot/projects/usb_buf/src/sys/netgraph/ng_base.c#3 integrate .. //depot/projects/usb_buf/src/sys/netgraph/ng_bridge.c#3 integrate .. //depot/projects/usb_buf/src/sys/netgraph/ng_bridge.h#2 integrate .. //depot/projects/usb_buf/src/sys/netgraph/ng_hub.c#2 integrate .. //depot/projects/usb_buf/src/sys/netgraph/ng_hub.h#2 integrate .. //depot/projects/usb_buf/src/sys/netgraph/ng_ksocket.c#4 integrate .. //depot/projects/usb_buf/src/sys/netinet/sctp_bsd_addr.c#3 integrate .. //depot/projects/usb_buf/src/sys/netinet/sctp_bsd_addr.h#2 integrate .. //depot/projects/usb_buf/src/sys/netinet/sctp_constants.h#3 integrate .. //depot/projects/usb_buf/src/sys/netinet/sctp_indata.c#3 integrate .. //depot/projects/usb_buf/src/sys/netinet/sctp_input.c#3 integrate .. //depot/projects/usb_buf/src/sys/netinet/sctp_lock_bsd.h#2 integrate .. //depot/projects/usb_buf/src/sys/netinet/sctp_output.c#3 integrate .. //depot/projects/usb_buf/src/sys/netinet/sctp_pcb.c#4 integrate .. //depot/projects/usb_buf/src/sys/netinet/sctp_pcb.h#3 integrate .. //depot/projects/usb_buf/src/sys/netinet/sctp_structs.h#3 integrate .. //depot/projects/usb_buf/src/sys/netinet/sctp_timer.c#3 integrate .. //depot/projects/usb_buf/src/sys/netinet/sctp_usrreq.c#3 integrate .. //depot/projects/usb_buf/src/sys/netinet/sctputil.c#4 integrate .. //depot/projects/usb_buf/src/sys/netinet6/in6_proto.c#3 integrate .. //depot/projects/usb_buf/src/sys/netinet6/ip6_input.c#5 integrate .. //depot/projects/usb_buf/src/sys/netinet6/ip6_output.c#4 integrate .. //depot/projects/usb_buf/src/sys/netinet6/udp6_usrreq.c#4 integrate .. //depot/projects/usb_buf/src/sys/nfsclient/nfs_bio.c#6 integrate .. //depot/projects/usb_buf/src/sys/powerpc/aim/mmu_oea.c#4 integrate .. //depot/projects/usb_buf/src/sys/powerpc/aim/mmu_oea64.c#4 integrate .. //depot/projects/usb_buf/src/sys/powerpc/aim/ofw_machdep.c#4 integrate .. //depot/projects/usb_buf/src/sys/powerpc/booke/pmap.c#5 integrate .. //depot/projects/usb_buf/src/sys/powerpc/cpufreq/pcr.c#2 integrate .. //depot/projects/usb_buf/src/sys/powerpc/include/intr_machdep.h#2 integrate .. //depot/projects/usb_buf/src/sys/powerpc/ofw/ofw_pcibus.c#2 integrate .. //depot/projects/usb_buf/src/sys/powerpc/ofw/ofw_real.c#3 integrate .. //depot/projects/usb_buf/src/sys/powerpc/powermac/ata_kauai.c#3 integrate .. //depot/projects/usb_buf/src/sys/powerpc/powermac/cpcht.c#2 integrate .. //depot/projects/usb_buf/src/sys/powerpc/powermac/cpchtvar.h#2 delete .. //depot/projects/usb_buf/src/sys/powerpc/powermac/smu.c#2 integrate .. //depot/projects/usb_buf/src/sys/powerpc/powermac/uninorth.c#3 integrate .. //depot/projects/usb_buf/src/sys/powerpc/powermac/uninorthpci.c#1 branch .. //depot/projects/usb_buf/src/sys/powerpc/powermac/uninorthvar.h#2 integrate .. //depot/projects/usb_buf/src/sys/powerpc/powerpc/openpic.c#4 integrate .. //depot/projects/usb_buf/src/sys/sparc64/pci/schizo.c#3 integrate .. //depot/projects/usb_buf/src/sys/sparc64/pci/schizoreg.h#2 integrate .. //depot/projects/usb_buf/src/sys/sparc64/pci/schizovar.h#3 integrate .. //depot/projects/usb_buf/src/sys/sparc64/sparc64/pmap.c#3 integrate .. //depot/projects/usb_buf/src/sys/sun4v/sun4v/pmap.c#3 integrate .. //depot/projects/usb_buf/src/sys/sys/buf_ring.h#3 integrate .. //depot/projects/usb_buf/src/sys/sys/conf.h#4 integrate .. //depot/projects/usb_buf/src/sys/sys/eventhandler.h#5 integrate .. //depot/projects/usb_buf/src/sys/sys/lock.h#4 integrate .. //depot/projects/usb_buf/src/sys/sys/mbuf.h#3 integrate .. //depot/projects/usb_buf/src/sys/sys/param.h#7 integrate .. //depot/projects/usb_buf/src/sys/sys/vmmeter.h#2 integrate .. //depot/projects/usb_buf/src/sys/sys/vnode.h#4 integrate .. //depot/projects/usb_buf/src/sys/ufs/ffs/ffs_snapshot.c#3 integrate .. //depot/projects/usb_buf/src/sys/ufs/ffs/ffs_softdep.c#4 integrate .. //depot/projects/usb_buf/src/sys/ufs/ffs/ffs_vnops.c#3 integrate .. //depot/projects/usb_buf/src/sys/ufs/ufs/quota.h#2 integrate .. //depot/projects/usb_buf/src/sys/ufs/ufs/ufs_quota.c#2 integrate .. //depot/projects/usb_buf/src/sys/ufs/ufs/ufs_vfsops.c#2 integrate .. //depot/projects/usb_buf/src/sys/ufs/ufs/ufsmount.h#3 integrate .. //depot/projects/usb_buf/src/sys/vm/device_pager.c#3 integrate .. //depot/projects/usb_buf/src/sys/vm/sg_pager.c#2 integrate .. //depot/projects/usb_buf/src/sys/vm/swap_pager.c#3 integrate .. //depot/projects/usb_buf/src/sys/vm/vm_contig.c#4 integrate .. //depot/projects/usb_buf/src/sys/vm/vm_fault.c#3 integrate .. //depot/projects/usb_buf/src/sys/vm/vm_glue.c#3 integrate .. //depot/projects/usb_buf/src/sys/vm/vm_object.c#4 integrate .. //depot/projects/usb_buf/src/sys/vm/vm_page.c#5 integrate .. //depot/projects/usb_buf/src/sys/vm/vm_page.h#5 integrate .. //depot/projects/usb_buf/src/sys/vm/vm_pageout.c#5 integrate .. //depot/projects/usb_buf/src/sys/vm/vm_pageout.h#2 integrate .. //depot/projects/usb_buf/src/sys/vm/vnode_pager.c#5 integrate Differences ... ==== //depot/projects/usb_buf/src/lib/libusb/libusb.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb/libusb.h,v 1.12 2010/02/13 09:45:50 wkoszek Exp $ */ +/* $FreeBSD: src/lib/libusb/libusb.h,v 1.13 2010/05/13 00:25:30 thompsa Exp $ */ /*- * Copyright (c) 2009 Sylvestre Gallon. All rights reserved. * ==== //depot/projects/usb_buf/src/lib/libusb/libusb10.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb/libusb10.c,v 1.8 2010/02/13 09:45:50 wkoszek Exp $ */ +/* $FreeBSD: src/lib/libusb/libusb10.c,v 1.9 2010/05/13 00:25:30 thompsa Exp $ */ /*- * Copyright (c) 2009 Sylvestre Gallon. All rights reserved. * Copyright (c) 2009 Hans Petter Selasky. All rights reserved. ==== //depot/projects/usb_buf/src/lib/libusb/libusb10_desc.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb/libusb10_desc.c,v 1.6 2010/02/13 09:45:50 wkoszek Exp $ */ +/* $FreeBSD: src/lib/libusb/libusb10_desc.c,v 1.7 2010/05/13 00:25:30 thompsa Exp $ */ /*- * Copyright (c) 2009 Sylvestre Gallon. All rights reserved. * ==== //depot/projects/usb_buf/src/lib/libusb/libusb10_io.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb/libusb10_io.c,v 1.6 2010/02/13 09:45:50 wkoszek Exp $ */ +/* $FreeBSD: src/lib/libusb/libusb10_io.c,v 1.7 2010/05/13 00:25:30 thompsa Exp $ */ /*- * Copyright (c) 2009 Sylvestre Gallon. All rights reserved. * ==== //depot/projects/usb_buf/src/lib/libusb/libusb20_compat01.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb/libusb20_compat01.c,v 1.6 2010/02/13 09:45:50 wkoszek Exp $ */ +/* $FreeBSD: src/lib/libusb/libusb20_compat01.c,v 1.7 2010/05/13 00:26:30 thompsa Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb_buf/src/lib/libusbhid/data.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libusbhid/data.c,v 1.7 2010/03/27 08:00:16 kaiw Exp $"); +__FBSDID("$FreeBSD: src/lib/libusbhid/data.c,v 1.9 2010/05/13 02:03:00 thompsa Exp $"); #include <sys/param.h> #include <assert.h> ==== //depot/projects/usb_buf/src/lib/libusbhid/usbhid.h#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/lib/libusbhid/usbhid.h,v 1.13 2010/03/27 08:00:16 kaiw Exp $ + * $FreeBSD: src/lib/libusbhid/usbhid.h,v 1.14 2010/05/13 02:03:00 thompsa Exp $ * */ ==== //depot/projects/usb_buf/src/sys/amd64/amd64/apic_vector.S#3 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * from: vector.s, 386BSD 0.1 unknown origin - * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.113 2010/03/29 19:13:34 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.115 2010/05/13 09:59:10 kib Exp $ */ /* @@ -81,7 +81,7 @@ /* No EOI cycle used here */ - iretq + jmp doreti_iret ISR_VEC(1, apic_isr1) ISR_VEC(2, apic_isr2) @@ -135,7 +135,7 @@ incl smp_tlb_wait popq %rax - iretq + jmp doreti_iret /* * Single page TLB shootdown @@ -155,7 +155,7 @@ incl smp_tlb_wait popq %rax - iretq + jmp doreti_iret /* * Page range TLB shootdown. @@ -181,7 +181,7 @@ popq %rdx popq %rax - iretq + jmp doreti_iret /* * Invalidate cache. @@ -200,7 +200,7 @@ incl smp_tlb_wait popq %rax - iretq + jmp doreti_iret /* * Handler for IPIs sent via the per-cpu IPI bitmap. @@ -247,7 +247,7 @@ call cpususpend_handler POP_FRAME - iretq + jmp doreti_iret /* * Executed by a CPU when it receives a RENDEZVOUS IPI from another CPU. ==== //depot/projects/usb_buf/src/sys/amd64/amd64/exception.S#3 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.145 2010/05/03 14:30:49 kib Exp $ + * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.146 2010/05/12 10:29:35 kib Exp $ */ #include "opt_atpic.h" @@ -553,7 +553,7 @@ movq TF_R14(%rsp),%r14 movq TF_R15(%rsp),%r15 addq $TF_RIP,%rsp - iretq + jmp doreti_iret ENTRY(fork_trampoline) movq %r12,%rdi /* function */ ==== //depot/projects/usb_buf/src/sys/amd64/amd64/identcpu.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.180 2010/03/11 14:17:37 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.181 2010/05/05 21:07:47 kib Exp $"); #include "opt_cpu.h" @@ -240,7 +240,7 @@ printf("\n Features2=0x%b", cpu_feature2, "\020" "\001SSE3" /* SSE3 */ - "\002<b1>" + "\002PCLMULQDQ" /* Carry-Less Mul Quadword */ "\003DTES64" /* 64-bit Debug Trace */ "\004MON" /* MONITOR/MWAIT Instructions */ "\005DS_CPL" /* CPL Qualified Debug Store */ @@ -264,7 +264,7 @@ "\027MOVBE" "\030POPCNT" "\031<b24>" - "\032<b25>" + "\032AESNI" /* AES Crypto*/ "\033XSAVE" "\034OSXSAVE" "\035<b28>" ==== //depot/projects/usb_buf/src/sys/amd64/amd64/pmap.c#4 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.694 2010/04/30 00:46:43 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.697 2010/05/16 23:45:10 alc Exp $"); /* * Manages physical address maps. @@ -2796,7 +2796,7 @@ KASSERT((m->flags & PG_FICTITIOUS) == 0, ("pmap_remove_all: page %p is fictitious", m)); - mtx_assert(&vm_page_queue_mtx, MA_OWNED); + vm_page_lock_queues(); pvh = pa_to_pvh(VM_PAGE_TO_PHYS(m)); while ((pv = TAILQ_FIRST(&pvh->pv_list)) != NULL) { pmap = PV_PMAP(pv); @@ -2834,6 +2834,7 @@ PMAP_UNLOCK(pmap); } vm_page_flag_clear(m, PG_WRITEABLE); + vm_page_unlock_queues(); } /* @@ -3138,7 +3139,10 @@ va = trunc_page(va); KASSERT(va <= VM_MAX_KERNEL_ADDRESS, ("pmap_enter: toobig")); KASSERT(va < UPT_MIN_ADDRESS || va >= UPT_MAX_ADDRESS, - ("pmap_enter: invalid to pmap_enter page table pages (va: 0x%lx)", va)); + ("pmap_enter: invalid to pmap_enter page table pages (va: 0x%lx)", + va)); + KASSERT((m->oflags & VPO_BUSY) != 0, + ("pmap_enter: page %p is not busy", m)); mpte = NULL; @@ -3414,8 +3418,10 @@ pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot) { + vm_page_lock_queues(); PMAP_LOCK(pmap); - (void) pmap_enter_quick_locked(pmap, va, m, prot, NULL); + (void)pmap_enter_quick_locked(pmap, va, m, prot, NULL); + vm_page_unlock_queues(); PMAP_UNLOCK(pmap); } @@ -3926,8 +3932,11 @@ count = 0; if ((m->flags & PG_FICTITIOUS) != 0) return (count); + vm_page_lock_queues(); count = pmap_pvh_wired_mappings(&m->md, count); - return (pmap_pvh_wired_mappings(pa_to_pvh(VM_PAGE_TO_PHYS(m)), count)); + count = pmap_pvh_wired_mappings(pa_to_pvh(VM_PAGE_TO_PHYS(m)), count); + vm_page_unlock_queues(); + return (count); } /* @@ -3961,16 +3970,15 @@ boolean_t pmap_page_is_mapped(vm_page_t m) { - struct md_page *pvh; + boolean_t rv; if ((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) != 0) return (FALSE); - mtx_assert(&vm_page_queue_mtx, MA_OWNED); - if (TAILQ_EMPTY(&m->md.pv_list)) { - pvh = pa_to_pvh(VM_PAGE_TO_PHYS(m)); - return (!TAILQ_EMPTY(&pvh->pv_list)); - } else - return (TRUE); + vm_page_lock_queues(); + rv = !TAILQ_EMPTY(&m->md.pv_list) || + !TAILQ_EMPTY(&pa_to_pvh(VM_PAGE_TO_PHYS(m))->pv_list); + vm_page_unlock_queues(); + return (rv); } /* @@ -4235,10 +4243,19 @@ pt_entry_t oldpte, *pte; vm_offset_t va; - if ((m->flags & PG_FICTITIOUS) != 0 || + KASSERT((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) == 0, + ("pmap_remove_write: page %p is not managed", m)); + + /* + * If the page is not VPO_BUSY, then PG_WRITEABLE cannot be set by + * another thread while the object is locked. Thus, if PG_WRITEABLE + * is clear, no page table entries need updating. + */ + VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED); + if ((m->oflags & VPO_BUSY) == 0 && (m->flags & PG_WRITEABLE) == 0) return; - mtx_assert(&vm_page_queue_mtx, MA_OWNED); + vm_page_lock_queues(); pvh = pa_to_pvh(VM_PAGE_TO_PHYS(m)); TAILQ_FOREACH_SAFE(pv, &pvh->pv_list, pv_list, next_pv) { pmap = PV_PMAP(pv); @@ -4269,6 +4286,7 @@ PMAP_UNLOCK(pmap); } vm_page_flag_clear(m, PG_WRITEABLE); + vm_page_unlock_queues(); } /* ==== //depot/projects/usb_buf/src/sys/amd64/amd64/trap.c#4 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.342 2010/05/01 13:15:35 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.343 2010/05/12 10:29:06 kib Exp $"); /* * AMD64 Trap and System call handling @@ -488,22 +488,18 @@ } if (frame->tf_rip == (long)ld_ds) { frame->tf_rip = (long)ds_load_fault; - frame->tf_ds = _udatasel; goto out; } if (frame->tf_rip == (long)ld_es) { frame->tf_rip = (long)es_load_fault; - frame->tf_es = _udatasel; goto out; } if (frame->tf_rip == (long)ld_fs) { frame->tf_rip = (long)fs_load_fault; - frame->tf_fs = _ufssel; goto out; } if (frame->tf_rip == (long)ld_gs) { frame->tf_rip = (long)gs_load_fault; - frame->tf_gs = _ugssel; goto out; } if (frame->tf_rip == (long)ld_gsbase) { ==== //depot/projects/usb_buf/src/sys/amd64/include/specialreg.h#4 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * from: @(#)specialreg.h 7.1 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.61 2010/03/22 15:08:26 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.62 2010/05/05 21:07:47 kib Exp $ */ #ifndef _MACHINE_SPECIALREG_H_ @@ -113,6 +113,7 @@ #define CPUID_PBE 0x80000000 #define CPUID2_SSE3 0x00000001 +#define CPUID2_PCLMULQDQ 0x00000002 #define CPUID2_DTES64 0x00000004 #define CPUID2_MON 0x00000008 #define CPUID2_DS_CPL 0x00000010 @@ -131,6 +132,7 @@ #define CPUID2_X2APIC 0x00200000 #define CPUID2_MOVBE 0x00400000 #define CPUID2_POPCNT 0x00800000 +#define CPUID2_AESNI 0x02000000 /* * Important bits in the AMD extended cpuid flags ==== //depot/projects/usb_buf/src/sys/amd64/include/xen/xenfunc.h#2 (text+ko) ==== @@ -1,6 +1,5 @@ -/* - * - * Copyright (c) 2004,2005 Kip Macy +/*- + * Copyright (c) 2004, 2005 Kip Macy * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -11,22 +10,22 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * $FreeBSD: src/sys/amd64/include/xen/xenfunc.h,v 1.2 2010/05/05 20:39:02 joel Exp $ */ - #ifndef _XEN_XENFUNC_H_ #define _XEN_XENFUNC_H_ ==== //depot/projects/usb_buf/src/sys/amd64/include/xen/xenvar.h#2 (text+ko) ==== @@ -1,31 +1,29 @@ -/* +/*- * Copyright (c) 2008 Kip Macy * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. - * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. * - * - * $FreeBSD: src/sys/amd64/include/xen/xenvar.h,v 1.1 2009/03/11 15:30:12 dfr Exp $ + * $FreeBSD: src/sys/amd64/include/xen/xenvar.h,v 1.2 2010/05/05 20:39:02 joel Exp $ */ #ifndef XENVAR_H_ #define XENVAR_H_ ==== //depot/projects/usb_buf/src/sys/arm/arm/identcpu.c#3 (text+ko) ==== @@ -42,7 +42,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/identcpu.c,v 1.19 2010/05/04 10:14:05 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/identcpu.c,v 1.20 2010/05/12 05:50:56 kevlo Exp $"); #include <sys/systm.h> #include <sys/param.h> #include <sys/malloc.h> @@ -220,7 +220,7 @@ generic_steppings }, { CPU_ID_ARM966ESR1, CPU_CLASS_ARM9ES, "ARM966E-S", generic_steppings }, - { CPU_ID_FA526, CPU_CLASS_ARM9, "FA526", + { CPU_ID_FA526, CPU_CLASS_ARM9TDMI, "FA526", generic_steppings }, { CPU_ID_FA626TE, CPU_CLASS_ARM9ES, "FA626TE", generic_steppings }, @@ -322,7 +322,6 @@ { "ARM7", "CPU_ARM7" }, /* CPU_CLASS_ARM7 */ { "ARM7TDMI", "CPU_ARM7TDMI" }, /* CPU_CLASS_ARM7TDMI */ { "ARM8", "CPU_ARM8" }, /* CPU_CLASS_ARM8 */ - { "ARM9", "CPU_ARM9" }, /* CPU_CLASS_ARM9 */ { "ARM9TDMI", "CPU_ARM9TDMI" }, /* CPU_CLASS_ARM9TDMI */ { "ARM9E-S", "CPU_ARM9E" }, /* CPU_CLASS_ARM9ES */ { "ARM9EJ-S", "CPU_ARM9E" }, /* CPU_CLASS_ARM9EJS */ ==== //depot/projects/usb_buf/src/sys/arm/arm/pmap.c#3 (text+ko) ==== @@ -140,7 +140,7 @@ #include "opt_vm.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.121 2010/04/30 00:46:43 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.123 2010/05/16 23:45:10 alc Exp $"); #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -3118,18 +3118,11 @@ pmap_t curpm; int flags = 0; -#if defined(PMAP_DEBUG) - /* - * XXX This makes pmap_remove_all() illegal for non-managed pages! - */ - if (m->flags & PG_FICTITIOUS) { - panic("pmap_remove_all: illegal for unmanaged page, va: 0x%x", VM_PAGE_TO_PHYS(m)); - } -#endif - + KASSERT((m->flags & PG_FICTITIOUS) == 0, + ("pmap_remove_all: page %p is fictitious", m)); if (TAILQ_EMPTY(&m->md.pv_list)) return; - mtx_assert(&vm_page_queue_mtx, MA_OWNED); + vm_page_lock_queues(); pmap_remove_write(m); curpm = vmspace_pmap(curproc->p_vmspace); while ((pv = TAILQ_FIRST(&m->md.pv_list)) != NULL) { @@ -3180,6 +3173,7 @@ pmap_tlb_flushD(curpm); } vm_page_flag_clear(m, PG_WRITEABLE); + vm_page_unlock_queues(); } @@ -3324,6 +3318,8 @@ u_int oflags; vm_paddr_t pa; + KASSERT((m->oflags & VPO_BUSY) != 0 || (flags & M_NOWAIT) != 0, + ("pmap_enter_locked: page %p is not busy", m)); PMAP_ASSERT_LOCKED(pmap); mtx_assert(&vm_page_queue_mtx, MA_OWNED); if (va == vector_page) { @@ -3615,9 +3611,11 @@ pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot) { + vm_page_lock_queues(); PMAP_LOCK(pmap); pmap_enter_locked(pmap, va, m, prot & (VM_PROT_READ | VM_PROT_EXECUTE), FALSE, M_NOWAIT); + vm_page_unlock_queues(); PMAP_UNLOCK(pmap); } @@ -4450,10 +4448,11 @@ count = 0; if ((m->flags & PG_FICTITIOUS) != 0) return (count); - mtx_assert(&vm_page_queue_mtx, MA_OWNED); + vm_page_lock_queues(); TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) if ((pv->pv_flags & PVF_WIRED) != 0) count++; + vm_page_unlock_queues(); return (count); } @@ -4530,8 +4529,21 @@ pmap_remove_write(vm_page_t m) { - if (m->flags & PG_WRITEABLE) + KASSERT((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) == 0, + ("pmap_remove_write: page %p is not managed", m)); + + /* + * If the page is not VPO_BUSY, then PG_WRITEABLE cannot be set by + * another thread while the object is locked. Thus, if PG_WRITEABLE + * is clear, no page table entries need updating. + */ + VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED); + if ((m->oflags & VPO_BUSY) != 0 || + (m->flags & PG_WRITEABLE) != 0) { + vm_page_lock_queues(); pmap_clearbit(m, PVF_WRITE); + vm_page_unlock_queues(); + } } ==== //depot/projects/usb_buf/src/sys/arm/include/disassem.h#2 (text+ko) ==== @@ -35,7 +35,7 @@ * * Define the interface structure required by the disassembler. * - * $FreeBSD: src/sys/arm/include/disassem.h,v 1.2 2005/01/05 21:58:48 imp Exp $ + * $FreeBSD: src/sys/arm/include/disassem.h,v 1.3 2010/05/14 00:00:19 cognet Exp $ */ #ifndef _MACHINE_DISASSEM_H_ @@ -43,7 +43,7 @@ typedef struct { u_int (*di_readword)(u_int); void (*di_printaddr)(u_int); - void (*di_printf)(const char *, ...) __printflike(1, 2); + int (*di_printf)(const char *, ...) __printflike(1, 2); } disasm_interface_t; /* Prototypes for callable functions */ ==== //depot/projects/usb_buf/src/sys/arm/include/md_var.h#3 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * from: FreeBSD: src/sys/i386/include/md_var.h,v 1.40 2001/07/12 - * $FreeBSD: src/sys/arm/include/md_var.h,v 1.7 2010/02/20 14:54:11 kevlo Exp $ + * $FreeBSD: src/sys/arm/include/md_var.h,v 1.8 2010/05/12 05:50:56 kevlo Exp $ */ #ifndef _MACHINE_MD_VAR_H_ @@ -57,7 +57,6 @@ CPU_CLASS_ARM7, CPU_CLASS_ARM7TDMI, CPU_CLASS_ARM8, - CPU_CLASS_ARM9, CPU_CLASS_ARM9TDMI, CPU_CLASS_ARM9ES, CPU_CLASS_ARM9EJS, ==== //depot/projects/usb_buf/src/sys/boot/common/module.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/boot/common/module.c,v 1.29 2009/12/31 12:17:38 nyan Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/common/module.c,v 1.30 2010/05/10 18:23:00 imp Exp $"); /* * file/module function dispatcher, support, etc. @@ -295,7 +295,8 @@ } static int -file_load_dependencies(struct preloaded_file *base_file) { +file_load_dependencies(struct preloaded_file *base_file) +{ struct file_metadata *md; struct preloaded_file *fp; struct mod_depend *verinfo; ==== //depot/projects/usb_buf/src/sys/boot/forth/loader.conf.5#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sys/boot/forth/loader.conf.5,v 1.29 2009/11/27 03:55:42 sobomax Exp $ +.\" $FreeBSD: src/sys/boot/forth/loader.conf.5,v 1.30 2010/05/13 12:07:55 uqs Exp $ .Dd January 16, 2008 .Dt LOADER.CONF 5 .Os @@ -243,6 +243,14 @@ .Xr boot 8 , .Xr loader 8 , .Xr loader.4th 8 +.Sh HISTORY +The file +.Nm +first appeared in +.Fx 3.2 . +.Sh AUTHORS +This manual page was written by +.An Daniel C. Sobral Aq dcs@FreeBSD.org . .Sh BUGS The .Xr loader 8 @@ -253,11 +261,3 @@ .Dq Va hw.ata.ata_dma Ns "=0" ) should precede any experimental additions to .Nm . -.Sh HISTORY -The file -.Nm -first appeared in -.Fx 3.2 . -.Sh AUTHORS -This manual page was written by -.An Daniel C. Sobral Aq dcs@FreeBSD.org . ==== //depot/projects/usb_buf/src/sys/cam/scsi/scsi_sg.c#3 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sg.c,v 1.17 2010/03/17 18:53:58 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sg.c,v 1.19 2010/05/11 22:51:13 mjacob Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -303,7 +303,14 @@ softc->dev = make_dev(&sg_cdevsw, periph->unit_number, UID_ROOT, GID_OPERATOR, 0600, "%s%d", periph->periph_name, periph->unit_number); - (void)make_dev_alias(softc->dev, "sg%c", 'a' + periph->unit_number); + if (periph->unit_number < 26) { + (void)make_dev_alias(softc->dev, "sg%c", + periph->unit_number + 'a'); + } else { + (void)make_dev_alias(softc->dev, "sg%c%c", + ((periph->unit_number / 26) - 1) + 'a', + (periph->unit_number % 26) + 'a'); + } cam_periph_lock(periph); softc->dev->si_drv1 = periph; ==== //depot/projects/usb_buf/src/sys/cddl/boot/zfs/zfsimpl.h#4 (text+ko) ==== @@ -66,7 +66,7 @@ #define P2ROUNDUP(x, align) (-(-(x) & -(align))) #define P2END(x, align) (-(~(x) & -(align))) #define P2PHASEUP(x, align, phase) ((phase) - (((phase) - (x)) & -(align))) -#define P2CROSS(x, y, align) (((x) ^ (y)) > (align) - 1) +#define P2BOUNDARY(off, len, align) (((off) ^ ((off) + (len) - 1)) > (align) - 1) >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201005170426.o4H4QRjx041857>