PERFORCE change 153127 for review
Marko Zec
zec at FreeBSD.org
Tue Nov 18 03:25:45 PST 2008
http://perforce.freebsd.org/chv.cgi?CH=153127
Change 153127 by zec at zec_tca51 on 2008/11/18 11:24:59
IFC @ 153121
Affected files ...
.. //depot/projects/vimage/src/sys/amd64/conf/GENERIC#22 integrate
.. //depot/projects/vimage/src/sys/amd64/include/pmc_mdep.h#5 integrate
.. //depot/projects/vimage/src/sys/amd64/linux32/linux.h#8 integrate
.. //depot/projects/vimage/src/sys/amd64/linux32/linux32_machdep.c#14 integrate
.. //depot/projects/vimage/src/sys/amd64/linux32/linux32_proto.h#8 integrate
.. //depot/projects/vimage/src/sys/amd64/linux32/linux32_syscall.h#8 integrate
.. //depot/projects/vimage/src/sys/amd64/linux32/linux32_sysent.c#8 integrate
.. //depot/projects/vimage/src/sys/amd64/linux32/syscalls.master#8 integrate
.. //depot/projects/vimage/src/sys/arm/arm/dump_machdep.c#10 integrate
.. //depot/projects/vimage/src/sys/arm/arm/minidump_machdep.c#1 branch
.. //depot/projects/vimage/src/sys/arm/arm/pmap.c#16 integrate
.. //depot/projects/vimage/src/sys/arm/include/md_var.h#3 integrate
.. //depot/projects/vimage/src/sys/arm/include/minidump.h#1 branch
.. //depot/projects/vimage/src/sys/arm/include/pmap.h#8 integrate
.. //depot/projects/vimage/src/sys/arm/mv/mv_machdep.c#2 integrate
.. //depot/projects/vimage/src/sys/boot/Makefile#6 integrate
.. //depot/projects/vimage/src/sys/boot/common/bootstrap.h#4 integrate
.. //depot/projects/vimage/src/sys/boot/forth/loader.conf#16 integrate
.. //depot/projects/vimage/src/sys/boot/i386/Makefile#4 integrate
.. //depot/projects/vimage/src/sys/boot/i386/libi386/bootinfo32.c#2 integrate
.. //depot/projects/vimage/src/sys/boot/i386/libi386/devicename.c#4 integrate
.. //depot/projects/vimage/src/sys/boot/i386/loader/Makefile#4 integrate
.. //depot/projects/vimage/src/sys/boot/i386/loader/conf.c#3 integrate
.. //depot/projects/vimage/src/sys/boot/i386/loader/main.c#5 integrate
.. //depot/projects/vimage/src/sys/boot/i386/zfsboot/Makefile#1 branch
.. //depot/projects/vimage/src/sys/boot/i386/zfsboot/zfsboot.c#1 branch
.. //depot/projects/vimage/src/sys/boot/i386/zfsboot/zfsldr.S#1 branch
.. //depot/projects/vimage/src/sys/boot/zfs/Makefile#1 branch
.. //depot/projects/vimage/src/sys/boot/zfs/zfs.c#1 branch
.. //depot/projects/vimage/src/sys/boot/zfs/zfsimpl.c#1 branch
.. //depot/projects/vimage/src/sys/bsm/audit_internal.h#6 integrate
.. //depot/projects/vimage/src/sys/bsm/audit_record.h#6 integrate
.. //depot/projects/vimage/src/sys/cddl/boot/zfs/README#1 branch
.. //depot/projects/vimage/src/sys/cddl/boot/zfs/fletcher.c#1 branch
.. //depot/projects/vimage/src/sys/cddl/boot/zfs/lzjb.c#1 branch
.. //depot/projects/vimage/src/sys/cddl/boot/zfs/sha256.c#1 branch
.. //depot/projects/vimage/src/sys/cddl/boot/zfs/zfsimpl.h#1 branch
.. //depot/projects/vimage/src/sys/cddl/boot/zfs/zfssubr.c#1 branch
.. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c#3 integrate
.. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c#4 integrate
.. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/kern/opensolaris_lookup.c#1 branch
.. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#3 integrate
.. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#3 integrate
.. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#4 integrate
.. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/kern/opensolaris_zone.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/sys/acl.h#2 delete
.. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/sys/atomic.h#4 integrate
.. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/sys/callb.h#2 delete
.. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/sys/cred.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/sys/dnlc.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/sys/file.h#1 branch
.. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/sys/kidmap.h#1 branch
.. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/sys/kmem.h#3 integrate
.. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/sys/misc.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/sys/mntent.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/sys/param.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/sys/pathname.h#1 branch
.. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/sys/policy.h#3 integrate
.. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/sys/proc.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/sys/refstr.h#1 branch
.. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/sys/sid.h#1 branch
.. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/sys/sig.h#1 branch
.. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/sys/sunddi.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/sys/sysmacros.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/sys/time.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/sys/types.h#3 integrate
.. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/sys/uio.h#3 integrate
.. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/sys/vfs.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/sys/vnode.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/sys/zone.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/common/atomic/amd64/atomic.S#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/common/atomic/i386/atomic.S#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/common/avl/avl.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/common/unicode/u8_textprep.c#1 branch
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_comutil.c#1 branch
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_comutil.h#1 branch
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_deleg.c#1 branch
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_deleg.h#1 branch
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/common/zfs/zpool_prop.c#1 branch
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/common/zfs/zprop_common.c#1 branch
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/Makefile.files#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#3 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/vnode.c#1 branch
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bplist.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#3 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deleg.c#1 branch
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scrub.c#1 branch
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/refcount.c#3 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/rrwlock.c#1 branch
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sha256.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#3 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#3 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_deleg.h#1 branch
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#3 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/rrwlock.h#1 branch
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_boot.h#1 branch
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_fuid.h#1 branch
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/unique.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#3 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#5 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fuid.c#1 branch
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#3 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#3 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#5 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#5 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/os/callb.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/os/list.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/os/taskq.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_array.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/sys/acl.h#1 branch
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/sys/acl_impl.h#1 branch
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/sys/avl.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/sys/byteorder.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/sys/callb.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/sys/cpuvar.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/sys/cred.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/sys/dkio.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/sys/dklabel.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/sys/extdirent.h#1 branch
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/sys/fm/protocol.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/sys/fm/util.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/sys/gfs.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/sys/idmap.h#1 branch
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#4 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/sys/list.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/sys/nvpair.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/sys/processor.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/sys/synch.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent/eventdefs.h#1 branch
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/sys/u8_textprep.h#1 branch
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/sys/u8_textprep_data.h#1 branch
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h#1 branch
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod.c#2 integrate
.. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_misc.c#14 integrate
.. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_proto.h#16 integrate
.. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_syscall.h#16 integrate
.. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_syscalls.c#16 integrate
.. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_sysent.c#16 integrate
.. //depot/projects/vimage/src/sys/compat/freebsd32/syscalls.master#17 integrate
.. //depot/projects/vimage/src/sys/compat/linux/linux_futex.c#7 integrate
.. //depot/projects/vimage/src/sys/compat/linux/linux_misc.c#27 integrate
.. //depot/projects/vimage/src/sys/conf/NOTES#37 integrate
.. //depot/projects/vimage/src/sys/conf/files#43 integrate
.. //depot/projects/vimage/src/sys/conf/files.amd64#14 integrate
.. //depot/projects/vimage/src/sys/conf/files.arm#7 integrate
.. //depot/projects/vimage/src/sys/conf/files.i386#21 integrate
.. //depot/projects/vimage/src/sys/conf/files.pc98#13 integrate
.. //depot/projects/vimage/src/sys/conf/options#36 integrate
.. //depot/projects/vimage/src/sys/crypto/via/padlock.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/adb/adb_bus.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/age/if_age.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/ale/if_ale.c#1 branch
.. //depot/projects/vimage/src/sys/dev/ale/if_alereg.h#1 branch
.. //depot/projects/vimage/src/sys/dev/ale/if_alevar.h#1 branch
.. //depot/projects/vimage/src/sys/dev/cardbus/cardbus.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/cardbus/cardbus_cis.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/cardbus/cardbus_device.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/cardbus/cardbusvar.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_ctl_defs.h#5 integrate
.. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_t3_hw.c#11 integrate
.. //depot/projects/vimage/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#17 integrate
.. //depot/projects/vimage/src/sys/dev/cxgb/ulp/tom/cxgb_tom.c#8 integrate
.. //depot/projects/vimage/src/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/fdc/fdc.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/glxsb/glxsb.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_amd.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_amd.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_intel.c#1 branch
.. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_logging.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_mod.c#11 integrate
.. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_pentium.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_pentium.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_piv.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_piv.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_ppro.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_ppro.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_tsc.c#1 branch
.. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_tsc.h#1 branch
.. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_x86.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/if_ndis/if_ndis.c#17 integrate
.. //depot/projects/vimage/src/sys/dev/ipmi/ipmi.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/ispfw/ispfw.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/mfi/mfi.c#15 integrate
.. //depot/projects/vimage/src/sys/dev/mfi/mfi_disk.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/mfi/mfi_ioctl.h#6 integrate
.. //depot/projects/vimage/src/sys/dev/mfi/mfi_pci.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/mfi/mfireg.h#6 integrate
.. //depot/projects/vimage/src/sys/dev/mfi/mfivar.h#5 integrate
.. //depot/projects/vimage/src/sys/dev/pci/pci.c#17 integrate
.. //depot/projects/vimage/src/sys/dev/ppbus/if_plip.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/ppbus/immio.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/ppbus/lpbb.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/ppbus/lpt.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/ppbus/lpt.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/ppbus/pcfclock.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/ppbus/ppb_1284.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/ppbus/ppb_base.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/ppbus/ppb_msq.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/ppbus/ppbconf.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/ppbus/ppbconf.h#5 integrate
.. //depot/projects/vimage/src/sys/dev/ppbus/ppi.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/ppbus/ppi.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/ppbus/pps.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/ppbus/vpo.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/ppbus/vpoio.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/ppbus/vpoio.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/ppc/ppc.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/ppc/ppc_acpi.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/sound/pci/hda/hdac.c#24 integrate
.. //depot/projects/vimage/src/sys/dev/syscons/syscons.c#11 integrate
.. //depot/projects/vimage/src/sys/dev/syscons/sysmouse.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/usb/if_aue.c#9 integrate
.. //depot/projects/vimage/src/sys/dev/usb/u3g.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/usb/ugen.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb.h#5 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_quirks.c#11 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_subr.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usbdevs#35 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usbdi.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usbdi.h#5 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/controller/at91dci.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/controller/at91dci_atmelarm.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/controller/ehci2.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/controller/ehci2_pci.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/controller/musb2_otg.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/controller/musb2_otg_atmelarm.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/controller/ohci2.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/controller/ohci2_atmelarm.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/controller/ohci2_pci.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/controller/uhci2.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/controller/uhci2_pci.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/controller/usb2_bus.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/controller/usb2_controller.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/controller/uss820dci.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/controller/uss820dci_atmelarm.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/controller/uss820dci_pccard.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_busdma.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_core.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_device.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_handle_request.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_hub.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_request.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_sw_transfer.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_transfer.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_transfer.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/serial/uark2.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/serial/ubsa2.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/serial/ubser2.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/serial/uchcom2.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/serial/ucycom2.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/serial/ufoma2.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/serial/uftdi2.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/serial/ugensa2.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/serial/uipaq2.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/serial/umct2.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/serial/umodem2.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/serial/umoscom2.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/serial/uplcom2.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/serial/usb2_serial.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/serial/uvisor2.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/serial/uvscom2.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/storage/ata-usb2.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/vge/if_vge.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/vr/if_vr.c#3 integrate
.. //depot/projects/vimage/src/sys/geom/part/g_part_bsd.c#6 integrate
.. //depot/projects/vimage/src/sys/geom/part/g_part_gpt.c#8 integrate
.. //depot/projects/vimage/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.h#3 integrate
.. //depot/projects/vimage/src/sys/gnu/fs/xfs/xfs_dfrag.c#2 integrate
.. //depot/projects/vimage/src/sys/gnu/fs/xfs/xfs_inode.c#3 integrate
.. //depot/projects/vimage/src/sys/gnu/fs/xfs/xfs_inode.h#2 integrate
.. //depot/projects/vimage/src/sys/gnu/fs/xfs/xfs_vnodeops.c#3 integrate
.. //depot/projects/vimage/src/sys/i386/conf/GENERIC#26 integrate
.. //depot/projects/vimage/src/sys/i386/conf/XEN#5 integrate
.. //depot/projects/vimage/src/sys/i386/include/pmc_mdep.h#4 integrate
.. //depot/projects/vimage/src/sys/i386/linux/linux.h#8 integrate
.. //depot/projects/vimage/src/sys/i386/linux/linux_machdep.c#11 integrate
.. //depot/projects/vimage/src/sys/i386/linux/linux_proto.h#9 integrate
.. //depot/projects/vimage/src/sys/i386/linux/linux_syscall.h#9 integrate
.. //depot/projects/vimage/src/sys/i386/linux/linux_sysent.c#9 integrate
.. //depot/projects/vimage/src/sys/i386/linux/syscalls.master#9 integrate
.. //depot/projects/vimage/src/sys/kern/init_sysent.c#10 integrate
.. //depot/projects/vimage/src/sys/kern/kern_jail.c#17 integrate
.. //depot/projects/vimage/src/sys/kern/kern_mbuf.c#10 integrate
.. //depot/projects/vimage/src/sys/kern/kern_osd.c#1 branch
.. //depot/projects/vimage/src/sys/kern/kern_proc.c#16 integrate
.. //depot/projects/vimage/src/sys/kern/kern_thread.c#19 integrate
.. //depot/projects/vimage/src/sys/kern/kern_xxx.c#13 integrate
.. //depot/projects/vimage/src/sys/kern/sched_ule.c#27 integrate
.. //depot/projects/vimage/src/sys/kern/subr_bus.c#12 integrate
.. //depot/projects/vimage/src/sys/kern/subr_firmware.c#5 integrate
.. //depot/projects/vimage/src/sys/kern/subr_prf.c#4 integrate
.. //depot/projects/vimage/src/sys/kern/sys_pipe.c#9 integrate
.. //depot/projects/vimage/src/sys/kern/syscalls.c#10 integrate
.. //depot/projects/vimage/src/sys/kern/syscalls.master#11 integrate
.. //depot/projects/vimage/src/sys/kern/systrace_args.c#9 integrate
.. //depot/projects/vimage/src/sys/kern/tty.c#26 integrate
.. //depot/projects/vimage/src/sys/kern/tty_ttydisc.c#5 integrate
.. //depot/projects/vimage/src/sys/kern/vfs_lookup.c#17 integrate
.. //depot/projects/vimage/src/sys/kern/vfs_subr.c#21 integrate
.. //depot/projects/vimage/src/sys/kern/vfs_vnops.c#17 integrate
.. //depot/projects/vimage/src/sys/kgssapi/gsstest.c#2 integrate
.. //depot/projects/vimage/src/sys/modules/Makefile#33 integrate
.. //depot/projects/vimage/src/sys/modules/ale/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/cxgb/cxgb/Makefile#7 integrate
.. //depot/projects/vimage/src/sys/modules/cxgb/iw_cxgb/Makefile#3 integrate
.. //depot/projects/vimage/src/sys/modules/cxgb/toecore/Makefile#3 integrate
.. //depot/projects/vimage/src/sys/modules/em/Makefile#6 integrate
.. //depot/projects/vimage/src/sys/modules/hwpmc/Makefile#3 integrate
.. //depot/projects/vimage/src/sys/modules/igb/Makefile#3 integrate
.. //depot/projects/vimage/src/sys/modules/zfs/Makefile#8 integrate
.. //depot/projects/vimage/src/sys/net/if.c#47 integrate
.. //depot/projects/vimage/src/sys/net/radix_mpath.c#4 integrate
.. //depot/projects/vimage/src/sys/netgraph/ng_tty.c#4 integrate
.. //depot/projects/vimage/src/sys/netgraph/ng_tty.h#3 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_fw2.c#54 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_constants.h#24 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_indata.c#28 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_input.c#28 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_pcb.c#31 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_pcb.h#21 integrate
.. //depot/projects/vimage/src/sys/netinet/sctputil.c#32 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_input.c#43 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#58 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_var.h#25 integrate
.. //depot/projects/vimage/src/sys/nfsclient/nfs.h#6 integrate
.. //depot/projects/vimage/src/sys/nfsserver/nfs.h#6 integrate
.. //depot/projects/vimage/src/sys/nfsserver/nfs_fha.c#2 integrate
.. //depot/projects/vimage/src/sys/nfsserver/nfs_srvkrpc.c#2 integrate
.. //depot/projects/vimage/src/sys/nfsserver/nfs_srvsubs.c#12 integrate
.. //depot/projects/vimage/src/sys/nlm/nlm_prot_svc.c#3 integrate
.. //depot/projects/vimage/src/sys/powerpc/include/float.h#3 integrate
.. //depot/projects/vimage/src/sys/rpc/clnt_vc.c#4 integrate
.. //depot/projects/vimage/src/sys/security/audit/audit.c#15 integrate
.. //depot/projects/vimage/src/sys/security/audit/audit.h#9 integrate
.. //depot/projects/vimage/src/sys/security/audit/audit_arg.c#13 integrate
.. //depot/projects/vimage/src/sys/security/audit/audit_bsm.c#10 integrate
.. //depot/projects/vimage/src/sys/security/audit/audit_bsm_token.c#9 integrate
.. //depot/projects/vimage/src/sys/security/audit/audit_private.h#8 integrate
.. //depot/projects/vimage/src/sys/security/audit/audit_syscalls.c#16 integrate
.. //depot/projects/vimage/src/sys/security/audit/audit_worker.c#12 integrate
.. //depot/projects/vimage/src/sys/sparc64/include/iommureg.h#4 integrate
.. //depot/projects/vimage/src/sys/sparc64/include/iommuvar.h#4 integrate
.. //depot/projects/vimage/src/sys/sparc64/sparc64/iommu.c#5 integrate
.. //depot/projects/vimage/src/sys/sparc64/sparc64/machdep.c#13 integrate
.. //depot/projects/vimage/src/sys/sparc64/sparc64/support.S#5 integrate
.. //depot/projects/vimage/src/sys/sys/cfictl.h#2 integrate
.. //depot/projects/vimage/src/sys/sys/conf.h#14 integrate
.. //depot/projects/vimage/src/sys/sys/jail.h#5 integrate
.. //depot/projects/vimage/src/sys/sys/mount.h#14 integrate
.. //depot/projects/vimage/src/sys/sys/namei.h#3 integrate
.. //depot/projects/vimage/src/sys/sys/osd.h#1 branch
.. //depot/projects/vimage/src/sys/sys/pmc.h#6 integrate
.. //depot/projects/vimage/src/sys/sys/priv.h#12 integrate
.. //depot/projects/vimage/src/sys/sys/proc.h#26 integrate
.. //depot/projects/vimage/src/sys/sys/syscall.h#10 integrate
.. //depot/projects/vimage/src/sys/sys/syscall.mk#10 integrate
.. //depot/projects/vimage/src/sys/sys/syscallsubr.h#7 integrate
.. //depot/projects/vimage/src/sys/sys/sysproto.h#10 integrate
.. //depot/projects/vimage/src/sys/sys/ttydefaults.h#4 integrate
.. //depot/projects/vimage/src/sys/sys/vnode.h#14 integrate
.. //depot/projects/vimage/src/sys/ufs/ffs/ffs_snapshot.c#13 integrate
.. //depot/projects/vimage/src/sys/vm/vm_page.c#19 integrate
.. //depot/projects/vimage/src/sys/vm/vm_pageout.c#13 integrate
.. //depot/projects/vimage/src/sys/xdr/xdr_mbuf.c#3 integrate
.. //depot/projects/vimage/src/sys/xen/xenbus/xenbus_xs.c#4 integrate
Differences ...
==== //depot/projects/vimage/src/sys/amd64/conf/GENERIC#22 (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/vimage/src/sys/amd64/include/pmc_mdep.h#5 (text+ko) ====
@@ -27,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/include/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/vimage/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/vimage/src/sys/amd64/linux32/linux32_machdep.c#14 (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/vimage/src/sys/amd64/linux32/linux32_proto.h#8 (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/vimage/src/sys/amd64/linux32/linux32_syscall.h#8 (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/vimage/src/sys/amd64/linux32/linux32_sysent.c#8 (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/vimage/src/sys/amd64/linux32/syscalls.master#8 (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/vimage/src/sys/arm/arm/dump_machdep.c#10 (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>
#include <sys/conf.h>
#include <sys/cons.h>
+#include <sys/sysctl.h>
#include <sys/kernel.h>
#include <sys/proc.h>
#include <sys/kerneldump.h>
@@ -44,6 +45,11 @@
CTASSERT(sizeof(struct kerneldumpheader) == 512);
+int do_minidump = 1;
+TUNABLE_INT("debug.minidump", &do_minidump);
+SYSCTL_INT(_debug, OID_AUTO, minidump, CTLFLAG_RW, &do_minidump, 0,
+ "Enable mini crash dumps");
+
/*
* Don't touch the first SIZEOF_METADATA bytes on the dump device. This
* is to protect us from metadata and to protect metadata from us.
@@ -155,11 +161,10 @@
vm_offset_t va;
uint32_t pgs;
size_t counter, sz, chunk;
- int c, error, twiddle;
+ int c, error;
error = 0; /* catch case in which chunk size is 0 */
- counter = 0; /* Update twiddle every 16MB */
- twiddle = 0;
+ counter = 0;
va = 0;
pgs = mdp->md_size / PAGE_SIZE;
pa = mdp->md_start;
@@ -264,7 +269,12 @@
off_t hdrgap;
size_t hdrsz;
int error;
-
+
+ if (do_minidump) {
+ minidumpsys(di);
+ return;
+ }
+
bzero(&ehdr, sizeof(ehdr));
ehdr.e_ident[EI_MAG0] = ELFMAG0;
ehdr.e_ident[EI_MAG1] = ELFMAG1;
==== //depot/projects/vimage/src/sys/arm/arm/pmap.c#16 (text+ko) ====
@@ -147,7 +147,7 @@
#include "opt_vm.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.104 2008/10/13 18:59:59 raj Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.106 2008/11/06 16:28:28 raj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
@@ -270,6 +270,11 @@
struct msgbuf *msgbufp = 0;
+/*
+ * Crashdump maps.
+ */
+static caddr_t crashdumpmap;
+
extern void bcopy_page(vm_offset_t, vm_offset_t);
extern void bzero_page(vm_offset_t);
@@ -1209,7 +1214,7 @@
CTR4(KTR_PMAP, "pmap_l2cache_wbinv_range: pmap %p is_kernel %d "
"va 0x%08x len 0x%x ", pm, pm == pmap_kernel(), va, rest);
if (pmap_get_pde_pte(pm, va, &pde, &ptep) && l2pte_valid(*ptep))
- cpu_l2cache_wb_range(va, rest);
+ cpu_l2cache_wb_range(va, rest);
len -= rest;
va += rest;
@@ -1241,7 +1246,7 @@
CTR4(KTR_PMAP, "pmap_l2cache_wb_range: pmap %p is_kernel %d "
"va 0x%08x len 0x%x ", pm, pm == pmap_kernel(), va, rest);
if (pmap_get_pde_pte(pm, va, &pde, &ptep) && l2pte_valid(*ptep))
- cpu_l2cache_wb_range(va, rest);
+ cpu_l2cache_wb_range(va, rest);
len -= rest;
va += rest;
@@ -1276,6 +1281,7 @@
pmap_dcache_wb_range(pmap_t pm, vm_offset_t va, vm_size_t len, boolean_t do_inv,
boolean_t rd_only)
{
+
CTR4(KTR_PMAP, "pmap_dcache_wb_range: pmap %p is_kernel %d va 0x%08x "
"len 0x%x ", pm, pm == pmap_kernel(), va, len);
CTR2(KTR_PMAP, " do_inv %d rd_only %d", do_inv, rd_only);
@@ -1290,8 +1296,7 @@
cpu_dcache_wbinv_range(va, len);
pmap_l2cache_wbinv_range(pm, va, len);
}
- } else
- if (!rd_only) {
+ } else if (!rd_only) {
cpu_dcache_wb_range(va, len);
pmap_l2cache_wb_range(pm, va, len);
}
@@ -2455,6 +2460,8 @@
pmap_alloc_specials(&virtual_avail,
1, (vm_offset_t*)&_tmppt, NULL);
+ pmap_alloc_specials(&virtual_avail,
+ MAXDUMPPGS, (vm_offset_t *)&crashdumpmap, NULL);
SLIST_INIT(&l1_list);
TAILQ_INIT(&l1_lru_list);
mtx_init(&l1_lru_lock, "l1 list lock", NULL, MTX_DEF);
@@ -2793,6 +2800,20 @@
}
/*
+ * Make a temporary mapping for a physical address. This is only intended
+ * to be used for panic dumps.
+ */
+void *
+pmap_kenter_temp(vm_paddr_t pa, int i)
+{
+ vm_offset_t va;
+
+ va = (vm_offset_t)crashdumpmap + (i * PAGE_SIZE);
+ pmap_kenter(va, pa);
+ return ((void *)crashdumpmap);
+}
+
+/*
* add a wired page to the kva
* note that in order for the mapping to take effect -- you
* should do a invltlb after doing the pmap_kenter...
@@ -3958,7 +3979,7 @@
* Hook in the page, zero it, invalidate the TLB as needed.
*
* Note the temporary zero-page mapping must be a non-cached page in
- * ordert to work without corruption when write-allocate is enabled.
+ * order to work without corruption when write-allocate is enabled.
*/
*cdst_pte = L2_S_PROTO | phys | L2_S_PROT(PTE_KERNEL, VM_PROT_WRITE);
cpu_tlb_flushD_SE(cdstp);
==== //depot/projects/vimage/src/sys/arm/include/md_var.h#3 (text+ko) ====
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*
* from: FreeBSD: src/sys/i386/include/md_var.h,v 1.40 2001/07/12
- * $FreeBSD: src/sys/arm/include/md_var.h,v 1.4 2007/01/17 00:53:05 cognet Exp $
+ * $FreeBSD: src/sys/arm/include/md_var.h,v 1.5 2008/11/06 16:20:27 raj Exp $
*/
#ifndef _MACHINE_MD_VAR_H_
@@ -35,6 +35,8 @@
extern char sigcode[];
extern int szsigcode;
+extern uint32_t *vm_page_dump;
+extern int vm_page_dump_size;
extern int (*_arm_memcpy)(void *, void *, int, int);
extern int (*_arm_bzero)(void *, int, int);
@@ -46,7 +48,11 @@
#define SRC_IS_USER 0x2
#define IS_PHYSICAL 0x4
+struct dumperinfo;
extern int busdma_swi_pending;
void busdma_swi(void);
+void dump_add_page(vm_paddr_t);
+void dump_drop_page(vm_paddr_t);
+void minidumpsys(struct dumperinfo *);
#endif /* !_MACHINE_MD_VAR_H_ */
==== //depot/projects/vimage/src/sys/arm/include/pmap.h#8 (text+ko) ====
@@ -44,7 +44,7 @@
* from: @(#)pmap.h 7.4 (Berkeley) 5/12/91
* from: FreeBSD: src/sys/i386/include/pmap.h,v 1.70 2000/11/30
*
- * $FreeBSD: src/sys/arm/include/pmap.h,v 1.29 2008/03/06 21:59:47 cognet Exp $
+ * $FreeBSD: src/sys/arm/include/pmap.h,v 1.30 2008/11/06 16:20:27 raj Exp $
*/
#ifndef _MACHINE_PMAP_H_
@@ -206,6 +206,7 @@
void pmap_bootstrap(vm_offset_t, vm_offset_t, struct pv_addr *);
void pmap_kenter(vm_offset_t va, vm_paddr_t pa);
void pmap_kenter_nocache(vm_offset_t va, vm_paddr_t pa);
+void *pmap_kenter_temp(vm_paddr_t pa, int i);
void pmap_kenter_user(vm_offset_t va, vm_paddr_t pa);
void pmap_kremove(vm_offset_t);
void *pmap_mapdev(vm_offset_t, vm_size_t);
==== //depot/projects/vimage/src/sys/arm/mv/mv_machdep.c#2 (text+ko) ====
@@ -39,7 +39,7 @@
#include "opt_ddb.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/mv/mv_machdep.c,v 1.1 2008/10/13 20:07:13 raj Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/mv/mv_machdep.c,v 1.2 2008/11/06 16:25:12 raj Exp $");
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/param.h>
@@ -93,9 +93,6 @@
#define debugf(fmt, args...)
#endif
-#define KERNEL_PT_SYS 0 /* Page table for mapping proc0 zero page */
-#define KERNEL_PT_KERN 1
-
/*
* This is the number of L2 page tables required for covering max
* (hypothetical) memsize of 4GB and all kernel mappings (vectors, msgbuf,
@@ -366,7 +363,7 @@
struct bi_mem_region *mr;
void *kmdp;
u_int l1pagetable;
- int i = 0;
+ int i = 0, j = 0;
kmdp = NULL;
lastaddr = 0;
@@ -465,13 +462,14 @@
if (!(i % (PAGE_SIZE / L2_TABLE_SIZE_REAL))) {
valloc_pages(kernel_pt_table[i],
L2_TABLE_SIZE / PAGE_SIZE);
+ j = i;
} else {
- kernel_pt_table[i].pv_va = freemempos -
- (i % (PAGE_SIZE / L2_TABLE_SIZE_REAL)) *
- L2_TABLE_SIZE_REAL;
+ kernel_pt_table[i].pv_va = kernel_pt_table[j].pv_va +
+ L2_TABLE_SIZE_REAL * (i - j);
kernel_pt_table[i].pv_pa =
kernel_pt_table[i].pv_va - KERNVIRTADDR +
KERNPHYSADDR;
+
}
}
/*
@@ -506,7 +504,7 @@
l2_start = lastaddr & ~(L1_S_OFFSET);
for (i = 0 ; i < l2size - 1; i++)
pmap_link_l2pt(l1pagetable, l2_start + i * L1_S_SIZE,
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list