Date: Fri, 13 Apr 2007 20:06:06 GMT From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 118048 for review Message-ID: <200704132006.l3DK66ku032424@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=118048 Change 118048 by marcel@marcel_cluster on 2007/04/13 20:05:29 IFC @118042 Affected files ... .. //depot/projects/uart/amd64/amd64/pmap.c#45 integrate .. //depot/projects/uart/amd64/conf/GENERIC#27 integrate .. //depot/projects/uart/boot/forth/loader.conf#14 integrate .. //depot/projects/uart/boot/pc98/boot0.5/Makefile#4 integrate .. //depot/projects/uart/boot/pc98/boot0.5/boot0.5.s#3 integrate .. //depot/projects/uart/boot/pc98/boot0.5/ldscript#1 branch .. //depot/projects/uart/boot/pc98/boot0.5/putssjis.s#1 branch .. //depot/projects/uart/boot/pc98/boot0.5/selector.s#2 integrate .. //depot/projects/uart/boot/pc98/boot0.5/start.s#2 integrate .. //depot/projects/uart/boot/pc98/boot2/boot.c#6 integrate .. //depot/projects/uart/cam/scsi/scsi_sg.c#1 branch .. //depot/projects/uart/cam/scsi/scsi_sg.h#1 branch .. //depot/projects/uart/compat/linprocfs/linprocfs.c#24 integrate .. //depot/projects/uart/compat/linux/linux_file.c#13 integrate .. //depot/projects/uart/compat/linux/linux_ioctl.c#12 integrate .. //depot/projects/uart/compat/linux/linux_ioctl.h#6 integrate .. //depot/projects/uart/compat/ndis/kern_ndis.c#10 integrate .. //depot/projects/uart/compat/ndis/ndis_var.h#7 integrate .. //depot/projects/uart/compat/ndis/subr_ndis.c#10 integrate .. //depot/projects/uart/compat/ndis/subr_pe.c#5 integrate .. //depot/projects/uart/compat/opensolaris/kern/opensolaris_kmem.c#1 branch .. //depot/projects/uart/compat/opensolaris/kern/opensolaris_kobj.c#1 branch .. //depot/projects/uart/compat/opensolaris/kern/opensolaris_kstat.c#1 branch .. //depot/projects/uart/compat/opensolaris/kern/opensolaris_misc.c#1 branch .. //depot/projects/uart/compat/opensolaris/kern/opensolaris_policy.c#1 branch .. //depot/projects/uart/compat/opensolaris/kern/opensolaris_string.c#1 branch .. //depot/projects/uart/compat/opensolaris/kern/opensolaris_vfs.c#1 branch .. //depot/projects/uart/compat/opensolaris/kern/opensolaris_zone.c#1 branch .. //depot/projects/uart/compat/opensolaris/machine/endian.h#1 branch .. //depot/projects/uart/compat/opensolaris/rpc/xdr.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/acl.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/byteorder.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/callb.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/cmn_err.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/cred.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/debug.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/dirent.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/dkio.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/kcondvar.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/kmem.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/kobj.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/kstat.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/lock.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/misc.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/mntent.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/mnttab.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/mount.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/mutex.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/policy.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/proc.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/random.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/rwlock.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/sdt.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/string.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/sysmacros.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/systm.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/taskq.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/taskq_impl.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/time.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/types.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/uio.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/varargs.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/vfs.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/vnode.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/zone.h#1 branch .. //depot/projects/uart/compat/svr4/svr4_filio.c#6 integrate .. //depot/projects/uart/conf/NOTES#50 integrate .. //depot/projects/uart/conf/files#81 integrate .. //depot/projects/uart/conf/files.amd64#28 integrate .. //depot/projects/uart/conf/files.i386#34 integrate .. //depot/projects/uart/conf/files.ia64#21 integrate .. //depot/projects/uart/conf/files.pc98#28 integrate .. //depot/projects/uart/conf/files.powerpc#15 integrate .. //depot/projects/uart/conf/options#47 integrate .. //depot/projects/uart/contrib/dev/acpica/utmisc.c#7 integrate .. //depot/projects/uart/contrib/opensolaris/common/acl/acl_common.c#1 branch .. //depot/projects/uart/contrib/opensolaris/common/acl/acl_common.h#1 branch .. //depot/projects/uart/contrib/opensolaris/common/atomic/amd64/atomic.S#1 branch .. //depot/projects/uart/contrib/opensolaris/common/atomic/i386/atomic.S#1 branch .. //depot/projects/uart/contrib/opensolaris/common/avl/avl.c#1 branch .. //depot/projects/uart/contrib/opensolaris/common/nvpair/nvpair.c#1 branch .. //depot/projects/uart/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c#1 branch .. //depot/projects/uart/contrib/opensolaris/common/zfs/zfs_namecheck.c#1 branch .. //depot/projects/uart/contrib/opensolaris/common/zfs/zfs_namecheck.h#1 branch .. //depot/projects/uart/contrib/opensolaris/common/zfs/zfs_prop.c#1 branch .. //depot/projects/uart/contrib/opensolaris/common/zfs/zfs_prop.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/Makefile.files#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/dnlc.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/gfs.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/arc.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/bplist.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/dmu.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/dnode.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/gzip.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/lzjb.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/refcount.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sha256.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/spa.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/space_map.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_file.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_rlock.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/txg.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/uberblock.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/unique.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/vdev.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zap.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zfs.conf#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zil.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zio.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zvol.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/os/callb.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/os/list.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/os/nvpair_alloc_system.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/os/taskq.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/rpc/xdr.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/rpc/xdr.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/rpc/xdr_array.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/rpc/xdr_mem.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/asm_linkage.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/atomic.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/avl.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/avl_impl.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/bitmap.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/byteorder.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/callb.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/ccompile.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/compress.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/cred.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/debug.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/dkio.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/dklabel.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/dnlc.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/errorq.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/feature_tests.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/fm/protocol.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/fm/util.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/fs/zfs.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/gfs.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/isa_defs.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/list.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/list_impl.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/note.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/nvpair.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/nvpair_impl.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/processor.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/procset.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/sdt.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/synch.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/sysevent.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/sysmacros.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/vfs.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/vmem.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/zmod.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/zmod/adler32.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/zmod/crc32.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/zmod/crc32.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/zmod/deflate.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/zmod/deflate.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/zmod/inffast.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/zmod/inffast.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/zmod/inffixed.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/zmod/inflate.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/zmod/inflate.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/zmod/inftrees.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/zmod/inftrees.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/zmod/trees.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/zmod/zconf.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/zmod/zlib.h#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/zmod/zmod.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/zmod/zmod_subr.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/zmod/zutil.c#1 branch .. //depot/projects/uart/contrib/opensolaris/uts/common/zmod/zutil.h#1 branch .. //depot/projects/uart/dev/ata/ata-all.h#17 integrate .. //depot/projects/uart/dev/ata/ata-chipset.c#26 integrate .. //depot/projects/uart/dev/ata/ata-dma.c#14 integrate .. //depot/projects/uart/dev/ata/ata-lowlevel.c#22 integrate .. //depot/projects/uart/dev/ata/ata_if.m#3 integrate .. //depot/projects/uart/dev/ath/ah_osdep.c#2 integrate .. //depot/projects/uart/dev/cxgb/cxgb_adapter.h#3 integrate .. //depot/projects/uart/dev/cxgb/cxgb_lro.c#2 integrate .. //depot/projects/uart/dev/cxgb/cxgb_main.c#3 integrate .. //depot/projects/uart/dev/cxgb/cxgb_osdep.h#2 integrate .. //depot/projects/uart/dev/cxgb/cxgb_sge.c#3 integrate .. //depot/projects/uart/dev/cxgb/sys/mvec.h#1 branch .. //depot/projects/uart/dev/cxgb/sys/uipc_mvec.c#1 branch .. //depot/projects/uart/dev/if_ndis/if_ndis_pccard.c#5 integrate .. //depot/projects/uart/dev/mii/brgphy.c#18 integrate .. //depot/projects/uart/dev/mii/miidevs#12 integrate .. //depot/projects/uart/dev/mpt/mpt_cam.c#23 integrate .. //depot/projects/uart/dev/msk/if_msk.c#2 integrate .. //depot/projects/uart/dev/mxge/if_mxge.c#9 integrate .. //depot/projects/uart/dev/sound/pci/cmi.c#14 integrate .. //depot/projects/uart/dev/streams/streams.c#8 integrate .. //depot/projects/uart/dev/uart/uart_bus_pci.c#20 integrate .. //depot/projects/uart/dev/usb/if_ural.c#14 integrate .. //depot/projects/uart/dev/usb/usbdevs#31 integrate .. //depot/projects/uart/fs/devfs/devfs_vnops.c#21 integrate .. //depot/projects/uart/fs/fdescfs/fdesc_vfsops.c#10 integrate .. //depot/projects/uart/fs/fdescfs/fdesc_vnops.c#12 integrate .. //depot/projects/uart/fs/fifofs/fifo_vnops.c#12 integrate .. //depot/projects/uart/fs/pseudofs/pseudofs.c#8 integrate .. //depot/projects/uart/fs/pseudofs/pseudofs.h#7 integrate .. //depot/projects/uart/fs/pseudofs/pseudofs_fileno.c#3 integrate .. //depot/projects/uart/fs/pseudofs/pseudofs_internal.h#3 integrate .. //depot/projects/uart/fs/pseudofs/pseudofs_vncache.c#8 integrate .. //depot/projects/uart/fs/unionfs/union_subr.c#10 integrate .. //depot/projects/uart/geom/eli/g_eli.c#13 integrate .. //depot/projects/uart/geom/journal/g_journal.c#4 integrate .. //depot/projects/uart/geom/uzip/g_uzip.c#5 integrate .. //depot/projects/uart/geom/vinum/geom_vinum.h#7 integrate .. //depot/projects/uart/geom/vinum/geom_vinum_rm.c#7 integrate .. //depot/projects/uart/geom/vinum/geom_vinum_share.c#3 integrate .. //depot/projects/uart/geom/vinum/geom_vinum_subr.c#6 integrate .. //depot/projects/uart/i386/conf/GENERIC#26 integrate .. //depot/projects/uart/i386/i386/identcpu.c#25 integrate .. //depot/projects/uart/i386/i386/initcpu.c#10 integrate .. //depot/projects/uart/i386/i386/minidump_machdep.c#3 integrate .. //depot/projects/uart/i386/i386/mp_machdep.c#28 integrate .. //depot/projects/uart/i386/i386/pmap.c#48 integrate .. //depot/projects/uart/i386/i386/trap.c#19 integrate .. //depot/projects/uart/i386/include/pmap.h#14 integrate .. //depot/projects/uart/i386/include/specialreg.h#9 integrate .. //depot/projects/uart/i386/include/vmparam.h#4 integrate .. //depot/projects/uart/ia64/conf/GENERIC#18 integrate .. //depot/projects/uart/kern/kern_descrip.c#28 integrate .. //depot/projects/uart/kern/kern_event.c#17 integrate .. //depot/projects/uart/kern/kern_fork.c#20 integrate .. //depot/projects/uart/kern/kern_jail.c#11 integrate .. //depot/projects/uart/kern/kern_mbuf.c#15 integrate .. //depot/projects/uart/kern/kern_mib.c#7 integrate .. //depot/projects/uart/kern/kern_mutex.c#20 integrate .. //depot/projects/uart/kern/kern_sx.c#13 integrate .. //depot/projects/uart/kern/subr_lock.c#4 integrate .. //depot/projects/uart/kern/subr_witness.c#22 integrate .. //depot/projects/uart/kern/sys_generic.c#17 integrate .. //depot/projects/uart/kern/uipc_mqueue.c#9 integrate .. //depot/projects/uart/kern/uipc_syscalls.c#27 integrate .. //depot/projects/uart/kern/uipc_usrreq.c#20 integrate .. //depot/projects/uart/kern/vfs_cache.c#13 integrate .. //depot/projects/uart/kern/vfs_lookup.c#18 integrate .. //depot/projects/uart/kern/vfs_mount.c#32 integrate .. //depot/projects/uart/kern/vfs_subr.c#40 integrate .. //depot/projects/uart/kern/vfs_syscalls.c#33 integrate .. //depot/projects/uart/libkern/index.c#3 integrate .. //depot/projects/uart/libkern/memset.c#1 branch .. //depot/projects/uart/libkern/rindex.c#4 integrate .. //depot/projects/uart/modules/Makefile#47 integrate .. //depot/projects/uart/modules/cam/Makefile#6 integrate .. //depot/projects/uart/modules/cxgb/Makefile#2 integrate .. //depot/projects/uart/modules/dpt/Makefile#2 integrate .. //depot/projects/uart/modules/if_trunk/Makefile#1 branch .. //depot/projects/uart/modules/libalias/libalias/Makefile#2 integrate .. //depot/projects/uart/modules/zfs/Makefile#1 branch .. //depot/projects/uart/net/ieee8023ad_lacp.c#1 branch .. //depot/projects/uart/net/ieee8023ad_lacp.h#1 branch .. //depot/projects/uart/net/if.c#27 integrate .. //depot/projects/uart/net/if_ethersubr.c#22 integrate .. //depot/projects/uart/net/if_trunk.c#1 branch .. //depot/projects/uart/net/if_trunk.h#1 branch .. //depot/projects/uart/net/if_var.h#15 integrate .. //depot/projects/uart/netatm/atm_if.c#9 integrate .. //depot/projects/uart/netinet/in_pcb.c#24 integrate .. //depot/projects/uart/netinet/in_pcb.h#14 integrate .. //depot/projects/uart/netinet/ip_fw2.c#30 integrate .. //depot/projects/uart/netinet/ip_var.h#12 integrate .. //depot/projects/uart/netinet/libalias/alias_db.c#5 integrate .. //depot/projects/uart/netinet/libalias/alias_ftp.c#4 integrate .. //depot/projects/uart/netinet/libalias/alias_irc.c#4 integrate .. //depot/projects/uart/netinet/libalias/alias_proxy.c#5 integrate .. //depot/projects/uart/netinet/libalias/alias_skinny.c#4 integrate .. //depot/projects/uart/netinet/sctp_asconf.c#3 integrate .. //depot/projects/uart/netinet/sctp_bsd_addr.h#3 integrate .. //depot/projects/uart/netinet/sctp_constants.h#4 integrate .. //depot/projects/uart/netinet/sctp_indata.c#4 integrate .. //depot/projects/uart/netinet/sctp_input.c#4 integrate .. //depot/projects/uart/netinet/sctp_os_bsd.h#4 integrate .. //depot/projects/uart/netinet/sctp_output.c#4 integrate .. //depot/projects/uart/netinet/sctp_output.h#3 integrate .. //depot/projects/uart/netinet/sctp_pcb.c#4 integrate .. //depot/projects/uart/netinet/sctp_pcb.h#4 integrate .. //depot/projects/uart/netinet/sctp_sysctl.c#3 integrate .. //depot/projects/uart/netinet/sctp_sysctl.h#3 integrate .. //depot/projects/uart/netinet/sctp_timer.c#3 integrate .. //depot/projects/uart/netinet/sctp_uio.h#4 integrate .. //depot/projects/uart/netinet/sctp_usrreq.c#4 integrate .. //depot/projects/uart/netinet/sctputil.c#4 integrate .. //depot/projects/uart/netinet/tcp_input.c#32 integrate .. //depot/projects/uart/netinet/tcp_output.c#14 integrate .. //depot/projects/uart/netinet/tcp_sack.c#12 integrate .. //depot/projects/uart/netinet/tcp_subr.c#27 integrate .. //depot/projects/uart/netinet/tcp_syncache.c#21 integrate .. //depot/projects/uart/netinet/tcp_timer.c#18 integrate .. //depot/projects/uart/netinet/tcp_timer.h#7 integrate .. //depot/projects/uart/netinet/tcp_usrreq.c#20 integrate .. //depot/projects/uart/netinet/tcp_var.h#17 integrate .. //depot/projects/uart/netinet6/ipsec.c#14 integrate .. //depot/projects/uart/netinet6/sctp6_usrreq.c#4 integrate .. //depot/projects/uart/netipsec/ipsec_osdep.h#5 integrate .. //depot/projects/uart/netsmb/smb_dev.c#10 integrate .. //depot/projects/uart/opencrypto/cryptodev.c#11 integrate .. //depot/projects/uart/pc98/conf/GENERIC#21 integrate .. //depot/projects/uart/powerpc/conf/GENERIC#17 integrate .. //depot/projects/uart/rpc/types.h#1 branch .. //depot/projects/uart/security/audit/audit.c#9 integrate .. //depot/projects/uart/security/audit/audit.h#5 integrate .. //depot/projects/uart/security/audit/audit_arg.c#8 integrate .. //depot/projects/uart/security/audit/audit_bsm.c#7 integrate .. //depot/projects/uart/security/audit/audit_bsm_klib.c#6 integrate .. //depot/projects/uart/security/audit/audit_bsm_token.c#7 integrate .. //depot/projects/uart/security/audit/audit_private.h#7 integrate .. //depot/projects/uart/security/audit/audit_syscalls.c#7 integrate .. //depot/projects/uart/sparc64/conf/GENERIC#27 integrate .. //depot/projects/uart/sun4v/conf/GENERIC#4 integrate .. //depot/projects/uart/sun4v/include/smp.h#3 integrate .. //depot/projects/uart/sys/elf_common.h#7 integrate .. //depot/projects/uart/sys/eventhandler.h#7 integrate .. //depot/projects/uart/sys/filedesc.h#10 integrate .. //depot/projects/uart/sys/filio.h#4 integrate .. //depot/projects/uart/sys/hash.h#2 integrate .. //depot/projects/uart/sys/jail.h#8 integrate .. //depot/projects/uart/sys/kernel.h#14 integrate .. //depot/projects/uart/sys/libkern.h#10 integrate .. //depot/projects/uart/sys/link_elf.h#3 integrate .. //depot/projects/uart/sys/lock.h#12 integrate .. //depot/projects/uart/sys/lock_profile.h#3 integrate .. //depot/projects/uart/sys/mbuf.h#18 integrate .. //depot/projects/uart/sys/mount.h#23 integrate .. //depot/projects/uart/sys/mutex.h#18 integrate .. //depot/projects/uart/sys/param.h#32 integrate .. //depot/projects/uart/sys/priv.h#3 integrate .. //depot/projects/uart/sys/proc.h#28 integrate .. //depot/projects/uart/sys/sx.h#11 integrate .. //depot/projects/uart/sys/sysctl.h#14 integrate .. //depot/projects/uart/sys/systm.h#21 integrate .. //depot/projects/uart/sys/unistd.h#5 integrate .. //depot/projects/uart/ufs/ffs/ffs_snapshot.c#20 integrate .. //depot/projects/uart/ufs/ffs/ffs_softdep.c#25 integrate .. //depot/projects/uart/ufs/ffs/ffs_vfsops.c#30 integrate .. //depot/projects/uart/ufs/ffs/ffs_vnops.c#17 integrate .. //depot/projects/uart/vm/phys_pager.c#7 integrate .. //depot/projects/uart/vm/vm_fault.c#22 integrate .. //depot/projects/uart/vm/vm_kern.c#12 integrate Differences ... ==== //depot/projects/uart/amd64/amd64/pmap.c#45 (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/uart/amd64/conf/GENERIC#27 (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/uart/boot/forth/loader.conf#14 (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/uart/boot/pc98/boot0.5/Makefile#4 (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/uart/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/uart/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/uart/boot/pc98/boot0.5/start.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/start.s,v 1.2 2003/05/02 09:33:12 kato Exp $ +# $FreeBSD: src/sys/boot/pc98/boot0.5/start.s,v 1.3 2007/04/07 08:37:04 kato Exp $ # .global start .code16 @@ -34,8 +34,19 @@ start: jmp start1 + # Magic + .org 0x053, 0x20 + .byte 0x4e, 0x45, 0x43 + + .org 0x8f + .byte 0x32, 0x2e, 0x37, 0x30 + .org 0x2d4 start1: + # The instruction 'call 0x9ab' can be here. See also selector.s. + nop + nop + nop cli movw %cs, %ax movw %ax, %ds ==== //depot/projects/uart/boot/pc98/boot2/boot.c#6 (text+ko) ==== @@ -49,7 +49,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/boot/pc98/boot2/boot.c,v 1.16 2006/11/02 17:28:38 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/pc98/boot2/boot.c,v 1.17 2007/04/06 20:50:24 kan Exp $"); #include "boot.h" #include <a.out.h> @@ -70,7 +70,7 @@ static char kernel_config_namebuf[NAMEBUF_LEN + sizeof "config"]; static char linebuf[NAMEBUF_LEN]; static char namebuf[NAMEBUF_LEN]; -static struct bootinfo bootinfo; +struct bootinfo bootinfo; int loadflags; static void getbootdev(char *ptr, int *howto); ==== //depot/projects/uart/compat/linprocfs/linprocfs.c#24 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.108 2007/03/30 17:56:44 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.109 2007/04/06 18:15:56 jkim Exp $"); #include <sys/param.h> #include <sys/queue.h> @@ -1238,3 +1238,5 @@ PSEUDOFS(linprocfs, 1); MODULE_DEPEND(linprocfs, linux, 1, 1, 1); MODULE_DEPEND(linprocfs, procfs, 1, 1, 1); +MODULE_DEPEND(linprocfs, sysvmsg, 1, 1, 1); +MODULE_DEPEND(linprocfs, sysvsem, 1, 1, 1); ==== //depot/projects/uart/compat/linux/linux_file.c#13 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.102 2007/03/29 02:11:45 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.103 2007/04/04 09:11:31 rwatson Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -193,7 +193,7 @@ linux_at(struct thread *td, int dirfd, char *filename, char **newpath, char **freebuf) { struct file *fp; - int error = 0; + int error = 0, vfslocked; struct vnode *dvp; struct filedesc *fdp = td->td_proc->p_fd; char *fullpath = "unknown"; @@ -207,9 +207,10 @@ /* check for AT_FDWCD */ if (dirfd == LINUX_AT_FDCWD) { - FILEDESC_LOCK(fdp); + FILEDESC_SLOCK(fdp); dvp = fdp->fd_cdir; - FILEDESC_UNLOCK(fdp); + vref(dvp); + FILEDESC_SUNLOCK(fdp); } else { error = fget(td, dirfd, &fp); if (error) @@ -220,16 +221,28 @@ fdrop(fp, td); return (ENOTDIR); } + vref(dvp); fdrop(fp, td); } + /* + * XXXRW: This is bogus, as vn_fullpath() returns only an advisory + * file path, and may fail in several common situations, including + * for file systmes that don't use the name cache, and if the entry + * for the file falls out of the name cache. We should implement + * openat() in the FreeBSD native system call layer properly (using a + * requested starting directory), and have Linux and other ABIs wrap + * the native implementation. + */ error = vn_fullpath(td, dvp, &fullpath, &freepath); if (!error) { *newpath = malloc(strlen(fullpath) + strlen(filename) + 2, M_TEMP, M_WAITOK | M_ZERO); *freebuf = freepath; sprintf(*newpath, "%s/%s", fullpath, filename); } - + vfslocked = VFS_LOCK_GIANT(dvp->v_mount); + vrele(dvp); + VFS_UNLOCK_GIANT(vfslocked); return (error); } ==== //depot/projects/uart/compat/linux/linux_ioctl.c#12 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.137 2006/07/06 21:42:36 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.138 2007/04/07 19:40:58 scottl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -86,6 +86,7 @@ static linux_ioctl_function_t linux_ioctl_termio; static linux_ioctl_function_t linux_ioctl_private; static linux_ioctl_function_t linux_ioctl_drm; +static linux_ioctl_function_t linux_ioctl_sg; static linux_ioctl_function_t linux_ioctl_special; static struct linux_ioctl_handler cdrom_handler = @@ -108,6 +109,8 @@ { linux_ioctl_private, LINUX_IOCTL_PRIVATE_MIN, LINUX_IOCTL_PRIVATE_MAX }; static struct linux_ioctl_handler drm_handler = { linux_ioctl_drm, LINUX_IOCTL_DRM_MIN, LINUX_IOCTL_DRM_MAX }; +static struct linux_ioctl_handler sg_handler = +{ linux_ioctl_sg, LINUX_IOCTL_SG_MIN, LINUX_IOCTL_SG_MAX }; DATA_SET(linux_ioctl_handler_set, cdrom_handler); DATA_SET(linux_ioctl_handler_set, vfat_handler); @@ -119,6 +122,7 @@ DATA_SET(linux_ioctl_handler_set, termio_handler); DATA_SET(linux_ioctl_handler_set, private_handler); DATA_SET(linux_ioctl_handler_set, drm_handler); +DATA_SET(linux_ioctl_handler_set, sg_handler); struct handler_element { @@ -1583,6 +1587,11 @@ break; } + case LINUX_SCSI_GET_BUS_NUMBER: + case LINUX_SCSI_GET_IDLUN: + error = linux_ioctl_sg(td, args); + break; + /* LINUX_CDROM_SEND_PACKET */ /* LINUX_CDROM_NEXT_WRITABLE */ /* LINUX_CDROM_LAST_WRITTEN */ @@ -2522,6 +2531,24 @@ return ioctl(td, (struct ioctl_args *)args); } +static int +linux_ioctl_sg(struct thread *td, struct linux_ioctl_args *args) +{ + struct file *fp; + u_long cmd; + int error; + + if ((error = fget(td, args->fd, &fp)) != 0) { + printf("sg_linux_ioctl: fget returned %d\n", error); + return (error); + } + cmd = args->cmd; + + error = (fo_ioctl(fp, cmd, (caddr_t)args->arg, td->td_ucred, td)); + fdrop(fp, td); + return (error); +} + /* * Special ioctl handler */ ==== //depot/projects/uart/compat/linux/linux_ioctl.h#6 (text+ko) ==== @@ -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/compat/linux/linux_ioctl.h,v 1.24 2006/05/10 20:38:16 netchild Exp $ + * $FreeBSD: src/sys/compat/linux/linux_ioctl.h,v 1.26 2007/04/10 21:37:37 scottl Exp $ */ #ifndef _LINUX_IOCTL_H_ @@ -103,6 +103,8 @@ #define LINUX_CDROM_DEBUG 0x5330 #define LINUX_CDROM_GET_CAPABILITY 0x5331 #define LINUX_CDROMAUDIOBUFSIZ 0x5382 +#define LINUX_SCSI_GET_IDLUN 0x5382 +#define LINUX_SCSI_GET_BUS_NUMBER 0x5386 #define LINUX_DVD_READ_STRUCT 0x5390 #define LINUX_DVD_WRITE_STRUCT 0x5391 #define LINUX_DVD_AUTH 0x5392 @@ -130,6 +132,38 @@ #define LINUX_DVD_HOST_SEND_RPC_STATE 11 /* + * SG + */ +#define LINUX_SG_SET_TIMEOUT 0x2201 +#define LINUX_SG_GET_TIMEOUT 0x2202 +#define LINUX_SG_EMULATED_HOST 0x2203 +#define LINUX_SG_SET_TRANSFORM 0x2204 +#define LINUX_SG_GET_TRANSFORM 0x2205 +#define LINUX_SG_GET_COMMAND_Q 0x2270 +#define LINUX_SG_SET_COMMAND_Q 0x2271 +#define LINUX_SG_SET_RESERVED_SIZE 0x2275 +#define LINUX_SG_GET_RESERVED_SIZE 0x2272 +#define LINUX_SG_GET_SCSI_ID 0x2276 +#define LINUX_SG_SET_FORCE_LOW_DMA 0x2279 +#define LINUX_SG_GET_LOW_DMA 0x227a +#define LINUX_SG_SET_FORCE_PACK_ID 0x227b +#define LINUX_SG_GET_PACK_ID 0x227c +#define LINUX_SG_GET_NUM_WAITING 0x227d +#define LINUX_SG_SET_DEBUG 0x227e +#define LINUX_SG_GET_SG_TABLESIZE 0x227f +#define LINUX_SG_GET_VERSION_NUM 0x2282 +#define LINUX_SG_NEXT_CMD_LEN 0x2283 +#define LINUX_SG_SCSI_RESET 0x2284 +#define LINUX_SG_IO 0x2285 +#define LINUX_SG_GET_REQUEST_TABLE 0x2286 +#define LINUX_SG_SET_KEEP_ORPHAN 0x2287 +#define LINUX_SG_GET_KEEP_ORPHAN 0x2288 +#define LINUX_SG_GET_ACCESS_COUNT 0x2289 + +#define LINUX_IOCTL_SG_MIN 0x2200 +#define LINUX_IOCTL_SG_MAX 0x22ff + +/* * VFAT */ #define LINUX_VFAT_READDIR_BOTH 0x7201 ==== //depot/projects/uart/compat/ndis/kern_ndis.c#10 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.94 2007/02/23 16:25:07 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.95 2007/04/06 11:18:57 pjd Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -323,8 +323,7 @@ TAILQ_FOREACH(e, device_get_sysctl_ctx(sc->ndis_dev), link) { #endif oidp = e->entry; - if (ndis_strcasecmp(oidp->oid_name, - vals->nc_cfgkey) == 0) + if (strcasecmp(oidp->oid_name, vals->nc_cfgkey) == 0) break; oidp = NULL; } ==== //depot/projects/uart/compat/ndis/ndis_var.h#7 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/ndis/ndis_var.h,v 1.46 2005/11/07 16:57:14 wpaul Exp $ + * $FreeBSD: src/sys/compat/ndis/ndis_var.h,v 1.47 2007/04/06 11:18:57 pjd Exp $ */ #ifndef _NDIS_VAR_H_ @@ -1746,8 +1746,6 @@ extern int ndis_create_sysctls(void *); extern int ndis_add_sysctl(void *, char *, char *, char *, int); extern int ndis_flush_sysctls(void *); -extern int ndis_strcasecmp(const char *, const char *); -extern int ndis_strncasecmp(const char *, const char *, size_t); extern uint32_t NdisAddDevice(driver_object *, device_object *); extern void NdisAllocatePacketPool(ndis_status *, ==== //depot/projects/uart/compat/ndis/subr_ndis.c#10 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.106 2006/06/20 21:31:38 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.107 2007/04/06 11:18:57 pjd Exp $"); /* * This file implements a translation layer between the BSD networking @@ -613,53 +613,6 @@ return(NDIS_STATUS_SUCCESS); } -int -ndis_strcasecmp(s1, s2) - const char *s1; - const char *s2; -{ - char a, b; - - /* - * In the kernel, toupper() is a macro. Have to be careful - * not to use pointer arithmetic when passing it arguments. - */ - - while(1) { - a = *s1; - b = *s2++; - if (toupper(a) != toupper(b)) - break; - if (*s1++ == '\0') - return(0); - } - - return (*(const unsigned char *)s1 - *(const unsigned char *)(s2 - 1)); -} - -int -ndis_strncasecmp(s1, s2, n) - const char *s1; - const char *s2; - size_t n; -{ - char a, b; - - if (n != 0) { - do { - a = *s1; - b = *s2++; - if (toupper(a) != toupper(b)) - return (*(const unsigned char *)s1 - - *(const unsigned char *)(s2 - 1)); - if (*s1++ == '\0') - break; - } while (--n != 0); - } - - return(0); -} - static void NdisReadConfiguration(status, parm, cfg, key, type) ndis_status *status; @@ -700,7 +653,7 @@ TAILQ_FOREACH(e, device_get_sysctl_ctx(sc->ndis_dev), link) { #endif oidp = e->entry; - if (ndis_strcasecmp(oidp->oid_name, keystr) == 0) { + if (strcasecmp(oidp->oid_name, keystr) == 0) { if (strcmp((char *)oidp->oid_arg1, "UNSET") == 0) { RtlFreeAnsiString(&as); *status = NDIS_STATUS_FAILURE; @@ -809,7 +762,7 @@ TAILQ_FOREACH(e, device_get_sysctl_ctx(sc->ndis_dev), link) { #endif oidp = e->entry; - if (ndis_strcasecmp(oidp->oid_name, keystr) == 0) { + if (strcasecmp(oidp->oid_name, keystr) == 0) { >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200704132006.l3DK66ku032424>