PERFORCE change 153179 for review
John Baldwin
jhb at FreeBSD.org
Tue Nov 18 15:26:22 PST 2008
http://perforce.freebsd.org/chv.cgi?CH=153179
Change 153179 by jhb at jhb_mutex on 2008/11/18 23:25:45
IFC @153178
Affected files ...
.. //depot/projects/smpng/sys/amd64/conf/GENERIC#68 integrate
.. //depot/projects/smpng/sys/amd64/include/pmc_mdep.h#6 integrate
.. //depot/projects/smpng/sys/amd64/linux32/linux.h#16 integrate
.. //depot/projects/smpng/sys/amd64/linux32/linux32_machdep.c#29 integrate
.. //depot/projects/smpng/sys/amd64/linux32/linux32_proto.h#25 integrate
.. //depot/projects/smpng/sys/amd64/linux32/linux32_syscall.h#25 integrate
.. //depot/projects/smpng/sys/amd64/linux32/linux32_sysent.c#25 integrate
.. //depot/projects/smpng/sys/amd64/linux32/syscalls.master#29 integrate
.. //depot/projects/smpng/sys/arm/arm/dump_machdep.c#6 integrate
.. //depot/projects/smpng/sys/arm/arm/minidump_machdep.c#1 branch
.. //depot/projects/smpng/sys/arm/arm/pmap.c#46 integrate
.. //depot/projects/smpng/sys/arm/at91/at91_mci.c#9 integrate
.. //depot/projects/smpng/sys/arm/at91/uart_dev_at91usart.c#16 integrate
.. //depot/projects/smpng/sys/arm/include/md_var.h#5 integrate
.. //depot/projects/smpng/sys/arm/include/minidump.h#1 branch
.. //depot/projects/smpng/sys/arm/include/pmap.h#25 integrate
.. //depot/projects/smpng/sys/arm/mv/mv_machdep.c#2 integrate
.. //depot/projects/smpng/sys/boot/Makefile#29 integrate
.. //depot/projects/smpng/sys/boot/common/bootstrap.h#13 integrate
.. //depot/projects/smpng/sys/boot/forth/loader.conf#56 integrate
.. //depot/projects/smpng/sys/boot/i386/Makefile#8 integrate
.. //depot/projects/smpng/sys/boot/i386/libi386/bootinfo32.c#4 integrate
.. //depot/projects/smpng/sys/boot/i386/libi386/devicename.c#8 integrate
.. //depot/projects/smpng/sys/boot/i386/loader/Makefile#25 integrate
.. //depot/projects/smpng/sys/boot/i386/loader/conf.c#11 integrate
.. //depot/projects/smpng/sys/boot/i386/loader/main.c#18 integrate
.. //depot/projects/smpng/sys/boot/i386/zfsboot/Makefile#1 branch
.. //depot/projects/smpng/sys/boot/i386/zfsboot/zfsboot.c#1 branch
.. //depot/projects/smpng/sys/boot/i386/zfsboot/zfsldr.S#1 branch
.. //depot/projects/smpng/sys/boot/zfs/Makefile#1 branch
.. //depot/projects/smpng/sys/boot/zfs/zfs.c#1 branch
.. //depot/projects/smpng/sys/boot/zfs/zfsimpl.c#1 branch
.. //depot/projects/smpng/sys/bsm/audit_internal.h#9 integrate
.. //depot/projects/smpng/sys/bsm/audit_record.h#11 integrate
.. //depot/projects/smpng/sys/cddl/boot/zfs/README#1 branch
.. //depot/projects/smpng/sys/cddl/boot/zfs/fletcher.c#1 branch
.. //depot/projects/smpng/sys/cddl/boot/zfs/lzjb.c#1 branch
.. //depot/projects/smpng/sys/cddl/boot/zfs/sha256.c#1 branch
.. //depot/projects/smpng/sys/cddl/boot/zfs/zfsimpl.h#1 branch
.. //depot/projects/smpng/sys/cddl/boot/zfs/zfssubr.c#1 branch
.. //depot/projects/smpng/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c#3 integrate
.. //depot/projects/smpng/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c#3 integrate
.. //depot/projects/smpng/sys/cddl/compat/opensolaris/kern/opensolaris_lookup.c#1 branch
.. //depot/projects/smpng/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#2 integrate
.. //depot/projects/smpng/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#3 integrate
.. //depot/projects/smpng/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#4 integrate
.. //depot/projects/smpng/sys/cddl/compat/opensolaris/kern/opensolaris_zone.c#2 integrate
.. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/acl.h#3 delete
.. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/atomic.h#4 integrate
.. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/callb.h#3 delete
.. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/cred.h#2 integrate
.. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/dnlc.h#2 integrate
.. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/file.h#1 branch
.. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/kidmap.h#1 branch
.. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/kmem.h#3 integrate
.. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/misc.h#2 integrate
.. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/mntent.h#3 integrate
.. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/param.h#2 integrate
.. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/pathname.h#1 branch
.. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/policy.h#3 integrate
.. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/proc.h#2 integrate
.. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/refstr.h#1 branch
.. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/sid.h#1 branch
.. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/sig.h#1 branch
.. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/sunddi.h#2 integrate
.. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/sysmacros.h#3 integrate
.. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/time.h#2 integrate
.. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/types.h#2 integrate
.. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/uio.h#2 integrate
.. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/vfs.h#2 integrate
.. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/vnode.h#2 integrate
.. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/zone.h#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/common/acl/acl_common.h#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/common/atomic/amd64/atomic.S#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/common/atomic/i386/atomic.S#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/common/avl/avl.c#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/common/unicode/u8_textprep.c#1 branch
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/common/zfs/zfs_comutil.c#1 branch
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/common/zfs/zfs_comutil.h#1 branch
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/common/zfs/zfs_deleg.c#1 branch
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/common/zfs/zfs_deleg.h#1 branch
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.c#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.h#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.h#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/common/zfs/zpool_prop.c#1 branch
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/common/zfs/zprop_common.c#1 branch
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/Makefile.files#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#4 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#3 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/vnode.c#1 branch
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bplist.c#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#3 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deleg.c#1 branch
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scrub.c#1 branch
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/refcount.c#3 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/rrwlock.c#1 branch
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sha256.c#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#3 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_deleg.h#1 branch
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#3 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/rrwlock.h#1 branch
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_boot.h#1 branch
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_fuid.h#1 branch
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#3 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/unique.c#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#3 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#4 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fuid.c#1 branch
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#3 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#3 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#5 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#5 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/os/callb.c#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/os/list.c#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/os/taskq.c#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.c#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.h#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_array.c#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/acl.h#1 branch
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/acl_impl.h#1 branch
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/avl.h#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/byteorder.h#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/callb.h#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/cpuvar.h#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/cred.h#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/dkio.h#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/dklabel.h#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/extdirent.h#1 branch
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/fm/protocol.h#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/fm/util.h#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/gfs.h#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/idmap.h#1 branch
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#4 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/list.h#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/nvpair.h#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/processor.h#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/synch.h#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent/eventdefs.h#1 branch
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/u8_textprep.h#1 branch
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/u8_textprep_data.h#1 branch
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h#1 branch
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod.c#2 integrate
.. //depot/projects/smpng/sys/cddl/dev/dtrace/dtrace_ioctl.c#2 integrate
.. //depot/projects/smpng/sys/cddl/dev/dtrace/dtrace_load.c#2 integrate
.. //depot/projects/smpng/sys/cddl/dev/dtrace/dtrace_unload.c#2 integrate
.. //depot/projects/smpng/sys/cddl/dev/systrace/systrace.c#2 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#53 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#48 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#48 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#48 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#48 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#52 integrate
.. //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#68 integrate
.. //depot/projects/smpng/sys/compat/linux/linux_futex.c#10 integrate
.. //depot/projects/smpng/sys/compat/linux/linux_misc.c#93 integrate
.. //depot/projects/smpng/sys/conf/NOTES#157 integrate
.. //depot/projects/smpng/sys/conf/files#222 integrate
.. //depot/projects/smpng/sys/conf/files.amd64#57 integrate
.. //depot/projects/smpng/sys/conf/files.arm#15 integrate
.. //depot/projects/smpng/sys/conf/files.i386#114 integrate
.. //depot/projects/smpng/sys/conf/files.pc98#92 integrate
.. //depot/projects/smpng/sys/conf/kmod.mk#69 integrate
.. //depot/projects/smpng/sys/conf/options#155 integrate
.. //depot/projects/smpng/sys/crypto/via/padlock.c#12 integrate
.. //depot/projects/smpng/sys/dev/acpi_support/acpi_asus.c#13 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi.c#109 integrate
.. //depot/projects/smpng/sys/dev/adb/adb_bus.c#2 integrate
.. //depot/projects/smpng/sys/dev/age/if_age.c#4 integrate
.. //depot/projects/smpng/sys/dev/ale/if_ale.c#1 branch
.. //depot/projects/smpng/sys/dev/ale/if_alereg.h#1 branch
.. //depot/projects/smpng/sys/dev/ale/if_alevar.h#1 branch
.. //depot/projects/smpng/sys/dev/an/if_an.c#56 integrate
.. //depot/projects/smpng/sys/dev/cardbus/cardbus.c#34 integrate
.. //depot/projects/smpng/sys/dev/cardbus/cardbus_cis.c#31 integrate
.. //depot/projects/smpng/sys/dev/cardbus/cardbus_device.c#2 integrate
.. //depot/projects/smpng/sys/dev/cardbus/cardbusvar.h#12 integrate
.. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_ctl_defs.h#3 integrate
.. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_t3_hw.c#8 integrate
.. //depot/projects/smpng/sys/dev/cxgb/cxgb_main.c#15 integrate
.. //depot/projects/smpng/sys/dev/cxgb/cxgb_osdep.h#9 integrate
.. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#12 integrate
.. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_tom.c#7 integrate
.. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#6 integrate
.. //depot/projects/smpng/sys/dev/e1000/if_em.c#2 integrate
.. //depot/projects/smpng/sys/dev/e1000/if_igb.c#3 integrate
.. //depot/projects/smpng/sys/dev/en/midway.c#34 integrate
.. //depot/projects/smpng/sys/dev/fdc/fdc.c#32 integrate
.. //depot/projects/smpng/sys/dev/glxsb/glxsb.c#2 integrate
.. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_amd.c#12 integrate
.. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_amd.h#2 integrate
.. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_logging.c#10 integrate
.. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_mod.c#27 integrate
.. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_pentium.c#3 integrate
.. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_pentium.h#2 integrate
.. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_piv.c#12 integrate
.. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_piv.h#2 integrate
.. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_ppro.c#9 integrate
.. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_ppro.h#2 integrate
.. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_tsc.c#1 branch
.. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_tsc.h#1 branch
.. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_x86.c#9 integrate
.. //depot/projects/smpng/sys/dev/if_ndis/if_ndis.c#48 integrate
.. //depot/projects/smpng/sys/dev/ipmi/ipmi.c#10 integrate
.. //depot/projects/smpng/sys/dev/ispfw/ispfw.c#16 integrate
.. //depot/projects/smpng/sys/dev/mfi/mfi.c#24 integrate
.. //depot/projects/smpng/sys/dev/mfi/mfi_disk.c#8 integrate
.. //depot/projects/smpng/sys/dev/mfi/mfi_ioctl.h#7 integrate
.. //depot/projects/smpng/sys/dev/mfi/mfi_pci.c#8 integrate
.. //depot/projects/smpng/sys/dev/mfi/mfireg.h#10 integrate
.. //depot/projects/smpng/sys/dev/mfi/mfivar.h#9 integrate
.. //depot/projects/smpng/sys/dev/pci/pci.c#102 integrate
.. //depot/projects/smpng/sys/dev/ppbus/if_plip.c#23 integrate
.. //depot/projects/smpng/sys/dev/ppbus/immio.c#5 integrate
.. //depot/projects/smpng/sys/dev/ppbus/lpbb.c#9 integrate
.. //depot/projects/smpng/sys/dev/ppbus/lpt.c#22 integrate
.. //depot/projects/smpng/sys/dev/ppbus/lpt.h#2 integrate
.. //depot/projects/smpng/sys/dev/ppbus/pcfclock.c#15 integrate
.. //depot/projects/smpng/sys/dev/ppbus/ppb_1284.c#4 integrate
.. //depot/projects/smpng/sys/dev/ppbus/ppb_base.c#4 integrate
.. //depot/projects/smpng/sys/dev/ppbus/ppb_msq.c#6 integrate
.. //depot/projects/smpng/sys/dev/ppbus/ppbconf.c#10 integrate
.. //depot/projects/smpng/sys/dev/ppbus/ppbconf.h#6 integrate
.. //depot/projects/smpng/sys/dev/ppbus/ppi.c#19 integrate
.. //depot/projects/smpng/sys/dev/ppbus/ppi.h#2 integrate
.. //depot/projects/smpng/sys/dev/ppbus/pps.c#23 integrate
.. //depot/projects/smpng/sys/dev/ppbus/vpo.c#14 integrate
.. //depot/projects/smpng/sys/dev/ppbus/vpoio.c#7 integrate
.. //depot/projects/smpng/sys/dev/ppbus/vpoio.h#3 integrate
.. //depot/projects/smpng/sys/dev/ppc/ppc.c#22 integrate
.. //depot/projects/smpng/sys/dev/ppc/ppc_acpi.c#4 integrate
.. //depot/projects/smpng/sys/dev/sio/sio_pci.c#19 integrate
.. //depot/projects/smpng/sys/dev/sio/sio_puc.c#11 integrate
.. //depot/projects/smpng/sys/dev/snp/snp.c#32 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/hda/hdac.c#20 integrate
.. //depot/projects/smpng/sys/dev/sound/pcm/channel.c#42 integrate
.. //depot/projects/smpng/sys/dev/sound/pcm/channel.h#16 integrate
.. //depot/projects/smpng/sys/dev/sound/pcm/mixer.c#30 integrate
.. //depot/projects/smpng/sys/dev/sound/pcm/mixer.h#9 integrate
.. //depot/projects/smpng/sys/dev/syscons/syscons.c#67 integrate
.. //depot/projects/smpng/sys/dev/syscons/sysmouse.c#17 integrate
.. //depot/projects/smpng/sys/dev/usb/if_aue.c#52 integrate
.. //depot/projects/smpng/sys/dev/usb/u3g.c#3 integrate
.. //depot/projects/smpng/sys/dev/usb/ugen.c#41 integrate
.. //depot/projects/smpng/sys/dev/usb/usb.h#13 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_quirks.c#29 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_subr.c#42 integrate
.. //depot/projects/smpng/sys/dev/usb/usbdevs#119 integrate
.. //depot/projects/smpng/sys/dev/usb/usbdi.c#29 integrate
.. //depot/projects/smpng/sys/dev/usb/usbdi.h#22 integrate
.. //depot/projects/smpng/sys/dev/usb2/bluetooth/TODO.TXT#1 branch
.. //depot/projects/smpng/sys/dev/usb2/bluetooth/ng_ubt2.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/bluetooth/ng_ubt2_var.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/bluetooth/ubtbcmfw2.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/bluetooth/usb2_bluetooth.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/bluetooth/usb2_bluetooth.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/controller/at91dci.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/controller/at91dci.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/controller/at91dci_atmelarm.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/controller/ehci2.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/controller/ehci2.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/controller/ehci2_pci.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/controller/musb2_otg.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/controller/musb2_otg.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/controller/musb2_otg_atmelarm.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/controller/ohci2.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/controller/ohci2.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/controller/ohci2_atmelarm.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/controller/ohci2_pci.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/controller/uhci2.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/controller/uhci2.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/controller/uhci2_pci.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/controller/usb2_bus.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/controller/usb2_controller.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/controller/usb2_controller.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/controller/usb2_pci.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/controller/uss820dci.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/controller/uss820dci.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/controller/uss820dci_atmelarm.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/controller/uss820dci_pccard.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/core/README.TXT#1 branch
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_busdma.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_busdma.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_compat_linux.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_compat_linux.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_config_td.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_config_td.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_core.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_core.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_debug.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_debug.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_dev.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_dev.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_device.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_device.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_dynamic.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_dynamic.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_error.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_generic.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_generic.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_handle_request.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_handle_request.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_hid.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_hid.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_hub.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_hub.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_if.m#1 branch
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_lookup.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_lookup.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_mbuf.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_mbuf.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_msctest.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_msctest.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_parse.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_parse.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_process.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_process.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_request.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_request.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_sw_transfer.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_sw_transfer.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_transfer.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_transfer.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_util.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_util.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/core/usbdevs#1 branch
.. //depot/projects/smpng/sys/dev/usb2/ethernet/if_aue2.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/ethernet/if_aue2_reg.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/ethernet/if_axe2.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/ethernet/if_axe2_reg.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/ethernet/if_cdce2.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/ethernet/if_cdce2_reg.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/ethernet/if_cue2.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/ethernet/if_cue2_reg.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/ethernet/if_kue2.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/ethernet/if_kue2_fw.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/ethernet/if_kue2_reg.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/ethernet/if_rue2.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/ethernet/if_rue2_reg.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/ethernet/if_udav2.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/ethernet/if_udav2_reg.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/ethernet/usb2_ethernet.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/ethernet/usb2_ethernet.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/image/usb2_image.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/image/usb2_image.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/image/uscanner2.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/include/Makefile#1 branch
.. //depot/projects/smpng/sys/dev/usb2/include/ufm2_ioctl.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/include/urio2_ioctl.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/include/usb2_cdc.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/include/usb2_defs.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/include/usb2_devid.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/include/usb2_devtable.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/include/usb2_endian.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/include/usb2_error.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/include/usb2_hid.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/include/usb2_ioctl.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/include/usb2_mfunc.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/include/usb2_revision.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/include/usb2_standard.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/input/uhid2.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/input/ukbd2.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/input/ums2.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/input/usb2_input.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/input/usb2_input.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/input/usb2_rdesc.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/misc/udbp2.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/misc/udbp2.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/misc/ufm2.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/misc/usb2_misc.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/misc/usb2_misc.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/ndis/if_ndis_usb2.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/ndis/usb2_ndis.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/ndis/usb2_ndis.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/quirk/usb2_quirk.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/quirk/usb2_quirk.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/serial/uark2.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/serial/ubsa2.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/serial/ubser2.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/serial/uchcom2.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/serial/ucycom2.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/serial/ufoma2.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/serial/uftdi2.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/serial/uftdi2_reg.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/serial/ugensa2.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/serial/uipaq2.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/serial/ulpt2.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/serial/umct2.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/serial/umodem2.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/serial/umoscom2.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/serial/uplcom2.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/serial/usb2_serial.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/serial/usb2_serial.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/serial/uvisor2.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/serial/uvscom2.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/sound/uaudio2.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/sound/uaudio2.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/sound/uaudio2_pcm.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/sound/uaudio2_reg.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/sound/usb2_sound.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/sound/usb2_sound.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/storage/ata-usb2.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/storage/umass2.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/storage/urio2.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/storage/usb2_storage.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/storage/usb2_storage.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/storage/ustorage2_fs.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/template/usb2_template.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/template/usb2_template.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/template/usb2_template_cdce.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/template/usb2_template_msc.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/template/usb2_template_mtp.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/wlan/if_rum2.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/wlan/if_rum2_fw.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/wlan/if_rum2_reg.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/wlan/if_rum2_var.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/wlan/if_ural2.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/wlan/if_ural2_reg.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/wlan/if_ural2_var.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/wlan/if_zyd2.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/wlan/if_zyd2_fw.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/wlan/if_zyd2_reg.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/wlan/usb2_wlan.c#1 branch
.. //depot/projects/smpng/sys/dev/usb2/wlan/usb2_wlan.h#1 branch
.. //depot/projects/smpng/sys/dev/vge/if_vge.c#22 integrate
.. //depot/projects/smpng/sys/dev/vr/if_vr.c#3 integrate
.. //depot/projects/smpng/sys/fs/cd9660/cd9660_bmap.c#2 integrate
.. //depot/projects/smpng/sys/fs/cd9660/cd9660_node.c#4 integrate
.. //depot/projects/smpng/sys/fs/cd9660/cd9660_node.h#2 integrate
.. //depot/projects/smpng/sys/fs/cd9660/cd9660_vfsops.c#8 integrate
.. //depot/projects/smpng/sys/fs/cd9660/cd9660_vnops.c#5 integrate
.. //depot/projects/smpng/sys/fs/procfs/procfs.c#16 integrate
.. //depot/projects/smpng/sys/fs/procfs/procfs_map.c#13 integrate
.. //depot/projects/smpng/sys/fs/unionfs/union_vfsops.c#38 integrate
.. //depot/projects/smpng/sys/geom/part/g_part_bsd.c#7 integrate
.. //depot/projects/smpng/sys/geom/part/g_part_gpt.c#7 integrate
.. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.h#4 integrate
.. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_dfrag.c#3 integrate
.. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_inode.c#4 integrate
.. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_inode.h#3 integrate
.. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_vnodeops.c#4 integrate
.. //depot/projects/smpng/sys/i386/conf/GENERIC#100 integrate
.. //depot/projects/smpng/sys/i386/conf/XEN#4 integrate
.. //depot/projects/smpng/sys/i386/include/pmc_mdep.h#5 integrate
.. //depot/projects/smpng/sys/i386/linux/linux.h#23 integrate
.. //depot/projects/smpng/sys/i386/linux/linux_machdep.c#49 integrate
.. //depot/projects/smpng/sys/i386/linux/linux_proto.h#45 integrate
.. //depot/projects/smpng/sys/i386/linux/linux_syscall.h#43 integrate
.. //depot/projects/smpng/sys/i386/linux/linux_sysent.c#44 integrate
.. //depot/projects/smpng/sys/i386/linux/syscalls.master#50 integrate
.. //depot/projects/smpng/sys/isa/isa_common.c#23 integrate
.. //depot/projects/smpng/sys/isa/isa_common.h#9 integrate
.. //depot/projects/smpng/sys/isa/isahint.c#7 integrate
.. //depot/projects/smpng/sys/isa/isavar.h#12 integrate
.. //depot/projects/smpng/sys/kern/bus_if.m#16 integrate
.. //depot/projects/smpng/sys/kern/init_sysent.c#88 integrate
.. //depot/projects/smpng/sys/kern/kern_descrip.c#118 integrate
.. //depot/projects/smpng/sys/kern/kern_exec.c#114 integrate
.. //depot/projects/smpng/sys/kern/kern_jail.c#58 integrate
.. //depot/projects/smpng/sys/kern/kern_mbuf.c#28 integrate
.. //depot/projects/smpng/sys/kern/kern_osd.c#1 branch
.. //depot/projects/smpng/sys/kern/kern_proc.c#98 integrate
.. //depot/projects/smpng/sys/kern/kern_sig.c#144 integrate
.. //depot/projects/smpng/sys/kern/kern_thr.c#48 integrate
.. //depot/projects/smpng/sys/kern/kern_thread.c#112 integrate
.. //depot/projects/smpng/sys/kern/kern_xxx.c#23 integrate
.. //depot/projects/smpng/sys/kern/sched_ule.c#89 integrate
.. //depot/projects/smpng/sys/kern/subr_bus.c#71 integrate
.. //depot/projects/smpng/sys/kern/subr_firmware.c#20 integrate
.. //depot/projects/smpng/sys/kern/subr_prf.c#53 integrate
.. //depot/projects/smpng/sys/kern/subr_sleepqueue.c#45 integrate
.. //depot/projects/smpng/sys/kern/subr_smp.c#52 integrate
.. //depot/projects/smpng/sys/kern/sys_pipe.c#62 integrate
.. //depot/projects/smpng/sys/kern/sys_process.c#63 integrate
.. //depot/projects/smpng/sys/kern/syscalls.c#88 integrate
.. //depot/projects/smpng/sys/kern/syscalls.master#94 integrate
.. //depot/projects/smpng/sys/kern/systrace_args.c#15 integrate
.. //depot/projects/smpng/sys/kern/tty.c#80 integrate
.. //depot/projects/smpng/sys/kern/tty_pts.c#13 integrate
.. //depot/projects/smpng/sys/kern/tty_ttydisc.c#4 integrate
.. //depot/projects/smpng/sys/kern/vfs_lookup.c#53 integrate
.. //depot/projects/smpng/sys/kern/vfs_subr.c#157 integrate
.. //depot/projects/smpng/sys/kern/vfs_syscalls.c#137 integrate
.. //depot/projects/smpng/sys/kern/vfs_vnops.c#89 integrate
.. //depot/projects/smpng/sys/kgssapi/gsstest.c#2 integrate
.. //depot/projects/smpng/sys/modules/Makefile#150 integrate
.. //depot/projects/smpng/sys/modules/ale/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/cxgb/cxgb/Makefile#7 integrate
.. //depot/projects/smpng/sys/modules/cxgb/iw_cxgb/Makefile#3 integrate
.. //depot/projects/smpng/sys/modules/cxgb/toecore/Makefile#3 integrate
.. //depot/projects/smpng/sys/modules/em/Makefile#12 integrate
.. //depot/projects/smpng/sys/modules/hwpmc/Makefile#5 integrate
.. //depot/projects/smpng/sys/modules/igb/Makefile#4 integrate
.. //depot/projects/smpng/sys/modules/krpc/Makefile#2 integrate
.. //depot/projects/smpng/sys/modules/nfsserver/Makefile#8 integrate
.. //depot/projects/smpng/sys/modules/snp/Makefile#6 integrate
.. //depot/projects/smpng/sys/modules/usb2/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb2/bluetooth/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb2/bluetooth_fw/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb2/bluetooth_ng/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb2/controller/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb2/controller_at91dci/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb2/controller_ehci/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb2/controller_musb/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb2/controller_ohci/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb2/controller_uhci/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb2/controller_uss820dci/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb2/core/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb2/ethernet/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb2/ethernet_aue/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb2/ethernet_axe/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb2/ethernet_cdce/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb2/ethernet_cue/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb2/ethernet_dav/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb2/ethernet_kue/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb2/ethernet_rue/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb2/image/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb2/input/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb2/input_hid/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb2/input_kbd/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb2/input_ms/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb2/misc/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb2/misc_dbp/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb2/misc_fm/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb2/ndis/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb2/quirk/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb2/scanner/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb2/serial/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb2/serial_ark/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb2/serial_bsa/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb2/serial_bser/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb2/serial_chcom/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb2/serial_cycom/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb2/serial_foma/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb2/serial_ftdi/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb2/serial_gensa/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb2/serial_ipaq/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb2/serial_lpt/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb2/serial_mct/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb2/serial_modem/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb2/serial_moscom/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb2/serial_plcom/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb2/serial_visor/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb2/serial_vscom/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb2/sound/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb2/storage/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb2/storage_ata/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb2/storage_fs/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb2/storage_mass/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb2/storage_rio/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb2/template/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb2/wlan/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb2/wlan_ral/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb2/wlan_rum/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb2/wlan_zyd/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/zfs/Makefile#7 integrate
.. //depot/projects/smpng/sys/net/if.c#105 integrate
.. //depot/projects/smpng/sys/net/if_arcsubr.c#24 integrate
.. //depot/projects/smpng/sys/net/if_fddisubr.c#32 integrate
.. //depot/projects/smpng/sys/net/if_fwsubr.c#19 integrate
.. //depot/projects/smpng/sys/net/if_gif.c#45 integrate
.. //depot/projects/smpng/sys/net/if_iso88025subr.c#31 integrate
.. //depot/projects/smpng/sys/net/if_spppsubr.c#36 integrate
.. //depot/projects/smpng/sys/net/if_tun.c#56 integrate
.. //depot/projects/smpng/sys/net/radix_mpath.c#2 integrate
.. //depot/projects/smpng/sys/netgraph/ng_tty.c#22 integrate
.. //depot/projects/smpng/sys/netgraph/ng_tty.h#5 integrate
.. //depot/projects/smpng/sys/netinet/ip_fw2.c#97 integrate
.. //depot/projects/smpng/sys/netinet/sctp_constants.h#16 integrate
.. //depot/projects/smpng/sys/netinet/sctp_indata.c#19 integrate
.. //depot/projects/smpng/sys/netinet/sctp_input.c#19 integrate
.. //depot/projects/smpng/sys/netinet/sctp_pcb.c#21 integrate
.. //depot/projects/smpng/sys/netinet/sctp_pcb.h#15 integrate
.. //depot/projects/smpng/sys/netinet/sctputil.c#23 integrate
.. //depot/projects/smpng/sys/netinet/tcp_input.c#119 integrate
.. //depot/projects/smpng/sys/netinet/tcp_subr.c#102 integrate
.. //depot/projects/smpng/sys/netinet/tcp_var.h#60 integrate
.. //depot/projects/smpng/sys/nfsclient/nfs.h#33 integrate
.. //depot/projects/smpng/sys/nfsserver/nfs.h#24 integrate
.. //depot/projects/smpng/sys/nfsserver/nfs_fha.c#2 integrate
.. //depot/projects/smpng/sys/nfsserver/nfs_srvkrpc.c#2 integrate
.. //depot/projects/smpng/sys/nfsserver/nfs_srvsubs.c#45 integrate
.. //depot/projects/smpng/sys/nlm/nlm_prot_svc.c#3 integrate
.. //depot/projects/smpng/sys/powerpc/include/float.h#9 integrate
.. //depot/projects/smpng/sys/rpc/clnt_vc.c#4 integrate
.. //depot/projects/smpng/sys/security/audit/audit.c#16 integrate
.. //depot/projects/smpng/sys/security/audit/audit.h#9 integrate
.. //depot/projects/smpng/sys/security/audit/audit_arg.c#16 integrate
.. //depot/projects/smpng/sys/security/audit/audit_bsm.c#12 integrate
.. //depot/projects/smpng/sys/security/audit/audit_bsm_klib.c#13 integrate
.. //depot/projects/smpng/sys/security/audit/audit_bsm_token.c#11 integrate
.. //depot/projects/smpng/sys/security/audit/audit_private.h#12 integrate
.. //depot/projects/smpng/sys/security/audit/audit_syscalls.c#18 integrate
.. //depot/projects/smpng/sys/security/audit/audit_worker.c#11 integrate
.. //depot/projects/smpng/sys/sparc64/include/iommureg.h#9 integrate
.. //depot/projects/smpng/sys/sparc64/include/iommuvar.h#16 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/iommu.c#34 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#92 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/support.S#13 integrate
.. //depot/projects/smpng/sys/sys/cfictl.h#2 integrate
.. //depot/projects/smpng/sys/sys/conf.h#55 integrate
.. //depot/projects/smpng/sys/sys/jail.h#19 integrate
.. //depot/projects/smpng/sys/sys/mount.h#68 integrate
.. //depot/projects/smpng/sys/sys/namei.h#20 integrate
.. //depot/projects/smpng/sys/sys/osd.h#1 branch
.. //depot/projects/smpng/sys/sys/pmc.h#12 integrate
.. //depot/projects/smpng/sys/sys/priv.h#14 integrate
.. //depot/projects/smpng/sys/sys/proc.h#192 integrate
.. //depot/projects/smpng/sys/sys/syscall.h#87 integrate
.. //depot/projects/smpng/sys/sys/syscall.mk#87 integrate
.. //depot/projects/smpng/sys/sys/syscallsubr.h#57 integrate
.. //depot/projects/smpng/sys/sys/sysent.h#31 integrate
.. //depot/projects/smpng/sys/sys/sysproto.h#91 integrate
.. //depot/projects/smpng/sys/sys/ttydefaults.h#9 integrate
.. //depot/projects/smpng/sys/sys/vnode.h#91 integrate
.. //depot/projects/smpng/sys/ufs/ffs/ffs_snapshot.c#71 integrate
.. //depot/projects/smpng/sys/ufs/ufs/ufs_acl.c#17 integrate
.. //depot/projects/smpng/sys/ufs/ufs/ufs_dirhash.c#28 integrate
.. //depot/projects/smpng/sys/vm/vm_page.c#101 integrate
.. //depot/projects/smpng/sys/vm/vm_pageout.c#69 integrate
.. //depot/projects/smpng/sys/xdr/xdr_mbuf.c#3 integrate
.. //depot/projects/smpng/sys/xen/xenbus/xenbus_xs.c#2 integrate
Differences ...
==== //depot/projects/smpng/sys/amd64/conf/GENERIC#68 (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/smpng/sys/amd64/include/pmc_mdep.h#6 (text+ko) ====
@@ -27,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/include/pmc_mdep.h,v 1.6 2008/09/15 06:47:52 jkoshy Exp $
+ * $FreeBSD: src/sys/amd64/include/pmc_mdep.h,v 1.7 2008/11/09 17:37:54 jkoshy Exp $
*/
/* Machine dependent interfaces */
@@ -35,9 +35,35 @@
#ifndef _MACHINE_PMC_MDEP_H
#define _MACHINE_PMC_MDEP_H 1
+#ifdef _KERNEL
+struct pmc_mdep;
+#endif
+
#include <dev/hwpmc/hwpmc_amd.h>
#include <dev/hwpmc/hwpmc_piv.h>
+#include <dev/hwpmc/hwpmc_tsc.h>
+/*
+ * Intel processors implementing V2 and later of the Intel performance
+ * measurement architecture have PMCs of the following classes: TSC,
+ * IAF and IAP.
+ */
+#define PMC_MDEP_CLASS_INDEX_TSC 0
+#define PMC_MDEP_CLASS_INDEX_K8 1
+#define PMC_MDEP_CLASS_INDEX_P4 1
+#define PMC_MDEP_CLASS_INDEX_IAF 1
+#define PMC_MDEP_CLASS_INDEX_IAP 2
+
+/*
+ * On the amd64 platform we support the following PMCs.
+ *
+ * TSC The timestamp counter
+ * K8 AMD Athlon64 and Opteron PMCs in 64 bit mode.
+ * PIV Intel P4/HTT and P4/EMT64
+ * IAP Intel Core/Core2/Atom CPUs in 64 bits mode.
+ * IAF Intel fixed-function PMCs in Core2 and later CPUs.
+ */
+
union pmc_md_op_pmcallocate {
struct pmc_md_amd_op_pmcallocate pm_amd;
struct pmc_md_p4_op_pmcallocate pm_p4;
@@ -55,8 +81,6 @@
struct pmc_md_p4_pmc pm_p4;
};
-struct pmc;
-
#define PMC_TRAPFRAME_TO_PC(TF) ((TF)->tf_rip)
#define PMC_TRAPFRAME_TO_FP(TF) ((TF)->tf_rbp)
#define PMC_TRAPFRAME_TO_USER_SP(TF) ((TF)->tf_rsp)
@@ -88,5 +112,10 @@
void start_exceptions(void), end_exceptions(void);
void pmc_x86_lapic_enable_pmc_interrupt(void);
-#endif
+struct pmc_mdep *pmc_amd_initialize(void);
+void pmc_amd_finalize(struct pmc_mdep *_md);
+struct pmc_mdep *pmc_intel_initialize(void);
+void pmc_intel_finalize(struct pmc_mdep *_md);
+
+#endif /* _KERNEL */
#endif /* _MACHINE_PMC_MDEP_H */
==== //depot/projects/smpng/sys/amd64/linux32/linux.h#16 (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/smpng/sys/amd64/linux32/linux32_machdep.c#29 (text+ko) ====
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.49 2008/09/08 09:59:05 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.50 2008/11/11 14:55:59 ed Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -977,33 +977,20 @@
int
linux_pipe(struct thread *td, struct linux_pipe_args *args)
{
- int pip[2];
int error;
- register_t reg_rdx;
+ int fildes[2];
#ifdef DEBUG
if (ldebug(pipe))
printf(ARGS(pipe, "*"));
#endif
- reg_rdx = td->td_retval[1];
- error = pipe(td, 0);
- if (error) {
- td->td_retval[1] = reg_rdx;
+ error = kern_pipe(td, fildes);
+ if (error)
return (error);
- }
- pip[0] = td->td_retval[0];
- pip[1] = td->td_retval[1];
- error = copyout(pip, args->pipefds, 2 * sizeof(int));
- if (error) {
- td->td_retval[1] = reg_rdx;
- return (error);
- }
-
- td->td_retval[1] = reg_rdx;
- td->td_retval[0] = 0;
- return (0);
+ /* XXX: Close descriptors on error. */
+ return (copyout(fildes, args->pipefds, sizeof fildes));
}
int
==== //depot/projects/smpng/sys/amd64/linux32/linux32_proto.h#25 (text+ko) ====
@@ -2,8 +2,8 @@
* System call prototypes.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.37 2008/05/13 20:02:25 rdivacky Exp $
- * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.34 2008/05/13 20:01:26 rdivacky Exp
+ * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.38 2008/11/09 10:48:06 ed Exp $
+ * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 184789 2008-11-09 10:45:13Z ed
*/
#ifndef _LINUX_SYSPROTO_H_
@@ -378,6 +378,10 @@
char dummy_l_[PADL_(int)]; int dummy; char dummy_r_[PADR_(int)];
char child_tidptr_l_[PADL_(void *)]; void * child_tidptr; char child_tidptr_r_[PADR_(void *)];
};
+struct linux_setdomainname_args {
+ char name_l_[PADL_(char *)]; char * name; char name_r_[PADR_(char *)];
+ char len_l_[PADL_(int)]; int len; char len_r_[PADR_(int)];
+};
struct linux_newuname_args {
char buf_l_[PADL_(struct l_new_utsname *)]; struct l_new_utsname * buf; char buf_r_[PADR_(struct l_new_utsname *)];
};
@@ -1077,6 +1081,7 @@
int linux_ipc(struct thread *, struct linux_ipc_args *);
int linux_sigreturn(struct thread *, struct linux_sigreturn_args *);
int linux_clone(struct thread *, struct linux_clone_args *);
+int linux_setdomainname(struct thread *, struct linux_setdomainname_args *);
int linux_newuname(struct thread *, struct linux_newuname_args *);
int linux_adjtimex(struct thread *, struct linux_adjtimex_args *);
int linux_mprotect(struct thread *, struct linux_mprotect_args *);
@@ -1339,6 +1344,7 @@
#define LINUX_SYS_AUE_linux_ipc AUE_NULL
#define LINUX_SYS_AUE_linux_sigreturn AUE_SIGRETURN
#define LINUX_SYS_AUE_linux_clone AUE_RFORK
+#define LINUX_SYS_AUE_linux_setdomainname AUE_SYSCTL
#define LINUX_SYS_AUE_linux_newuname AUE_NULL
#define LINUX_SYS_AUE_linux_adjtimex AUE_ADJTIME
#define LINUX_SYS_AUE_linux_mprotect AUE_MPROTECT
==== //depot/projects/smpng/sys/amd64/linux32/linux32_syscall.h#25 (text+ko) ====
@@ -2,8 +2,8 @@
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.37 2008/05/13 20:02:25 rdivacky Exp $
- * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.34 2008/05/13 20:01:26 rdivacky Exp
+ * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.38 2008/11/09 10:48:06 ed Exp $
+ * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 184789 2008-11-09 10:45:13Z ed
*/
#define LINUX_SYS_exit 1
@@ -112,7 +112,7 @@
#define LINUX_SYS_fsync 118
#define LINUX_SYS_linux_sigreturn 119
#define LINUX_SYS_linux_clone 120
-#define LINUX_SYS_setdomainname 121
+#define LINUX_SYS_linux_setdomainname 121
#define LINUX_SYS_linux_newuname 122
#define LINUX_SYS_linux_adjtimex 124
#define LINUX_SYS_linux_mprotect 125
==== //depot/projects/smpng/sys/amd64/linux32/linux32_sysent.c#25 (text+ko) ====
@@ -2,8 +2,8 @@
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.37 2008/05/13 20:02:25 rdivacky Exp $
- * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.34 2008/05/13 20:01:26 rdivacky Exp
+ * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.38 2008/11/09 10:48:06 ed Exp $
+ * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 184789 2008-11-09 10:45:13Z ed
*/
#include "opt_compat.h"
@@ -140,7 +140,7 @@
{ AS(fsync_args), (sy_call_t *)fsync, AUE_FSYNC, NULL, 0, 0 }, /* 118 = fsync */
{ AS(linux_sigreturn_args), (sy_call_t *)linux_sigreturn, AUE_SIGRETURN, NULL, 0, 0 }, /* 119 = linux_sigreturn */
{ AS(linux_clone_args), (sy_call_t *)linux_clone, AUE_RFORK, NULL, 0, 0 }, /* 120 = linux_clone */
- { AS(setdomainname_args), (sy_call_t *)setdomainname, AUE_SYSCTL, NULL, 0, 0 }, /* 121 = setdomainname */
+ { AS(linux_setdomainname_args), (sy_call_t *)linux_setdomainname, AUE_SYSCTL, NULL, 0, 0 }, /* 121 = linux_setdomainname */
{ AS(linux_newuname_args), (sy_call_t *)linux_newuname, AUE_NULL, NULL, 0, 0 }, /* 122 = linux_newuname */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 123 = modify_ldt */
{ 0, (sy_call_t *)linux_adjtimex, AUE_ADJTIME, NULL, 0, 0 }, /* 124 = linux_adjtimex */
==== //depot/projects/smpng/sys/amd64/linux32/syscalls.master#29 (text+ko) ====
@@ -1,4 +1,4 @@
- $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.34 2008/05/13 20:01:26 rdivacky Exp $
+ $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.35 2008/11/09 10:45:13 ed Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
; System call name/number master file (or rather, slave, from LINUX).
@@ -216,7 +216,7 @@
; linux uses some strange calling convention here so we have to use the dummy arg
120 AUE_RFORK STD { int linux_clone(l_int flags, void *stack, \
void *parent_tidptr, int dummy, void * child_tidptr); }
-121 AUE_SYSCTL NOPROTO { int setdomainname(char *name, \
+121 AUE_SYSCTL STD { int linux_setdomainname(char *name, \
int len); }
122 AUE_NULL STD { int linux_newuname( \
struct l_new_utsname *buf); }
==== //depot/projects/smpng/sys/arm/arm/dump_machdep.c#6 (text+ko) ====
@@ -25,12 +25,13 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/dump_machdep.c,v 1.5 2008/10/01 22:08:53 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/dump_machdep.c,v 1.6 2008/11/06 16:20:27 raj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list