PERFORCE change 117910 for review
John Baldwin
jhb at FreeBSD.org
Wed Apr 11 18:27:48 UTC 2007
http://perforce.freebsd.org/chv.cgi?CH=117910
Change 117910 by jhb at jhb_zion on 2007/04/11 18:27:24
IFC @117906.
Affected files ...
.. //depot/projects/smpng/sys/amd64/conf/GENERIC#57 integrate
.. //depot/projects/smpng/sys/arm/at91/uart_cpu_at91rm9200usart.c#3 integrate
.. //depot/projects/smpng/sys/arm/at91/uart_dev_at91usart.c#11 integrate
.. //depot/projects/smpng/sys/arm/sa11x0/uart_cpu_sa1110.c#5 integrate
.. //depot/projects/smpng/sys/arm/sa11x0/uart_dev_sa1110.c#6 integrate
.. //depot/projects/smpng/sys/arm/xscale/i80321/uart_cpu_i80321.c#5 integrate
.. //depot/projects/smpng/sys/arm/xscale/ixp425/uart_cpu_ixp425.c#2 integrate
.. //depot/projects/smpng/sys/boot/arm/at91/boot2/boot2.c#5 integrate
.. //depot/projects/smpng/sys/boot/forth/loader.conf#48 integrate
.. //depot/projects/smpng/sys/boot/pc98/boot0.5/Makefile#4 integrate
.. //depot/projects/smpng/sys/boot/pc98/boot0.5/boot0.5.s#3 integrate
.. //depot/projects/smpng/sys/boot/pc98/boot0.5/ldscript#1 branch
.. //depot/projects/smpng/sys/boot/pc98/boot0.5/putssjis.s#1 branch
.. //depot/projects/smpng/sys/boot/pc98/boot0.5/selector.s#2 integrate
.. //depot/projects/smpng/sys/boot/pc98/boot0.5/start.s#3 integrate
.. //depot/projects/smpng/sys/boot/pc98/boot2/boot.c#10 integrate
.. //depot/projects/smpng/sys/cam/scsi/scsi_sg.c#1 branch
.. //depot/projects/smpng/sys/cam/scsi/scsi_sg.h#1 branch
.. //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#57 integrate
.. //depot/projects/smpng/sys/compat/linux/linux_file.c#36 integrate
.. //depot/projects/smpng/sys/compat/linux/linux_ioctl.c#48 integrate
.. //depot/projects/smpng/sys/compat/linux/linux_ioctl.h#14 integrate
.. //depot/projects/smpng/sys/compat/ndis/kern_ndis.c#36 integrate
.. //depot/projects/smpng/sys/compat/ndis/ndis_var.h#26 integrate
.. //depot/projects/smpng/sys/compat/ndis/subr_ndis.c#41 integrate
.. //depot/projects/smpng/sys/compat/ndis/subr_pe.c#8 integrate
.. //depot/projects/smpng/sys/compat/opensolaris/kern/opensolaris_kmem.c#1 branch
.. //depot/projects/smpng/sys/compat/opensolaris/kern/opensolaris_kobj.c#1 branch
.. //depot/projects/smpng/sys/compat/opensolaris/kern/opensolaris_kstat.c#1 branch
.. //depot/projects/smpng/sys/compat/opensolaris/kern/opensolaris_misc.c#1 branch
.. //depot/projects/smpng/sys/compat/opensolaris/kern/opensolaris_policy.c#1 branch
.. //depot/projects/smpng/sys/compat/opensolaris/kern/opensolaris_string.c#1 branch
.. //depot/projects/smpng/sys/compat/opensolaris/kern/opensolaris_vfs.c#1 branch
.. //depot/projects/smpng/sys/compat/opensolaris/kern/opensolaris_zone.c#1 branch
.. //depot/projects/smpng/sys/compat/opensolaris/machine/endian.h#1 branch
.. //depot/projects/smpng/sys/compat/opensolaris/rpc/xdr.h#1 branch
.. //depot/projects/smpng/sys/compat/opensolaris/sys/acl.h#1 branch
.. //depot/projects/smpng/sys/compat/opensolaris/sys/byteorder.h#1 branch
.. //depot/projects/smpng/sys/compat/opensolaris/sys/callb.h#1 branch
.. //depot/projects/smpng/sys/compat/opensolaris/sys/cmn_err.h#1 branch
.. //depot/projects/smpng/sys/compat/opensolaris/sys/cred.h#1 branch
.. //depot/projects/smpng/sys/compat/opensolaris/sys/debug.h#1 branch
.. //depot/projects/smpng/sys/compat/opensolaris/sys/dirent.h#1 branch
.. //depot/projects/smpng/sys/compat/opensolaris/sys/dkio.h#1 branch
.. //depot/projects/smpng/sys/compat/opensolaris/sys/kcondvar.h#1 branch
.. //depot/projects/smpng/sys/compat/opensolaris/sys/kmem.h#1 branch
.. //depot/projects/smpng/sys/compat/opensolaris/sys/kobj.h#1 branch
.. //depot/projects/smpng/sys/compat/opensolaris/sys/kstat.h#1 branch
.. //depot/projects/smpng/sys/compat/opensolaris/sys/lock.h#1 branch
.. //depot/projects/smpng/sys/compat/opensolaris/sys/misc.h#1 branch
.. //depot/projects/smpng/sys/compat/opensolaris/sys/mntent.h#1 branch
.. //depot/projects/smpng/sys/compat/opensolaris/sys/mnttab.h#1 branch
.. //depot/projects/smpng/sys/compat/opensolaris/sys/mount.h#1 branch
.. //depot/projects/smpng/sys/compat/opensolaris/sys/mutex.h#1 branch
.. //depot/projects/smpng/sys/compat/opensolaris/sys/policy.h#1 branch
.. //depot/projects/smpng/sys/compat/opensolaris/sys/proc.h#1 branch
.. //depot/projects/smpng/sys/compat/opensolaris/sys/random.h#1 branch
.. //depot/projects/smpng/sys/compat/opensolaris/sys/rwlock.h#1 branch
.. //depot/projects/smpng/sys/compat/opensolaris/sys/sdt.h#1 branch
.. //depot/projects/smpng/sys/compat/opensolaris/sys/string.h#1 branch
.. //depot/projects/smpng/sys/compat/opensolaris/sys/sysmacros.h#1 branch
.. //depot/projects/smpng/sys/compat/opensolaris/sys/systm.h#1 branch
.. //depot/projects/smpng/sys/compat/opensolaris/sys/taskq.h#1 branch
.. //depot/projects/smpng/sys/compat/opensolaris/sys/taskq_impl.h#1 branch
.. //depot/projects/smpng/sys/compat/opensolaris/sys/time.h#1 branch
.. //depot/projects/smpng/sys/compat/opensolaris/sys/types.h#1 branch
.. //depot/projects/smpng/sys/compat/opensolaris/sys/uio.h#1 branch
.. //depot/projects/smpng/sys/compat/opensolaris/sys/varargs.h#1 branch
.. //depot/projects/smpng/sys/compat/opensolaris/sys/vfs.h#1 branch
.. //depot/projects/smpng/sys/compat/opensolaris/sys/vnode.h#1 branch
.. //depot/projects/smpng/sys/compat/opensolaris/sys/zone.h#1 branch
.. //depot/projects/smpng/sys/compat/svr4/svr4_filio.c#17 integrate
.. //depot/projects/smpng/sys/conf/NOTES#141 integrate
.. //depot/projects/smpng/sys/conf/files#203 integrate
.. //depot/projects/smpng/sys/conf/files.amd64#51 integrate
.. //depot/projects/smpng/sys/conf/files.i386#106 integrate
.. //depot/projects/smpng/sys/conf/files.ia64#58 integrate
.. //depot/projects/smpng/sys/conf/files.pc98#88 integrate
.. //depot/projects/smpng/sys/conf/files.powerpc#36 integrate
.. //depot/projects/smpng/sys/conf/options#140 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/utmisc.c#20 integrate
.. //depot/projects/smpng/sys/contrib/opensolaris/common/acl/acl_common.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/common/acl/acl_common.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/common/atomic/amd64/atomic.S#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/common/atomic/i386/atomic.S#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/common/avl/avl.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/common/nvpair/nvpair.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/common/zfs/zfs_namecheck.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/common/zfs/zfs_namecheck.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/common/zfs/zfs_prop.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/common/zfs/zfs_prop.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/Makefile.files#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/dnlc.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/gfs.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/bplist.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/dmu.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/dnode.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/gzip.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/lzjb.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/refcount.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sha256.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/spa.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/space_map.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_file.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_rlock.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/txg.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/uberblock.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/unique.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zap.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zfs.conf#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zil.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/os/callb.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/os/list.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/os/nvpair_alloc_system.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/os/taskq.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/rpc/xdr.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/rpc/xdr.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/rpc/xdr_array.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/rpc/xdr_mem.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/asm_linkage.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/atomic.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/avl.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/avl_impl.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/bitmap.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/byteorder.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/callb.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/ccompile.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/compress.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/cred.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/debug.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/dkio.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/dklabel.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/dnlc.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/errorq.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/feature_tests.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/fm/protocol.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/fm/util.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/fs/zfs.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/gfs.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/isa_defs.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/list.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/list_impl.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/note.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/nvpair.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/nvpair_impl.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/processor.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/procset.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/sdt.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/synch.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/sysevent.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/sysmacros.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/vfs.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/vmem.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/zmod.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/zmod/adler32.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/zmod/crc32.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/zmod/crc32.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/zmod/deflate.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/zmod/deflate.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/zmod/inffast.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/zmod/inffast.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/zmod/inffixed.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/zmod/inflate.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/zmod/inflate.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/zmod/inftrees.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/zmod/inftrees.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/zmod/trees.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/zmod/zconf.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/zmod/zlib.h#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/zmod/zmod.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/zmod/zmod_subr.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/zmod/zutil.c#1 branch
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/zmod/zutil.h#1 branch
.. //depot/projects/smpng/sys/dev/ata/ata-all.h#52 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#81 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-dma.c#51 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-lowlevel.c#37 integrate
.. //depot/projects/smpng/sys/dev/ata/ata_if.m#4 integrate
.. //depot/projects/smpng/sys/dev/ath/ah_osdep.c#2 integrate
.. //depot/projects/smpng/sys/dev/cxgb/cxgb_adapter.h#3 integrate
.. //depot/projects/smpng/sys/dev/cxgb/cxgb_lro.c#2 integrate
.. //depot/projects/smpng/sys/dev/cxgb/cxgb_osdep.h#2 integrate
.. //depot/projects/smpng/sys/dev/cxgb/cxgb_sge.c#3 integrate
.. //depot/projects/smpng/sys/dev/cxgb/sys/mvec.h#1 branch
.. //depot/projects/smpng/sys/dev/cxgb/sys/uipc_mvec.c#1 branch
.. //depot/projects/smpng/sys/dev/if_ndis/if_ndis_pccard.c#8 integrate
.. //depot/projects/smpng/sys/dev/mii/brgphy.c#41 integrate
.. //depot/projects/smpng/sys/dev/mii/miidevs#25 integrate
.. //depot/projects/smpng/sys/dev/mpt/mpt_cam.c#23 integrate
.. //depot/projects/smpng/sys/dev/msk/if_msk.c#6 integrate
.. //depot/projects/smpng/sys/dev/mxge/if_mxge.c#15 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/cmi.c#34 integrate
.. //depot/projects/smpng/sys/dev/streams/streams.c#33 integrate
.. //depot/projects/smpng/sys/dev/uart/uart.h#5 integrate
.. //depot/projects/smpng/sys/dev/uart/uart_bus.h#11 integrate
.. //depot/projects/smpng/sys/dev/uart/uart_bus_pci.c#8 integrate
.. //depot/projects/smpng/sys/dev/uart/uart_core.c#16 integrate
.. //depot/projects/smpng/sys/dev/uart/uart_cpu.h#9 integrate
.. //depot/projects/smpng/sys/dev/uart/uart_cpu_amd64.c#8 integrate
.. //depot/projects/smpng/sys/dev/uart/uart_cpu_i386.c#8 integrate
.. //depot/projects/smpng/sys/dev/uart/uart_cpu_ia64.c#9 integrate
.. //depot/projects/smpng/sys/dev/uart/uart_cpu_pc98.c#9 integrate
.. //depot/projects/smpng/sys/dev/uart/uart_cpu_powerpc.c#3 integrate
.. //depot/projects/smpng/sys/dev/uart/uart_cpu_sparc64.c#16 integrate
.. //depot/projects/smpng/sys/dev/uart/uart_dev_ns8250.c#17 integrate
.. //depot/projects/smpng/sys/dev/uart/uart_dev_sab82532.c#11 integrate
.. //depot/projects/smpng/sys/dev/uart/uart_dev_z8530.c#14 integrate
.. //depot/projects/smpng/sys/dev/uart/uart_kbd_sun.c#11 integrate
.. //depot/projects/smpng/sys/dev/uart/uart_subr.c#5 integrate
.. //depot/projects/smpng/sys/dev/usb/if_ural.c#23 integrate
.. //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#63 integrate
.. //depot/projects/smpng/sys/fs/fdescfs/fdesc_vfsops.c#22 integrate
.. //depot/projects/smpng/sys/fs/fdescfs/fdesc_vnops.c#26 integrate
.. //depot/projects/smpng/sys/fs/fifofs/fifo_vnops.c#42 integrate
.. //depot/projects/smpng/sys/fs/pseudofs/pseudofs.c#24 integrate
.. //depot/projects/smpng/sys/fs/pseudofs/pseudofs.h#25 integrate
.. //depot/projects/smpng/sys/fs/unionfs/union_subr.c#29 integrate
.. //depot/projects/smpng/sys/geom/eli/g_eli.c#21 integrate
.. //depot/projects/smpng/sys/geom/journal/g_journal.c#5 integrate
.. //depot/projects/smpng/sys/geom/uzip/g_uzip.c#9 integrate
.. //depot/projects/smpng/sys/i386/conf/GENERIC#87 integrate
.. //depot/projects/smpng/sys/i386/i386/identcpu.c#53 integrate
.. //depot/projects/smpng/sys/i386/i386/initcpu.c#29 integrate
.. //depot/projects/smpng/sys/i386/i386/minidump_machdep.c#3 integrate
.. //depot/projects/smpng/sys/i386/i386/pmap.c#117 integrate
.. //depot/projects/smpng/sys/i386/i386/trap.c#107 integrate
.. //depot/projects/smpng/sys/i386/include/pmap.h#35 integrate
.. //depot/projects/smpng/sys/i386/include/specialreg.h#15 integrate
.. //depot/projects/smpng/sys/i386/include/vmparam.h#8 integrate
.. //depot/projects/smpng/sys/ia64/conf/GENERIC#56 integrate
.. //depot/projects/smpng/sys/kern/kern_descrip.c#104 integrate
.. //depot/projects/smpng/sys/kern/kern_event.c#51 integrate
.. //depot/projects/smpng/sys/kern/kern_fork.c#108 integrate
.. //depot/projects/smpng/sys/kern/kern_jail.c#48 integrate
.. //depot/projects/smpng/sys/kern/kern_mbuf.c#23 integrate
.. //depot/projects/smpng/sys/kern/kern_mib.c#29 integrate
.. //depot/projects/smpng/sys/kern/kern_mutex.c#146 integrate
.. //depot/projects/smpng/sys/kern/kern_sx.c#46 integrate
.. //depot/projects/smpng/sys/kern/subr_lock.c#7 integrate
.. //depot/projects/smpng/sys/kern/subr_witness.c#162 integrate
.. //depot/projects/smpng/sys/kern/sys_generic.c#49 integrate
.. //depot/projects/smpng/sys/kern/uipc_mqueue.c#13 integrate
.. //depot/projects/smpng/sys/kern/uipc_syscalls.c#102 integrate
.. //depot/projects/smpng/sys/kern/uipc_usrreq.c#76 integrate
.. //depot/projects/smpng/sys/kern/vfs_cache.c#34 integrate
.. //depot/projects/smpng/sys/kern/vfs_lookup.c#43 integrate
.. //depot/projects/smpng/sys/kern/vfs_mount.c#72 integrate
.. //depot/projects/smpng/sys/kern/vfs_subr.c#140 integrate
.. //depot/projects/smpng/sys/kern/vfs_syscalls.c#128 integrate
.. //depot/projects/smpng/sys/libkern/index.c#4 integrate
.. //depot/projects/smpng/sys/libkern/memset.c#1 branch
.. //depot/projects/smpng/sys/libkern/rindex.c#5 integrate
.. //depot/projects/smpng/sys/modules/Makefile#138 integrate
.. //depot/projects/smpng/sys/modules/cam/Makefile#12 integrate
.. //depot/projects/smpng/sys/modules/cxgb/Makefile#2 integrate
.. //depot/projects/smpng/sys/modules/dpt/Makefile#2 integrate
.. //depot/projects/smpng/sys/modules/if_trunk/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/libalias/libalias/Makefile#2 integrate
.. //depot/projects/smpng/sys/modules/zfs/Makefile#1 branch
.. //depot/projects/smpng/sys/net/ieee8023ad_lacp.c#1 branch
.. //depot/projects/smpng/sys/net/ieee8023ad_lacp.h#1 branch
.. //depot/projects/smpng/sys/net/if.c#93 integrate
.. //depot/projects/smpng/sys/net/if_ethersubr.c#82 integrate
.. //depot/projects/smpng/sys/net/if_trunk.c#1 branch
.. //depot/projects/smpng/sys/net/if_trunk.h#1 branch
.. //depot/projects/smpng/sys/net/if_var.h#48 integrate
.. //depot/projects/smpng/sys/netatm/atm_if.c#17 integrate
.. //depot/projects/smpng/sys/netinet/in_pcb.c#73 integrate
.. //depot/projects/smpng/sys/netinet/in_pcb.h#45 integrate
.. //depot/projects/smpng/sys/netinet/ip_fw2.c#84 integrate
.. //depot/projects/smpng/sys/netinet/ip_var.h#33 integrate
.. //depot/projects/smpng/sys/netinet/libalias/alias_db.c#5 integrate
.. //depot/projects/smpng/sys/netinet/libalias/alias_ftp.c#4 integrate
.. //depot/projects/smpng/sys/netinet/libalias/alias_irc.c#4 integrate
.. //depot/projects/smpng/sys/netinet/libalias/alias_proxy.c#5 integrate
.. //depot/projects/smpng/sys/netinet/libalias/alias_skinny.c#4 integrate
.. //depot/projects/smpng/sys/netinet/sctp_asconf.c#7 integrate
.. //depot/projects/smpng/sys/netinet/sctp_bsd_addr.h#4 integrate
.. //depot/projects/smpng/sys/netinet/sctp_constants.h#8 integrate
.. //depot/projects/smpng/sys/netinet/sctp_indata.c#9 integrate
.. //depot/projects/smpng/sys/netinet/sctp_input.c#9 integrate
.. //depot/projects/smpng/sys/netinet/sctp_os_bsd.h#8 integrate
.. //depot/projects/smpng/sys/netinet/sctp_output.c#9 integrate
.. //depot/projects/smpng/sys/netinet/sctp_output.h#4 integrate
.. //depot/projects/smpng/sys/netinet/sctp_pcb.c#8 integrate
.. //depot/projects/smpng/sys/netinet/sctp_pcb.h#7 integrate
.. //depot/projects/smpng/sys/netinet/sctp_sysctl.c#3 integrate
.. //depot/projects/smpng/sys/netinet/sctp_sysctl.h#3 integrate
.. //depot/projects/smpng/sys/netinet/sctp_timer.c#7 integrate
.. //depot/projects/smpng/sys/netinet/sctp_uio.h#8 integrate
.. //depot/projects/smpng/sys/netinet/sctp_usrreq.c#9 integrate
.. //depot/projects/smpng/sys/netinet/sctputil.c#10 integrate
.. //depot/projects/smpng/sys/netinet/tcp_input.c#102 integrate
.. //depot/projects/smpng/sys/netinet/tcp_output.c#47 integrate
.. //depot/projects/smpng/sys/netinet/tcp_sack.c#21 integrate
.. //depot/projects/smpng/sys/netinet/tcp_subr.c#90 integrate
.. //depot/projects/smpng/sys/netinet/tcp_syncache.c#57 integrate
.. //depot/projects/smpng/sys/netinet/tcp_timer.c#35 integrate
.. //depot/projects/smpng/sys/netinet/tcp_timer.h#14 integrate
.. //depot/projects/smpng/sys/netinet/tcp_usrreq.c#60 integrate
.. //depot/projects/smpng/sys/netinet/tcp_var.h#49 integrate
.. //depot/projects/smpng/sys/netinet6/ipsec.c#28 integrate
.. //depot/projects/smpng/sys/netinet6/sctp6_usrreq.c#8 integrate
.. //depot/projects/smpng/sys/netipsec/ipsec_osdep.h#5 integrate
.. //depot/projects/smpng/sys/netsmb/smb_dev.c#23 integrate
.. //depot/projects/smpng/sys/opencrypto/cryptodev.c#22 integrate
.. //depot/projects/smpng/sys/pc98/conf/GENERIC#69 integrate
.. //depot/projects/smpng/sys/powerpc/conf/GENERIC#43 integrate
.. //depot/projects/smpng/sys/rpc/types.h#1 branch
.. //depot/projects/smpng/sys/security/audit/audit_bsm_klib.c#5 integrate
.. //depot/projects/smpng/sys/sparc64/conf/GENERIC#77 integrate
.. //depot/projects/smpng/sys/sun4v/conf/GENERIC#6 integrate
.. //depot/projects/smpng/sys/sun4v/include/smp.h#5 integrate
.. //depot/projects/smpng/sys/sys/elf_common.h#10 integrate
.. //depot/projects/smpng/sys/sys/filedesc.h#30 integrate
.. //depot/projects/smpng/sys/sys/filio.h#4 integrate
.. //depot/projects/smpng/sys/sys/hash.h#2 integrate
.. //depot/projects/smpng/sys/sys/jail.h#17 integrate
.. //depot/projects/smpng/sys/sys/kernel.h#36 integrate
.. //depot/projects/smpng/sys/sys/libkern.h#24 integrate
.. //depot/projects/smpng/sys/sys/link_elf.h#4 integrate
.. //depot/projects/smpng/sys/sys/lock.h#46 integrate
.. //depot/projects/smpng/sys/sys/lock_profile.h#5 integrate
.. //depot/projects/smpng/sys/sys/mbuf.h#70 integrate
.. //depot/projects/smpng/sys/sys/mount.h#60 integrate
.. //depot/projects/smpng/sys/sys/mutex.h#73 integrate
.. //depot/projects/smpng/sys/sys/param.h#115 integrate
.. //depot/projects/smpng/sys/sys/priv.h#5 integrate
.. //depot/projects/smpng/sys/sys/sx.h#26 integrate
.. //depot/projects/smpng/sys/sys/sysctl.h#43 integrate
.. //depot/projects/smpng/sys/sys/systm.h#83 integrate
.. //depot/projects/smpng/sys/sys/unistd.h#16 integrate
.. //depot/projects/smpng/sys/ufs/ffs/ffs_snapshot.c#62 integrate
.. //depot/projects/smpng/sys/ufs/ffs/ffs_softdep.c#63 integrate
.. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#94 integrate
.. //depot/projects/smpng/sys/ufs/ffs/ffs_vnops.c#52 integrate
.. //depot/projects/smpng/sys/vm/phys_pager.c#16 integrate
.. //depot/projects/smpng/sys/vm/vm_fault.c#66 integrate
.. //depot/projects/smpng/sys/vm/vm_kern.c#37 integrate
Differences ...
==== //depot/projects/smpng/sys/amd64/conf/GENERIC#57 (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/smpng/sys/arm/at91/uart_cpu_at91rm9200usart.c#3 (text) ====
@@ -27,7 +27,7 @@
#include "opt_uart.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/at91/uart_cpu_at91rm9200usart.c,v 1.2 2006/05/13 23:41:16 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/uart_cpu_at91rm9200usart.c,v 1.3 2007/04/02 22:00:21 marcel Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -43,7 +43,7 @@
bus_space_tag_t uart_bus_space_io;
bus_space_tag_t uart_bus_space_mem;
-extern struct uart_ops at91_usart_ops;
+extern struct uart_class at91_usart_class;
extern struct bus_space at91_bs_tag;
int
@@ -55,7 +55,10 @@
int
uart_cpu_getdev(int devtype, struct uart_devinfo *di)
{
- di->ops = at91_usart_ops;
+ struct uart_class *class;
+
+ class = &at91_usart_class;
+ di->ops = uart_getops(class);
di->bas.chan = 0;
di->bas.bst = &at91_bs_tag;
/*
@@ -77,7 +80,5 @@
uart_bus_space_io = &at91_bs_tag;
uart_bus_space_mem = NULL;
/* Check the environment for overrides */
- if (uart_getenv(devtype, di) == 0)
- return (0);
- return (0);
+ return (uart_getenv(devtype, di, class));
}
==== //depot/projects/smpng/sys/arm/at91/uart_dev_at91usart.c#11 (text) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/at91/uart_dev_at91usart.c,v 1.11 2007/01/18 22:01:19 marius Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/uart_dev_at91usart.c,v 1.12 2007/04/02 22:00:21 marcel Exp $");
#include "opt_comconsole.h"
@@ -196,7 +196,7 @@
return (0);
}
-struct uart_ops at91_usart_ops = {
+static struct uart_ops at91_usart_ops = {
.probe = at91_usart_probe,
.init = at91_usart_init,
.term = at91_usart_term,
@@ -662,10 +662,12 @@
}
return (EINVAL);
}
+
struct uart_class at91_usart_class = {
- "at91_usart class",
+ "at91_usart",
at91_usart_methods,
sizeof(struct at91_usart_softc),
+ .uc_ops = &at91_usart_ops,
.uc_range = 8,
.uc_rclk = DEFAULT_RCLK
};
==== //depot/projects/smpng/sys/arm/sa11x0/uart_cpu_sa1110.c#5 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/sa11x0/uart_cpu_sa1110.c,v 1.6 2006/06/21 10:56:59 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/sa11x0/uart_cpu_sa1110.c,v 1.7 2007/04/02 22:00:21 marcel Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -42,7 +42,7 @@
bus_space_tag_t uart_bus_space_io;
bus_space_tag_t uart_bus_space_mem;
-extern struct uart_ops uart_sa1110_ops;
+extern struct uart_class uart_sa1110_class;
vm_offset_t sa1110_uart_vaddr;
@@ -55,7 +55,8 @@
int
uart_cpu_getdev(int devtype, struct uart_devinfo *di)
{
- di->ops = uart_sa1110_ops;
+
+ di->ops = uart_getops(&uart_sa1110_class);
di->bas.chan = 0;
di->bas.bst = &sa11x0_bs_tag;
di->bas.bsh = sa1110_uart_vaddr;
==== //depot/projects/smpng/sys/arm/sa11x0/uart_dev_sa1110.c#6 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/sa11x0/uart_dev_sa1110.c,v 1.7 2007/01/18 22:01:19 marius Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/sa11x0/uart_dev_sa1110.c,v 1.8 2007/04/02 22:00:21 marcel Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -57,7 +57,7 @@
extern SLIST_HEAD(uart_devinfo_list, uart_devinfo) uart_sysdevs;
-struct uart_ops uart_sa1110_ops = {
+static struct uart_ops uart_sa1110_ops = {
.probe = sa1110_probe,
.init = sa1110_init,
.term = sa1110_term,
@@ -272,10 +272,12 @@
{
return (EINVAL);
}
+
struct uart_class uart_sa1110_class = {
- "sa1110 class",
+ "sa1110",
sa1110_methods,
1,
+ .uc_ops = &uart_sa1110_ops,
.uc_range = 8,
.uc_rclk = 3686400
};
==== //depot/projects/smpng/sys/arm/xscale/i80321/uart_cpu_i80321.c#5 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/uart_cpu_i80321.c,v 1.4 2005/01/20 22:23:26 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/uart_cpu_i80321.c,v 1.5 2007/04/02 22:00:22 marcel Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -51,7 +51,7 @@
int
uart_cpu_getdev(int devtype, struct uart_devinfo *di)
{
- di->ops = uart_ns8250_ops;
+ di->ops = uart_getops(&uart_ns8250_class);
di->bas.chan = 0;
di->bas.bst = &obio_bs_tag;
di->bas.regshft = 0;
==== //depot/projects/smpng/sys/arm/xscale/ixp425/uart_cpu_ixp425.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/uart_cpu_ixp425.c,v 1.1 2006/11/19 23:55:23 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/uart_cpu_ixp425.c,v 1.2 2007/04/02 22:00:22 marcel Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -51,7 +51,7 @@
int
uart_cpu_getdev(int devtype, struct uart_devinfo *di)
{
- di->ops = uart_ns8250_ops;
+ di->ops = uart_getops(&uart_ns8250_class);
di->bas.chan = 0;
di->bas.bst = &ixp425_a4x_bs_tag;
di->bas.regshft = 0;
==== //depot/projects/smpng/sys/boot/arm/at91/boot2/boot2.c#5 (text+ko) ====
@@ -14,7 +14,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/boot/arm/at91/boot2/boot2.c,v 1.4 2007/03/28 21:18:45 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/arm/at91/boot2/boot2.c,v 1.5 2007/04/02 20:26:04 imp Exp $");
#include <sys/param.h>
#include <sys/disklabel.h>
@@ -148,8 +148,9 @@
board_init();
EMAC_Init();
- sdcard_init();
EMAC_SetMACAddress(mac);
+ while (sdcard_init() == 0)
+ printf("Looking for SD card\n");
dmadat = (void *)(0x20000000 + (16 << 20));
/* Process configuration file */
==== //depot/projects/smpng/sys/boot/forth/loader.conf#48 (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/smpng/sys/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/smpng/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/smpng/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/smpng/sys/boot/pc98/boot0.5/start.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/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/smpng/sys/boot/pc98/boot2/boot.c#10 (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/smpng/sys/compat/linprocfs/linprocfs.c#57 (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/smpng/sys/compat/linux/linux_file.c#36 (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/smpng/sys/compat/linux/linux_ioctl.c#48 (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);
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list