PERFORCE change 153216 for review
Hans Petter Selasky
hselasky at FreeBSD.org
Wed Nov 19 07:56:49 PST 2008
http://perforce.freebsd.org/chv.cgi?CH=153216
Change 153216 by hselasky at hselasky_laptop001 on 2008/11/19 15:55:47
IFC @ 153212
Affected files ...
.. //depot/projects/usb/src/sys/amd64/conf/GENERIC#16 integrate
.. //depot/projects/usb/src/sys/amd64/linux32/linux.h#8 integrate
.. //depot/projects/usb/src/sys/arm/at91/at91_mci.c#7 integrate
.. //depot/projects/usb/src/sys/arm/at91/uart_dev_at91usart.c#9 integrate
.. //depot/projects/usb/src/sys/arm/conf/DB-78XXX#2 integrate
.. //depot/projects/usb/src/sys/arm/conf/DB-88F5XXX#2 integrate
.. //depot/projects/usb/src/sys/arm/conf/DB-88F6XXX#2 integrate
.. //depot/projects/usb/src/sys/arm/mv/common.c#2 integrate
.. //depot/projects/usb/src/sys/arm/mv/discovery/db78xxx.c#2 integrate
.. //depot/projects/usb/src/sys/arm/mv/discovery/discovery.c#2 integrate
.. //depot/projects/usb/src/sys/arm/mv/files.mv#2 integrate
.. //depot/projects/usb/src/sys/arm/mv/kirkwood/db88f6xxx.c#2 integrate
.. //depot/projects/usb/src/sys/arm/mv/kirkwood/kirkwood.c#2 integrate
.. //depot/projects/usb/src/sys/arm/mv/mv_pci.c#1 branch
.. //depot/projects/usb/src/sys/arm/mv/mvreg.h#2 integrate
.. //depot/projects/usb/src/sys/arm/mv/mvvar.h#2 integrate
.. //depot/projects/usb/src/sys/arm/mv/obio.c#2 integrate
.. //depot/projects/usb/src/sys/arm/mv/orion/db88f5xxx.c#2 integrate
.. //depot/projects/usb/src/sys/arm/mv/orion/orion.c#2 integrate
.. //depot/projects/usb/src/sys/boot/Makefile#8 integrate
.. //depot/projects/usb/src/sys/boot/common/bootstrap.h#4 integrate
.. //depot/projects/usb/src/sys/boot/forth/loader.conf#13 integrate
.. //depot/projects/usb/src/sys/boot/i386/Makefile#4 integrate
.. //depot/projects/usb/src/sys/boot/i386/libi386/bootinfo32.c#3 integrate
.. //depot/projects/usb/src/sys/boot/i386/libi386/devicename.c#5 integrate
.. //depot/projects/usb/src/sys/boot/i386/loader/Makefile#5 integrate
.. //depot/projects/usb/src/sys/boot/i386/loader/conf.c#3 integrate
.. //depot/projects/usb/src/sys/boot/i386/loader/main.c#7 integrate
.. //depot/projects/usb/src/sys/boot/i386/zfsboot/Makefile#1 branch
.. //depot/projects/usb/src/sys/boot/i386/zfsboot/zfsboot.c#1 branch
.. //depot/projects/usb/src/sys/boot/i386/zfsboot/zfsldr.S#1 branch
.. //depot/projects/usb/src/sys/boot/zfs/Makefile#1 branch
.. //depot/projects/usb/src/sys/boot/zfs/zfs.c#1 branch
.. //depot/projects/usb/src/sys/boot/zfs/zfsimpl.c#1 branch
.. //depot/projects/usb/src/sys/bsm/audit_internal.h#7 integrate
.. //depot/projects/usb/src/sys/bsm/audit_record.h#7 integrate
.. //depot/projects/usb/src/sys/cddl/boot/zfs/README#1 branch
.. //depot/projects/usb/src/sys/cddl/boot/zfs/fletcher.c#1 branch
.. //depot/projects/usb/src/sys/cddl/boot/zfs/lzjb.c#1 branch
.. //depot/projects/usb/src/sys/cddl/boot/zfs/sha256.c#1 branch
.. //depot/projects/usb/src/sys/cddl/boot/zfs/zfsimpl.h#1 branch
.. //depot/projects/usb/src/sys/cddl/boot/zfs/zfssubr.c#1 branch
.. //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c#3 integrate
.. //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c#4 integrate
.. //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_lookup.c#1 branch
.. //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#2 integrate
.. //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#3 integrate
.. //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#4 integrate
.. //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_zone.c#2 integrate
.. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/acl.h#3 delete
.. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/atomic.h#4 integrate
.. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/callb.h#3 delete
.. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/cred.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/dnlc.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/file.h#1 branch
.. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/kidmap.h#1 branch
.. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/kmem.h#3 integrate
.. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/misc.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/mntent.h#3 integrate
.. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/param.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/pathname.h#1 branch
.. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/policy.h#3 integrate
.. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/proc.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/refstr.h#1 branch
.. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/sid.h#1 branch
.. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/sig.h#1 branch
.. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/sunddi.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/sysmacros.h#3 integrate
.. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/time.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/types.h#3 integrate
.. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/uio.h#3 integrate
.. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/vfs.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/vnode.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/zone.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/atomic/amd64/atomic.S#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/atomic/i386/atomic.S#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/avl/avl.c#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/unicode/u8_textprep.c#1 branch
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_comutil.c#1 branch
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_comutil.h#1 branch
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_deleg.c#1 branch
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_deleg.h#1 branch
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.c#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/zfs/zpool_prop.c#1 branch
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/zfs/zprop_common.c#1 branch
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/Makefile.files#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#3 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/vnode.c#1 branch
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bplist.c#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#3 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deleg.c#1 branch
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scrub.c#1 branch
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/refcount.c#3 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/rrwlock.c#1 branch
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sha256.c#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#3 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_deleg.h#1 branch
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#3 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/rrwlock.h#1 branch
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_boot.h#1 branch
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_fuid.h#1 branch
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/unique.c#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#3 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#3 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#5 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fuid.c#1 branch
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#3 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#3 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#4 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#5 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/os/callb.c#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/os/list.c#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/os/taskq.c#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.c#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_array.c#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/acl.h#1 branch
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/acl_impl.h#1 branch
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/avl.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/byteorder.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/callb.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/cpuvar.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/cred.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/dkio.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/dklabel.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/extdirent.h#1 branch
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/fm/protocol.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/fm/util.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/gfs.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/idmap.h#1 branch
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#4 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/list.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/nvpair.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/processor.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/synch.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent/eventdefs.h#1 branch
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/u8_textprep.h#1 branch
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/u8_textprep_data.h#1 branch
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h#1 branch
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod.c#2 integrate
.. //depot/projects/usb/src/sys/compat/linux/linux_futex.c#7 integrate
.. //depot/projects/usb/src/sys/conf/NOTES#22 integrate
.. //depot/projects/usb/src/sys/conf/files#40 integrate
.. //depot/projects/usb/src/sys/conf/options#13 integrate
.. //depot/projects/usb/src/sys/crypto/via/padlock.c#6 integrate
.. //depot/projects/usb/src/sys/dev/acpica/acpi.c#13 integrate
.. //depot/projects/usb/src/sys/dev/adb/adb_bus.c#2 integrate
.. //depot/projects/usb/src/sys/dev/ale/if_ale.c#1 branch
.. //depot/projects/usb/src/sys/dev/ale/if_alereg.h#1 branch
.. //depot/projects/usb/src/sys/dev/ale/if_alevar.h#1 branch
.. //depot/projects/usb/src/sys/dev/bce/if_bce.c#12 integrate
.. //depot/projects/usb/src/sys/dev/cardbus/cardbus.c#7 integrate
.. //depot/projects/usb/src/sys/dev/cardbus/cardbus_cis.c#6 integrate
.. //depot/projects/usb/src/sys/dev/cardbus/cardbus_device.c#3 integrate
.. //depot/projects/usb/src/sys/dev/cardbus/cardbusvar.h#2 integrate
.. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_ctl_defs.h#4 integrate
.. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_t3_hw.c#8 integrate
.. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#7 integrate
.. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_tom.c#5 integrate
.. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#5 integrate
.. //depot/projects/usb/src/sys/dev/fdc/fdc.c#7 integrate
.. //depot/projects/usb/src/sys/dev/glxsb/glxsb.c#2 integrate
.. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_amd.c#6 integrate
.. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_intel.c#2 integrate
.. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_mod.c#10 integrate
.. //depot/projects/usb/src/sys/dev/ipmi/ipmi.c#5 integrate
.. //depot/projects/usb/src/sys/dev/mfi/mfi.c#12 integrate
.. //depot/projects/usb/src/sys/dev/mfi/mfi_disk.c#6 integrate
.. //depot/projects/usb/src/sys/dev/mfi/mfi_ioctl.h#5 integrate
.. //depot/projects/usb/src/sys/dev/mfi/mfi_pci.c#7 integrate
.. //depot/projects/usb/src/sys/dev/mfi/mfireg.h#7 integrate
.. //depot/projects/usb/src/sys/dev/mfi/mfivar.h#7 integrate
.. //depot/projects/usb/src/sys/dev/pci/pci.c#12 integrate
.. //depot/projects/usb/src/sys/dev/ppbus/if_plip.c#7 integrate
.. //depot/projects/usb/src/sys/dev/ppbus/immio.c#3 integrate
.. //depot/projects/usb/src/sys/dev/ppbus/lpbb.c#4 integrate
.. //depot/projects/usb/src/sys/dev/ppbus/lpt.c#5 integrate
.. //depot/projects/usb/src/sys/dev/ppbus/lpt.h#2 integrate
.. //depot/projects/usb/src/sys/dev/ppbus/pcfclock.c#3 integrate
.. //depot/projects/usb/src/sys/dev/ppbus/ppb_1284.c#2 integrate
.. //depot/projects/usb/src/sys/dev/ppbus/ppb_base.c#3 integrate
.. //depot/projects/usb/src/sys/dev/ppbus/ppb_msq.c#3 integrate
.. //depot/projects/usb/src/sys/dev/ppbus/ppbconf.c#8 integrate
.. //depot/projects/usb/src/sys/dev/ppbus/ppbconf.h#5 integrate
.. //depot/projects/usb/src/sys/dev/ppbus/ppi.c#5 integrate
.. //depot/projects/usb/src/sys/dev/ppbus/ppi.h#2 integrate
.. //depot/projects/usb/src/sys/dev/ppbus/pps.c#5 integrate
.. //depot/projects/usb/src/sys/dev/ppbus/vpo.c#6 integrate
.. //depot/projects/usb/src/sys/dev/ppbus/vpoio.c#3 integrate
.. //depot/projects/usb/src/sys/dev/ppbus/vpoio.h#3 integrate
.. //depot/projects/usb/src/sys/dev/ppc/ppc.c#7 integrate
.. //depot/projects/usb/src/sys/dev/ppc/ppc_acpi.c#4 integrate
.. //depot/projects/usb/src/sys/dev/sio/sio_pci.c#3 integrate
.. //depot/projects/usb/src/sys/dev/sio/sio_puc.c#3 integrate
.. //depot/projects/usb/src/sys/dev/sound/pci/hda/hdac.c#12 integrate
.. //depot/projects/usb/src/sys/dev/syscons/syscons.c#9 integrate
.. //depot/projects/usb/src/sys/dev/usb/if_aue.c#49 integrate
.. //depot/projects/usb/src/sys/dev/usb/rio500_usb.h#10 integrate
.. //depot/projects/usb/src/sys/dev/usb/u3g.c#2 integrate
.. //depot/projects/usb/src/sys/dev/usb/ugen.c#46 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb.h#35 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_quirks.c#22 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#109 integrate
.. //depot/projects/usb/src/sys/dev/usb/usbdevs#26 integrate
.. //depot/projects/usb/src/sys/dev/usb/usbdi.c#5 integrate
.. //depot/projects/usb/src/sys/dev/usb/usbdi.h#4 integrate
.. //depot/projects/usb/src/sys/dev/usb2/bluetooth/ng_ubt2.c#11 integrate
.. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2.c#19 integrate
.. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2.h#8 integrate
.. //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci_pccard.c#12 delete
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_busdma.c#13 integrate
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_core.h#26 integrate
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_dev.c#43 integrate
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_dev.h#16 integrate
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_device.c#33 integrate
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_generic.c#34 edit
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_generic.h#9 edit
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_hub.c#21 integrate
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_request.c#24 integrate
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_util.c#8 integrate
.. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_aue2.c#12 edit
.. //depot/projects/usb/src/sys/dev/usb2/image/uscanner2.c#11 integrate
.. //depot/projects/usb/src/sys/dev/usb2/include/Makefile#5 integrate
.. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#12 edit
.. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#12 edit
.. //depot/projects/usb/src/sys/dev/usb2/include/usb2_ioctl.h#24 integrate
.. //depot/projects/usb/src/sys/dev/usb2/quirk/usb2_quirk.c#9 edit
.. //depot/projects/usb/src/sys/dev/usb2/serial/ubsa2.c#15 integrate
.. //depot/projects/usb/src/sys/dev/usb2/serial/ugensa2.c#15 integrate
.. //depot/projects/usb/src/sys/dev/usb2/sound/uaudio2.c#17 integrate
.. //depot/projects/usb/src/sys/dev/usb2/storage/umass2.c#16 integrate
.. //depot/projects/usb/src/sys/dev/usb2/storage/urio2.c#11 integrate
.. //depot/projects/usb/src/sys/dev/vge/if_vge.c#6 integrate
.. //depot/projects/usb/src/sys/dev/vr/if_vr.c#3 integrate
.. //depot/projects/usb/src/sys/fs/cd9660/cd9660_bmap.c#2 integrate
.. //depot/projects/usb/src/sys/fs/cd9660/cd9660_node.c#3 integrate
.. //depot/projects/usb/src/sys/fs/cd9660/cd9660_node.h#2 integrate
.. //depot/projects/usb/src/sys/fs/cd9660/cd9660_vfsops.c#5 integrate
.. //depot/projects/usb/src/sys/fs/cd9660/cd9660_vnops.c#5 integrate
.. //depot/projects/usb/src/sys/geom/part/g_part_bsd.c#5 integrate
.. //depot/projects/usb/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.h#4 integrate
.. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_dfrag.c#3 integrate
.. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_inode.c#4 integrate
.. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_inode.h#3 integrate
.. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_vnodeops.c#4 integrate
.. //depot/projects/usb/src/sys/i386/conf/GENERIC#16 integrate
.. //depot/projects/usb/src/sys/i386/conf/XEN#3 integrate
.. //depot/projects/usb/src/sys/i386/linux/linux.h#8 integrate
.. //depot/projects/usb/src/sys/isa/isa_common.c#7 integrate
.. //depot/projects/usb/src/sys/isa/isa_common.h#4 integrate
.. //depot/projects/usb/src/sys/isa/isahint.c#3 integrate
.. //depot/projects/usb/src/sys/isa/isavar.h#4 integrate
.. //depot/projects/usb/src/sys/kern/bus_if.m#5 integrate
.. //depot/projects/usb/src/sys/kern/kern_jail.c#10 integrate
.. //depot/projects/usb/src/sys/kern/kern_osd.c#1 branch
.. //depot/projects/usb/src/sys/kern/kern_proc.c#13 integrate
.. //depot/projects/usb/src/sys/kern/kern_thread.c#13 integrate
.. //depot/projects/usb/src/sys/kern/sched_ule.c#11 integrate
.. //depot/projects/usb/src/sys/kern/subr_bus.c#15 integrate
.. //depot/projects/usb/src/sys/kern/subr_prf.c#6 integrate
.. //depot/projects/usb/src/sys/kern/tty_ttydisc.c#3 integrate
.. //depot/projects/usb/src/sys/kern/vfs_lookup.c#10 integrate
.. //depot/projects/usb/src/sys/kern/vfs_subr.c#13 integrate
.. //depot/projects/usb/src/sys/kern/vfs_vnops.c#13 integrate
.. //depot/projects/usb/src/sys/kgssapi/gsstest.c#2 integrate
.. //depot/projects/usb/src/sys/modules/Makefile#23 integrate
.. //depot/projects/usb/src/sys/modules/ale/Makefile#1 branch
.. //depot/projects/usb/src/sys/modules/cxgb/cxgb/Makefile#6 integrate
.. //depot/projects/usb/src/sys/modules/cxgb/iw_cxgb/Makefile#3 integrate
.. //depot/projects/usb/src/sys/modules/cxgb/toecore/Makefile#3 integrate
.. //depot/projects/usb/src/sys/modules/em/Makefile#6 integrate
.. //depot/projects/usb/src/sys/modules/igb/Makefile#3 integrate
.. //depot/projects/usb/src/sys/modules/zfs/Makefile#6 integrate
.. //depot/projects/usb/src/sys/net/if.c#13 integrate
.. //depot/projects/usb/src/sys/net/if_ethersubr.c#11 integrate
.. //depot/projects/usb/src/sys/net/if_gif.c#10 integrate
.. //depot/projects/usb/src/sys/net/if_loop.c#12 integrate
.. //depot/projects/usb/src/sys/net/raw_cb.c#8 integrate
.. //depot/projects/usb/src/sys/net/route.c#12 integrate
.. //depot/projects/usb/src/sys/netinet/if_ether.c#13 integrate
.. //depot/projects/usb/src/sys/netinet/igmp.c#6 integrate
.. //depot/projects/usb/src/sys/netinet/in.c#11 integrate
.. //depot/projects/usb/src/sys/netinet/in_gif.c#8 integrate
.. //depot/projects/usb/src/sys/netinet/in_mcast.c#6 integrate
.. //depot/projects/usb/src/sys/netinet/in_pcb.c#14 integrate
.. //depot/projects/usb/src/sys/netinet/in_pcb.h#12 integrate
.. //depot/projects/usb/src/sys/netinet/in_proto.c#7 integrate
.. //depot/projects/usb/src/sys/netinet/in_rmx.c#10 integrate
.. //depot/projects/usb/src/sys/netinet/in_var.h#8 integrate
.. //depot/projects/usb/src/sys/netinet/ip_divert.c#10 integrate
.. //depot/projects/usb/src/sys/netinet/ip_fastfwd.c#8 integrate
.. //depot/projects/usb/src/sys/netinet/ip_icmp.c#10 integrate
.. //depot/projects/usb/src/sys/netinet/ip_icmp.h#2 integrate
.. //depot/projects/usb/src/sys/netinet/ip_input.c#14 integrate
.. //depot/projects/usb/src/sys/netinet/raw_ip.c#13 integrate
.. //depot/projects/usb/src/sys/netinet/sctp_constants.h#10 integrate
.. //depot/projects/usb/src/sys/netinet/sctp_indata.c#11 integrate
.. //depot/projects/usb/src/sys/netinet/sctp_input.c#11 integrate
.. //depot/projects/usb/src/sys/netinet/sctp_pcb.c#12 integrate
.. //depot/projects/usb/src/sys/netinet/sctp_pcb.h#11 integrate
.. //depot/projects/usb/src/sys/netinet/sctputil.c#13 integrate
.. //depot/projects/usb/src/sys/netinet/tcp_hostcache.c#8 integrate
.. //depot/projects/usb/src/sys/netinet/tcp_input.c#16 integrate
.. //depot/projects/usb/src/sys/netinet/tcp_output.c#14 integrate
.. //depot/projects/usb/src/sys/netinet/tcp_reass.c#6 integrate
.. //depot/projects/usb/src/sys/netinet/tcp_sack.c#7 integrate
.. //depot/projects/usb/src/sys/netinet/tcp_subr.c#14 integrate
.. //depot/projects/usb/src/sys/netinet/tcp_syncache.c#16 integrate
.. //depot/projects/usb/src/sys/netinet/tcp_timewait.c#7 integrate
.. //depot/projects/usb/src/sys/netinet/tcp_var.h#12 integrate
.. //depot/projects/usb/src/sys/netinet/udp_usrreq.c#14 integrate
.. //depot/projects/usb/src/sys/netinet/vinet.h#2 integrate
.. //depot/projects/usb/src/sys/netinet6/frag6.c#9 integrate
.. //depot/projects/usb/src/sys/netinet6/icmp6.c#13 integrate
.. //depot/projects/usb/src/sys/netinet6/in6_ifattach.c#10 integrate
.. //depot/projects/usb/src/sys/netinet6/in6_proto.c#10 integrate
.. //depot/projects/usb/src/sys/netinet6/in6_rmx.c#9 integrate
.. //depot/projects/usb/src/sys/netinet6/in6_src.c#13 integrate
.. //depot/projects/usb/src/sys/netinet6/ip6_forward.c#9 integrate
.. //depot/projects/usb/src/sys/netinet6/ip6_input.c#13 integrate
.. //depot/projects/usb/src/sys/netinet6/ip6_mroute.c#9 integrate
.. //depot/projects/usb/src/sys/netinet6/mld6.c#9 integrate
.. //depot/projects/usb/src/sys/netinet6/nd6.c#11 integrate
.. //depot/projects/usb/src/sys/netinet6/nd6_nbr.c#9 integrate
.. //depot/projects/usb/src/sys/netinet6/nd6_rtr.c#9 integrate
.. //depot/projects/usb/src/sys/netinet6/raw_ip6.c#13 integrate
.. //depot/projects/usb/src/sys/netinet6/scope6.c#7 integrate
.. //depot/projects/usb/src/sys/netinet6/vinet6.h#2 integrate
.. //depot/projects/usb/src/sys/netipsec/ipsec.c#12 integrate
.. //depot/projects/usb/src/sys/netipsec/ipsec.h#9 integrate
.. //depot/projects/usb/src/sys/netipsec/key.c#8 integrate
.. //depot/projects/usb/src/sys/netipsec/keysock.c#8 integrate
.. //depot/projects/usb/src/sys/netipsec/xform_ah.c#7 integrate
.. //depot/projects/usb/src/sys/netipsec/xform_esp.c#7 integrate
.. //depot/projects/usb/src/sys/netipsec/xform_ipcomp.c#6 integrate
.. //depot/projects/usb/src/sys/netipsec/xform_ipip.c#8 integrate
.. //depot/projects/usb/src/sys/nfsclient/nfs.h#6 integrate
.. //depot/projects/usb/src/sys/nfsserver/nfs.h#8 integrate
.. //depot/projects/usb/src/sys/nfsserver/nfs_srvkrpc.c#3 integrate
.. //depot/projects/usb/src/sys/nfsserver/nfs_srvsubs.c#11 integrate
.. //depot/projects/usb/src/sys/nlm/nlm_prot_svc.c#3 integrate
.. //depot/projects/usb/src/sys/powerpc/include/float.h#3 integrate
.. //depot/projects/usb/src/sys/rpc/clnt_vc.c#4 integrate
.. //depot/projects/usb/src/sys/security/audit/audit.c#11 integrate
.. //depot/projects/usb/src/sys/security/audit/audit.h#8 integrate
.. //depot/projects/usb/src/sys/security/audit/audit_arg.c#11 integrate
.. //depot/projects/usb/src/sys/security/audit/audit_bsm.c#10 integrate
.. //depot/projects/usb/src/sys/security/audit/audit_bsm_token.c#8 integrate
.. //depot/projects/usb/src/sys/security/audit/audit_private.h#8 integrate
.. //depot/projects/usb/src/sys/security/audit/audit_syscalls.c#10 integrate
.. //depot/projects/usb/src/sys/sparc64/include/iommureg.h#4 integrate
.. //depot/projects/usb/src/sys/sparc64/include/iommuvar.h#4 integrate
.. //depot/projects/usb/src/sys/sparc64/sparc64/iommu.c#6 integrate
.. //depot/projects/usb/src/sys/sparc64/sparc64/machdep.c#10 integrate
.. //depot/projects/usb/src/sys/sparc64/sparc64/support.S#5 integrate
.. //depot/projects/usb/src/sys/sys/conf.h#12 integrate
.. //depot/projects/usb/src/sys/sys/jail.h#6 integrate
.. //depot/projects/usb/src/sys/sys/mount.h#12 integrate
.. //depot/projects/usb/src/sys/sys/namei.h#3 integrate
.. //depot/projects/usb/src/sys/sys/osd.h#1 branch
.. //depot/projects/usb/src/sys/sys/priv.h#10 integrate
.. //depot/projects/usb/src/sys/sys/proc.h#14 integrate
.. //depot/projects/usb/src/sys/sys/vimage.h#3 integrate
.. //depot/projects/usb/src/sys/sys/vnode.h#12 integrate
.. //depot/projects/usb/src/sys/ufs/ffs/ffs_snapshot.c#11 integrate
.. //depot/projects/usb/src/sys/vm/vm_pageout.c#12 integrate
.. //depot/projects/usb/src/sys/xdr/xdr_mbuf.c#4 integrate
.. //depot/projects/usb/src/sys/xen/xenbus/xenbus_xs.c#2 integrate
Differences ...
==== //depot/projects/usb/src/sys/amd64/conf/GENERIC#16 (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.508 2008/10/03 10:31:31 stas Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.509 2008/11/12 09:52:06 yongari Exp $
cpu HAMMER
ident GENERIC
@@ -202,6 +202,7 @@
device miibus # MII bus support
device ae # Attansic/Atheros L2 FastEthernet
device age # Attansic/Atheros L1 Gigabit Ethernet
+device ale # Atheros AR8121/AR8113/AR8114 Ethernet
device bce # Broadcom BCM5706/BCM5708 Gigabit Ethernet
device bfe # Broadcom BCM440x 10/100 Ethernet
device bge # Broadcom BCM570xx Gigabit Ethernet
==== //depot/projects/usb/src/sys/amd64/linux32/linux.h#8 (text+ko) ====
@@ -27,7 +27,7 @@
* (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/linux32/linux.h,v 1.19 2008/10/19 10:02:26 kib Exp $
+ * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.20 2008/11/16 15:45:41 kib Exp $
*/
#ifndef _AMD64_LINUX_H_
@@ -892,7 +892,7 @@
struct linux_robust_list_head {
struct linux_robust_list list;
- l_ulong futex_offset;
+ l_long futex_offset;
l_uintptr_t pending_list;
};
==== //depot/projects/usb/src/sys/arm/at91/at91_mci.c#7 (text+ko) ====
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/at91/at91_mci.c,v 1.9 2008/10/29 20:01:26 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/at91_mci.c,v 1.10 2008/11/18 12:42:59 stas Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -176,7 +176,7 @@
* Allocate DMA tags and maps
*/
err = bus_dma_tag_create(bus_get_dma_tag(dev), 1, 0,
- BUS_SPACE_MAXADDR_32BIT, US_SPACE_MAXADDR, NULL, NULL, MAXPHYS, 1,
+ BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, MAXPHYS, 1,
MAXPHYS, BUS_DMA_ALLOCNOW, NULL, NULL, &sc->dmatag);
if (err != 0)
goto out;
==== //depot/projects/usb/src/sys/arm/at91/uart_dev_at91usart.c#9 (text) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/at91/uart_dev_at91usart.c,v 1.16 2008/10/07 17:23:16 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/uart_dev_at91usart.c,v 1.17 2008/11/18 12:42:59 stas Exp $");
#include "opt_comconsole.h"
@@ -350,7 +350,7 @@
/*
* Allocate DMA tags and maps
*/
- err = bus_dma_tag_create(bus_get_dma_tag(dev), 1, 0,
+ err = bus_dma_tag_create(bus_get_dma_tag(sc->sc_dev), 1, 0,
BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL,
USART_BUFFER_SIZE, 1, USART_BUFFER_SIZE, BUS_DMA_ALLOCNOW, NULL,
NULL, &atsc->dmatag);
==== //depot/projects/usb/src/sys/arm/conf/DB-78XXX#2 (text+ko) ====
@@ -1,7 +1,7 @@
#
# Custom kernel for Marvell DB-78xx boards.
#
-# $FreeBSD: src/sys/arm/conf/DB-78XXX,v 1.2 2008/10/23 01:51:55 marcel Exp $
+# $FreeBSD: src/sys/arm/conf/DB-78XXX,v 1.3 2008/11/19 11:47:23 raj Exp $
#
ident DB-88F78XX
@@ -46,6 +46,8 @@
options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed
#options WITNESS_KDB
+device pci
+
# Pseudo devices
device loop
device md
==== //depot/projects/usb/src/sys/arm/conf/DB-88F5XXX#2 (text+ko) ====
@@ -1,7 +1,7 @@
#
# Custom kernel for Marvell DB-88F5xxx boards.
#
-# $FreeBSD: src/sys/arm/conf/DB-88F5XXX,v 1.2 2008/10/23 01:51:55 marcel Exp $
+# $FreeBSD: src/sys/arm/conf/DB-88F5XXX,v 1.3 2008/11/19 11:47:23 raj Exp $
#
ident DB-88F5XXX
@@ -46,6 +46,8 @@
options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed
#options WITNESS_KDB
+device pci
+
# Pseudo devices
device md
device loop
==== //depot/projects/usb/src/sys/arm/conf/DB-88F6XXX#2 (text+ko) ====
@@ -1,7 +1,7 @@
#
# Custom kernel for Marvell DB-88F6xxx boards.
#
-# $FreeBSD: src/sys/arm/conf/DB-88F6XXX,v 1.2 2008/10/23 01:51:55 marcel Exp $
+# $FreeBSD: src/sys/arm/conf/DB-88F6XXX,v 1.3 2008/11/19 11:47:23 raj Exp $
#
ident DB-88F6XXX
@@ -46,6 +46,8 @@
options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed
#options WITNESS_KDB
+device pci
+
# Pseudo devices
device loop
device md
==== //depot/projects/usb/src/sys/arm/mv/common.c#2 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/mv/common.c,v 1.1 2008/10/13 20:07:13 raj Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/mv/common.c,v 1.3 2008/11/19 11:57:16 raj Exp $");
#include <sys/systm.h>
#include <sys/bus.h>
@@ -53,6 +53,7 @@
static void decode_win_pcie_setup(uint32_t base);
static uint32_t dev, rev;
+static uint32_t used_cpu_wins;
uint32_t
read_cpu_ctrl(uint32_t reg)
@@ -198,8 +199,20 @@
decode_win_eth_setup(MV_ETH0_BASE);
if (dev == MV_DEV_MV78100)
decode_win_eth_setup(MV_ETH1_BASE);
+
decode_win_idma_setup();
- decode_win_pcie_setup(MV_PCIE_BASE);
+
+ if (dev == MV_DEV_MV78100) {
+ decode_win_pcie_setup(MV_PCIE00_BASE);
+ decode_win_pcie_setup(MV_PCIE01_BASE);
+ decode_win_pcie_setup(MV_PCIE02_BASE);
+ decode_win_pcie_setup(MV_PCIE03_BASE);
+ decode_win_pcie_setup(MV_PCIE10_BASE);
+ decode_win_pcie_setup(MV_PCIE11_BASE);
+ decode_win_pcie_setup(MV_PCIE12_BASE);
+ decode_win_pcie_setup(MV_PCIE13_BASE);
+ } else
+ decode_win_pcie_setup(MV_PCIE_BASE);
/* TODO set up decode wins for SATA */
@@ -405,12 +418,49 @@
return (rv);
}
+int
+decode_win_cpu_set(int target, int attr, vm_paddr_t base, uint32_t size,
+ int remap)
+{
+ uint32_t br, cr;
+ int win;
+
+ if (used_cpu_wins >= MV_WIN_CPU_MAX)
+ return (-1);
+
+ win = used_cpu_wins++;
+
+ br = base & 0xffff0000;
+ win_cpu_br_write(win, br);
+
+ if (win_cpu_can_remap(win)) {
+ if (remap >= 0) {
+ win_cpu_remap_l_write(win, remap & 0xffff0000);
+ win_cpu_remap_h_write(win, 0);
+ } else {
+ /*
+ * Remap function is not used for a given window
+ * (capable of remapping) - set remap field with the
+ * same value as base.
+ */
+ win_cpu_remap_l_write(win, base & 0xffff0000);
+ win_cpu_remap_h_write(win, 0);
+ }
+ }
+
+ cr = ((size - 1) & 0xffff0000) | (attr << 8) | (target << 4) | 1;
+ win_cpu_cr_write(win, cr);
+
+ return (0);
+}
+
static void
decode_win_cpu_setup(void)
{
- uint32_t br, cr;
int i;
+ used_cpu_wins = 0;
+
/* Disable all CPU windows */
for (i = 0; i < MV_WIN_CPU_MAX; i++) {
win_cpu_cr_write(i, 0);
@@ -422,35 +472,11 @@
}
for (i = 0; i < cpu_wins_no; i++)
- if (cpu_wins[i].target > 0) {
-
- br = cpu_wins[i].base & 0xffff0000;
- win_cpu_br_write(i, br);
-
- if (win_cpu_can_remap(i)) {
- if (cpu_wins[i].remap >= 0) {
- win_cpu_remap_l_write(i,
- cpu_wins[i].remap & 0xffff0000);
- win_cpu_remap_h_write(i, 0);
- } else {
- /*
- * Remap function is not used for
- * a given window (capable of
- * remapping) - set remap field with the
- * same value as base.
- */
- win_cpu_remap_l_write(i,
- cpu_wins[i].base & 0xffff0000);
- win_cpu_remap_h_write(i, 0);
- }
- }
+ if (cpu_wins[i].target > 0)
+ decode_win_cpu_set(cpu_wins[i].target,
+ cpu_wins[i].attr, cpu_wins[i].base,
+ cpu_wins[i].size, cpu_wins[i].remap);
- cr = ((cpu_wins[i].size - 1) & 0xffff0000) |
- (cpu_wins[i].attr << 8) |
- (cpu_wins[i].target << 4) | 1;
-
- win_cpu_cr_write(i, cr);
- }
}
/*
@@ -554,7 +580,7 @@
* field in the ctrl reg
*/
cr = (((ddr_size(i) - 1) & 0xffff0000) |
- (ddr_attr(i) << 8) | (ddr_target(i) << 4) | 1);
+ (ddr_attr(i) << 8) | (ddr_target(i) << 4) | 1);
/* Set the first free USB window */
for (j = 0; j < MV_WIN_USB_MAX; j++) {
@@ -637,7 +663,7 @@
for (i = 0; i < MV_WIN_DDR_MAX; i++)
if (ddr_is_active(i)) {
- br = ddr_base(i) | (ddr_attr(i) << 8) | ddr_target(i);
+ br = ddr_base(i) | (ddr_attr(i) << 8) | ddr_target(i);
sz = ((ddr_size(i) - 1) & 0xffff0000);
/* Set the first free ETH window */
@@ -782,7 +808,7 @@
/* IDMA decode windows 0-3 have remap capability */
if (i < 4)
return (1);
-
+
return (0);
}
@@ -811,7 +837,7 @@
*/
for (i = 0; i < MV_WIN_DDR_MAX; i++)
if (ddr_is_active(i)) {
- br = ddr_base(i) | (ddr_attr(i) << 8) | ddr_target(i);
+ br = ddr_base(i) | (ddr_attr(i) << 8) | ddr_target(i);
sz = ((ddr_size(i) - 1) & 0xffff0000);
/* Place DDR entries in non-remapped windows */
@@ -838,7 +864,7 @@
for (i = 0; i < idma_wins_no; i++)
if (idma_wins[i].target > 0) {
br = (idma_wins[i].base & 0xffff0000) |
- (idma_wins[i].attr << 8) | idma_wins[i].target;
+ (idma_wins[i].attr << 8) | idma_wins[i].target;
sz = ((idma_wins[i].size - 1) & 0xffff0000);
/* Set the first free IDMA window */
@@ -849,7 +875,8 @@
/* Configure window */
win_idma_br_write(j, br);
win_idma_sz_write(j, sz);
- if (win_idma_can_remap(j) && idma_wins[j].remap >= 0)
+ if (win_idma_can_remap(j) &&
+ idma_wins[j].remap >= 0)
win_idma_har_write(j, idma_wins[j].remap);
/* Set protection RW on all channels */
@@ -888,8 +915,8 @@
for (i = 0; i < idma_wins_no; i++, wintab++) {
if (wintab->target == 0) {
- printf("IDMA window#%d: DDR target window is not supposed "
- "to be reprogrammed!\n", i);
+ printf("IDMA window#%d: DDR target window is not "
+ "supposed to be reprogrammed!\n", i);
rv = 0;
}
@@ -903,7 +930,7 @@
b = wintab->base;
e = b + s - 1;
if (s > (0xFFFFFFFF - b + 1)) {
- /* XXX this boundary check should accont for 64bit and
+ /* XXX this boundary check should account for 64bit and
* remapping.. */
printf("IDMA window#%d: no space for size 0x%08x at "
"0x%08x\n", i, s, b);
@@ -913,8 +940,8 @@
j = decode_win_overlap(i, idma_wins_no, &idma_wins[0]);
if (j >= 0) {
- printf("IDMA window#%d: (0x%08x - 0x%08x) overlaps with "
- "#%d (0x%08x - 0x%08x)\n", i, b, e, j,
+ printf("IDMA window#%d: (0x%08x - 0x%08x) overlaps "
+ "with " "#%d (0x%08x - 0x%08x)\n", i, b, e, j,
idma_wins[j].base,
idma_wins[j].base + idma_wins[j].size - 1);
rv = 0;
==== //depot/projects/usb/src/sys/arm/mv/discovery/db78xxx.c#2 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/mv/discovery/db78xxx.c,v 1.1 2008/10/13 20:07:13 raj Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/mv/discovery/db78xxx.c,v 1.2 2008/11/19 11:30:44 raj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -57,7 +57,10 @@
* virtual_avail - 0xefff_ffff : KVA (virtual_avail is typically < 0xc0a0_0000)
* 0xf000_0000 - 0xf0ff_ffff : no-cache allocation area (16MB)
* 0xf100_0000 - 0xf10f_ffff : SoC integrated devices registers range (1MB)
- * 0xf110_0000 - 0xfffe_ffff : PCIE (MEM+IO) outbound windows (~238MB)
+ * 0xf110_0000 - 0xf11f_ffff : PCI-Express I/O space (1MB)
+ * 0xf120_0000 - 0xf12f_ffff : unused (1MB)
+ * 0xf130_0000 - 0xf52f_ffff : PCI-Express memory space (64MB)
+ * 0xf930_0000 - 0xfffe_ffff : unused (~172MB)
* 0xffff_0000 - 0xffff_0fff : 'high' vectors page (4KB)
* 0xffff_1000 - 0xffff_1fff : ARM_TP_ADDRESS/RAS page (4KB)
* 0xffff_2000 - 0xffff_ffff : unused (~55KB)
@@ -79,6 +82,20 @@
VM_PROT_READ | VM_PROT_WRITE,
PTE_NOCACHE,
},
+ { /* PCIE I/O */
+ MV_PCIE_IO_BASE,
+ MV_PCIE_IO_PHYS_BASE,
+ MV_PCIE_IO_SIZE,
+ VM_PROT_READ | VM_PROT_WRITE,
+ PTE_NOCACHE,
+ },
+ { /* PCIE Memory */
+ MV_PCIE_MEM_BASE,
+ MV_PCIE_MEM_PHYS_BASE,
+ MV_PCIE_MEM_SIZE,
+ VM_PROT_READ | VM_PROT_WRITE,
+ PTE_NOCACHE,
+ },
{ 0, 0, 0, 0, 0, }
};
==== //depot/projects/usb/src/sys/arm/mv/discovery/discovery.c#2 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/mv/discovery/discovery.c,v 1.1 2008/10/13 20:07:13 raj Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/mv/discovery/discovery.c,v 1.2 2008/11/19 11:30:44 raj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -41,6 +41,24 @@
#include <arm/mv/mvreg.h>
#include <arm/mv/mvvar.h>
+#define _MV_PCIE_MAX_PORT 8
+
+#define _MV_PCIE_IO_SIZE (MV_PCIE_IO_SIZE / _MV_PCIE_MAX_PORT)
+#define _MV_PCIE_MEM_SIZE (MV_PCIE_MEM_SIZE / _MV_PCIE_MAX_PORT)
+
+#define _MV_PCIE_IO(n) (MV_PCIE_IO_BASE + ((n) * _MV_PCIE_IO_SIZE))
+#define _MV_PCIE_MEM(n) (MV_PCIE_MEM_BASE + ((n) * _MV_PCIE_MEM_SIZE))
+
+#define _MV_PCIE_IO_PHYS(n) (MV_PCIE_IO_PHYS_BASE + ((n) * _MV_PCIE_IO_SIZE))
+#define _MV_PCIE_MEM_PHYS(n) (MV_PCIE_MEM_PHYS_BASE + ((n) * _MV_PCIE_MEM_SIZE))
+
+/*
+ * Note the 'pcib' devices are not declared in the obio_devices[]: due to the
+ * much more complex configuration schemes allowed, specifically of the
+ * PCI-Express (multiple lanes width per port configured dynamically etc.) it
+ * is better and flexible to instantiate the number of PCI bridge devices
+ * (known in run-time) in the pcib_mbus_identify() method.
+ */
struct obio_device obio_devices[] = {
{ "ic", MV_IC_BASE, MV_IC_SIZE,
{ -1 },
@@ -104,6 +122,61 @@
{ NULL, 0, 0, { 0 }, { 0 }, 0 }
};
+const struct obio_pci mv_pci_info[] = {
+ { MV_TYPE_PCIE,
+ MV_PCIE00_BASE, MV_PCIE_SIZE,
+ _MV_PCIE_IO(0), _MV_PCIE_IO_SIZE, 4, 0xE0,
+ _MV_PCIE_MEM(0), _MV_PCIE_MEM_SIZE, 4, 0xE8,
+ NULL, MV_INT_PEX00 },
+
+ { MV_TYPE_PCIE_AGGR_LANE,
+ MV_PCIE01_BASE, MV_PCIE_SIZE,
+ _MV_PCIE_IO(1), _MV_PCIE_IO_SIZE, 4, 0xD0,
+ _MV_PCIE_MEM(1), _MV_PCIE_MEM_SIZE, 4, 0xD8,
+ NULL, MV_INT_PEX01 },
+#if 0
+ /*
+ * XXX Access to devices on this interface (PCIE 0.2) crashes the
+ * system. Could be a silicon defect as Marvell U-Boot has a 'Do not
+ * touch' precaution comment...
+ */
+ { MV_TYPE_PCIE_AGGR_LANE,
+ MV_PCIE02_BASE, MV_PCIE_SIZE,
+ _MV_PCIE_IO(2), _MV_PCIE_IO_SIZE(2), 4, 0xB0,
+ _MV_PCIE_MEM(2), _MV_PCIE_MEM_SIZE(2), 4, 0xB8,
+ NULL, MV_INT_PEX02 },
+#endif
+ { MV_TYPE_PCIE_AGGR_LANE,
+ MV_PCIE03_BASE, MV_PCIE_SIZE,
+ _MV_PCIE_IO(3), _MV_PCIE_IO_SIZE, 4, 0x70,
+ _MV_PCIE_MEM(3), _MV_PCIE_MEM_SIZE, 4, 0x78,
+ NULL, MV_INT_PEX03 },
+
+ { MV_TYPE_PCIE,
+ MV_PCIE10_BASE, MV_PCIE_SIZE,
+ _MV_PCIE_IO(4), _MV_PCIE_IO_SIZE, 8, 0xE0,
+ _MV_PCIE_MEM(4), _MV_PCIE_MEM_SIZE, 8, 0xE8,
+ NULL, MV_INT_PEX10 },
+
+ { MV_TYPE_PCIE_AGGR_LANE,
+ MV_PCIE11_BASE, MV_PCIE_SIZE,
+ _MV_PCIE_IO(5), _MV_PCIE_IO_SIZE, 8, 0xD0,
+ _MV_PCIE_MEM(5), _MV_PCIE_MEM_SIZE, 8, 0xD8,
+ NULL, MV_INT_PEX11 },
+ { MV_TYPE_PCIE_AGGR_LANE,
+ MV_PCIE12_BASE, MV_PCIE_SIZE,
+ _MV_PCIE_IO(6), _MV_PCIE_IO_SIZE, 8, 0xB0,
+ _MV_PCIE_MEM(6), _MV_PCIE_MEM_SIZE, 8, 0xB8,
+ NULL, MV_INT_PEX12 },
+ { MV_TYPE_PCIE_AGGR_LANE,
+ MV_PCIE13_BASE, MV_PCIE_SIZE,
+ _MV_PCIE_IO(7), _MV_PCIE_IO_SIZE, 8, 0x70,
+ _MV_PCIE_MEM(7), _MV_PCIE_MEM_SIZE, 8, 0x78,
+ NULL, MV_INT_PEX13 },
+
+ { 0, 0, 0 }
+};
+
struct resource_spec mv_gpio_spec[] = {
{ SYS_RES_MEMORY, 0, RF_ACTIVE },
{ SYS_RES_IRQ, 0, RF_ACTIVE },
@@ -122,12 +195,6 @@
};
const struct decode_win cpu_win_tbl[] = {
- /* PCIE IO */
- { 4, 0x51, MV_PCIE_IO_PHYS_BASE, MV_PCIE_IO_SIZE, -1 },
-
- /* PCIE MEM */
- { 4, 0x59, MV_PCIE_MEM_PHYS_BASE, MV_PCIE_MEM_SIZE, -1 },
-
/* Device bus BOOT */
{ 1, 0x2f, MV_DEV_BOOT_PHYS_BASE, MV_DEV_BOOT_SIZE, -1 },
@@ -154,7 +221,8 @@
*/
const struct decode_win idma_win_tbl[] = {
/* PCIE MEM */
- { 4, 0x59, MV_PCIE_MEM_PHYS_BASE, MV_PCIE_MEM_SIZE, -1 },
+ { 4, 0xE8, _MV_PCIE_MEM_PHYS(0), _MV_PCIE_MEM_SIZE, -1 },
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list