From owner-p4-projects@FreeBSD.ORG Fri Apr 6 17:10:41 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 055BC16A405; Fri, 6 Apr 2007 17:10:41 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BA33B16A401 for ; Fri, 6 Apr 2007 17:10:40 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id A9B8713C45A for ; Fri, 6 Apr 2007 17:10:40 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l36HAe0b078620 for ; Fri, 6 Apr 2007 17:10:40 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l36HAat7078613 for perforce@freebsd.org; Fri, 6 Apr 2007 17:10:36 GMT (envelope-from rdivacky@FreeBSD.org) Date: Fri, 6 Apr 2007 17:10:36 GMT Message-Id: <200704061710.l36HAat7078613@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 117525 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Apr 2007 17:10:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=117525 Change 117525 by rdivacky@rdivacky_witten on 2007/04/06 17:09:41 IFC (welcome new sx and ZFS!) Affected files ... .. //depot/projects/linuxolator/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#2 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/uart_dev_at91usart.c#4 integrate .. //depot/projects/linuxolator/src/sys/arm/sa11x0/uart_cpu_sa1110.c#2 integrate .. //depot/projects/linuxolator/src/sys/arm/sa11x0/uart_dev_sa1110.c#3 integrate .. //depot/projects/linuxolator/src/sys/arm/xscale/i80321/uart_cpu_i80321.c#2 integrate .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/uart_cpu_ixp425.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/boot2/boot2.c#5 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_file.c#23 integrate .. //depot/projects/linuxolator/src/sys/compat/ndis/kern_ndis.c#3 integrate .. //depot/projects/linuxolator/src/sys/compat/ndis/ndis_var.h#2 integrate .. //depot/projects/linuxolator/src/sys/compat/ndis/subr_ndis.c#3 integrate .. //depot/projects/linuxolator/src/sys/compat/ndis/subr_pe.c#2 integrate .. //depot/projects/linuxolator/src/sys/compat/opensolaris/kern/opensolaris_kmem.c#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/kern/opensolaris_kobj.c#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/kern/opensolaris_kstat.c#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/kern/opensolaris_policy.c#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/kern/opensolaris_string.c#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/kern/opensolaris_vfs.c#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/kern/opensolaris_zone.c#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/machine/endian.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/rpc/xdr.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/acl.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/byteorder.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/callb.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/cmn_err.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/cred.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/debug.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/dirent.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/dkio.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/kcondvar.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/kmem.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/kobj.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/kstat.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/mntent.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/mnttab.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/mount.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/mutex.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/policy.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/proc.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/random.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/rwlock.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/sdt.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/string.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/sysmacros.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/systm.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/taskq.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/taskq_impl.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/time.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/types.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/uio.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/varargs.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/vfs.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/vnode.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/zone.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_filio.c#2 integrate .. //depot/projects/linuxolator/src/sys/conf/files#25 integrate .. //depot/projects/linuxolator/src/sys/conf/files.amd64#11 integrate .. //depot/projects/linuxolator/src/sys/conf/files.i386#10 integrate .. //depot/projects/linuxolator/src/sys/conf/files.pc98#8 integrate .. //depot/projects/linuxolator/src/sys/conf/files.powerpc#5 integrate .. //depot/projects/linuxolator/src/sys/conf/options#22 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/common/acl/acl_common.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/common/acl/acl_common.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/common/avl/avl.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/common/nvpair/nvpair.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/common/zfs/zfs_namecheck.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/common/zfs/zfs_namecheck.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/common/zfs/zfs_prop.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/common/zfs/zfs_prop.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/Makefile.files#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/arch/amd64/atomic.S#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/arch/i386/atomic.S#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/dnlc.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/gfs.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/bplist.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/dnode.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/gzip.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/lzjb.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/refcount.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sha256.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/space_map.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_file.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_rlock.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/txg.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/uberblock.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/unique.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs.conf#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zil.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/os/callb.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/os/list.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/os/nvpair_alloc_system.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/os/taskq.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/rpc/xdr.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/rpc/xdr.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/rpc/xdr_array.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/rpc/xdr_mem.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/asm_linkage.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/atomic.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/avl.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/avl_impl.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/bitmap.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/byteorder.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/callb.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/ccompile.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/compress.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/cred.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/debug.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/dkio.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/dklabel.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/dnlc.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/errorq.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/feature_tests.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/fm/protocol.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/fm/util.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/fs/zfs.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/gfs.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/isa_defs.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/list.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/list_impl.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/note.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/nvpair.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/nvpair_impl.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/processor.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/procset.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/sdt.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/synch.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/sysevent.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/sysmacros.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/vfs.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/vmem.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/zmod.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/zmod/adler32.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/zmod/crc32.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/zmod/crc32.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/zmod/deflate.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/zmod/deflate.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/zmod/inffast.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/zmod/inffast.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/zmod/inffixed.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/zmod/inflate.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/zmod/inflate.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/zmod/inftrees.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/zmod/inftrees.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/zmod/trees.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/zmod/zconf.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/zmod/zlib.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/zmod/zmod.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/zmod/zmod_subr.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/zmod/zutil.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/zmod/zutil.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/ata/ata-all.h#5 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/ata-chipset.c#12 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/ata-dma.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/ata-lowlevel.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/ata_if.m#2 integrate .. //depot/projects/linuxolator/src/sys/dev/bge/if_bge.c#17 integrate .. //depot/projects/linuxolator/src/sys/dev/cxgb/cxgb_adapter.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/cxgb/cxgb_sge.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/if_ndis/if_ndis_pccard.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/msk/if_msk.c#7 integrate .. //depot/projects/linuxolator/src/sys/dev/mxge/if_mxge.c#11 integrate .. //depot/projects/linuxolator/src/sys/dev/streams/streams.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/uart/uart.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/uart/uart_bus.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/uart/uart_bus_pci.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/uart/uart_core.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/uart/uart_cpu.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/uart/uart_cpu_amd64.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/uart/uart_cpu_i386.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/uart/uart_cpu_ia64.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/uart/uart_cpu_pc98.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/uart/uart_cpu_powerpc.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/uart/uart_cpu_sparc64.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/uart/uart_dev_ns8250.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/uart/uart_dev_sab82532.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/uart/uart_dev_z8530.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/uart/uart_kbd_sun.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/uart/uart_subr.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/if_ural.c#6 integrate .. //depot/projects/linuxolator/src/sys/fs/devfs/devfs_vnops.c#7 integrate .. //depot/projects/linuxolator/src/sys/fs/fdescfs/fdesc_vfsops.c#2 integrate .. //depot/projects/linuxolator/src/sys/fs/fdescfs/fdesc_vnops.c#3 integrate .. //depot/projects/linuxolator/src/sys/fs/fifofs/fifo_vnops.c#3 integrate .. //depot/projects/linuxolator/src/sys/fs/pseudofs/pseudofs.c#3 integrate .. //depot/projects/linuxolator/src/sys/fs/pseudofs/pseudofs.h#3 integrate .. //depot/projects/linuxolator/src/sys/fs/unionfs/union_subr.c#6 integrate .. //depot/projects/linuxolator/src/sys/geom/journal/g_journal.c#5 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_descrip.c#10 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_event.c#5 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_fork.c#14 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_jail.c#9 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_mbuf.c#5 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_mutex.c#8 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_sx.c#8 integrate .. //depot/projects/linuxolator/src/sys/kern/subr_lock.c#6 integrate .. //depot/projects/linuxolator/src/sys/kern/subr_witness.c#11 integrate .. //depot/projects/linuxolator/src/sys/kern/sys_generic.c#6 integrate .. //depot/projects/linuxolator/src/sys/kern/uipc_mqueue.c#7 integrate .. //depot/projects/linuxolator/src/sys/kern/uipc_syscalls.c#8 integrate .. //depot/projects/linuxolator/src/sys/kern/uipc_usrreq.c#12 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_cache.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_lookup.c#10 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_mount.c#13 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_syscalls.c#14 integrate .. //depot/projects/linuxolator/src/sys/libkern/memset.c#1 branch .. //depot/projects/linuxolator/src/sys/modules/Makefile#12 integrate .. //depot/projects/linuxolator/src/sys/modules/zfs/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/netatm/atm_if.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/in_pcb.h#4 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_fw2.c#13 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_var.h#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/libalias/alias_ftp.c#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/libalias/alias_irc.c#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/libalias/alias_proxy.c#4 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_asconf.c#9 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_bsd_addr.h#4 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_constants.h#9 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_indata.c#11 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_input.c#11 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_os_bsd.h#10 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_output.c#11 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_output.h#4 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_pcb.c#11 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_pcb.h#9 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_sysctl.c#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_sysctl.h#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_timer.c#8 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_uio.h#8 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_usrreq.c#11 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctputil.c#11 integrate .. //depot/projects/linuxolator/src/sys/netinet/tcp_input.c#14 integrate .. //depot/projects/linuxolator/src/sys/netinet/tcp_output.c#9 integrate .. //depot/projects/linuxolator/src/sys/netinet/tcp_sack.c#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/tcp_subr.c#9 integrate .. //depot/projects/linuxolator/src/sys/netinet/tcp_syncache.c#7 integrate .. //depot/projects/linuxolator/src/sys/netinet/tcp_timer.c#4 integrate .. //depot/projects/linuxolator/src/sys/netinet6/sctp6_usrreq.c#11 integrate .. //depot/projects/linuxolator/src/sys/netsmb/smb_dev.c#3 integrate .. //depot/projects/linuxolator/src/sys/opencrypto/cryptodev.c#3 integrate .. //depot/projects/linuxolator/src/sys/security/audit/audit_bsm_klib.c#3 integrate .. //depot/projects/linuxolator/src/sys/sun4v/include/smp.h#5 integrate .. //depot/projects/linuxolator/src/sys/sys/elf_common.h#4 integrate .. //depot/projects/linuxolator/src/sys/sys/filedesc.h#2 integrate .. //depot/projects/linuxolator/src/sys/sys/filio.h#2 integrate .. //depot/projects/linuxolator/src/sys/sys/jail.h#3 integrate .. //depot/projects/linuxolator/src/sys/sys/kernel.h#3 integrate .. //depot/projects/linuxolator/src/sys/sys/link_elf.h#2 integrate .. //depot/projects/linuxolator/src/sys/sys/lock.h#8 integrate .. //depot/projects/linuxolator/src/sys/sys/lock_profile.h#5 integrate .. //depot/projects/linuxolator/src/sys/sys/mbuf.h#9 integrate .. //depot/projects/linuxolator/src/sys/sys/mount.h#10 integrate .. //depot/projects/linuxolator/src/sys/sys/mutex.h#9 integrate .. //depot/projects/linuxolator/src/sys/sys/param.h#14 integrate .. //depot/projects/linuxolator/src/sys/sys/priv.h#7 integrate .. //depot/projects/linuxolator/src/sys/sys/sx.h#5 integrate .. //depot/projects/linuxolator/src/sys/sys/systm.h#12 integrate .. //depot/projects/linuxolator/src/sys/sys/unistd.h#5 integrate .. //depot/projects/linuxolator/src/sys/ufs/ffs/ffs_snapshot.c#5 integrate .. //depot/projects/linuxolator/src/sys/ufs/ffs/ffs_softdep.c#9 integrate .. //depot/projects/linuxolator/src/sys/ufs/ffs/ffs_vfsops.c#10 integrate .. //depot/projects/linuxolator/src/sys/ufs/ffs/ffs_vnops.c#10 integrate .. //depot/projects/linuxolator/src/sys/vm/vm_fault.c#7 integrate .. //depot/projects/linuxolator/src/sys/vm/vm_kern.c#6 integrate Differences ... ==== //depot/projects/linuxolator/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#2 (text) ==== @@ -27,7 +27,7 @@ #include "opt_uart.h" #include -__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 #include @@ -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/linuxolator/src/sys/arm/at91/uart_dev_at91usart.c#4 (text) ==== @@ -26,7 +26,7 @@ */ #include -__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/linuxolator/src/sys/arm/sa11x0/uart_cpu_sa1110.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__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 #include @@ -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/linuxolator/src/sys/arm/sa11x0/uart_dev_sa1110.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__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 #include @@ -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/linuxolator/src/sys/arm/xscale/i80321/uart_cpu_i80321.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__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 #include @@ -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/linuxolator/src/sys/arm/xscale/ixp425/uart_cpu_ixp425.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__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 #include @@ -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/linuxolator/src/sys/boot/arm/at91/boot2/boot2.c#5 (text+ko) ==== @@ -14,7 +14,7 @@ */ #include -__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 #include @@ -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/linuxolator/src/sys/compat/linux/linux_file.c#23 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__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" ==== //depot/projects/linuxolator/src/sys/compat/ndis/kern_ndis.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__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 #include @@ -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/linuxolator/src/sys/compat/ndis/ndis_var.h#2 (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/linuxolator/src/sys/compat/ndis/subr_ndis.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__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) { /* Found it, set the value. */ strcpy((char *)oidp->oid_arg1, val); RtlFreeAnsiString(&as); ==== //depot/projects/linuxolator/src/sys/compat/ndis/subr_pe.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_pe.c,v 1.12 2005/10/26 18:46:27 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_pe.c,v 1.13 2007/04/06 11:18:57 pjd Exp $"); /* * This file contains routines for relocating and dynamically linking @@ -53,8 +53,6 @@ #include #ifdef _KERNEL #include -extern int ndis_strncasecmp(const char *, const char *, size_t); -#define strncasecmp(a, b, c) ndis_strncasecmp(a, b, c) #else #include #include ==== //depot/projects/linuxolator/src/sys/compat/svr4/svr4_filio.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_filio.c,v 1.34 2005/01/05 22:34:36 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_filio.c,v 1.35 2007/04/04 09:11:31 rwatson Exp $"); #include #include @@ -211,15 +211,15 @@ switch (cmd) { case SVR4_FIOCLEX: - FILEDESC_LOCK_FAST(fdp); + FILEDESC_XLOCK(fdp); fdp->fd_ofileflags[fd] |= UF_EXCLOSE; - FILEDESC_UNLOCK_FAST(fdp); + FILEDESC_XUNLOCK(fdp); return 0; case SVR4_FIONCLEX: - FILEDESC_LOCK_FAST(fdp); + FILEDESC_XLOCK(fdp); fdp->fd_ofileflags[fd] &= ~UF_EXCLOSE; - FILEDESC_UNLOCK_FAST(fdp); + FILEDESC_XUNLOCK(fdp); return 0; case SVR4_FIOGETOWN: ==== //depot/projects/linuxolator/src/sys/conf/files#25 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1188 2007/03/26 08:59:03 rwatson Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1190 2007/04/06 04:51:50 kan Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and ==== //depot/projects/linuxolator/src/sys/conf/files.amd64#11 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.amd64,v 1.100 2006/12/18 05:45:23 mjacob Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.101 2007/04/06 04:51:50 kan Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -267,3 +267,5 @@ i386/cpufreq/powernow.c optional cpufreq i386/cpufreq/est.c optional cpufreq i386/cpufreq/p4tcc.c optional cpufreq +# +libkern/memset.c standard ==== //depot/projects/linuxolator/src/sys/conf/files.i386#10 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.572 2006/12/18 05:45:23 mjacob Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.574 2007/04/06 11:29:52 nyan Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -440,6 +440,7 @@ libkern/divdi3.c standard libkern/ffsl.c standard libkern/flsl.c standard +libkern/memset.c standard libkern/moddi3.c standard libkern/qdivrem.c standard libkern/ucmpdi2.c standard ==== //depot/projects/linuxolator/src/sys/conf/files.pc98#8 (text+ko) ==== @@ -3,7 +3,7 @@ # # modified for PC-9801/PC-9821 # -# $FreeBSD: src/sys/conf/files.pc98,v 1.351 2006/12/18 05:45:23 mjacob Exp $ +# $FreeBSD: src/sys/conf/files.pc98,v 1.352 2007/04/06 11:30:31 nyan Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -314,6 +314,7 @@ libkern/divdi3.c standard libkern/ffsl.c standard libkern/flsl.c standard +libkern/memset.c standard libkern/moddi3.c standard libkern/qdivrem.c standard libkern/ucmpdi2.c standard ==== //depot/projects/linuxolator/src/sys/conf/files.powerpc#5 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.powerpc,v 1.62 2007/02/07 18:55:29 marcel Exp $ +# $FreeBSD: src/sys/conf/files.powerpc,v 1.64 2007/04/06 11:29:52 nyan Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -93,6 +93,7 @@ libkern/fls.c standard libkern/flsl.c standard libkern/lshrdi3.c standard +libkern/memset.c standard libkern/moddi3.c standard libkern/qdivrem.c standard libkern/ucmpdi2.c standard ==== //depot/projects/linuxolator/src/sys/conf/options#22 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.584 2007/03/31 23:23:41 jhb Exp $ +# $FreeBSD: src/sys/conf/options,v 1.585 2007/04/04 14:44:15 andre Exp $ # # On the handling of kernel options # @@ -390,7 +390,6 @@ SLIP_IFF_OPTS opt_slip.h TCPDEBUG TCP_SIGNATURE opt_inet.h -TCP_SACK_DEBUG opt_tcp_sack.h DEV_VLAN opt_vlan.h VLAN_ARRAY opt_vlan.h XBONEHACK ==== //depot/projects/linuxolator/src/sys/dev/ata/ata-all.h#5 (text+ko) ==== @@ -23,7 +23,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/dev/ata/ata-all.h,v 1.121 2007/03/08 16:39:25 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.122 2007/04/06 16:18:59 sos Exp $ */ /* ATA register defines */ @@ -445,6 +445,7 @@ #define ATA_DMA_READ 0x01 /* transaction is a read */ #define ATA_DMA_LOADED 0x02 /* DMA tables etc loaded */ #define ATA_DMA_ACTIVE 0x04 /* DMA transfer in progress */ +#define ATA_DMA_64BIT 0x10 /* supports 64bit addressing */ void (*alloc)(device_t dev); void (*free)(device_t dev); ==== //depot/projects/linuxolator/src/sys/dev/ata/ata-chipset.c#12 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.192 2007/03/12 15:34:08 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.194 2007/04/06 16:21:34 sos Exp $"); #include "opt_ata.h" #include @@ -503,6 +503,7 @@ { struct ata_pci_controller *ctlr = device_get_softc(device_get_parent(dev)); struct ata_channel *ch = device_get_softc(dev); + u_int64_t work; int offset = ch->unit << 7; /* set the SATA resources */ @@ -521,13 +522,13 @@ ch->hw.command = NULL; /* not used here */ /* setup work areas */ - ATA_OUTL(ctlr->r_res2, ATA_AHCI_P_CLB + offset, - ch->dma->work_bus + ATA_AHCI_CL_OFFSET); - ATA_OUTL(ctlr->r_res2, ATA_AHCI_P_CLBU + offset, 0x00000000); + work = ch->dma->work_bus + ATA_AHCI_CL_OFFSET; + ATA_OUTL(ctlr->r_res2, ATA_AHCI_P_CLB + offset, work & 0xffffffff); + ATA_OUTL(ctlr->r_res2, ATA_AHCI_P_CLBU + offset, work >> 32); - ATA_OUTL(ctlr->r_res2, ATA_AHCI_P_FB + offset, - ch->dma->work_bus + ATA_AHCI_FB_OFFSET); - ATA_OUTL(ctlr->r_res2, ATA_AHCI_P_FBU + offset, 0x00000000); + work = ch->dma->work_bus + ATA_AHCI_FB_OFFSET; + ATA_OUTL(ctlr->r_res2, ATA_AHCI_P_FB + offset, work & 0xffffffff); + ATA_OUTL(ctlr->r_res2, ATA_AHCI_P_FBU + offset, work >> 32); /* enable wanted port interrupts */ ATA_OUTL(ctlr->r_res2, ATA_AHCI_P_IE + offset, @@ -766,6 +767,7 @@ static void ata_ahci_dmainit(device_t dev) { + struct ata_pci_controller *ctlr = device_get_softc(device_get_parent(dev)); struct ata_channel *ch = device_get_softc(dev); ata_dmainit(dev); @@ -773,6 +775,8 @@ /* note start and stop are not used here */ ch->dma->setprd = ata_ahci_dmasetprd; ch->dma->max_iosize = 8192 * DEV_BSIZE; + if (ATA_INL(ctlr->r_res2, ATA_AHCI_CAP) & ATA_AHCI_CAP_64BIT) + ch->dma->flags |= ATA_DMA_64BIT; } } @@ -2417,7 +2421,7 @@ { struct ata_pci_controller *ctlr = device_get_softc(device_get_parent(dev)); struct ata_channel *ch = device_get_softc(dev); - bus_addr_t work = ch->dma->work_bus; + u_int64_t work = ch->dma->work_bus; int i; /* clear work area */ @@ -2470,7 +2474,7 @@ ATA_OUTL(ctlr->r_res1, 0x02000 + ATA_MV_EDMA_BASE(ch), (1<<11) | (1<<13)); /* request queue base high */ - ATA_OUTL(ctlr->r_res1, 0x02010 + ATA_MV_EDMA_BASE(ch), (work >> 16) >> 16); + ATA_OUTL(ctlr->r_res1, 0x02010 + ATA_MV_EDMA_BASE(ch), work >> 32); /* request queue in ptr */ ATA_OUTL(ctlr->r_res1, 0x02014 + ATA_MV_EDMA_BASE(ch), work & 0xffffffff); @@ -2480,7 +2484,7 @@ /* response queue base high */ work += 1024; - ATA_OUTL(ctlr->r_res1, 0x0201c + ATA_MV_EDMA_BASE(ch), (work >> 16) >> 16); + ATA_OUTL(ctlr->r_res1, 0x0201c + ATA_MV_EDMA_BASE(ch), work >> 32); /* response queue in ptr */ ATA_OUTL(ctlr->r_res1, 0x02020 + ATA_MV_EDMA_BASE(ch), 0x0); @@ -2568,7 +2572,7 @@ /* fill in this request */ quadp[0] = (long)ch->dma->sg_bus & 0xffffffff; - quadp[1] = (ch->dma->sg_bus & 0xffffffff00000000ull) >> 32; + quadp[1] = (u_int64_t)ch->dma->sg_bus >> 32; wordp[4] = (request->flags & ATA_R_READ ? 0x01 : 0x00) | (tag<<1); i = 10; @@ -2721,12 +2725,16 @@ static void ata_marvell_edma_dmainit(device_t dev) { + struct ata_pci_controller *ctlr = device_get_softc(device_get_parent(dev)); struct ata_channel *ch = device_get_softc(dev); ata_dmainit(dev); if (ch->dma) { /* note start and stop are not used here */ >>> TRUNCATED FOR MAIL (1000 lines) <<<