PERFORCE change 118519 for review
Marko Zec
zec at FreeBSD.org
Sat Apr 21 07:23:38 UTC 2007
http://perforce.freebsd.org/chv.cgi?CH=118519
Change 118519 by zec at zec_tca51 on 2007/04/21 07:22:56
IFC @ 118508
Affected files ...
.. //depot/projects/vimage/src/sys/Makefile#3 integrate
.. //depot/projects/vimage/src/sys/amd64/amd64/busdma_machdep.c#3 integrate
.. //depot/projects/vimage/src/sys/amd64/amd64/pmap.c#4 integrate
.. //depot/projects/vimage/src/sys/amd64/conf/GENERIC#5 integrate
.. //depot/projects/vimage/src/sys/amd64/include/vmparam.h#2 integrate
.. //depot/projects/vimage/src/sys/amd64/linux32/linux32_dummy.c#4 integrate
.. //depot/projects/vimage/src/sys/amd64/linux32/linux32_machdep.c#7 integrate
.. //depot/projects/vimage/src/sys/boot/forth/loader.conf#5 integrate
.. //depot/projects/vimage/src/sys/boot/pc98/boot0.5/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/boot/pc98/boot0.5/boot0.5.s#3 integrate
.. //depot/projects/vimage/src/sys/boot/pc98/boot0.5/ldscript#1 branch
.. //depot/projects/vimage/src/sys/boot/pc98/boot0.5/putssjis.s#1 branch
.. //depot/projects/vimage/src/sys/boot/pc98/boot0.5/selector.s#2 integrate
.. //depot/projects/vimage/src/sys/boot/pc98/boot0.5/start.s#2 integrate
.. //depot/projects/vimage/src/sys/boot/pc98/boot2/boot.c#2 integrate
.. //depot/projects/vimage/src/sys/bsm/audit.h#3 integrate
.. //depot/projects/vimage/src/sys/bsm/audit_internal.h#3 integrate
.. //depot/projects/vimage/src/sys/bsm/audit_kevents.h#3 integrate
.. //depot/projects/vimage/src/sys/bsm/audit_record.h#3 integrate
.. //depot/projects/vimage/src/sys/cam/cam_ccb.h#3 integrate
.. //depot/projects/vimage/src/sys/cam/cam_periph.c#3 integrate
.. //depot/projects/vimage/src/sys/cam/cam_periph.h#2 integrate
.. //depot/projects/vimage/src/sys/cam/cam_sim.c#2 integrate
.. //depot/projects/vimage/src/sys/cam/cam_sim.h#2 integrate
.. //depot/projects/vimage/src/sys/cam/cam_xpt.c#5 integrate
.. //depot/projects/vimage/src/sys/cam/cam_xpt.h#4 integrate
.. //depot/projects/vimage/src/sys/cam/cam_xpt_periph.h#2 integrate
.. //depot/projects/vimage/src/sys/cam/scsi/scsi_cd.c#3 integrate
.. //depot/projects/vimage/src/sys/cam/scsi/scsi_ch.c#3 integrate
.. //depot/projects/vimage/src/sys/cam/scsi/scsi_da.c#5 integrate
.. //depot/projects/vimage/src/sys/cam/scsi/scsi_low.c#2 integrate
.. //depot/projects/vimage/src/sys/cam/scsi/scsi_pass.c#3 integrate
.. //depot/projects/vimage/src/sys/cam/scsi/scsi_pt.c#3 integrate
.. //depot/projects/vimage/src/sys/cam/scsi/scsi_sa.c#3 integrate
.. //depot/projects/vimage/src/sys/cam/scsi/scsi_ses.c#3 integrate
.. //depot/projects/vimage/src/sys/cam/scsi/scsi_sg.c#1 branch
.. //depot/projects/vimage/src/sys/cam/scsi/scsi_sg.h#1 branch
.. //depot/projects/vimage/src/sys/cam/scsi/scsi_targ_bh.c#3 integrate
.. //depot/projects/vimage/src/sys/cam/scsi/scsi_target.c#4 integrate
.. //depot/projects/vimage/src/sys/compat/linprocfs/linprocfs.c#6 integrate
.. //depot/projects/vimage/src/sys/compat/linux/linux_file.c#4 integrate
.. //depot/projects/vimage/src/sys/compat/linux/linux_ioctl.c#4 integrate
.. //depot/projects/vimage/src/sys/compat/linux/linux_ioctl.h#2 integrate
.. //depot/projects/vimage/src/sys/compat/linux/linux_socket.c#3 integrate
.. //depot/projects/vimage/src/sys/compat/ndis/kern_ndis.c#3 integrate
.. //depot/projects/vimage/src/sys/compat/ndis/ndis_var.h#2 integrate
.. //depot/projects/vimage/src/sys/compat/ndis/subr_ndis.c#2 integrate
.. //depot/projects/vimage/src/sys/compat/ndis/subr_pe.c#2 integrate
.. //depot/projects/vimage/src/sys/compat/opensolaris/kern/opensolaris_kmem.c#1 branch
.. //depot/projects/vimage/src/sys/compat/opensolaris/kern/opensolaris_kobj.c#1 branch
.. //depot/projects/vimage/src/sys/compat/opensolaris/kern/opensolaris_kstat.c#1 branch
.. //depot/projects/vimage/src/sys/compat/opensolaris/kern/opensolaris_misc.c#1 branch
.. //depot/projects/vimage/src/sys/compat/opensolaris/kern/opensolaris_policy.c#1 branch
.. //depot/projects/vimage/src/sys/compat/opensolaris/kern/opensolaris_string.c#1 branch
.. //depot/projects/vimage/src/sys/compat/opensolaris/kern/opensolaris_vfs.c#1 branch
.. //depot/projects/vimage/src/sys/compat/opensolaris/kern/opensolaris_zone.c#1 branch
.. //depot/projects/vimage/src/sys/compat/opensolaris/machine/endian.h#1 branch
.. //depot/projects/vimage/src/sys/compat/opensolaris/rpc/xdr.h#1 branch
.. //depot/projects/vimage/src/sys/compat/opensolaris/sys/acl.h#1 branch
.. //depot/projects/vimage/src/sys/compat/opensolaris/sys/byteorder.h#1 branch
.. //depot/projects/vimage/src/sys/compat/opensolaris/sys/callb.h#1 branch
.. //depot/projects/vimage/src/sys/compat/opensolaris/sys/cmn_err.h#1 branch
.. //depot/projects/vimage/src/sys/compat/opensolaris/sys/cred.h#1 branch
.. //depot/projects/vimage/src/sys/compat/opensolaris/sys/debug.h#1 branch
.. //depot/projects/vimage/src/sys/compat/opensolaris/sys/dirent.h#1 branch
.. //depot/projects/vimage/src/sys/compat/opensolaris/sys/dkio.h#1 branch
.. //depot/projects/vimage/src/sys/compat/opensolaris/sys/kcondvar.h#1 branch
.. //depot/projects/vimage/src/sys/compat/opensolaris/sys/kmem.h#1 branch
.. //depot/projects/vimage/src/sys/compat/opensolaris/sys/kobj.h#1 branch
.. //depot/projects/vimage/src/sys/compat/opensolaris/sys/kstat.h#1 branch
.. //depot/projects/vimage/src/sys/compat/opensolaris/sys/lock.h#1 branch
.. //depot/projects/vimage/src/sys/compat/opensolaris/sys/misc.h#1 branch
.. //depot/projects/vimage/src/sys/compat/opensolaris/sys/mntent.h#1 branch
.. //depot/projects/vimage/src/sys/compat/opensolaris/sys/mnttab.h#1 branch
.. //depot/projects/vimage/src/sys/compat/opensolaris/sys/mount.h#1 branch
.. //depot/projects/vimage/src/sys/compat/opensolaris/sys/mutex.h#1 branch
.. //depot/projects/vimage/src/sys/compat/opensolaris/sys/policy.h#1 branch
.. //depot/projects/vimage/src/sys/compat/opensolaris/sys/proc.h#1 branch
.. //depot/projects/vimage/src/sys/compat/opensolaris/sys/random.h#1 branch
.. //depot/projects/vimage/src/sys/compat/opensolaris/sys/rwlock.h#1 branch
.. //depot/projects/vimage/src/sys/compat/opensolaris/sys/sdt.h#1 branch
.. //depot/projects/vimage/src/sys/compat/opensolaris/sys/string.h#1 branch
.. //depot/projects/vimage/src/sys/compat/opensolaris/sys/sysmacros.h#1 branch
.. //depot/projects/vimage/src/sys/compat/opensolaris/sys/systm.h#1 branch
.. //depot/projects/vimage/src/sys/compat/opensolaris/sys/taskq.h#1 branch
.. //depot/projects/vimage/src/sys/compat/opensolaris/sys/taskq_impl.h#1 branch
.. //depot/projects/vimage/src/sys/compat/opensolaris/sys/time.h#1 branch
.. //depot/projects/vimage/src/sys/compat/opensolaris/sys/types.h#1 branch
.. //depot/projects/vimage/src/sys/compat/opensolaris/sys/uio.h#1 branch
.. //depot/projects/vimage/src/sys/compat/opensolaris/sys/varargs.h#1 branch
.. //depot/projects/vimage/src/sys/compat/opensolaris/sys/vfs.h#1 branch
.. //depot/projects/vimage/src/sys/compat/opensolaris/sys/vnode.h#1 branch
.. //depot/projects/vimage/src/sys/compat/opensolaris/sys/zone.h#1 branch
.. //depot/projects/vimage/src/sys/compat/svr4/svr4_filio.c#2 integrate
.. //depot/projects/vimage/src/sys/conf/NOTES#7 integrate
.. //depot/projects/vimage/src/sys/conf/files#7 integrate
.. //depot/projects/vimage/src/sys/conf/files.amd64#3 integrate
.. //depot/projects/vimage/src/sys/conf/files.i386#3 integrate
.. //depot/projects/vimage/src/sys/conf/files.ia64#2 integrate
.. //depot/projects/vimage/src/sys/conf/files.pc98#3 integrate
.. //depot/projects/vimage/src/sys/conf/files.powerpc#4 integrate
.. //depot/projects/vimage/src/sys/conf/options#9 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/utmisc.c#3 integrate
.. //depot/projects/vimage/src/sys/contrib/opensolaris/common/acl/acl_common.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/common/acl/acl_common.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/common/atomic/amd64/atomic.S#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/common/atomic/i386/atomic.S#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/common/avl/avl.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/common/nvpair/nvpair.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/common/zfs/zfs_namecheck.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/common/zfs/zfs_namecheck.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/common/zfs/zfs_prop.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/common/zfs/zfs_prop.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/Makefile.files#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/dnlc.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/gfs.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/bplist.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/dnode.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/gzip.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/lzjb.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/refcount.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sha256.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/space_map.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_file.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_rlock.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/txg.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/uberblock.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/unique.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs.conf#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zil.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/os/callb.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/os/list.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/os/nvpair_alloc_system.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/os/taskq.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/rpc/xdr.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/rpc/xdr.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/rpc/xdr_array.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/rpc/xdr_mem.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/asm_linkage.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/atomic.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/avl.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/avl_impl.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/bitmap.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/byteorder.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/callb.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/ccompile.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/compress.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/cred.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/debug.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/dkio.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/dklabel.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/dnlc.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/errorq.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/feature_tests.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/fm/protocol.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/fm/util.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/fs/zfs.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/gfs.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/isa_defs.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/list.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/list_impl.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/note.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/nvpair.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/nvpair_impl.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/processor.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/procset.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/sdt.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/synch.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/sysevent.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/sysmacros.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/vfs.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/vmem.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/zmod.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/zmod/adler32.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/zmod/crc32.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/zmod/crc32.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/zmod/deflate.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/zmod/deflate.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/zmod/inffast.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/zmod/inffast.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/zmod/inffixed.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/zmod/inflate.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/zmod/inflate.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/zmod/inftrees.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/zmod/inftrees.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/zmod/trees.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/zmod/zconf.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/zmod/zlib.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/zmod/zmod.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/zmod/zmod_subr.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/zmod/zutil.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/zmod/zutil.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/pf/net/if_pfsync.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/aac/aac_cam.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/advansys/advansys.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/advansys/adwcam.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/aha/aha.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/ahb/ahb.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/aic/aic.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/aic7xxx/aic7770.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/aic7xxx/aic79xx.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/aic7xxx/aic79xx.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/aic7xxx/aic79xx_osm.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/aic7xxx/aic79xx_osm.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/aic7xxx/aic79xx_pci.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/aic7xxx/aic7xxx.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/aic7xxx/aic7xxx.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/aic7xxx/aic7xxx_inline.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/aic7xxx/aic7xxx_osm.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/aic7xxx/aic7xxx_osm.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/aic7xxx/aic7xxx_pci.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/aic7xxx/aic_osm_lib.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/aic7xxx/aic_osm_lib.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/amd/amd.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/amr/amr_cam.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/arcmsr/arcmsr.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/asr/asr.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/ata/ata-all.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/ata/ata-chipset.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/ata/ata-dma.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/ata/ata-lowlevel.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/ata/ata_if.m#2 integrate
.. //depot/projects/vimage/src/sys/dev/ata/atapi-cam.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/ath/ah_osdep.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/ath/if_ath.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/buslogic/bt.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/ciss/ciss.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_adapter.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_lro.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_main.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_osdep.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_sge.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/cxgb/sys/mvec.h#1 branch
.. //depot/projects/vimage/src/sys/dev/cxgb/sys/uipc_mvec.c#1 branch
.. //depot/projects/vimage/src/sys/dev/dpt/dpt_scsi.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/esp/ncr53c9x.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/ex/if_exvar.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/firewire/fwdma.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/firewire/sbp.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/firewire/sbp_targ.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/hptmv/entry.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_logging.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_mod.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_piv.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/if_ndis/if_ndis_pccard.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/iicbus/icee.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/iir/iir.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/isp/isp_freebsd.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/mii/brgphy.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/mii/miidevs#6 integrate
.. //depot/projects/vimage/src/sys/dev/mly/mly.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/mpt/mpt_cam.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/msk/if_msk.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/ppbus/vpo.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/ral/rt2560.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/re/if_re.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/rr232x/osm_bsd.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/sound/isa/ad1816.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/sound/isa/ess.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/sound/isa/mss.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/sound/isa/sb16.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/sound/isa/sb8.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/sound/pci/als4000.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/sound/pci/atiixp.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/sound/pci/au88x0.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/sound/pci/aureal.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/sound/pci/cmi.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/sound/pci/cs4281.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/sound/pci/csapcm.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/sound/pci/ds1.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/sound/pci/emu10k1.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/sound/pci/emu10kx-pcm.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/sound/pci/envy24.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/sound/pci/envy24ht.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/sound/pci/es137x.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/sound/pci/fm801.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/sound/pci/hda/hdac.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/sound/pci/ich.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/sound/pci/maestro3.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/sound/pci/solo.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/sound/pci/t4dwave.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/sound/pci/via8233.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/sound/pci/via82c686.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/sound/pci/vibes.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/sound/pcm/ac97.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/sound/pcm/ac97.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/sound/pcm/ac97_patch.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/sound/pcm/ac97_patch.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/sound/pcm/buffer.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/sound/pcm/buffer.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/sound/pcm/sound.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/sound/sbus/cs4231.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/streams/streams.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/sym/sym_hipd.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/trm/trm.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/twa/tw_osl_cam.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/uart/uart_bus_pci.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/usb/if_ural.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/usb/umass.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usbdevs#3 integrate
.. //depot/projects/vimage/src/sys/dev/wds/wd7000.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/wi/if_wi.c#4 integrate
.. //depot/projects/vimage/src/sys/fs/devfs/devfs_vnops.c#3 integrate
.. //depot/projects/vimage/src/sys/fs/fdescfs/fdesc_vfsops.c#2 integrate
.. //depot/projects/vimage/src/sys/fs/fdescfs/fdesc_vnops.c#3 integrate
.. //depot/projects/vimage/src/sys/fs/fifofs/fifo_vnops.c#3 integrate
.. //depot/projects/vimage/src/sys/fs/procfs/procfs_dbregs.c#2 integrate
.. //depot/projects/vimage/src/sys/fs/procfs/procfs_fpregs.c#2 integrate
.. //depot/projects/vimage/src/sys/fs/procfs/procfs_map.c#2 integrate
.. //depot/projects/vimage/src/sys/fs/procfs/procfs_regs.c#2 integrate
.. //depot/projects/vimage/src/sys/fs/pseudofs/pseudofs.c#3 integrate
.. //depot/projects/vimage/src/sys/fs/pseudofs/pseudofs.h#3 integrate
.. //depot/projects/vimage/src/sys/fs/pseudofs/pseudofs_fileno.c#2 integrate
.. //depot/projects/vimage/src/sys/fs/pseudofs/pseudofs_internal.h#2 integrate
.. //depot/projects/vimage/src/sys/fs/pseudofs/pseudofs_vncache.c#4 integrate
.. //depot/projects/vimage/src/sys/fs/pseudofs/pseudofs_vnops.c#2 integrate
.. //depot/projects/vimage/src/sys/fs/unionfs/union_subr.c#5 integrate
.. //depot/projects/vimage/src/sys/geom/eli/g_eli.c#3 integrate
.. //depot/projects/vimage/src/sys/geom/journal/g_journal.c#4 integrate
.. //depot/projects/vimage/src/sys/geom/uzip/g_uzip.c#2 integrate
.. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum.h#2 integrate
.. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_rm.c#2 integrate
.. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_share.c#2 integrate
.. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_subr.c#2 integrate
.. //depot/projects/vimage/src/sys/i386/conf/GENERIC#7 integrate
.. //depot/projects/vimage/src/sys/i386/i386/bios.c#2 integrate
.. //depot/projects/vimage/src/sys/i386/i386/busdma_machdep.c#3 integrate
.. //depot/projects/vimage/src/sys/i386/i386/identcpu.c#4 integrate
.. //depot/projects/vimage/src/sys/i386/i386/initcpu.c#2 integrate
.. //depot/projects/vimage/src/sys/i386/i386/minidump_machdep.c#2 integrate
.. //depot/projects/vimage/src/sys/i386/i386/mp_machdep.c#4 integrate
.. //depot/projects/vimage/src/sys/i386/i386/pmap.c#4 integrate
.. //depot/projects/vimage/src/sys/i386/i386/trap.c#4 integrate
.. //depot/projects/vimage/src/sys/i386/include/pmap.h#3 integrate
.. //depot/projects/vimage/src/sys/i386/include/specialreg.h#4 integrate
.. //depot/projects/vimage/src/sys/i386/include/vmparam.h#2 integrate
.. //depot/projects/vimage/src/sys/ia64/conf/GENERIC#3 integrate
.. //depot/projects/vimage/src/sys/ia64/include/vmparam.h#2 integrate
.. //depot/projects/vimage/src/sys/isa/isa_common.c#2 integrate
.. //depot/projects/vimage/src/sys/kern/kern_descrip.c#5 integrate
.. //depot/projects/vimage/src/sys/kern/kern_event.c#3 integrate
.. //depot/projects/vimage/src/sys/kern/kern_fork.c#6 integrate
.. //depot/projects/vimage/src/sys/kern/kern_intr.c#5 integrate
.. //depot/projects/vimage/src/sys/kern/kern_jail.c#3 integrate
.. //depot/projects/vimage/src/sys/kern/kern_malloc.c#2 integrate
.. //depot/projects/vimage/src/sys/kern/kern_mbuf.c#3 integrate
.. //depot/projects/vimage/src/sys/kern/kern_mib.c#2 integrate
.. //depot/projects/vimage/src/sys/kern/kern_mutex.c#4 integrate
.. //depot/projects/vimage/src/sys/kern/kern_prot.c#3 integrate
.. //depot/projects/vimage/src/sys/kern/kern_sx.c#3 integrate
.. //depot/projects/vimage/src/sys/kern/sched_ule.c#6 integrate
.. //depot/projects/vimage/src/sys/kern/subr_lock.c#4 integrate
.. //depot/projects/vimage/src/sys/kern/subr_rman.c#4 integrate
.. //depot/projects/vimage/src/sys/kern/subr_witness.c#4 integrate
.. //depot/projects/vimage/src/sys/kern/sys_generic.c#3 integrate
.. //depot/projects/vimage/src/sys/kern/uipc_mbuf.c#4 integrate
.. //depot/projects/vimage/src/sys/kern/uipc_mqueue.c#3 integrate
.. //depot/projects/vimage/src/sys/kern/uipc_syscalls.c#7 integrate
.. //depot/projects/vimage/src/sys/kern/uipc_usrreq.c#5 integrate
.. //depot/projects/vimage/src/sys/kern/vfs_cache.c#3 integrate
.. //depot/projects/vimage/src/sys/kern/vfs_lookup.c#4 integrate
.. //depot/projects/vimage/src/sys/kern/vfs_mount.c#4 integrate
.. //depot/projects/vimage/src/sys/kern/vfs_subr.c#3 integrate
.. //depot/projects/vimage/src/sys/kern/vfs_syscalls.c#4 integrate
.. //depot/projects/vimage/src/sys/libkern/index.c#2 integrate
.. //depot/projects/vimage/src/sys/libkern/memset.c#1 branch
.. //depot/projects/vimage/src/sys/libkern/rindex.c#2 integrate
.. //depot/projects/vimage/src/sys/modules/Makefile#5 integrate
.. //depot/projects/vimage/src/sys/modules/cam/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/modules/cxgb/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/modules/dpt/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/modules/if_lagg/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/libalias/libalias/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/modules/zfs/Makefile#1 branch
.. //depot/projects/vimage/src/sys/net/ieee8023ad_lacp.c#1 branch
.. //depot/projects/vimage/src/sys/net/ieee8023ad_lacp.h#1 branch
.. //depot/projects/vimage/src/sys/net/if.c#10 integrate
.. //depot/projects/vimage/src/sys/net/if_ethersubr.c#9 integrate
.. //depot/projects/vimage/src/sys/net/if_lagg.c#1 branch
.. //depot/projects/vimage/src/sys/net/if_lagg.h#1 branch
.. //depot/projects/vimage/src/sys/net/if_var.h#7 integrate
.. //depot/projects/vimage/src/sys/netgraph/ng_ppp.c#5 integrate
.. //depot/projects/vimage/src/sys/netinet/in_pcb.c#8 integrate
.. //depot/projects/vimage/src/sys/netinet/in_pcb.h#6 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_fw2.c#12 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_var.h#4 integrate
.. //depot/projects/vimage/src/sys/netinet/libalias/alias_db.c#3 integrate
.. //depot/projects/vimage/src/sys/netinet/libalias/alias_ftp.c#2 integrate
.. //depot/projects/vimage/src/sys/netinet/libalias/alias_irc.c#2 integrate
.. //depot/projects/vimage/src/sys/netinet/libalias/alias_proxy.c#3 integrate
.. //depot/projects/vimage/src/sys/netinet/libalias/alias_skinny.c#2 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_constants.h#6 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_crc32.c#4 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_indata.c#7 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_input.c#7 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_lock_bsd.h#4 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_output.c#7 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_pcb.c#7 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_peeloff.c#5 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_structs.h#7 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_timer.c#6 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_uio.h#5 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_usrreq.c#7 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_var.h#6 integrate
.. //depot/projects/vimage/src/sys/netinet/sctputil.c#7 integrate
.. //depot/projects/vimage/src/sys/netinet/sctputil.h#6 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp.h#3 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_input.c#9 edit
.. //depot/projects/vimage/src/sys/netinet/tcp_output.c#7 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_sack.c#6 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#13 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_syncache.c#8 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_timer.c#9 edit
.. //depot/projects/vimage/src/sys/netinet/tcp_timer.h#3 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_usrreq.c#7 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_var.h#7 integrate
.. //depot/projects/vimage/src/sys/netinet6/ipsec.c#3 integrate
.. //depot/projects/vimage/src/sys/netinet6/sctp6_usrreq.c#7 integrate
.. //depot/projects/vimage/src/sys/netipsec/ipsec_osdep.h#2 integrate
.. //depot/projects/vimage/src/sys/netnatm/natm.h#3 integrate
.. //depot/projects/vimage/src/sys/netsmb/smb_dev.c#3 integrate
.. //depot/projects/vimage/src/sys/nfsserver/nfs_srvsock.c#3 integrate
.. //depot/projects/vimage/src/sys/opencrypto/cryptodev.c#3 integrate
.. //depot/projects/vimage/src/sys/pc98/conf/GENERIC#3 integrate
.. //depot/projects/vimage/src/sys/pci/if_rlreg.h#4 integrate
.. //depot/projects/vimage/src/sys/pci/if_vr.c#3 integrate
.. //depot/projects/vimage/src/sys/pci/if_vrreg.h#2 integrate
.. //depot/projects/vimage/src/sys/pci/intpm.c#5 integrate
.. //depot/projects/vimage/src/sys/pci/ncr.c#3 integrate
.. //depot/projects/vimage/src/sys/powerpc/conf/GENERIC#3 integrate
.. //depot/projects/vimage/src/sys/powerpc/powerpc/nexus.c#3 integrate
.. //depot/projects/vimage/src/sys/rpc/types.h#1 branch
.. //depot/projects/vimage/src/sys/security/audit/audit.c#4 integrate
.. //depot/projects/vimage/src/sys/security/audit/audit.h#2 integrate
.. //depot/projects/vimage/src/sys/security/audit/audit_arg.c#4 integrate
.. //depot/projects/vimage/src/sys/security/audit/audit_bsm.c#2 integrate
.. //depot/projects/vimage/src/sys/security/audit/audit_bsm_klib.c#3 integrate
.. //depot/projects/vimage/src/sys/security/audit/audit_bsm_token.c#3 integrate
.. //depot/projects/vimage/src/sys/security/audit/audit_private.h#2 integrate
.. //depot/projects/vimage/src/sys/security/audit/audit_syscalls.c#4 integrate
.. //depot/projects/vimage/src/sys/sparc64/conf/GENERIC#3 integrate
.. //depot/projects/vimage/src/sys/sparc64/include/vmparam.h#2 integrate
.. //depot/projects/vimage/src/sys/sun4v/conf/GENERIC#4 integrate
.. //depot/projects/vimage/src/sys/sun4v/include/smp.h#4 integrate
.. //depot/projects/vimage/src/sys/sun4v/include/vmparam.h#2 integrate
.. //depot/projects/vimage/src/sys/sys/eventhandler.h#3 integrate
.. //depot/projects/vimage/src/sys/sys/filedesc.h#2 integrate
.. //depot/projects/vimage/src/sys/sys/filio.h#2 integrate
.. //depot/projects/vimage/src/sys/sys/hash.h#2 integrate
.. //depot/projects/vimage/src/sys/sys/interrupt.h#4 integrate
.. //depot/projects/vimage/src/sys/sys/jail.h#2 integrate
.. //depot/projects/vimage/src/sys/sys/kernel.h#4 integrate
.. //depot/projects/vimage/src/sys/sys/libkern.h#2 integrate
.. //depot/projects/vimage/src/sys/sys/link_elf.h#2 integrate
.. //depot/projects/vimage/src/sys/sys/lock.h#3 integrate
.. //depot/projects/vimage/src/sys/sys/lock_profile.h#4 integrate
.. //depot/projects/vimage/src/sys/sys/mbuf.h#3 integrate
.. //depot/projects/vimage/src/sys/sys/mount.h#4 integrate
.. //depot/projects/vimage/src/sys/sys/mutex.h#4 integrate
.. //depot/projects/vimage/src/sys/sys/param.h#4 integrate
.. //depot/projects/vimage/src/sys/sys/priv.h#3 integrate
.. //depot/projects/vimage/src/sys/sys/proc.h#8 integrate
.. //depot/projects/vimage/src/sys/sys/socket.h#2 integrate
.. //depot/projects/vimage/src/sys/sys/sx.h#3 integrate
.. //depot/projects/vimage/src/sys/sys/sysctl.h#5 integrate
.. //depot/projects/vimage/src/sys/sys/systm.h#5 integrate
.. //depot/projects/vimage/src/sys/sys/unistd.h#2 integrate
.. //depot/projects/vimage/src/sys/ufs/ffs/ffs_snapshot.c#4 integrate
.. //depot/projects/vimage/src/sys/ufs/ffs/ffs_softdep.c#3 integrate
.. //depot/projects/vimage/src/sys/ufs/ffs/ffs_vfsops.c#3 integrate
.. //depot/projects/vimage/src/sys/ufs/ffs/ffs_vnops.c#3 integrate
.. //depot/projects/vimage/src/sys/vm/phys_pager.c#3 integrate
.. //depot/projects/vimage/src/sys/vm/vm_contig.c#3 integrate
.. //depot/projects/vimage/src/sys/vm/vm_fault.c#3 integrate
.. //depot/projects/vimage/src/sys/vm/vm_kern.c#4 integrate
.. //depot/projects/vimage/src/sys/vm/vm_param.h#2 integrate
Differences ...
==== //depot/projects/vimage/src/sys/Makefile#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/Makefile,v 1.41 2007/03/24 22:21:01 maxim Exp $
+# $FreeBSD: src/sys/Makefile,v 1.42 2007/04/14 16:29:15 maxim Exp $
.include <bsd.own.mk>
@@ -8,10 +8,10 @@
.endif
# Directories to include in cscope name file and TAGS.
-CSCOPEDIRS= cam coda compat conf contrib crypto ddb dev fs geom gnu i4b \
- isa kern libkern modules net net80211 netatalk netatm \
+CSCOPEDIRS= bsm cam coda compat conf contrib crypto ddb dev fs geom gnu \
+ i4b isa kern libkern modules net net80211 netatalk netatm \
netgraph netinet netinet6 netipx netkey netnatm netncp \
- netsmb nfs nfsclient nfs4client rpc pccard pci sys \
+ netsmb nfs nfsclient nfs4client rpc pccard pci security sys \
ufs vm ${ARCHDIR}
ARCHDIR ?= ${MACHINE}
==== //depot/projects/vimage/src/sys/amd64/amd64/busdma_machdep.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.79 2007/03/06 18:28:42 scottl Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.80 2007/04/17 21:05:34 jhb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -48,6 +48,7 @@
#include <machine/atomic.h>
#include <machine/bus.h>
#include <machine/md_var.h>
+#include <machine/specialreg.h>
#define MAX_BPAGES 8192
@@ -522,6 +523,9 @@
} else if ((uintptr_t)*vaddr & (dmat->alignment - 1)) {
printf("bus_dmamem_alloc failed to align memory properly.\n");
}
+ if (flags & BUS_DMA_NOCACHE)
+ pmap_change_attr((vm_offset_t)*vaddr, dmat->maxsize,
+ PAT_UNCACHEABLE);
CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d",
__func__, dmat, dmat->flags, ENOMEM);
return (0);
@@ -540,6 +544,7 @@
*/
if (map != NULL)
panic("bus_dmamem_free: Invalid map freed\n");
+ pmap_change_attr((vm_offset_t)vaddr, dmat->maxsize, PAT_WRITE_BACK);
if ((dmat->maxsize <= PAGE_SIZE) &&
(dmat->alignment < dmat->maxsize) &&
dmat->lowaddr >= ptoa((vm_paddr_t)Maxmem))
==== //depot/projects/vimage/src/sys/amd64/amd64/pmap.c#4 (text+ko) ====
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.581 2007/03/10 20:26:43 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.582 2007/04/13 16:07:29 alc Exp $");
/*
* Manages physical address maps.
@@ -3261,7 +3261,7 @@
pd_entry_t *pde;
pt_entry_t *pte;
- base = va & PG_FRAME;
+ base = trunc_page(va);
offset = va & PAGE_MASK;
size = roundup(offset + size, PAGE_SIZE);
==== //depot/projects/vimage/src/sys/amd64/conf/GENERIC#5 (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.473 2007/02/09 19:03:17 brooks Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.475 2007/04/10 21:40:12 pjd Exp $
cpu HAMMER
ident GENERIC
@@ -34,6 +34,7 @@
options SOFTUPDATES # Enable FFS soft updates support
options UFS_ACL # Support for access control lists
options UFS_DIRHASH # Improve performance on big directories
+options UFS_GJOURNAL # Enable gjournal-based UFS journaling
options MD_ROOT # MD is a potential root device
options NFSCLIENT # Network Filesystem Client
options NFSSERVER # Network Filesystem Server
==== //depot/projects/vimage/src/sys/amd64/include/vmparam.h#2 (text+ko) ====
@@ -38,7 +38,7 @@
* SUCH DAMAGE.
*
* from: @(#)vmparam.h 5.9 (Berkeley) 5/12/91
- * $FreeBSD: src/sys/amd64/include/vmparam.h,v 1.45 2004/10/27 17:21:15 peter Exp $
+ * $FreeBSD: src/sys/amd64/include/vmparam.h,v 1.46 2007/04/21 01:14:47 sepotvin Exp $
*/
@@ -122,7 +122,8 @@
/*
* How many physical pages per KVA page allocated.
- * min(max(VM_KMEM_SIZE, Physical memory/VM_KMEM_SIZE_SCALE), VM_KMEM_SIZE_MAX)
+ * min(max(max(VM_KMEM_SIZE, Physical memory/VM_KMEM_SIZE_SCALE),
+ * VM_KMEM_SIZE_MIN), VM_KMEM_SIZE_MAX)
* is the total KVA space allocated for kmem_map.
*/
#ifndef VM_KMEM_SIZE_SCALE
==== //depot/projects/vimage/src/sys/amd64/linux32/linux32_dummy.c#4 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_dummy.c,v 1.8 2007/03/29 02:11:46 julian Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_dummy.c,v 1.9 2007/04/18 18:08:12 jkim Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -64,7 +64,6 @@
DUMMY(mincore);
DUMMY(fadvise64);
DUMMY(ptrace);
-DUMMY(settimeofday);
DUMMY(lookup_dcookie);
DUMMY(epoll_create);
DUMMY(epoll_ctl);
==== //depot/projects/vimage/src/sys/amd64/linux32/linux32_machdep.c#7 (text+ko) ====
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.39 2007/03/30 17:27:13 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.42 2007/04/18 20:12:05 jkim Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -252,7 +252,7 @@
if (iovcnt > UIO_MAXIOV)
return (EINVAL);
iovlen = iovcnt * sizeof(struct iovec);
- uio = malloc(iovlen + sizeof *uio, M_IOV, M_WAITOK);
+ uio = malloc(iovlen + sizeof(*uio), M_IOV, M_WAITOK);
iov = (struct iovec *)(uio + 1);
for (i = 0; i < iovcnt; i++) {
error = copyin(&iovp[i], &iov32, sizeof(struct iovec32));
@@ -526,7 +526,9 @@
td2 = FIRST_THREAD_IN_PROC(p2);
- /* make it run */
+ /*
+ * Make this runnable after we are finished with it.
+ */
mtx_lock_spin(&sched_lock);
TD_SET_CAN_RUN(td2);
sched_add(td2, SRQ_BORING);
@@ -572,8 +574,8 @@
/*
* XXX: In Linux, sharing of fs info (chroot/cwd/umask)
* and open files is independant. In FreeBSD, its in one
- * structure but in reality it does not make any problems
- * because both of these flags are set at once usually.
+ * structure but in reality it does not cause any problems
+ * because both of these flags are usually set together.
*/
if (!(args->flags & (LINUX_CLONE_FILES | LINUX_CLONE_FS)))
ff |= RFFDG;
@@ -660,15 +662,15 @@
if (args->flags & LINUX_CLONE_SETTLS) {
struct user_segment_descriptor sd;
struct l_user_desc info;
- int a[2];
+ int a[2];
- error = copyin((void *)td->td_frame->tf_rsi, &info,
+ error = copyin((void *)td->td_frame->tf_rsi, &info,
sizeof(struct l_user_desc));
if (error) {
printf(LMSG("copyin failed!"));
} else {
/* We might copy out the entry_number as GUGS32_SEL. */
- info.entry_number = GUGS32_SEL;
+ info.entry_number = GUGS32_SEL;
error = copyout(&info, (void *)td->td_frame->tf_rsi,
sizeof(struct l_user_desc));
if (error)
@@ -871,7 +873,7 @@
*
* Our mmap with MAP_STACK takes addr as the maximum
* downsize limit on BOS, and as len the max size of
- * the region. It them maps the top SGROWSIZ bytes,
+ * the region. It then maps the top SGROWSIZ bytes,
* and auto grows the region down, up to the limit
* in addr.
*
@@ -1167,17 +1169,44 @@
microtime(&atv);
atv32.tv_sec = atv.tv_sec;
atv32.tv_usec = atv.tv_usec;
- error = copyout(&atv32, uap->tp, sizeof (atv32));
+ error = copyout(&atv32, uap->tp, sizeof(atv32));
}
if (error == 0 && uap->tzp != NULL) {
rtz.tz_minuteswest = tz_minuteswest;
rtz.tz_dsttime = tz_dsttime;
- error = copyout(&rtz, uap->tzp, sizeof (rtz));
+ error = copyout(&rtz, uap->tzp, sizeof(rtz));
}
return (error);
}
int
+linux_settimeofday(struct thread *td, struct linux_settimeofday_args *uap)
+{
+ l_timeval atv32;
+ struct timeval atv, *tvp;
+ struct timezone atz, *tzp;
+ int error;
+
+ if (uap->tp) {
+ error = copyin(uap->tp, &atv32, sizeof(atv32));
+ if (error)
+ return (error);
+ atv.tv_sec = atv32.tv_sec;
+ atv.tv_usec = atv32.tv_usec;
+ tvp = &atv;
+ } else
+ tvp = NULL;
+ if (uap->tzp) {
+ error = copyin(uap->tzp, &atz, sizeof(atz));
+ if (error)
+ return (error);
+ tzp = &atz;
+ } else
+ tzp = NULL;
+ return (kern_settimeofday(td, tvp, tzp));
+}
+
+int
linux_getrusage(struct thread *td, struct linux_getrusage_args *uap)
{
struct l_rusage s32;
@@ -1242,7 +1271,7 @@
#ifdef DEBUG
if (ldebug(set_thread_area))
- printf(ARGS(set_thread_area, "%i, %x, %x, %i, %i, %i, "
+ printf(ARGS(set_thread_area, "%i, %x, %x, %i, %i, %i, "
"%i, %i, %i"), info.entry_number, info.base_addr,
info.limit, info.seg_32bit, info.contents,
info.read_exec_only, info.limit_in_pages,
@@ -1261,9 +1290,10 @@
* The tls_array[] is used only in [gs]et_thread_area() syscalls and
* for loading the GDT descriptors. We use just one GDT descriptor
* for TLS, so we will load just one.
- * XXX: This doesnt work when user-space process tries to use more
+ *
+ * XXX: This doesn't work when a user space process tries to use more
* than one TLS segment. Comment in the Linux source says wine might
- * do that.
+ * do this.
*/
/*
@@ -1284,8 +1314,9 @@
/*
* We have to copy out the GDT entry we use.
- * XXX: What if userspace program does not check return value and
- * tries to use 6, 7 or 8?
+ *
+ * XXX: What if a user space program does not check the return value
+ * and tries to use 6, 7 or 8?
*/
error = copyout(&info, args->desc, sizeof(struct l_user_desc));
if (error)
==== //depot/projects/vimage/src/sys/boot/forth/loader.conf#5 (text+ko) ====
@@ -6,7 +6,7 @@
#
# All arguments must be in double quotes.
#
-# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.118 2007/02/04 06:35:10 imp Exp $
+# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.120 2007/04/09 22:09:09 pjd Exp $
##############################################################
### Basic configuration options ############################
@@ -138,6 +138,7 @@
#umapfs_load="NO" # User-id map filesystem
unionfs_load="NO" # Union filesystem
xfs_load="NO" # XFS
+zfs_load="NO" # ZFS
# Related stuff
@@ -418,3 +419,10 @@
#module_after="cmd" # executes "cmd" after loading the module
#module_error="cmd" # executes "cmd" if load fails
+##############################################################
+### Always try to load ZFS pool cache file #################
+##############################################################
+
+zpool_cache_load="YES"
+zpool_cache_type="/boot/zfs/zpool.cache"
+zpool_cache_name="/boot/zfs/zpool.cache"
==== //depot/projects/vimage/src/sys/boot/pc98/boot0.5/Makefile#2 (text+ko) ====
@@ -1,10 +1,11 @@
-# $FreeBSD: src/sys/boot/pc98/boot0.5/Makefile,v 1.4 2004/12/21 08:47:16 ru Exp $
+# $FreeBSD: src/sys/boot/pc98/boot0.5/Makefile,v 1.6 2007/04/07 13:37:45 nyan Exp $
PROG= ${BOOT}.out
INTERNALPROG=
FILES= ${BOOT}
NO_MAN=
-SRCS= start.s boot.s boot0.5.s disk.s selector.s support.s syscons.s
+SRCS= start.s boot.s boot0.5.s disk.s selector.s support.s syscons.s \
+ putssjis.s
CLEANFILES= ${BOOT} ${BOOT}.bin
BOOT= boot0.5
@@ -13,7 +14,7 @@
# unless you are glutton for punishment.
BOOT_BOOT0_ORG?= 0x0000
-LDFLAGS=-N -e start -Ttext ${BOOT_BOOT0_ORG}
+LDFLAGS=-N -e start -Ttext ${BOOT_BOOT0_ORG} -Wl,-T,${.CURDIR}/ldscript
# The size of boot0.5 must be 7168 bytes
${BOOT}: ${BOOT}.bin
==== //depot/projects/vimage/src/sys/boot/pc98/boot0.5/boot0.5.s#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# Copyright (c) KATO Takenori, 1999, 2000.
+# Copyright (c) KATO Takenori, 1999, 2000, 2007.
#
# All rights reserved. Unpublished rights reserved under the copyright
# laws of Japan.
@@ -25,7 +25,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/boot/pc98/boot0.5/boot0.5.s,v 1.3 2007/03/17 05:30:03 kato Exp $
+# $FreeBSD: src/sys/boot/pc98/boot0.5/boot0.5.s,v 1.4 2007/04/07 08:37:04 kato Exp $
#
.global main
.code16
@@ -261,8 +261,8 @@
.global ishireso
ishireso: .byte 0
-title: .asciz "PC98 Boot Selector Version 1.1"
-copyright: .ascii "(C)Copyright 1999, 2000 KATO Takenori. "
+title: .asciz "PC98 Boot Selector Version 1.2"
+copyright: .ascii "(C)Copyright 1999-2007 KATO Takenori. "
.asciz "All rights reserved."
msg_device: .asciz "Device"
msg_sasi: .asciz "SASI/IDE unit "
==== //depot/projects/vimage/src/sys/boot/pc98/boot0.5/selector.s#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# Copyright (c) KATO Takenori, 1999, 2000.
+# Copyright (c) KATO Takenori, 1999, 2000, 2007.
#
# All rights reserved. Unpublished rights reserved under the copyright
# laws of Japan.
@@ -25,7 +25,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/boot/pc98/boot0.5/selector.s,v 1.2 2000/08/06 14:35:37 kato Exp $
+# $FreeBSD: src/sys/boot/pc98/boot0.5/selector.s,v 1.3 2007/04/07 08:37:04 kato Exp $
#
.code16
@@ -299,6 +299,11 @@
jne dev_right
movw $3, mode # N88-BASIC
ret
+
+ # XXX
+ .space 5, 0x90
+ ret # Dummy ret @0x9ab
+
dev_up:
cmpw $0, curdevice
je devmode_loop
==== //depot/projects/vimage/src/sys/boot/pc98/boot0.5/start.s#2 (text+ko) ====
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list