From owner-p4-projects@FreeBSD.ORG Sun Apr 15 01:44:40 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 8BD9016A404; Sun, 15 Apr 2007 01:44:40 +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 6152716A402 for ; Sun, 15 Apr 2007 01:44:40 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 4FAB613C458 for ; Sun, 15 Apr 2007 01:44:40 +0000 (UTC) (envelope-from mjacob@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 l3F1ieBr044801 for ; Sun, 15 Apr 2007 01:44:40 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3F1iYoY044798 for perforce@freebsd.org; Sun, 15 Apr 2007 01:44:34 GMT (envelope-from mjacob@freebsd.org) Date: Sun, 15 Apr 2007 01:44:34 GMT Message-Id: <200704150144.l3F1iYoY044798@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 118132 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: Sun, 15 Apr 2007 01:44:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=118132 Change 118132 by mjacob@mjexp on 2007/04/15 01:43:48 IFC Affected files ... .. //depot/projects/mjexp/ObsoleteFiles.inc#12 integrate .. //depot/projects/mjexp/UPDATING#12 integrate .. //depot/projects/mjexp/contrib/libreadline/FREEBSD-upgrade#3 integrate .. //depot/projects/mjexp/contrib/libreadline/display.c#3 integrate .. //depot/projects/mjexp/contrib/opensolaris/cmd/zdb/zdb.8#2 integrate .. //depot/projects/mjexp/contrib/opensolaris/cmd/zfs/zfs.8#2 integrate .. //depot/projects/mjexp/contrib/opensolaris/cmd/zfs/zfs_main.c#2 integrate .. //depot/projects/mjexp/contrib/opensolaris/cmd/zpool/zpool.8#2 integrate .. //depot/projects/mjexp/contrib/opensolaris/cmd/ztest/ztest.c#3 integrate .. //depot/projects/mjexp/contrib/opensolaris/lib/libzfs/common/libzfs.h#3 integrate .. //depot/projects/mjexp/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#2 integrate .. //depot/projects/mjexp/contrib/opensolaris/lib/libzpool/common/kernel.c#3 integrate .. //depot/projects/mjexp/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#3 integrate .. //depot/projects/mjexp/contrib/sendmail/FREEBSD-upgrade#2 integrate .. //depot/projects/mjexp/contrib/sendmail/KNOWNBUGS#2 integrate .. //depot/projects/mjexp/contrib/sendmail/PGPKEYS#2 integrate .. //depot/projects/mjexp/contrib/sendmail/RELEASE_NOTES#2 integrate .. //depot/projects/mjexp/contrib/sendmail/cf/README#2 integrate .. //depot/projects/mjexp/contrib/sendmail/cf/cf/knecht.mc#2 integrate .. //depot/projects/mjexp/contrib/sendmail/cf/cf/submit.cf#2 integrate .. //depot/projects/mjexp/contrib/sendmail/cf/feature/access_db.m4#2 integrate .. //depot/projects/mjexp/contrib/sendmail/cf/feature/badmx.m4#1 branch .. //depot/projects/mjexp/contrib/sendmail/cf/feature/block_bad_helo.m4#1 branch .. //depot/projects/mjexp/contrib/sendmail/cf/feature/dnsbl.m4#2 integrate .. //depot/projects/mjexp/contrib/sendmail/cf/feature/enhdnsbl.m4#2 integrate .. //depot/projects/mjexp/contrib/sendmail/cf/feature/require_rdns.m4#1 branch .. //depot/projects/mjexp/contrib/sendmail/cf/m4/proto.m4#2 integrate .. //depot/projects/mjexp/contrib/sendmail/cf/m4/version.m4#2 integrate .. //depot/projects/mjexp/contrib/sendmail/cf/mailer/smtp.m4#2 integrate .. //depot/projects/mjexp/contrib/sendmail/contrib/cidrexpand#2 integrate .. //depot/projects/mjexp/contrib/sendmail/contrib/qtool.pl#2 integrate .. //depot/projects/mjexp/contrib/sendmail/doc/op/op.me#2 integrate .. //depot/projects/mjexp/contrib/sendmail/editmap/Makefile.m4#2 integrate .. //depot/projects/mjexp/contrib/sendmail/include/libmilter/mfapi.h#2 integrate .. //depot/projects/mjexp/contrib/sendmail/include/libmilter/mfdef.h#2 integrate .. //depot/projects/mjexp/contrib/sendmail/include/libmilter/milter.h#2 integrate .. //depot/projects/mjexp/contrib/sendmail/include/sm/conf.h#2 integrate .. //depot/projects/mjexp/contrib/sendmail/include/sm/errstring.h#2 integrate .. //depot/projects/mjexp/contrib/sendmail/include/sm/heap.h#2 integrate .. //depot/projects/mjexp/contrib/sendmail/include/sm/ldap.h#2 integrate .. //depot/projects/mjexp/contrib/sendmail/include/sm/misc.h#1 branch .. //depot/projects/mjexp/contrib/sendmail/include/sm/os/sm_os_qnx.h#1 branch .. //depot/projects/mjexp/contrib/sendmail/include/sm/sendmail.h#1 branch .. //depot/projects/mjexp/contrib/sendmail/include/sm/tailq.h#1 branch .. //depot/projects/mjexp/contrib/sendmail/libmilter/Makefile#2 integrate .. //depot/projects/mjexp/contrib/sendmail/libmilter/Makefile.m4#2 integrate .. //depot/projects/mjexp/contrib/sendmail/libmilter/README#2 integrate .. //depot/projects/mjexp/contrib/sendmail/libmilter/comm.c#2 integrate .. //depot/projects/mjexp/contrib/sendmail/libmilter/docs/api.html#2 integrate .. //depot/projects/mjexp/contrib/sendmail/libmilter/docs/design.html#2 integrate .. //depot/projects/mjexp/contrib/sendmail/libmilter/docs/index.html#2 integrate .. //depot/projects/mjexp/contrib/sendmail/libmilter/docs/installation.html#2 integrate .. //depot/projects/mjexp/contrib/sendmail/libmilter/docs/other.html#2 integrate .. //depot/projects/mjexp/contrib/sendmail/libmilter/docs/overview.html#2 integrate .. //depot/projects/mjexp/contrib/sendmail/libmilter/docs/sample.html#2 integrate .. //depot/projects/mjexp/contrib/sendmail/libmilter/docs/smfi_addheader.html#2 integrate .. //depot/projects/mjexp/contrib/sendmail/libmilter/docs/smfi_addrcpt.html#2 integrate .. //depot/projects/mjexp/contrib/sendmail/libmilter/docs/smfi_addrcpt_par.html#1 branch .. //depot/projects/mjexp/contrib/sendmail/libmilter/docs/smfi_chgfrom.html#1 branch .. //depot/projects/mjexp/contrib/sendmail/libmilter/docs/smfi_chgheader.html#2 integrate .. //depot/projects/mjexp/contrib/sendmail/libmilter/docs/smfi_delrcpt.html#2 integrate .. //depot/projects/mjexp/contrib/sendmail/libmilter/docs/smfi_getpriv.html#2 integrate .. //depot/projects/mjexp/contrib/sendmail/libmilter/docs/smfi_getsymval.html#2 integrate .. //depot/projects/mjexp/contrib/sendmail/libmilter/docs/smfi_insheader.html#2 integrate .. //depot/projects/mjexp/contrib/sendmail/libmilter/docs/smfi_main.html#2 integrate .. //depot/projects/mjexp/contrib/sendmail/libmilter/docs/smfi_opensocket.html#2 integrate .. //depot/projects/mjexp/contrib/sendmail/libmilter/docs/smfi_progress.html#2 integrate .. //depot/projects/mjexp/contrib/sendmail/libmilter/docs/smfi_quarantine.html#2 integrate .. //depot/projects/mjexp/contrib/sendmail/libmilter/docs/smfi_register.html#2 integrate .. //depot/projects/mjexp/contrib/sendmail/libmilter/docs/smfi_replacebody.html#2 integrate .. //depot/projects/mjexp/contrib/sendmail/libmilter/docs/smfi_setbacklog.html#2 integrate .. //depot/projects/mjexp/contrib/sendmail/libmilter/docs/smfi_setconn.html#2 integrate .. //depot/projects/mjexp/contrib/sendmail/libmilter/docs/smfi_setdbg.html#2 integrate .. //depot/projects/mjexp/contrib/sendmail/libmilter/docs/smfi_setmlreply.html#2 integrate .. //depot/projects/mjexp/contrib/sendmail/libmilter/docs/smfi_setpriv.html#2 integrate .. //depot/projects/mjexp/contrib/sendmail/libmilter/docs/smfi_setreply.html#2 integrate .. //depot/projects/mjexp/contrib/sendmail/libmilter/docs/smfi_setsymlist.html#1 branch .. //depot/projects/mjexp/contrib/sendmail/libmilter/docs/smfi_settimeout.html#2 integrate .. //depot/projects/mjexp/contrib/sendmail/libmilter/docs/smfi_stop.html#2 integrate .. //depot/projects/mjexp/contrib/sendmail/libmilter/docs/smfi_version.html#1 branch .. //depot/projects/mjexp/contrib/sendmail/libmilter/docs/xxfi_abort.html#2 integrate .. //depot/projects/mjexp/contrib/sendmail/libmilter/docs/xxfi_body.html#2 integrate .. //depot/projects/mjexp/contrib/sendmail/libmilter/docs/xxfi_close.html#2 integrate .. //depot/projects/mjexp/contrib/sendmail/libmilter/docs/xxfi_connect.html#2 integrate .. //depot/projects/mjexp/contrib/sendmail/libmilter/docs/xxfi_data.html#1 branch .. //depot/projects/mjexp/contrib/sendmail/libmilter/docs/xxfi_envfrom.html#2 integrate .. //depot/projects/mjexp/contrib/sendmail/libmilter/docs/xxfi_envrcpt.html#2 integrate .. //depot/projects/mjexp/contrib/sendmail/libmilter/docs/xxfi_eoh.html#2 integrate .. //depot/projects/mjexp/contrib/sendmail/libmilter/docs/xxfi_eom.html#2 integrate .. //depot/projects/mjexp/contrib/sendmail/libmilter/docs/xxfi_header.html#2 integrate .. //depot/projects/mjexp/contrib/sendmail/libmilter/docs/xxfi_helo.html#2 integrate .. //depot/projects/mjexp/contrib/sendmail/libmilter/docs/xxfi_negotiate.html#1 branch .. //depot/projects/mjexp/contrib/sendmail/libmilter/docs/xxfi_unknown.html#1 branch .. //depot/projects/mjexp/contrib/sendmail/libmilter/engine.c#2 integrate .. //depot/projects/mjexp/contrib/sendmail/libmilter/example.c#1 branch .. //depot/projects/mjexp/contrib/sendmail/libmilter/handler.c#2 integrate .. //depot/projects/mjexp/contrib/sendmail/libmilter/libmilter.h#2 integrate .. //depot/projects/mjexp/contrib/sendmail/libmilter/listener.c#2 integrate .. //depot/projects/mjexp/contrib/sendmail/libmilter/main.c#2 integrate .. //depot/projects/mjexp/contrib/sendmail/libmilter/monitor.c#1 branch .. //depot/projects/mjexp/contrib/sendmail/libmilter/smfi.c#2 integrate .. //depot/projects/mjexp/contrib/sendmail/libmilter/worker.c#1 branch .. //depot/projects/mjexp/contrib/sendmail/libsm/Makefile#2 integrate .. //depot/projects/mjexp/contrib/sendmail/libsm/Makefile.m4#2 integrate .. //depot/projects/mjexp/contrib/sendmail/libsm/config.c#2 integrate .. //depot/projects/mjexp/contrib/sendmail/libsm/exc.c#2 integrate .. //depot/projects/mjexp/contrib/sendmail/libsm/exc.html#2 integrate .. //depot/projects/mjexp/contrib/sendmail/libsm/findfp.c#2 integrate .. //depot/projects/mjexp/contrib/sendmail/libsm/flags.c#2 integrate .. //depot/projects/mjexp/contrib/sendmail/libsm/ldap.c#2 integrate .. //depot/projects/mjexp/contrib/sendmail/libsm/local.h#2 integrate .. //depot/projects/mjexp/contrib/sendmail/libsm/memstat.c#2 integrate .. //depot/projects/mjexp/contrib/sendmail/libsm/snprintf.c#2 integrate .. //depot/projects/mjexp/contrib/sendmail/libsm/t-memstat.c#2 integrate .. //depot/projects/mjexp/contrib/sendmail/libsm/t-qic.c#1 branch .. //depot/projects/mjexp/contrib/sendmail/libsm/t-sem.c#2 integrate .. //depot/projects/mjexp/contrib/sendmail/libsm/util.c#1 branch .. //depot/projects/mjexp/contrib/sendmail/libsm/vfscanf.c#2 integrate .. //depot/projects/mjexp/contrib/sendmail/libsmdb/Makefile.m4#2 integrate .. //depot/projects/mjexp/contrib/sendmail/libsmutil/Makefile.m4#2 integrate .. //depot/projects/mjexp/contrib/sendmail/mail.local/Makefile.m4#2 integrate .. //depot/projects/mjexp/contrib/sendmail/mail.local/mail.local.c#2 integrate .. //depot/projects/mjexp/contrib/sendmail/mailstats/Makefile.m4#2 integrate .. //depot/projects/mjexp/contrib/sendmail/makemap/Makefile.m4#2 integrate .. //depot/projects/mjexp/contrib/sendmail/praliases/Makefile.m4#2 integrate .. //depot/projects/mjexp/contrib/sendmail/rmail/Makefile.m4#2 integrate .. //depot/projects/mjexp/contrib/sendmail/smrsh/Makefile.m4#2 integrate .. //depot/projects/mjexp/contrib/sendmail/src/Makefile#2 integrate .. //depot/projects/mjexp/contrib/sendmail/src/Makefile.m4#2 integrate .. //depot/projects/mjexp/contrib/sendmail/src/README#2 integrate .. //depot/projects/mjexp/contrib/sendmail/src/TRACEFLAGS#2 integrate .. //depot/projects/mjexp/contrib/sendmail/src/TUNING#2 integrate .. //depot/projects/mjexp/contrib/sendmail/src/alias.c#2 integrate .. //depot/projects/mjexp/contrib/sendmail/src/arpadate.c#2 integrate .. //depot/projects/mjexp/contrib/sendmail/src/collect.c#2 integrate .. //depot/projects/mjexp/contrib/sendmail/src/conf.c#2 integrate .. //depot/projects/mjexp/contrib/sendmail/src/conf.h#2 integrate .. //depot/projects/mjexp/contrib/sendmail/src/control.c#2 integrate .. //depot/projects/mjexp/contrib/sendmail/src/daemon.c#2 integrate .. //depot/projects/mjexp/contrib/sendmail/src/daemon.h#1 branch .. //depot/projects/mjexp/contrib/sendmail/src/deliver.c#2 integrate .. //depot/projects/mjexp/contrib/sendmail/src/domain.c#2 integrate .. //depot/projects/mjexp/contrib/sendmail/src/envelope.c#2 integrate .. //depot/projects/mjexp/contrib/sendmail/src/err.c#2 integrate .. //depot/projects/mjexp/contrib/sendmail/src/headers.c#2 integrate .. //depot/projects/mjexp/contrib/sendmail/src/helpfile#2 integrate .. //depot/projects/mjexp/contrib/sendmail/src/macro.c#2 integrate .. //depot/projects/mjexp/contrib/sendmail/src/mailq.1#2 integrate .. //depot/projects/mjexp/contrib/sendmail/src/main.c#2 integrate .. //depot/projects/mjexp/contrib/sendmail/src/map.c#2 integrate .. //depot/projects/mjexp/contrib/sendmail/src/map.h#1 branch .. //depot/projects/mjexp/contrib/sendmail/src/mci.c#2 integrate .. //depot/projects/mjexp/contrib/sendmail/src/milter.c#2 integrate .. //depot/projects/mjexp/contrib/sendmail/src/mime.c#2 integrate .. //depot/projects/mjexp/contrib/sendmail/src/parseaddr.c#2 integrate .. //depot/projects/mjexp/contrib/sendmail/src/queue.c#2 integrate .. //depot/projects/mjexp/contrib/sendmail/src/ratectrl.c#2 integrate .. //depot/projects/mjexp/contrib/sendmail/src/readcf.c#2 integrate .. //depot/projects/mjexp/contrib/sendmail/src/recipient.c#2 integrate .. //depot/projects/mjexp/contrib/sendmail/src/sasl.c#2 integrate .. //depot/projects/mjexp/contrib/sendmail/src/savemail.c#2 integrate .. //depot/projects/mjexp/contrib/sendmail/src/sendmail.h#2 integrate .. //depot/projects/mjexp/contrib/sendmail/src/sm_resolve.c#2 integrate .. //depot/projects/mjexp/contrib/sendmail/src/srvrsmtp.c#2 integrate .. //depot/projects/mjexp/contrib/sendmail/src/stab.c#2 integrate .. //depot/projects/mjexp/contrib/sendmail/src/stats.c#2 integrate .. //depot/projects/mjexp/contrib/sendmail/src/timers.c#2 integrate .. //depot/projects/mjexp/contrib/sendmail/src/tls.c#2 integrate .. //depot/projects/mjexp/contrib/sendmail/src/udb.c#2 integrate .. //depot/projects/mjexp/contrib/sendmail/src/usersmtp.c#2 integrate .. //depot/projects/mjexp/contrib/sendmail/src/util.c#2 integrate .. //depot/projects/mjexp/contrib/sendmail/src/version.c#2 integrate .. //depot/projects/mjexp/contrib/sendmail/test/Makefile#2 integrate .. //depot/projects/mjexp/contrib/sendmail/vacation/Makefile.m4#2 integrate .. //depot/projects/mjexp/contrib/sendmail/vacation/vacation.c#2 integrate .. //depot/projects/mjexp/contrib/top/top.X#2 integrate .. //depot/projects/mjexp/contrib/top/top.c#2 integrate .. //depot/projects/mjexp/contrib/top/top.h#2 integrate .. //depot/projects/mjexp/etc/defaults/rc.conf#11 integrate .. //depot/projects/mjexp/etc/mtree/BSD.root.dist#3 integrate .. //depot/projects/mjexp/etc/rc.d/FILESYSTEMS#2 integrate .. //depot/projects/mjexp/etc/rc.d/Makefile#5 integrate .. //depot/projects/mjexp/etc/rc.d/NETWORKING#2 integrate .. //depot/projects/mjexp/etc/rc.d/hostid#1 branch .. //depot/projects/mjexp/etc/rc.d/ipfilter#5 integrate .. //depot/projects/mjexp/etc/rc.d/ipsec#3 integrate .. //depot/projects/mjexp/etc/rc.d/kldxref#3 integrate .. //depot/projects/mjexp/etc/rc.d/mountcritremote#4 integrate .. //depot/projects/mjexp/etc/rc.d/mountd#3 integrate .. //depot/projects/mjexp/etc/rc.d/netoptions#2 integrate .. //depot/projects/mjexp/etc/rc.d/pf#4 integrate .. //depot/projects/mjexp/etc/rc.d/pflog#4 integrate .. //depot/projects/mjexp/etc/rc.d/pfsync#4 integrate .. //depot/projects/mjexp/etc/rc.d/zfs#2 integrate .. //depot/projects/mjexp/etc/services#2 integrate .. //depot/projects/mjexp/include/Makefile#7 integrate .. //depot/projects/mjexp/include/rpc/Makefile#2 integrate .. //depot/projects/mjexp/include/rpc/types.h#2 delete .. //depot/projects/mjexp/lib/libarchive/Makefile#8 integrate .. //depot/projects/mjexp/lib/libarchive/archive_entry.c#8 integrate .. //depot/projects/mjexp/lib/libarchive/archive_platform.h#5 integrate .. //depot/projects/mjexp/lib/libarchive/archive_read_support_format_ar.c#2 integrate .. //depot/projects/mjexp/lib/libarchive/archive_read_support_format_cpio.c#6 integrate .. //depot/projects/mjexp/lib/libarchive/archive_read_support_format_tar.c#8 integrate .. //depot/projects/mjexp/lib/libarchive/archive_write_disk.c#5 integrate .. //depot/projects/mjexp/lib/libarchive/archive_write_set_format_pax.c#5 integrate .. //depot/projects/mjexp/lib/libarchive/archive_write_set_format_ustar.c#6 integrate .. //depot/projects/mjexp/lib/libarchive/config_freebsd.h#3 integrate .. //depot/projects/mjexp/lib/libarchive/test/Makefile#4 integrate .. //depot/projects/mjexp/lib/libarchive/test/main.c#2 integrate .. //depot/projects/mjexp/lib/libarchive/test/test_tar_filenames.c#1 branch .. //depot/projects/mjexp/lib/libc/gen/Symbol.map#4 integrate .. //depot/projects/mjexp/lib/libc/gen/sysconf.c#4 integrate .. //depot/projects/mjexp/lib/libc/gen/sysctl.3#3 integrate .. //depot/projects/mjexp/lib/libc/i386/Symbol.map#2 integrate .. //depot/projects/mjexp/lib/libc/stdlib/strtol.3#3 integrate .. //depot/projects/mjexp/lib/libc/sys/ptrace.2#4 integrate .. //depot/projects/mjexp/lib/libmilter/Makefile#2 integrate .. //depot/projects/mjexp/lib/libpmc/libpmc.c#2 integrate .. //depot/projects/mjexp/lib/libpmc/pmc.3#3 integrate .. //depot/projects/mjexp/lib/libsm/Makefile#2 integrate .. //depot/projects/mjexp/libexec/rtld-elf/Makefile#3 integrate .. //depot/projects/mjexp/libexec/rtld-elf/Symbol.map#2 integrate .. //depot/projects/mjexp/libexec/rtld-elf/Versions.def#2 integrate .. //depot/projects/mjexp/release/Makefile.inc.docports#2 integrate .. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/relnotes/article.sgml#11 integrate .. //depot/projects/mjexp/sbin/atm/atmconfig/diag.c#2 integrate .. //depot/projects/mjexp/sbin/dhclient/dhclient-script#3 integrate .. //depot/projects/mjexp/sbin/ifconfig/Makefile#2 integrate .. //depot/projects/mjexp/sbin/ifconfig/ifconfig.8#9 integrate .. //depot/projects/mjexp/sbin/ifconfig/iftrunk.c#1 branch .. //depot/projects/mjexp/sbin/mount/mount.c#6 integrate .. //depot/projects/mjexp/share/examples/cvsup/cvs-supfile#2 integrate .. //depot/projects/mjexp/share/examples/cvsup/stable-supfile#2 integrate .. //depot/projects/mjexp/share/examples/cvsup/standard-supfile#2 integrate .. //depot/projects/mjexp/share/man/man4/Makefile#10 integrate .. //depot/projects/mjexp/share/man/man4/trunk.4#1 branch .. //depot/projects/mjexp/share/man/man4/uftdi.4#3 integrate .. //depot/projects/mjexp/share/man/man5/rc.conf.5#11 integrate .. //depot/projects/mjexp/share/man/man9/hash.9#3 integrate .. //depot/projects/mjexp/share/misc/committers-ports.dot#4 integrate .. //depot/projects/mjexp/share/misc/committers-src.dot#3 integrate .. //depot/projects/mjexp/sys/Makefile#4 integrate .. //depot/projects/mjexp/sys/amd64/amd64/pmap.c#8 integrate .. //depot/projects/mjexp/sys/amd64/conf/GENERIC#8 integrate .. //depot/projects/mjexp/sys/boot/forth/loader.conf#6 integrate .. //depot/projects/mjexp/sys/cam/scsi/scsi_sg.c#2 integrate .. //depot/projects/mjexp/sys/cam/scsi/scsi_sg.h#2 integrate .. //depot/projects/mjexp/sys/compat/linux/linux_ioctl.h#3 integrate .. //depot/projects/mjexp/sys/compat/linux/linux_socket.c#3 integrate .. //depot/projects/mjexp/sys/compat/opensolaris/kern/opensolaris_kmem.c#2 integrate .. //depot/projects/mjexp/sys/compat/opensolaris/kern/opensolaris_kobj.c#2 integrate .. //depot/projects/mjexp/sys/compat/opensolaris/kern/opensolaris_string.c#2 integrate .. //depot/projects/mjexp/sys/compat/opensolaris/sys/kmem.h#2 integrate .. //depot/projects/mjexp/sys/compat/opensolaris/sys/kobj.h#2 integrate .. //depot/projects/mjexp/sys/compat/opensolaris/sys/lock.h#1 branch .. //depot/projects/mjexp/sys/compat/opensolaris/sys/mutex.h#2 integrate .. //depot/projects/mjexp/sys/compat/opensolaris/sys/rwlock.h#2 integrate .. //depot/projects/mjexp/sys/compat/opensolaris/sys/string.h#2 integrate .. //depot/projects/mjexp/sys/conf/NOTES#18 integrate .. //depot/projects/mjexp/sys/conf/files#19 integrate .. //depot/projects/mjexp/sys/conf/files.ia64#3 integrate .. //depot/projects/mjexp/sys/conf/options#16 integrate .. //depot/projects/mjexp/sys/contrib/dev/acpica/utmisc.c#3 integrate .. //depot/projects/mjexp/sys/contrib/opensolaris/common/atomic/amd64/atomic.S#2 integrate .. //depot/projects/mjexp/sys/contrib/opensolaris/common/atomic/i386/atomic.S#2 integrate .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/dnlc.c#2 integrate .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#3 integrate .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#2 integrate .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#3 integrate .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/spa.c#3 integrate .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#3 integrate .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#2 integrate .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#2 integrate .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#2 integrate .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#3 integrate .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#2 integrate .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#2 integrate .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/zap.c#2 integrate .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#2 integrate .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#2 integrate .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#2 integrate .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/sys/fs/zfs.h#3 integrate .. //depot/projects/mjexp/sys/contrib/pf/net/if_pfsync.c#5 integrate .. //depot/projects/mjexp/sys/dev/ath/ah_osdep.c#2 integrate .. //depot/projects/mjexp/sys/dev/cxgb/cxgb_main.c#2 integrate .. //depot/projects/mjexp/sys/dev/cxgb/cxgb_sge.c#4 integrate .. //depot/projects/mjexp/sys/dev/cxgb/sys/mvec.h#2 integrate .. //depot/projects/mjexp/sys/dev/cxgb/sys/uipc_mvec.c#2 integrate .. //depot/projects/mjexp/sys/dev/mii/brgphy.c#9 integrate .. //depot/projects/mjexp/sys/dev/mii/miidevs#8 integrate .. //depot/projects/mjexp/sys/dev/msk/if_msk.c#7 integrate .. //depot/projects/mjexp/sys/dev/usb/usbdevs#9 integrate .. //depot/projects/mjexp/sys/fs/pseudofs/pseudofs.c#4 integrate .. //depot/projects/mjexp/sys/fs/pseudofs/pseudofs.h#4 integrate .. //depot/projects/mjexp/sys/fs/pseudofs/pseudofs_fileno.c#2 integrate .. //depot/projects/mjexp/sys/fs/pseudofs/pseudofs_internal.h#2 integrate .. //depot/projects/mjexp/sys/fs/pseudofs/pseudofs_vncache.c#4 integrate .. //depot/projects/mjexp/sys/fs/pseudofs/pseudofs_vnops.c#2 integrate .. //depot/projects/mjexp/sys/geom/eli/g_eli.c#6 integrate .. //depot/projects/mjexp/sys/geom/vinum/geom_vinum.h#2 integrate .. //depot/projects/mjexp/sys/geom/vinum/geom_vinum_rm.c#2 integrate .. //depot/projects/mjexp/sys/geom/vinum/geom_vinum_share.c#2 integrate .. //depot/projects/mjexp/sys/geom/vinum/geom_vinum_subr.c#2 integrate .. //depot/projects/mjexp/sys/i386/conf/GENERIC#6 integrate .. //depot/projects/mjexp/sys/i386/i386/mp_machdep.c#7 integrate .. //depot/projects/mjexp/sys/i386/i386/pmap.c#9 integrate .. //depot/projects/mjexp/sys/i386/include/pmap.h#5 integrate .. //depot/projects/mjexp/sys/ia64/conf/GENERIC#5 integrate .. //depot/projects/mjexp/sys/kern/kern_jail.c#10 integrate .. //depot/projects/mjexp/sys/kern/kern_mib.c#2 integrate .. //depot/projects/mjexp/sys/kern/uipc_mbuf.c#6 integrate .. //depot/projects/mjexp/sys/kern/uipc_mqueue.c#6 integrate .. //depot/projects/mjexp/sys/kern/vfs_mount.c#11 integrate .. //depot/projects/mjexp/sys/kern/vfs_subr.c#7 integrate .. //depot/projects/mjexp/sys/libkern/index.c#2 integrate .. //depot/projects/mjexp/sys/libkern/rindex.c#2 integrate .. //depot/projects/mjexp/sys/modules/Makefile#10 integrate .. //depot/projects/mjexp/sys/modules/dpt/Makefile#2 integrate .. //depot/projects/mjexp/sys/modules/if_trunk/Makefile#1 branch .. //depot/projects/mjexp/sys/modules/libalias/libalias/Makefile#2 integrate .. //depot/projects/mjexp/sys/net/ieee8023ad_lacp.c#1 branch .. //depot/projects/mjexp/sys/net/ieee8023ad_lacp.h#1 branch .. //depot/projects/mjexp/sys/net/if.c#7 integrate .. //depot/projects/mjexp/sys/net/if_ethersubr.c#8 integrate .. //depot/projects/mjexp/sys/net/if_trunk.c#1 branch .. //depot/projects/mjexp/sys/net/if_trunk.h#1 branch .. //depot/projects/mjexp/sys/net/if_var.h#3 integrate .. //depot/projects/mjexp/sys/netinet/in_pcb.c#7 integrate .. //depot/projects/mjexp/sys/netinet/sctp_constants.h#7 integrate .. //depot/projects/mjexp/sys/netinet/sctp_crc32.c#4 integrate .. //depot/projects/mjexp/sys/netinet/sctp_indata.c#8 integrate .. //depot/projects/mjexp/sys/netinet/sctp_input.c#8 integrate .. //depot/projects/mjexp/sys/netinet/sctp_output.c#8 integrate .. //depot/projects/mjexp/sys/netinet/sctp_pcb.c#8 integrate .. //depot/projects/mjexp/sys/netinet/sctp_peeloff.c#6 integrate .. //depot/projects/mjexp/sys/netinet/sctp_timer.c#8 integrate .. //depot/projects/mjexp/sys/netinet/sctp_uio.h#7 integrate .. //depot/projects/mjexp/sys/netinet/sctp_usrreq.c#8 integrate .. //depot/projects/mjexp/sys/netinet/sctp_var.h#6 integrate .. //depot/projects/mjexp/sys/netinet/sctputil.c#8 integrate .. //depot/projects/mjexp/sys/netinet/tcp_input.c#10 integrate .. //depot/projects/mjexp/sys/netinet/tcp_output.c#7 integrate .. //depot/projects/mjexp/sys/netinet/tcp_sack.c#4 integrate .. //depot/projects/mjexp/sys/netinet/tcp_subr.c#8 integrate .. //depot/projects/mjexp/sys/netinet/tcp_syncache.c#7 integrate .. //depot/projects/mjexp/sys/netinet/tcp_timer.c#5 integrate .. //depot/projects/mjexp/sys/netinet/tcp_timer.h#3 integrate .. //depot/projects/mjexp/sys/netinet/tcp_usrreq.c#7 integrate .. //depot/projects/mjexp/sys/netinet/tcp_var.h#5 integrate .. //depot/projects/mjexp/sys/netinet6/ipsec.c#4 integrate .. //depot/projects/mjexp/sys/netinet6/sctp6_usrreq.c#8 integrate .. //depot/projects/mjexp/sys/netipsec/ipsec_osdep.h#3 integrate .. //depot/projects/mjexp/sys/pc98/conf/GENERIC#5 integrate .. //depot/projects/mjexp/sys/powerpc/conf/GENERIC#6 integrate .. //depot/projects/mjexp/sys/rpc/types.h#1 branch .. //depot/projects/mjexp/sys/security/audit/audit.c#6 integrate .. //depot/projects/mjexp/sys/security/audit/audit.h#2 integrate .. //depot/projects/mjexp/sys/security/audit/audit_arg.c#6 integrate .. //depot/projects/mjexp/sys/security/audit/audit_bsm.c#3 integrate .. //depot/projects/mjexp/sys/security/audit/audit_bsm_token.c#3 integrate .. //depot/projects/mjexp/sys/security/audit/audit_private.h#3 integrate .. //depot/projects/mjexp/sys/security/audit/audit_syscalls.c#6 integrate .. //depot/projects/mjexp/sys/sparc64/conf/GENERIC#5 integrate .. //depot/projects/mjexp/sys/sun4v/conf/GENERIC#5 integrate .. //depot/projects/mjexp/sys/sys/eventhandler.h#3 integrate .. //depot/projects/mjexp/sys/sys/hash.h#2 integrate .. //depot/projects/mjexp/sys/sys/kernel.h#4 integrate .. //depot/projects/mjexp/sys/sys/libkern.h#3 integrate .. //depot/projects/mjexp/sys/sys/mbuf.h#7 integrate .. //depot/projects/mjexp/sys/sys/mutex.h#9 integrate .. //depot/projects/mjexp/sys/sys/priv.h#5 integrate .. //depot/projects/mjexp/sys/sys/proc.h#11 integrate .. //depot/projects/mjexp/sys/sys/sysctl.h#2 integrate .. //depot/projects/mjexp/sys/sys/systm.h#12 integrate .. //depot/projects/mjexp/sys/ufs/ffs/ffs_snapshot.c#5 integrate .. //depot/projects/mjexp/sys/ufs/ffs/ffs_softdep.c#7 integrate .. //depot/projects/mjexp/sys/vm/phys_pager.c#4 integrate .. //depot/projects/mjexp/tools/regression/netinet/ipblock/Makefile#2 delete .. //depot/projects/mjexp/tools/regression/netinet/ipblock/ipblock.c#2 delete .. //depot/projects/mjexp/tools/regression/netinet/ipsockopt/ipsockopt.c#3 integrate .. //depot/projects/mjexp/tools/tools/net80211/wesside/wesside/Makefile#2 integrate .. //depot/projects/mjexp/tools/tools/net80211/wesside/wesside/aircrack-ptw-lib.c#1 branch .. //depot/projects/mjexp/tools/tools/net80211/wesside/wesside/aircrack-ptw-lib.h#1 branch .. //depot/projects/mjexp/tools/tools/net80211/wesside/wesside/wesside.c#2 integrate .. //depot/projects/mjexp/usr.bin/finger/extern.h#2 integrate .. //depot/projects/mjexp/usr.bin/finger/finger.1#2 integrate .. //depot/projects/mjexp/usr.bin/finger/finger.c#2 integrate .. //depot/projects/mjexp/usr.bin/finger/net.c#2 integrate .. //depot/projects/mjexp/usr.bin/gcore/elfcore.c#2 integrate .. //depot/projects/mjexp/usr.bin/kdump/kdump.c#5 integrate .. //depot/projects/mjexp/usr.bin/kdump/kdump_subr.h#3 integrate .. //depot/projects/mjexp/usr.bin/kdump/mksubr#4 integrate .. //depot/projects/mjexp/usr.bin/make/parse.c#3 integrate .. //depot/projects/mjexp/usr.bin/netstat/mcast.c#5 integrate .. //depot/projects/mjexp/usr.bin/tar/Makefile#3 integrate .. //depot/projects/mjexp/usr.bin/tar/bsdtar_platform.h#5 integrate .. //depot/projects/mjexp/usr.bin/tar/read.c#5 integrate .. //depot/projects/mjexp/usr.bin/tar/write.c#9 integrate .. //depot/projects/mjexp/usr.bin/top/machine.c#3 integrate .. //depot/projects/mjexp/usr.bin/touch/touch.1#2 integrate .. //depot/projects/mjexp/usr.bin/touch/touch.c#2 integrate .. //depot/projects/mjexp/usr.bin/truss/Makefile#2 integrate .. //depot/projects/mjexp/usr.bin/truss/amd64-fbsd.c#2 integrate .. //depot/projects/mjexp/usr.bin/truss/extern.h#2 integrate .. //depot/projects/mjexp/usr.bin/truss/i386-fbsd.c#2 integrate .. //depot/projects/mjexp/usr.bin/truss/i386-linux.c#2 integrate .. //depot/projects/mjexp/usr.bin/truss/ia64-fbsd.c#2 integrate .. //depot/projects/mjexp/usr.bin/truss/main.c#2 integrate .. //depot/projects/mjexp/usr.bin/truss/powerpc-fbsd.c#2 integrate .. //depot/projects/mjexp/usr.bin/truss/setup.c#2 integrate .. //depot/projects/mjexp/usr.bin/truss/sparc64-fbsd.c#2 integrate .. //depot/projects/mjexp/usr.bin/truss/syscall.h#2 integrate .. //depot/projects/mjexp/usr.bin/truss/syscalls.c#2 integrate .. //depot/projects/mjexp/usr.bin/truss/truss.1#3 integrate .. //depot/projects/mjexp/usr.bin/truss/truss.h#2 integrate .. //depot/projects/mjexp/usr.bin/uuidgen/Makefile#2 integrate .. //depot/projects/mjexp/usr.bin/whois/whois.c#3 integrate .. //depot/projects/mjexp/usr.sbin/adduser/adduser.conf.5#2 integrate .. //depot/projects/mjexp/usr.sbin/adduser/adduser.sh#3 integrate .. //depot/projects/mjexp/usr.sbin/ifmcstat/Makefile#3 integrate .. //depot/projects/mjexp/usr.sbin/ifmcstat/ifmcstat.8#3 integrate .. //depot/projects/mjexp/usr.sbin/ifmcstat/ifmcstat.c#3 integrate .. //depot/projects/mjexp/usr.sbin/mountd/mountd.c#6 integrate .. //depot/projects/mjexp/usr.sbin/rpc.lockd/lockd_lock.c#4 integrate .. //depot/projects/mjexp/usr.sbin/sendmail/Makefile#2 integrate Differences ... ==== //depot/projects/mjexp/ObsoleteFiles.inc#12 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.77 2007/03/28 07:49:57 delphij Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.78 2007/04/09 19:16:48 pjd Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,8 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20070409: uuidgen moved to /bin/ +OLD_FILES+=usr/bin/uuidgen # 20070328: bzip2 1.0.4 OLD_FILES+=usr/share/info/bzip2.info.gz # 20070303: libarchive 2.0 ==== //depot/projects/mjexp/UPDATING#12 (text+ko) ==== @@ -21,6 +21,11 @@ developers choose to disable these features on build machines to maximize performance. +20070408: + sendmail(8) has been updated to version 8.14.1. Mail filters + (aka, milters) compiled against the libmilter included in the + base operating system should be recompiled. + 20070302: Firmwares for ipw(4) and iwi(4) are now included in the base tree. In order to use them one must agree to the respective LICENSE in @@ -758,4 +763,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.484 2007/04/03 10:04:54 brueffer Exp $ +$FreeBSD: src/UPDATING,v 1.485 2007/04/14 16:26:01 gshapiro Exp $ ==== //depot/projects/mjexp/contrib/libreadline/FREEBSD-upgrade#3 (text+ko) ==== @@ -1,6 +1,7 @@ -# $FreeBSD: src/contrib/libreadline/FREEBSD-upgrade,v 1.9 2006/12/31 09:50:44 ache Exp $ +# $FreeBSD: src/contrib/libreadline/FREEBSD-upgrade,v 1.10 2007/04/12 14:45:25 ache Exp $ # # Official patch 001 imported as v5_2_p1 +# Official patch 002 imported as v5_2_p2 # rm doc/*.dvi doc/*.html doc/*.ps doc/*.0 doc/*.info doc/*.tex doc/texi2* doc/*.pdf ==== //depot/projects/mjexp/contrib/libreadline/display.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/libreadline/display.c,v 1.12 2006/12/31 09:47:34 ache Exp $ */ +/* $FreeBSD: src/contrib/libreadline/display.c,v 1.13 2007/04/12 14:45:25 ache Exp $ */ /* display.c -- readline redisplay facility. */ /* Copyright (C) 1987-2006 Free Software Foundation, Inc. @@ -562,6 +562,17 @@ wrap_offset = prompt_invis_chars_first_line = 0; } +#if defined (HANDLE_MULTIBYTE) +#define CHECK_INV_LBREAKS() \ + do { \ + if (newlines >= (inv_lbsize - 2)) \ + { \ + inv_lbsize *= 2; \ + inv_lbreaks = (int *)xrealloc (inv_lbreaks, inv_lbsize * sizeof (int)); \ + _rl_wrapped_line = (int *)xrealloc (_rl_wrapped_line, inv_lbsize * sizeof (int)); \ + } \ + } while (0) +#else #define CHECK_INV_LBREAKS() \ do { \ if (newlines >= (inv_lbsize - 2)) \ @@ -570,6 +581,7 @@ inv_lbreaks = (int *)xrealloc (inv_lbreaks, inv_lbsize * sizeof (int)); \ } \ } while (0) +#endif /* HANDLE_MULTIBYTE */ #if defined (HANDLE_MULTIBYTE) #define CHECK_LPOS() \ ==== //depot/projects/mjexp/contrib/opensolaris/cmd/zdb/zdb.8#2 (text+ko) ==== @@ -28,7 +28,6 @@ .fi .SH DESCRIPTION - .LP The \fBzdb\fR command is used by support engineers to diagnose failures and gather statistics. Since the \fBZFS\fR file system is always consistent on disk and is self-repairing, \fBzdb\fR should only be run under the direction by a support engineer. .LP @@ -36,7 +35,6 @@ .LP Any options supported by this command are internal to Sun and subject to change at any time. .SH EXIT STATUS - .LP The following exit values are returned: .sp @@ -73,7 +71,6 @@ .RE .SH ATTRIBUTES - .LP See \fBattributes\fR(5) for descriptions of the following attributes: .sp @@ -92,6 +89,5 @@ .TE .SH SEE ALSO - .LP \fBzfs\fR(1M), \fBzpool\fR(1M), \fBattributes\fR(5) ==== //depot/projects/mjexp/contrib/opensolaris/cmd/zfs/zfs.8#2 (text+ko) ==== @@ -26,103 +26,127 @@ .nf \fBzfs\fR [\fB-?\fR] .fi + .LP .nf \fBzfs\fR \fBcreate\fR [[\fB-o\fR property=\fIvalue\fR]]... \fIfilesystem\fR .fi + .LP .nf \fBzfs\fR \fBcreate\fR [\fB-s\fR] [\fB-b\fR \fIblocksize\fR] [[\fB-o\fR property=\fIvalue\fR]]... \fB-V\fR \fIsize\fR \fIvolume\fR .fi + .LP .nf \fBzfs\fR \fBdestroy\fR [\fB-rRf\fR] \fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR .fi + .LP .nf \fBzfs\fR \fBclone\fR \fIsnapshot\fR \fIfilesystem\fR|\fIvolume\fR .fi + .LP .nf \fBzfs\fR \fBpromote\fR \fIfilesystem\fR .fi + .LP .nf \fBzfs\fR \fBrename\fR \fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR [\fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR] .fi + .LP .nf \fBzfs\fR \fBsnapshot\fR [\fB-r\fR] \fIfilesystem@name\fR|\fIvolume@name\fR .fi + .LP .nf \fBzfs\fR \fBrollback\fR [\fB-rRf\fR] \fIsnapshot\fR .fi + .LP .nf \fBzfs\fR \fBlist\fR [\fB-rH\fR] [\fB-o\fR \fIprop\fR[,\fIprop\fR] ]... [ \fB-t\fR \fItype\fR[,\fItype\fR]...] [ \fB-s\fR \fIprop\fR [\fB-s\fR \fIprop\fR]... [ \fB-S\fR \fIprop\fR [\fB-S\fR \fIprop\fR]... [\fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR|\fI/pathname\fR|.\fI/pathname\fR ... .fi + .LP .nf \fBzfs\fR \fBset\fR \fIproperty\fR=\fIvalue\fR \fIfilesystem\fR|\fIvolume\fR ... .fi + .LP .nf \fBzfs\fR \fBget\fR [\fB-rHp\fR] [\fB-o\fR \fIfield\fR[,\fIfield\fR]...] [\fB-s\fR \fIsource\fR[,\fIsource\fR]...] \fIall\fR | \fIproperty\fR[,\fIproperty\fR]... \fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR ... .fi + .LP .nf \fBzfs\fR \fBinherit\fR [\fB-r\fR] \fIproperty\fR \fIfilesystem\fR|\fIvolume\fR... ... .fi + .LP .nf \fBzfs\fR \fBmount\fR .fi + .LP .nf \fBzfs\fR \fBmount\fR [\fB-o \fIoptions\fR\fR] [\fB-O\fR] \fB-a\fR .fi + .LP .nf \fBzfs\fR \fBmount\fR [\fB-o \fIoptions\fR\fR] [\fB-O\fR] \fIfilesystem\fR .fi + .LP .nf \fBzfs\fR \fBunmount\fR [\fB-f\fR] \fB-a\fR .fi + .LP .nf \fBzfs\fR \fBunmount\fR [\fB-f\fR] \fB\fIfilesystem\fR|\fImountpoint\fR\fR .fi + .LP .nf \fBzfs\fR \fBshare\fR \fB-a\fR .fi + .LP .nf \fBzfs\fR \fBshare\fR \fIfilesystem\fR .fi + .LP .nf \fBzfs\fR \fBunshare\fR [\fB-f\fR] \fB-a\fR .fi + .LP .nf \fBzfs\fR \fBunshare\fR [\fB-f\fR] \fB\fIfilesystem\fR|\fImountpoint\fR\fR .fi + .LP .nf \fBzfs\fR \fBsend\fR [\fB-i\fR \fIsnapshot1\fR] \fB\fIsnapshot2\fR\fR .fi + .LP .nf \fBzfs\fR \fBreceive\fR [\fB-vnF\fR ] \fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR .fi + .LP .nf \fBzfs\fR \fBreceive\fR [\fB-vnF\fR ] \fB-d\fR \fB\fIfilesystem\fR\fR @@ -137,7 +161,6 @@ .fi .SH DESCRIPTION - .LP The \fBzfs\fR command configures \fBZFS\fR datasets within a \fBZFS\fR storage pool, as described in \fBzpool\fR(1M). A dataset is identified by a unique path within the \fBZFS\fR namespace. For example: @@ -186,16 +209,14 @@ A read-only version of a file system or volume at a given point in time. It is specified as \fIfilesystem@name\fR or \fIvolume@name\fR. .RE -.SS ZFS File System Hierarchy - +.SS "ZFS File System Hierarchy" .LP A \fBZFS\fR storage pool is a logical collection of devices that provide space for datasets. A storage pool is also the root of the \fBZFS\fR file system hierarchy. .LP The root of the pool can be accessed as a file system, such as mounting and unmounting, taking snapshots, and setting properties. The physical storage characteristics, however, are managed by the \fBzpool\fR(1M) command. .LP See \fBzpool\fR(1M) for more information on creating and administering pools. -.SS Snapshots - +.SS "Snapshots" .LP A snapshot is a read-only copy of a file system or volume. Snapshots can be created extremely quickly, and initially consume no additional space within the pool. As data within the active dataset changes, the snapshot consumes more data than would otherwise be shared with the active dataset. .LP @@ -203,8 +224,7 @@ .LP File system snapshots can be accessed under the ".zfs/snapshot" directory in the root of the file system. Snapshots are automatically mounted on demand and may be unmounted at regular intervals. The visibility of the ".zfs" directory can be controlled by the "snapdir" property. -.SS Clones - +.SS "Clones" .LP A clone is a writable volume or file system whose initial contents are the same as another dataset. As with snapshots, creating a clone is nearly instantaneous, and initially consumes no additional space. .LP @@ -213,8 +233,7 @@ .LP The clone parent-child dependency relationship can be reversed by using the "\fBpromote\fR" subcommand. This causes the "origin" file system to become a clone of the specified file system, which makes it possible to destroy the file system that the clone was created from. -.SS Mount Points - +.SS "Mount Points" .LP Creating a \fBZFS\fR file system is a simple operation, so the number of file systems per system will likely be numerous. To cope with this, \fBZFS\fR automatically manages mounting and unmounting file systems without the need to edit the \fB/etc/vfstab\fR file. All automatically managed file systems are mounted by \fBZFS\fR at boot time. @@ -227,8 +246,7 @@ .LP If needed, \fBZFS\fR file systems can also be managed with traditional tools (\fBmount\fR, \fBumount\fR, \fB/etc/vfstab\fR). If a file system's mount point is set to "legacy", \fBZFS\fR makes no attempt to manage the file system, and the administrator is responsible for mounting and unmounting the file system. -.SS Zones - +.SS "Zones" .LP A \fBZFS\fR file system can be added to a non-global zone by using zonecfg's "\fBadd fs\fR" subcommand. A \fBZFS\fR file system that is added to a non-global zone must have its mountpoint property set to legacy. .LP @@ -244,8 +262,7 @@ After a dataset is delegated to a non-global zone, the "zoned" property is automatically set. A zoned file system cannot be mounted in the global zone, since the zone administrator might have to set the mount point to an unacceptable value. .LP The global administrator can forcibly clear the "zoned" property, though this should be done with extreme care. The global administrator should verify that all the mount points are acceptable before clearing the property. -.SS Native Properties - +.SS "Native Properties" .LP Properties are divided into two types, native properties and user defined properties. Native properties either export internal statistics or control \fBZFS\fR behavior. In addition, native properties are either editable or read-only. User properties have no effect on \fBZFS\fR behavior, but you can use them to annotate datasets in a way that is meaningful in your environment. For more information about user properties, see the "User Properties" section. @@ -507,11 +524,13 @@ .ne 2 .mk .na -\fBcompression=\fIon\fR | \fIoff\fR | \fIlzjb\fR\fR +\fBcompression=\fIon\fR | \fIoff\fR | \fIlzjb\fR | \fIgzip\fR | \fIgzip-N\fR\fR .ad .sp .6 .RS 4n -Controls the compression algorithm used for this dataset. There is currently only one algorithm, "\fIlzjb\fR", though this may change in future releases. The default value is "off". +Controls the compression algorithm used for this dataset. The "lzjb" compression algorithm is optimized for performance while providing decent data compression. Setting compression to "on" uses the "lzjb" compression algorithm. The "gzip" +compression algorithm uses the same compression as the \fBgzip\fR(1) command. You can specify the "gzip" level by using the value "gzip-\fIN\fR", +where \fIN\fR is an integer from 1 (fastest) to 9 (best compression ratio). Currently, "gzip" is equivalent to "gzip-6" (which is also the default for \fBgzip\fR(1)). .sp This property can also be referred to by its shortened column name "compress". .RE @@ -655,10 +674,10 @@ .ad .sp .6 .RS 4n -Controls the number of copies of data stored for this dataset. These copies are in addition to any redundancy provided by the pool (for example, mirroring or raid-z). The copies are stored on different disks if possible. The space used by multiple copies is charged to the associated -file and dataset, changing the "used" property and counting against quotas and reservations. +Controls the number of copies of data stored for this dataset. These copies are in addition to any redundancy provided by the pool, for example, mirroring or raid-z. The copies are stored on different disks, if possible. The space used by multiple copies is charged to the associated +file and dataset, changing the "used" property and counting against quotas and reservations. .sp -Changing this property only affects newly-written data. Therefore, it is recommended that this property be set at file system creation time, using the "\fB-o\fR copies=" option. +Changing this property only affects newly-written data. Therefore, set this property at file system creation time by using the "\fB-o\fR copies=" option. .RE .sp @@ -672,12 +691,10 @@ Controls whether the dataset is managed from within a jail. The default value is "off". .RE -.SS iscsioptions - +.SS "iscsioptions" .LP This read-only property, which is hidden, is used by the \fBiSCSI\fR target daemon to store persistent information, such as the \fBIQN\fR. It cannot be viewed or modified using the \fBzfs\fR command. The contents are not intended for external consumers. -.SS Temporary Mount Point Properties - +.SS "Temporary Mount Point Properties" .LP When a file system is mounted, either through \fBmount\fR(1M) for legacy mounts or the "\fBzfs mount\fR" command for normal file systems, its mount options are set according to its properties. The correlation between properties and mount options is as follows: @@ -697,8 +714,7 @@ .LP In addition, these options can be set on a per-mount basis using the \fB-o\fR option, without affecting the property that is stored on disk. The values specified on the command line override the values stored in the dataset. The \fB-nosuid\fR option is an alias for "nodevices,nosetuid". These properties are reported as "temporary" by the "\fBzfs get\fR" command. If the properties are changed while the dataset is mounted, the new setting overrides any temporary settings. -.SS User Properties - +.SS "User Properties" .LP In addition to the standard native properties, \fBZFS\fR supports arbitrary user properties. User properties have no effect on \fBZFS\fR behavior, but applications or administrators can use them to annotate datasets. .LP @@ -711,8 +727,7 @@ .LP The values of user properties are arbitrary strings, are always inherited, and are never validated. All of the commands that operate on properties ("zfs list", "zfs get", "zfs set", etc.) can be used to manipulate both native properties and user properties. Use the "\fBzfs inherit\fR" command to clear a user property . If the property is not defined in any parent dataset, it is removed entirely. Property values are limited to 1024 characters. -.SS Volumes as Swap or Dump Devices - +.SS "Volumes as Swap or Dump Devices" .LP To set up a swap area, create a \fBZFS\fR volume of a specific size and then enable swap on that device. For more information, see the EXAMPLES section. .LP @@ -720,7 +735,6 @@ .LP Using a \fBZFS\fR volume as a dump device is not supported. .SH SUBCOMMANDS - .LP All subcommands that modify state are logged persistently to the pool in their original form. .sp @@ -1466,10 +1480,10 @@ .SH EXAMPLES .LP \fBExample 1 \fRCreating a ZFS File System Hierarchy - .LP The following commands create a file system named "\fBpool/home\fR" and a file system named "\fBpool/home/bob\fR". The mount point "\fB/export/home\fR" is set for the parent file system, and automatically inherited by the child file system. + .sp .in +2 .nf @@ -1479,11 +1493,12 @@ .fi .in -2 .sp + .LP \fBExample 2 \fRCreating a ZFS Snapshot - .LP The following command creates a snapshot named "yesterday". This snapshot is mounted on demand in the ".zfs/snapshot" directory at the root of the "\fBpool/home/bob\fR" file system. + .sp .in +2 .nf @@ -1491,12 +1506,13 @@ .fi .in -2 .sp + .LP \fBExample 3 \fRTaking and destroying multiple snapshots - .LP The following command creates snapshots named "\fByesterday\fR" of "\fBpool/home\fR" and all of its descendant file systems. Each snapshot is mounted on demand in the ".zfs/snapshot" directory at the root of its file system. The second command destroys the newly created snapshots. + .sp .in +2 .nf @@ -1505,11 +1521,12 @@ .fi .in -2 .sp + .LP \fBExample 4 \fRTurning Off Compression - .LP The following commands turn compression off for all file systems under "\fBpool/home\fR", but explicitly turns it on for "\fBpool/home/anne\fR". + .sp .in +2 .nf @@ -1518,11 +1535,12 @@ .fi .in -2 .sp + .LP \fBExample 5 \fRListing ZFS Datasets - .LP The following command lists all active file systems and volumes in the system. + .sp .in +2 .nf @@ -1538,11 +1556,12 @@ .fi .in -2 .sp + .LP \fBExample 6 \fRSetting a Quota on a ZFS File System - .LP The following command sets a quota of 50 gbytes for "\fBpool/home/bob\fR". + .sp .in +2 .nf @@ -1550,11 +1569,12 @@ .fi .in -2 .sp + .LP \fBExample 7 \fRListing ZFS Properties - .LP The following command lists all properties for "\fBpool/home/bob\fR". + .sp .in +2 .nf @@ -1596,6 +1616,7 @@ .LP The following command gets a single property value. + .sp .in +2 .nf @@ -1607,6 +1628,7 @@ .LP The following command lists all properties with local settings for "\fBpool/home/bob\fR". + .sp .in +2 .nf @@ -1618,11 +1640,12 @@ .fi .in -2 .sp + .LP \fBExample 8 \fRRolling Back a ZFS File System - .LP The following command reverts the contents of "\fBpool/home/anne\fR" to the snapshot named "\fByesterday\fR", deleting all intermediate snapshots. + .sp .in +2 .nf @@ -1630,11 +1653,12 @@ .fi .in -2 .sp + .LP \fBExample 9 \fRCreating a ZFS Clone - .LP The following command creates a writable file system whose initial contents are the same as "\fBpool/home/bob@yesterday\fR". + .sp .in +2 .nf @@ -1642,11 +1666,12 @@ .fi .in -2 .sp + .LP \fBExample 10 \fRPromoting a ZFS Clone - .LP The following commands illustrate how to test out changes to a file system, and then replace the original file system with the changed one, using clones, clone promotion, and renaming: + .sp .in +2 .nf @@ -1664,11 +1689,12 @@ .fi .in -2 .sp + .LP \fBExample 11 \fRInheriting ZFS Properties - .LP The following command causes "\fBpool/home/bob\fR" and "\fBpool/home/anne\fR" to inherit the "checksum" property from their parent. + .sp .in +2 .nf @@ -1676,12 +1702,13 @@ .fi .in -2 .sp + >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Apr 15 03:06:24 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 2F94816A403; Sun, 15 Apr 2007 03:06:24 +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 CEA6116A400 for ; Sun, 15 Apr 2007 03:06:23 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B950513C465 for ; Sun, 15 Apr 2007 03:06:23 +0000 (UTC) (envelope-from scottl@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 l3F36NDP059649 for ; Sun, 15 Apr 2007 03:06:23 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3F36Nwt059646 for perforce@freebsd.org; Sun, 15 Apr 2007 03:06:23 GMT (envelope-from scottl@freebsd.org) Date: Sun, 15 Apr 2007 03:06:23 GMT Message-Id: <200704150306.l3F36Nwt059646@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 118135 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: Sun, 15 Apr 2007 03:06:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=118135 Change 118135 by scottl@scottl-x64 on 2007/04/15 03:06:13 Another try at the locking protocol. Rename cam_periph_block to cam_periph_hold. Give it the same arguments and semantics as the original cam_periph_lock(), but require that the periph lock already be held. Locking and holding can't be combined because several periph_register functions are called with the lock held already. Add cam_periph_hold/unhold to the periph drivers that need it, basically replacing the old instances of cam_periph_lock(). Some drivers where only using cam_periph_lock to protect flag changing, so there is not need to add a hold as well. Note that the scsi_sa and scsi_target drivers aren't being touched yet. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#19 edit .. //depot/projects/scottl-camlock/src/sys/cam/cam_periph.h#12 edit .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.c#18 edit .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_ch.c#12 edit .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_da.c#30 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#19 (text+ko) ==== @@ -309,27 +309,52 @@ } -void -cam_periph_block(struct cam_periph *periph) +int +cam_periph_hold(struct cam_periph *periph, int priority) { + struct mtx *mtx; + int error; mtx_assert(periph->sim->mtx, MA_OWNED); - cam_periph_acquire(periph); + /* + * Increment the reference count on the peripheral + * while we wait for our lock attempt to succeed + * to ensure the peripheral doesn't disappear out + * from user us while we sleep. + */ + + if (cam_periph_acquire(periph) != CAM_REQ_CMP) + return (ENXIO); + + mtx = periph->sim->mtx; + if (mtx == &Giant) + mtx = NULL; + + while ((periph->flags & CAM_PERIPH_LOCKED) != 0) { + periph->flags |= CAM_PERIPH_LOCK_WANTED; + if ((error = msleep(periph, mtx, priority, "caplck", 0)) != 0) { + cam_periph_release(periph); + return (error); + } + } + periph->flags |= CAM_PERIPH_LOCKED; + return (0); } void -cam_periph_unblock(struct cam_periph *periph) +cam_periph_unhold(struct cam_periph *periph) { mtx_assert(periph->sim->mtx, MA_OWNED); periph->flags &= ~CAM_PERIPH_LOCKED; - if (periph->flags &CAM_PERIPH_LOCK_WANTED) { + if ((periph->flags & CAM_PERIPH_LOCK_WANTED) != 0) { periph->flags &= ~CAM_PERIPH_LOCK_WANTED; wakeup(periph); } + cam_periph_release(periph); } @@ -532,16 +557,8 @@ void cam_periph_lock(struct cam_periph *periph) { - struct mtx *mtx; - mtx = periph->sim->mtx; - mtx_lock(mtx); - if (periph->flags & CAM_PERIPH_LOCKED) { - periph->flags |= CAM_PERIPH_LOCK_WANTED; - if (mtx == &Giant) - mtx = NULL; - msleep(periph, mtx, PCATCH, "periph", 0); - }; + mtx_lock(periph->sim->mtx); } /* ==== //depot/projects/scottl-camlock/src/sys/cam/cam_periph.h#12 (text+ko) ==== @@ -142,8 +142,8 @@ void cam_periph_unlock(struct cam_periph *periph); cam_status cam_periph_acquire(struct cam_periph *periph); void cam_periph_release(struct cam_periph *periph); -void cam_periph_block(struct cam_periph *periph); -void cam_periph_unblock(struct cam_periph *periph); +int cam_periph_hold(struct cam_periph *periph, int priority); +void cam_periph_unhold(struct cam_periph *periph); void cam_periph_invalidate(struct cam_periph *periph); int cam_periph_mapmem(union ccb *ccb, struct cam_periph_map_info *mapinfo); ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.c#18 (text+ko) ==== @@ -976,8 +976,11 @@ cdregisterexit: - /* Refcount this periph now that it's been created. */ - cam_periph_block(periph); + /* + * Refcount and block open attempts until we are setup + * Can't block + */ + (void)cam_periph_hold(periph, PRIBIO); if ((softc->flags & CD_FLAG_CHANGER) == 0) xpt_schedule(periph, /*priority*/5); @@ -992,6 +995,7 @@ { struct cam_periph *periph; struct cd_softc *softc; + int error; periph = (struct cam_periph *)dp->d_drv1; if (periph == NULL) @@ -1010,6 +1014,12 @@ return(ENXIO); } + if ((error = cam_periph_hold(periph, PRIBIO | PCATCH)) != 0) { + cam_periph_unlock(periph); + cam_periph_release(periph); + return (error); + } + /* Closes aren't symmetrical with opens, so fix up the refcounting. */ if (softc->flags & CD_FLAG_OPEN) cam_periph_release(periph); @@ -1024,6 +1034,7 @@ cdcheckmedia(periph); CAM_DEBUG(periph->path, CAM_DEBUG_TRACE, ("leaving cdopen\n")); + cam_periph_unhold(periph); cam_periph_unlock(periph); return (0); @@ -1042,6 +1053,7 @@ softc = (struct cd_softc *)periph->softc; cam_periph_lock(periph); + cam_periph_hold(periph, PRIBIO); if ((softc->flags & CD_FLAG_DISC_REMOVABLE) != 0) cdprevent(periph, PR_ALLOW); @@ -1057,6 +1069,7 @@ */ softc->flags &= ~(CD_FLAG_VALID_MEDIA|CD_FLAG_VALID_TOC|CD_FLAG_OPEN); + cam_periph_unhold(periph); cam_periph_unlock(periph); cam_periph_release(periph); @@ -1784,7 +1797,7 @@ * operation. */ xpt_release_ccb(done_ccb); - cam_periph_unblock(periph); + cam_periph_unhold(periph); return; } case CD_CCB_WAITING: @@ -1843,14 +1856,20 @@ if (periph == NULL) return(ENXIO); + cam_periph_lock(periph); CAM_DEBUG(periph->path, CAM_DEBUG_TRACE, ("entering cdioctl\n")); softc = (struct cd_softc *)periph->softc; - cam_periph_lock(periph); CAM_DEBUG(periph->path, CAM_DEBUG_TRACE, ("trying to do ioctl %#lx\n", cmd)); + if ((error = cam_periph_hold(periph, PRIBIO | PCATCH)) != 0) { + cam_periph_unlock(periph); + cam_periph_release(periph); + return (error); + } + /* * If we don't have media loaded, check for it. If still don't * have media loaded, we can only do a load or eject. @@ -1866,6 +1885,10 @@ && (IOCGROUP(cmd) == 'c')) { error = cdcheckmedia(periph); } + /* + * Drop the lock here so later mallocs can use WAITOK. The periph + * is essentially locked still with the cam_periph_hold call above. + */ cam_periph_unlock(periph); if (error != 0) return (error); @@ -2687,9 +2710,14 @@ break; } + cam_periph_lock(periph); + cam_periph_unhold(periph); + + CAM_DEBUG(periph->path, CAM_DEBUG_TRACE, ("leaving cdioctl\n")); if (error && bootverbose) { printf("scsi_cd.c::ioctl cmd=%08lx error=%d\n", cmd, error); } + cam_periph_unlock(periph); return (error); } ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_ch.c#12 (text+ko) ==== @@ -392,8 +392,11 @@ csa.callback_arg = periph; xpt_action((union ccb *)&csa); - /* Refcount this periph now that it's been created. */ - cam_periph_block(periph); + /* + * Lock this periph until we are setup. + * This first call can't block + */ + (void)cam_periph_hold(periph, PRIBIO); xpt_schedule(periph, /*priority*/5); return(CAM_REQ_CMP); @@ -425,6 +428,12 @@ else cam_periph_release(periph); + if ((error = cam_periph_hold(periph, PRIBIO | PCATCH)) != 0) { + cam_periph_unlock(periph); + cam_periph_release(periph); + return (error); + } + /* * Load information about this changer device into the softc. */ @@ -435,6 +444,7 @@ return(error); } + cam_periph_unhold(periph); cam_periph_unlock(periph); return(error); @@ -655,7 +665,7 @@ * operation. */ xpt_release_ccb(done_ccb); - cam_periph_unblock(periph); + cam_periph_unhold(periph); return; } case CH_CCB_WAITING: ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_da.c#30 (text+ko) ==== @@ -573,6 +573,11 @@ } cam_periph_lock(periph); + if ((error = cam_periph_hold(periph, PRIBIO|PCATCH)) != 0) { + cam_periph_unlock(periph); + cam_periph_release(periph); + return (error); + } unit = periph->unit_number; softc = (struct da_softc *)periph->softc; @@ -608,6 +613,7 @@ softc->flags &= ~DA_FLAG_OPEN; cam_periph_release(periph); } + cam_periph_unhold(periph); cam_periph_unlock(periph); return (error); } @@ -617,12 +623,18 @@ { struct cam_periph *periph; struct da_softc *softc; + int error; periph = (struct cam_periph *)dp->d_drv1; if (periph == NULL) return (ENXIO); cam_periph_lock(periph); + if ((error = cam_periph_hold(periph, PRIBIO)) != 0) { + cam_periph_unlock(periph); + cam_periph_release(periph); + return (error); + } softc = (struct da_softc *)periph->softc; @@ -687,6 +699,7 @@ } softc->flags &= ~DA_FLAG_OPEN; + cam_periph_unhold(periph); cam_periph_unlock(periph); cam_periph_release(periph); return (0); @@ -1205,7 +1218,7 @@ * to finish the probe. The reference will be dropped in dadone at * the end of probe. */ - cam_periph_block(periph); + (void)cam_periph_hold(periph, PRIBIO); xpt_schedule(periph, /*priority*/5); /* @@ -1687,7 +1700,7 @@ * operation. */ xpt_release_ccb(done_ccb); - cam_periph_unblock(periph); + cam_periph_unhold(periph); return; } case DA_CCB_WAITING: From owner-p4-projects@FreeBSD.ORG Sun Apr 15 06:35:43 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 94A4716A403; Sun, 15 Apr 2007 06:35:43 +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 3848916A400 for ; Sun, 15 Apr 2007 06:35:43 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 1C68613C448 for ; Sun, 15 Apr 2007 06:35:43 +0000 (UTC) (envelope-from mjacob@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 l3F6ZgNq006244 for ; Sun, 15 Apr 2007 06:35:42 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3F6ZgJP006241 for perforce@freebsd.org; Sun, 15 Apr 2007 06:35:42 GMT (envelope-from mjacob@freebsd.org) Date: Sun, 15 Apr 2007 06:35:42 GMT Message-Id: <200704150635.l3F6ZgJP006241@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 118142 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: Sun, 15 Apr 2007 06:35:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=118142 Change 118142 by mjacob@mjexp on 2007/04/15 06:34:53 More IFC. Affected files ... .. //depot/projects/mjexp/sys/dev/cxgb/cxgb_main.c#3 integrate .. //depot/projects/mjexp/sys/dev/cxgb/cxgb_sge.c#5 integrate .. //depot/projects/mjexp/sys/dev/cxgb/sys/uipc_mvec.c#3 integrate .. //depot/projects/mjexp/sys/sys/mbuf.h#8 integrate Differences ... ==== //depot/projects/mjexp/sys/dev/cxgb/cxgb_main.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_main.c,v 1.13 2007/04/14 20:40:22 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_main.c,v 1.14 2007/04/15 05:45:09 kmacy Exp $"); #include #include @@ -167,6 +167,7 @@ #define SGE_MSIX_COUNT (SGE_QSETS + 1) +extern int collapse_mbufs; /* * The driver uses the best interrupt scheme available on a platform in the * order MSI-X, MSI, legacy pin interrupts. This parameter determines which @@ -1339,8 +1340,8 @@ } m_sanity(m0, 0); m0 = m; -#endif - if (m->m_pkthdr.len > MCLBYTES && +#endif + if (collapse_mbufs && m->m_pkthdr.len > MCLBYTES && m_collapse(m, TX_MAX_SEGS, &m0) == EFBIG) { if ((m0 = m_defrag(m, M_NOWAIT)) != NULL) { m = m0; ==== //depot/projects/mjexp/sys/dev/cxgb/cxgb_sge.c#5 (text+ko) ==== @@ -32,7 +32,7 @@ ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_sge.c,v 1.11 2007/04/14 20:40:22 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_sge.c,v 1.12 2007/04/15 05:45:10 kmacy Exp $"); #include #include @@ -71,7 +71,7 @@ uint32_t collapse_free = 0; uint32_t mb_free_vec_free = 0; - +int collapse_mbufs = 1; #define USE_GTS 0 @@ -837,13 +837,6 @@ m0 = *m; pktlen = m0->m_pkthdr.len; - if ((stx->flags & TX_SW_DESC_MAP_CREATED) == 0) { - if ((err = bus_dmamap_create(txq->entry_tag, 0, &stx->map))) { - log(LOG_WARNING, "bus_dmamap_create failed %d\n", err); - return (err); - } - stx->flags |= TX_SW_DESC_MAP_CREATED; - } err = bus_dmamap_load_mvec_sg(txq->entry_tag, stx->map, m0, segs, nsegs, 0); #ifdef DEBUG if (err) { @@ -2264,7 +2257,10 @@ "mb_free_vec_free", CTLFLAG_RD, &mb_free_vec_free, 0, "frees during mb_free_vec"); - + SYSCTL_ADD_INT(ctx, children, OID_AUTO, + "collapse_mbufs", + CTLFLAG_RW, &collapse_mbufs, + 0, "collapse mbuf chains into iovecs"); } /** ==== //depot/projects/mjexp/sys/dev/cxgb/sys/uipc_mvec.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/cxgb/sys/uipc_mvec.c,v 1.5 2007/04/14 20:38:38 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/sys/uipc_mvec.c,v 1.7 2007/04/15 05:46:34 kmacy Exp $"); #include #include @@ -42,11 +42,7 @@ #include #include - #include "opt_zero.h" -#ifdef ZERO_COPY_SOCKETS -#error "ZERO_COPY_SOCKETS not supported with mvec" -#endif #ifdef DEBUG #define DPRINTF printf @@ -137,19 +133,7 @@ m->m_next = head; head = m; M_SANITY(m, 0); -#ifdef INVARIANTS - len = head->m_len; - m = m->m_next; - while (m) { - KASSERT((m->m_flags & M_PKTHDR) == 0, - ("pkthdr set on intermediate mbuf - post")); - len += m->m_len; - m = m->m_next; - - } - if (len != head->m_pkthdr.len) - panic("len=%d pktlen=%d", len, head->m_pkthdr.len); -#endif + return (0); } @@ -161,12 +145,14 @@ for (i = 0; i < max; i++) { if (m == NULL) break; -#ifndef PACKET_ZONE_DISABLED +#ifndef MBUF_PACKET_ZONE_DISABLE if ((m->m_flags & M_EXT) && (m->m_ext.ext_type == EXT_PACKET)) return (EINVAL); #endif - if (m->m_len == 0) - DPRINTF("m=%p is len=0\n", m); +#ifdef ZERO_COPY_SOCKETS + if ((m->m_flags & M_EXT) && (m->m_ext.ext_type == EXT_SFBUF)) + return (EINVAL); +#endif M_SANITY(m, 0); vec[i] = m; m = m->m_next; @@ -398,13 +384,28 @@ } #if (!defined(__sparc64__) && !defined(__sun4v__)) -struct mvec_sg_cb_arg { - bus_dma_segment_t *segs; - int error; - int index; - int nseg; +#include + +#define BUS_DMA_COULD_BOUNCE BUS_DMA_BUS3 +#define BUS_DMA_MIN_ALLOC_COMP BUS_DMA_BUS4 + +struct bounce_zone { + STAILQ_ENTRY(bounce_zone) links; + STAILQ_HEAD(bp_list, bounce_page) bounce_page_list; + int total_bpages; + int free_bpages; + int reserved_bpages; + int active_bpages; + int total_bounced; + int total_deferred; + bus_size_t alignment; + bus_size_t boundary; + bus_addr_t lowaddr; + char zoneid[8]; + char lowaddrid[20]; + struct sysctl_ctx_list sysctl_tree; + struct sysctl_oid *sysctl_tree_top; }; - struct bus_dma_tag { bus_dma_tag_t parent; bus_size_t alignment; @@ -425,23 +426,137 @@ struct bounce_zone *bounce_zone; }; -static void -mvec_cb(void *arg, bus_dma_segment_t *segs, int nseg, int error) +struct bus_dmamap { + struct bp_list bpages; + int pagesneeded; + int pagesreserved; + bus_dma_tag_t dmat; + void *buf; /* unmapped buffer pointer */ + bus_size_t buflen; /* unmapped buffer length */ + bus_dmamap_callback_t *callback; + void *callback_arg; + STAILQ_ENTRY(bus_dmamap) links; +}; + +static struct bus_dmamap nobounce_dmamap; + +static __inline int +run_filter(bus_dma_tag_t dmat, bus_addr_t paddr) +{ + int retval; + + retval = 0; + + do { + if (((paddr > dmat->lowaddr && paddr <= dmat->highaddr) + || ((paddr & (dmat->alignment - 1)) != 0)) + && (dmat->filter == NULL + || (*dmat->filter)(dmat->filterarg, paddr) != 0)) + retval = 1; + + dmat = dmat->parent; + } while (retval == 0 && dmat != NULL); + return (retval); +} + +static __inline int +_bus_dmamap_load_buffer(bus_dma_tag_t dmat, + bus_dmamap_t map, + void *buf, bus_size_t buflen, + pmap_t pmap, + int flags, + bus_addr_t *lastaddrp, + bus_dma_segment_t *segs, + int *segp, + int first) { - struct mvec_sg_cb_arg *cb_arg = arg; - - cb_arg->error = error; - cb_arg->segs[cb_arg->index] = segs[0]; - cb_arg->nseg = nseg; - KASSERT(nseg == 1, ("nseg=%d", nseg)); + bus_size_t sgsize; + bus_addr_t curaddr, lastaddr, baddr, bmask; + vm_offset_t vaddr; + int needbounce = 0; + int seg; + + if (map == NULL) + map = &nobounce_dmamap; + + /* Reserve Necessary Bounce Pages */ + if (map->pagesneeded != 0) + panic("don't support bounce pages"); + + vaddr = (vm_offset_t)buf; + lastaddr = *lastaddrp; + bmask = ~(dmat->boundary - 1); + + for (seg = *segp; buflen > 0 ; ) { + /* + * Get the physical address for this segment. + */ + if (pmap) + curaddr = pmap_extract(pmap, vaddr); + else + curaddr = pmap_kextract(vaddr); + + + /* + * Compute the segment size, and adjust counts. + */ + sgsize = PAGE_SIZE - ((u_long)curaddr & PAGE_MASK); + if (buflen < sgsize) + sgsize = buflen; + + /* + * Make sure we don't cross any boundaries. + */ + if (dmat->boundary > 0) { + baddr = (curaddr + dmat->boundary) & bmask; + if (sgsize > (baddr - curaddr)) + sgsize = (baddr - curaddr); + } + + if (map->pagesneeded != 0 && run_filter(dmat, curaddr)) + panic("no bounce page support"); + + /* + * Insert chunk into a segment, coalescing with + * previous segment if possible. + */ + if (first) { + segs[seg].ds_addr = curaddr; + segs[seg].ds_len = sgsize; + first = 0; + } else { + if (needbounce == 0 && curaddr == lastaddr && + (segs[seg].ds_len + sgsize) <= dmat->maxsegsz && + (dmat->boundary == 0 || + (segs[seg].ds_addr & bmask) == (curaddr & bmask))) + segs[seg].ds_len += sgsize; + else { + if (++seg >= dmat->nsegments) + break; + segs[seg].ds_addr = curaddr; + segs[seg].ds_len = sgsize; + } + } + + lastaddr = curaddr + sgsize; + vaddr += sgsize; + buflen -= sgsize; + } + + *segp = seg; + *lastaddrp = lastaddr; + + /* + * Did we fit? + */ + return (buflen != 0 ? EFBIG : 0); /* XXX better return value here? */ } int bus_dmamap_load_mvec_sg(bus_dma_tag_t dmat, bus_dmamap_t map, struct mbuf *m0, bus_dma_segment_t *segs, int *nsegs, int flags) { - int error; - struct mvec_sg_cb_arg cb_arg; + int error, i; M_ASSERTPKTHDR(m0); @@ -452,51 +567,43 @@ *nsegs = 0; error = 0; if (m0->m_pkthdr.len <= dmat->maxsize) { + int first = 1; + bus_addr_t lastaddr = 0; struct mbuf *m; - cb_arg.segs = segs; + for (m = m0; m != NULL && error == 0; m = m->m_next) { struct mbuf_vec *mv; - int count, first, i; + int count, firstcl; if (!(m->m_len > 0)) continue; mv = mtomv(m); count = mv->mv_count; - first = mv->mv_first; + firstcl = mv->mv_first; KASSERT(count <= MAX_MBUF_IOV, ("count=%d too large", count)); - for (i = first; i < count; i++) { + for (i = firstcl; i < count && error == 0; i++) { void *data = mv->mv_vec[i].mi_base + mv->mv_vec[i].mi_offset; - int size = mv->mv_vec[i].mi_len; + int len = mv->mv_vec[i].mi_len; - if (size == 0) + if (len == 0) continue; - DPRINTF("mapping data=%p size=%d\n", data, size); - cb_arg.index = *nsegs; - error = bus_dmamap_load(dmat, map, - data, size, mvec_cb, &cb_arg, flags); - (*nsegs)++; - - if (*nsegs >= dmat->nsegments) { - DPRINTF("*nsegs=%d dmat->nsegments=%d index=%d\n", - *nsegs, dmat->nsegments, cb_arg.index); - error = EFBIG; - goto err_out; - } - if (error || cb_arg.error) - goto err_out; + DPRINTF("mapping data=%p len=%d\n", data, len); + error = _bus_dmamap_load_buffer(dmat, NULL, + data, len, NULL, flags, &lastaddr, + segs, nsegs, first); + DPRINTF("%d: addr=0x%lx len=%ld\n", i, segs[i].ds_addr, + segs[i].ds_len); + first = 0; } } } else { error = EINVAL; } + + (*nsegs)++; + CTR5(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d nsegs %d", __func__, dmat, dmat->flags, error, *nsegs); return (error); - -err_out: - if (cb_arg.error) - return (cb_arg.error); - - return (error); } #endif /* !__sparc64__ && !__sun4v__ */ ==== //depot/projects/mjexp/sys/sys/mbuf.h#8 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * @(#)mbuf.h 8.5 (Berkeley) 2/19/95 - * $FreeBSD: src/sys/sys/mbuf.h,v 1.210 2007/04/14 20:31:05 kmacy Exp $ + * $FreeBSD: src/sys/sys/mbuf.h,v 1.211 2007/04/15 06:30:28 kmacy Exp $ */ #ifndef _SYS_MBUF_H_ @@ -341,9 +341,7 @@ extern uma_zone_t zone_jumbo16; extern uma_zone_t zone_ext_refcnt; -#ifndef MBUF_PACKET_ZONE_DISABLE static __inline struct mbuf *m_getcl(int how, short type, int flags); -#endif static __inline struct mbuf *m_get(int how, short type); static __inline struct mbuf *m_gethdr(int how, short type); static __inline struct mbuf *m_getjcl(int how, short type, int flags, @@ -453,7 +451,6 @@ return ((struct mbuf *)(uma_zalloc_arg(zone_mbuf, &args, how))); } -#ifndef MBUF_PACKET_ZONE_DISABLE static __inline struct mbuf * m_getcl(int how, short type, int flags) { @@ -463,9 +460,6 @@ args.type = type; return ((struct mbuf *)(uma_zalloc_arg(zone_pack, &args, how))); } -#else -#define m_getcl(how, type, flags) m_getjcl(how, type, flags, MCLBYTES) -#endif /* * m_getjcl() returns an mbuf with a cluster of the specified size attached. From owner-p4-projects@FreeBSD.ORG Sun Apr 15 07:56:23 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 F21E116A403; Sun, 15 Apr 2007 07:56:22 +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 C793116A400 for ; Sun, 15 Apr 2007 07:56:22 +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 B7BB813C4B0 for ; Sun, 15 Apr 2007 07:56:22 +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 l3F7uMZj019520 for ; Sun, 15 Apr 2007 07:56:22 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3F7uMUh019517 for perforce@freebsd.org; Sun, 15 Apr 2007 07:56:22 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 15 Apr 2007 07:56:22 GMT Message-Id: <200704150756.l3F7uMUh019517@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 118144 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: Sun, 15 Apr 2007 07:56:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=118144 Change 118144 by rdivacky@rdivacky_witten on 2007/04/15 07:55:54 Check whether the vnode is a directory and return ENOTDIR if not. Affected files ... .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#3 edit Differences ... ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#3 (text+ko) ==== @@ -989,6 +989,10 @@ error = fgetvp(td, dirfd, &dir_vn); if (error) return (error); + if (dir_vn->v_type != VDIR) { + vrele(dir_vn); + return (ENOTDIR); + } } NDINIT_AT(&nd, LOOKUP, FOLLOW | AUDITVNODE1 | MPSAFE, pathseg, path, td, dir_vn); @@ -1918,6 +1922,10 @@ error = fgetvp(td, dirfd, &dir_vn); if (error) return (error); + if (dir_vn->v_type != VDIR) { + vrele(dir_vn); + return (ENOTDIR); + } } NDINIT_AT(&nd, LOOKUP, FOLLOW | LOCKLEAF | MPSAFE | AUDITVNODE1, From owner-p4-projects@FreeBSD.ORG Sun Apr 15 08:00:29 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 CA20316A40E; Sun, 15 Apr 2007 08:00:28 +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 8DC7C16A403 for ; Sun, 15 Apr 2007 08:00:28 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 7E67013C48A for ; Sun, 15 Apr 2007 08:00:28 +0000 (UTC) (envelope-from scottl@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 l3F80ShV019744 for ; Sun, 15 Apr 2007 08:00:28 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3F80S5s019741 for perforce@freebsd.org; Sun, 15 Apr 2007 08:00:28 GMT (envelope-from scottl@freebsd.org) Date: Sun, 15 Apr 2007 08:00:28 GMT Message-Id: <200704150800.l3F80S5s019741@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 118145 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: Sun, 15 Apr 2007 08:00:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=118145 Change 118145 by scottl@scottl-x64 on 2007/04/15 07:59:43 Finish locking the scsi_sa periph, remove spls. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_sa.c#12 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_sa.c#12 (text+ko) ==== @@ -456,6 +456,7 @@ } cam_periph_lock(periph); + softc = (struct sa_softc *)periph->softc; CAM_DEBUG(periph->path, CAM_DEBUG_TRACE|CAM_DEBUG_INFO, @@ -467,6 +468,12 @@ return (0); } + if ((error = cam_periph_hold(periph, PRIBIO|PCATCH)) != 0) { + cam_periph_unlock(periph); + cam_periph_release(periph); + return (error); + } + if (softc->flags & SA_FLAG_OPEN) { error = EBUSY; } else if (softc->flags & SA_FLAG_INVALID) { @@ -488,12 +495,14 @@ if (error && (flags & O_NONBLOCK)) { softc->flags |= SA_FLAG_OPEN; softc->open_pending_mount = 1; + cam_periph_unhold(periph); cam_periph_unlock(periph); return (0); } } if (error) { + cam_periph_unhold(periph); cam_periph_unlock(periph); cam_periph_release(periph); return (error); @@ -502,6 +511,7 @@ saprevent(periph, PR_PREVENT); softc->flags |= SA_FLAG_OPEN; + cam_periph_unhold(periph); cam_periph_unlock(periph); return (error); } @@ -520,10 +530,10 @@ if (periph == NULL) return (ENXIO); + cam_periph_lock(periph); + softc = (struct sa_softc *)periph->softc; - cam_periph_lock(periph); - CAM_DEBUG(periph->path, CAM_DEBUG_TRACE|CAM_DEBUG_INFO, ("saclose(%d): dev=0x%x softc=0x%x\n", unit, unit, softc->flags)); @@ -544,6 +554,11 @@ return (0); } + if ((error = cam_periph_hold(periph, PRIBIO)) != 0) { + cam_periph_unlock(periph); + return (error); + } + /* * Were we writing the tape? */ @@ -651,6 +666,7 @@ if ((softc->flags & SA_FLAG_TAPE_MOUNTED) == 0) sareservereleaseunit(periph, FALSE); + cam_periph_unhold(periph); cam_periph_unlock(periph); cam_periph_release(periph); @@ -678,10 +694,10 @@ biofinish(bp, NULL, ENXIO); return; } + cam_periph_lock(periph); + softc = (struct sa_softc *)periph->softc; - cam_periph_lock(periph); - if (softc->flags & SA_FLAG_INVALID) { cam_periph_unlock(periph); biofinish(bp, NULL, ENXIO); @@ -803,7 +819,6 @@ struct sa_softc *softc; scsi_space_code spaceop; int didlockperiph = 0; - int s; int mode; int error = 0; @@ -815,6 +830,7 @@ if (periph == NULL) return (ENXIO); + cam_periph_lock(periph); softc = (struct sa_softc *)periph->softc; /* @@ -840,9 +856,10 @@ * other thread that has this device open to do * an MTIOCERRSTAT that would clear latched status. */ - s = splsoftcam(); if ((periph->flags & CAM_PERIPH_LOCKED) == 0) { - cam_periph_lock(periph); + error = cam_periph_hold(periph, PRIBIO|PCATCH); + if (error != 0) + return (error); didlockperiph = 1; } break; @@ -875,8 +892,9 @@ * than at open time because we are sharing writable * access to data structures. */ - s = splsoftcam(); - cam_periph_lock(periph); + error = cam_periph_hold(periph, PRIBIO|PCATCH); + if (error != 0) + return (error); didlockperiph = 1; break; @@ -1303,8 +1321,9 @@ } } if (didlockperiph) { - cam_periph_unlock(periph); + cam_periph_unhold(periph); } + cam_periph_unlock(periph); return (error); } @@ -1347,7 +1366,6 @@ { struct sa_softc *softc; struct ccb_setasync csa; - int s; softc = (struct sa_softc *)periph->softc; @@ -1365,20 +1383,12 @@ softc->flags |= SA_FLAG_INVALID; /* - * Although the oninvalidate() routines are always called at - * splsoftcam, we need to be at splbio() here to keep the buffer - * queue from being modified while we traverse it. - */ - s = splbio(); - - /* * Return all queued I/O with ENXIO. * XXX Handle any transactions queued to the card * with XPT_ABORT_CCB. */ bioq_flush(&softc->bio_queue, NULL, ENXIO); softc->queue_count = 0; - splx(s); xpt_print(periph->path, "lost device\n"); @@ -1585,12 +1595,10 @@ { /* Pull a buffer from the queue and get going on it */ struct bio *bp; - int s; /* * See if there is a buf with work for us to do.. */ - s = splbio(); bp = bioq_first(&softc->bio_queue); if (periph->immediate_priority <= periph->pinfo.priority) { CAM_DEBUG_PRINT(CAM_DEBUG_SUBTRACE, @@ -1599,10 +1607,8 @@ SLIST_INSERT_HEAD(&periph->ccb_list, &start_ccb->ccb_h, periph_links.sle); periph->immediate_priority = CAM_PRIORITY_NONE; - splx(s); wakeup(&periph->ccb_list); } else if (bp == NULL) { - splx(s); xpt_release_ccb(start_ccb); } else if ((softc->flags & SA_FLAG_ERR_PENDING) != 0) { struct bio *done_bp; @@ -1645,7 +1651,6 @@ "%d more buffers queued up\n", (softc->flags & SA_FLAG_ERR_PENDING), (bp != NULL)? "not " : " ", softc->queue_count)); - splx(s); xpt_release_ccb(start_ccb); biodone(done_bp); } else { @@ -1665,7 +1670,6 @@ bp->bio_error = EIO; xpt_print(periph->path, "zero blocksize" " for FIXED length writes?\n"); - splx(s); biodone(bp); break; } @@ -1716,7 +1720,6 @@ Set_CCB_Type(start_ccb, SA_CCB_BUFFER_IO); start_ccb->ccb_h.ccb_bp = bp; bp = bioq_first(&softc->bio_queue); - splx(s); xpt_action(start_ccb); } @@ -1761,7 +1764,6 @@ } if (error == EIO) { - int s; /* * Catastrophic error. Mark the tape as frozen @@ -1774,10 +1776,8 @@ * */ - s = splbio(); softc->flags |= SA_FLAG_TAPE_FROZEN; bioq_flush(&softc->bio_queue, NULL, EIO); - splx(s); } if (error != 0) { bp->bio_resid = bp->bio_bcount; From owner-p4-projects@FreeBSD.ORG Sun Apr 15 08:01:30 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 79A5C16A406; Sun, 15 Apr 2007 08:01:30 +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 57EEC16A401 for ; Sun, 15 Apr 2007 08:01:30 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 47CD513C4BA for ; Sun, 15 Apr 2007 08:01:30 +0000 (UTC) (envelope-from scottl@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 l3F81UXM020328 for ; Sun, 15 Apr 2007 08:01:30 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3F81UUC020325 for perforce@freebsd.org; Sun, 15 Apr 2007 08:01:30 GMT (envelope-from scottl@freebsd.org) Date: Sun, 15 Apr 2007 08:01:30 GMT Message-Id: <200704150801.l3F81UUC020325@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 118146 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: Sun, 15 Apr 2007 08:01:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=118146 Change 118146 by scottl@scottl-x64 on 2007/04/15 08:01:17 Remove lingering spls Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_ses.c#13 edit .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_targ_bh.c#9 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_ses.c#13 (text+ko) ==== @@ -485,13 +485,11 @@ static void sesstart(struct cam_periph *p, union ccb *sccb) { - int s = splbio(); if (p->immediate_priority <= p->pinfo.priority) { SLIST_INSERT_HEAD(&p->ccb_list, &sccb->ccb_h, periph_links.sle); p->immediate_priority = CAM_PRIORITY_NONE; wakeup(&p->ccb_list); } - splx(s); } static void ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_targ_bh.c#9 (text+ko) ==== @@ -463,27 +463,22 @@ struct targbh_cmd_desc *desc; struct ccb_scsiio *csio; ccb_flags flags; - int s; softc = (struct targbh_softc *)periph->softc; - s = splbio(); ccbh = TAILQ_FIRST(&softc->work_queue); if (periph->immediate_priority <= periph->pinfo.priority) { start_ccb->ccb_h.ccb_type = TARGBH_CCB_WAITING; SLIST_INSERT_HEAD(&periph->ccb_list, &start_ccb->ccb_h, periph_links.sle); periph->immediate_priority = CAM_PRIORITY_NONE; - splx(s); wakeup(&periph->ccb_list); } else if (ccbh == NULL) { - splx(s); xpt_release_ccb(start_ccb); } else { TAILQ_REMOVE(&softc->work_queue, ccbh, periph_links.tqe); TAILQ_INSERT_HEAD(&softc->pending_queue, ccbh, periph_links.tqe); - splx(s); atio = (struct ccb_accept_tio*)ccbh; desc = (struct targbh_cmd_desc *)atio->ccb_h.ccb_descr; @@ -544,9 +539,7 @@ /*getcount_only*/0); atio->ccb_h.status &= ~CAM_DEV_QFRZN; } - s = splbio(); ccbh = TAILQ_FIRST(&softc->work_queue); - splx(s); } if (ccbh != NULL) xpt_schedule(periph, /*priority*/1); From owner-p4-projects@FreeBSD.ORG Sun Apr 15 08:05:39 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 BF91B16A404; Sun, 15 Apr 2007 08:05:38 +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 5D85816A400 for ; Sun, 15 Apr 2007 08:05:38 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 4C50713C44B for ; Sun, 15 Apr 2007 08:05:38 +0000 (UTC) (envelope-from scottl@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 l3F85cnA022235 for ; Sun, 15 Apr 2007 08:05:38 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3F85aNk022232 for perforce@freebsd.org; Sun, 15 Apr 2007 08:05:36 GMT (envelope-from scottl@freebsd.org) Date: Sun, 15 Apr 2007 08:05:36 GMT Message-Id: <200704150805.l3F85aNk022232@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 118147 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: Sun, 15 Apr 2007 08:05:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=118147 Change 118147 by scottl@scottl-x64 on 2007/04/15 08:04:53 IFC Affected files ... .. //depot/projects/scottl-camlock/src/sys/Makefile#12 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/pmap.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_socket.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/conf/options#19 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utmisc.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/common/atomic/amd64/atomic.S#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/common/atomic/i386/atomic.S#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/dnlc.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/if_pfsync.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_main.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_sge.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/sys/mvec.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/sys/uipc_mvec.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/msk/if_msk.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdevs#17 integrate .. //depot/projects/scottl-camlock/src/sys/fs/pseudofs/pseudofs.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/fs/pseudofs/pseudofs.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/fs/pseudofs/pseudofs_fileno.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/fs/pseudofs/pseudofs_internal.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/fs/pseudofs/pseudofs_vncache.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/fs/pseudofs/pseudofs_vnops.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/geom/vinum/geom_vinum.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/geom/vinum/geom_vinum_rm.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/geom/vinum/geom_vinum_share.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/geom/vinum/geom_vinum_subr.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/mp_machdep.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/pmap.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/pmap.h#13 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_jail.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_mbuf.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_mqueue.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_mount.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_subr.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_trunk.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_constants.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_crc32.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_indata.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_input.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_output.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_pcb.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_peeloff.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_timer.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_uio.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_usrreq.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_var.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctputil.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_input.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_output.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_sack.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_subr.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_syncache.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_timer.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_timer.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_usrreq.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_var.h#15 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/ipsec.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/sctp6_usrreq.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/rpc/types.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/security/audit/audit.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/security/audit/audit.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/security/audit/audit_arg.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/security/audit/audit_bsm.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/security/audit/audit_bsm_token.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/security/audit/audit_private.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/security/audit/audit_syscalls.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/sys/eventhandler.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/sys/mbuf.h#14 integrate .. //depot/projects/scottl-camlock/src/sys/sys/mutex.h#12 integrate .. //depot/projects/scottl-camlock/src/sys/sys/proc.h#16 integrate Differences ... ==== //depot/projects/scottl-camlock/src/sys/Makefile#12 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/Makefile,v 1.41 2007/03/24 22:21:01 maxim Exp $ +# $FreeBSD: src/sys/Makefile,v 1.42 2007/04/14 16:29:15 maxim Exp $ .include @@ -8,10 +8,10 @@ .endif # Directories to include in cscope name file and TAGS. -CSCOPEDIRS= cam coda compat conf contrib crypto ddb dev fs geom gnu i4b \ - isa kern libkern modules net net80211 netatalk netatm \ +CSCOPEDIRS= bsm cam coda compat conf contrib crypto ddb dev fs geom gnu \ + i4b isa kern libkern modules net net80211 netatalk netatm \ netgraph netinet netinet6 netipx netkey netnatm netncp \ - netsmb nfs nfsclient nfs4client rpc pccard pci sys \ + netsmb nfs nfsclient nfs4client rpc pccard pci security sys \ ufs vm ${ARCHDIR} ARCHDIR ?= ${MACHINE} ==== //depot/projects/scottl-camlock/src/sys/amd64/amd64/pmap.c#18 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.581 2007/03/10 20:26:43 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.582 2007/04/13 16:07:29 alc Exp $"); /* * Manages physical address maps. @@ -3261,7 +3261,7 @@ pd_entry_t *pde; pt_entry_t *pte; - base = va & PG_FRAME; + base = trunc_page(va); offset = va & PAGE_MASK; size = roundup(offset + size, PAGE_SIZE); ==== //depot/projects/scottl-camlock/src/sys/compat/linux/linux_socket.c#12 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.72 2007/02/01 13:36:19 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.73 2007/04/14 10:35:09 rwatson Exp $"); /* XXX we use functions that might not exist. */ #include "opt_compat.h" @@ -1028,6 +1028,16 @@ error = copyin(PTRIN(linux_args.msg), &msg, sizeof(msg)); if (error) return (error); + + /* + * Some Linux applications (ping) define a non-NULL control data + * pointer, but a msg_controllen of 0, which is not allowed in the + * FreeBSD system call interface. NULL the msg_control pointer in + * order to handle this case. This should be checked, but allows the + * Linux ping to work. + */ + if (msg.msg_control != NULL && msg.msg_controllen == 0) + msg.msg_control = NULL; error = copyiniov(msg.msg_iov, msg.msg_iovlen, &iov, EMSGSIZE); if (error) return (error); ==== //depot/projects/scottl-camlock/src/sys/conf/options#19 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.585 2007/04/04 14:44:15 andre Exp $ +# $FreeBSD: src/sys/conf/options,v 1.586 2007/04/14 20:16:03 kmacy Exp $ # # On the handling of kernel options # @@ -127,6 +127,7 @@ NO_ADAPTIVE_MUTEXES opt_adaptive_mutexes.h NO_ADAPTIVE_RWLOCKS NSWBUF_MIN opt_swap.h +MBUF_PACKET_ZONE_DISABLE opt_global.h PANIC_REBOOT_WAIT_TIME opt_panic.h PPC_DEBUG opt_ppc.h PPC_PROBE_CHIPSET opt_ppc.h ==== //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utmisc.c#6 (text+ko) ==== @@ -1295,6 +1295,11 @@ { va_list args; +#ifdef _KERNEL + /* Temporarily hide too verbose printfs. */ + if (!bootverbose) + return; +#endif /* * Removed ModuleName, LineNumber, and acpica version, not needed ==== //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/common/atomic/amd64/atomic.S#2 (text+ko) ==== @@ -78,52 +78,52 @@ ENTRY(atomic_inc_8_nv) ALTENTRY(atomic_inc_uchar_nv) - movb (%rdi), %al + movb (%rdi), %al // %al = old value 1: - leaq 1(%rax), %rcx + leaq 1(%rax), %rcx // %cl = new value lock - cmpxchgb %cl, (%rdi) + cmpxchgb %cl, (%rdi) // try to stick it in jne 1b - movzbl %cl, %eax + movzbl %cl, %eax // return new value ret SET_SIZE(atomic_inc_uchar_nv) SET_SIZE(atomic_inc_8_nv) ENTRY(atomic_inc_16_nv) ALTENTRY(atomic_inc_ushort_nv) - movw (%rdi), %ax + movw (%rdi), %ax // %ax = old value 1: - leaq 1(%rax), %rcx + leaq 1(%rax), %rcx // %cx = new value lock - cmpxchgw %cx, (%rdi) + cmpxchgw %cx, (%rdi) // try to stick it in jne 1b - movzwl %cx, %eax + movzwl %cx, %eax // return new value ret SET_SIZE(atomic_inc_ushort_nv) SET_SIZE(atomic_inc_16_nv) ENTRY(atomic_inc_32_nv) ALTENTRY(atomic_inc_uint_nv) - movl (%rdi), %eax + movl (%rdi), %eax // %eax = old value 1: - leaq 1(%rax), %rcx + leaq 1(%rax), %rcx // %ecx = new value lock - cmpxchgl %ecx, (%rdi) + cmpxchgl %ecx, (%rdi) // try to stick it in jne 1b - movl %ecx, %eax + movl %ecx, %eax // return new value ret SET_SIZE(atomic_inc_uint_nv) SET_SIZE(atomic_inc_32_nv) ENTRY(atomic_inc_64_nv) ALTENTRY(atomic_inc_ulong_nv) - movq (%rdi), %rax + movq (%rdi), %rax // %rax = old value 1: - leaq 1(%rax), %rcx + leaq 1(%rax), %rcx // %rcx = new value lock - cmpxchgq %rcx, (%rdi) + cmpxchgq %rcx, (%rdi) // try to stick it in jne 1b - movq %rcx, %rax + movq %rcx, %rax // return new value ret SET_SIZE(atomic_inc_ulong_nv) SET_SIZE(atomic_inc_64_nv) @@ -162,52 +162,52 @@ ENTRY(atomic_dec_8_nv) ALTENTRY(atomic_dec_uchar_nv) - movb (%rdi), %al + movb (%rdi), %al // %al = old value 1: - leaq -1(%rax), %rcx + leaq -1(%rax), %rcx // %cl = new value lock - cmpxchgb %cl, (%rdi) + cmpxchgb %cl, (%rdi) // try to stick it in jne 1b - movzbl %cl, %eax + movzbl %cl, %eax // return new value ret SET_SIZE(atomic_dec_uchar_nv) SET_SIZE(atomic_dec_8_nv) ENTRY(atomic_dec_16_nv) ALTENTRY(atomic_dec_ushort_nv) - movw (%rdi), %ax + movw (%rdi), %ax // %ax = old value 1: - leaq -1(%rax), %rcx + leaq -1(%rax), %rcx // %cx = new value lock - cmpxchgw %cx, (%rdi) + cmpxchgw %cx, (%rdi) // try to stick it in jne 1b - movzwl %cx, %eax + movzwl %cx, %eax // return new value ret SET_SIZE(atomic_dec_ushort_nv) SET_SIZE(atomic_dec_16_nv) ENTRY(atomic_dec_32_nv) ALTENTRY(atomic_dec_uint_nv) - movl (%rdi), %eax + movl (%rdi), %eax // %eax = old value 1: - leaq -1(%rax), %rcx + leaq -1(%rax), %rcx // %ecx = new value lock - cmpxchgl %ecx, (%rdi) + cmpxchgl %ecx, (%rdi) // try to stick it in jne 1b - movl %ecx, %eax + movl %ecx, %eax // return new value ret SET_SIZE(atomic_dec_uint_nv) SET_SIZE(atomic_dec_32_nv) ENTRY(atomic_dec_64_nv) ALTENTRY(atomic_dec_ulong_nv) - movq (%rdi), %rax + movq (%rdi), %rax // %rax = old value 1: - leaq -1(%rax), %rcx + leaq -1(%rax), %rcx // %rcx = new value lock - cmpxchgq %rcx, (%rdi) + cmpxchgq %rcx, (%rdi) // try to stick it in jne 1b - movq %rcx, %rax + movq %rcx, %rax // return new value ret SET_SIZE(atomic_dec_ulong_nv) SET_SIZE(atomic_dec_64_nv) @@ -278,28 +278,28 @@ ENTRY(atomic_add_8_nv) ALTENTRY(atomic_add_char_nv) - movb (%rdi), %al + movb (%rdi), %al // %al = old value 1: movb %sil, %cl - addb %al, %cl + addb %al, %cl // %cl = new value lock - cmpxchgb %cl, (%rdi) + cmpxchgb %cl, (%rdi) // try to stick it in jne 1b - movzbl %cl, %eax + movzbl %cl, %eax // return new value ret SET_SIZE(atomic_add_char_nv) SET_SIZE(atomic_add_8_nv) ENTRY(atomic_add_16_nv) ALTENTRY(atomic_add_short_nv) - movw (%rdi), %ax + movw (%rdi), %ax // %ax = old value 1: movw %si, %cx - addw %ax, %cx + addw %ax, %cx // %cx = new value lock - cmpxchgw %cx, (%rdi) + cmpxchgw %cx, (%rdi) // try to stick it in jne 1b - movzwl %cx, %eax + movzwl %cx, %eax // return new value ret SET_SIZE(atomic_add_short_nv) SET_SIZE(atomic_add_16_nv) @@ -336,28 +336,28 @@ ENTRY(atomic_and_8_nv) ALTENTRY(atomic_and_uchar_nv) - movb (%rdi), %al + movb (%rdi), %al // %al = old value 1: movb %sil, %cl - andb %al, %cl + andb %al, %cl // %cl = new value lock - cmpxchgb %cl, (%rdi) + cmpxchgb %cl, (%rdi) // try to stick it in jne 1b - movzbl %cl, %eax + movzbl %cl, %eax // return new value ret SET_SIZE(atomic_and_uchar_nv) SET_SIZE(atomic_and_8_nv) ENTRY(atomic_and_16_nv) ALTENTRY(atomic_and_ushort_nv) - movw (%rdi), %ax + movw (%rdi), %ax // %ax = old value 1: movw %si, %cx - andw %ax, %cx + andw %ax, %cx // %cx = new value lock - cmpxchgw %cx, (%rdi) + cmpxchgw %cx, (%rdi) // try to stick it in jne 1b - movzwl %cx, %eax + movzwl %cx, %eax // return new value ret SET_SIZE(atomic_and_ushort_nv) SET_SIZE(atomic_and_16_nv) @@ -392,28 +392,28 @@ ENTRY(atomic_or_8_nv) ALTENTRY(atomic_or_uchar_nv) - movb (%rdi), %al + movb (%rdi), %al // %al = old value 1: movb %sil, %cl - orb %al, %cl + orb %al, %cl // %cl = new value lock - cmpxchgb %cl, (%rdi) + cmpxchgb %cl, (%rdi) // try to stick it in jne 1b - movzbl %cl, %eax + movzbl %cl, %eax // return new value ret SET_SIZE(atomic_and_uchar_nv) SET_SIZE(atomic_and_8_nv) ENTRY(atomic_or_16_nv) ALTENTRY(atomic_or_ushort_nv) - movw (%rdi), %ax + movw (%rdi), %ax // %ax = old value 1: movw %si, %cx - orw %ax, %cx + orw %ax, %cx // %cx = new value lock - cmpxchgw %cx, (%rdi) + cmpxchgw %cx, (%rdi) // try to stick it in jne 1b - movzwl %cx, %eax + movzwl %cx, %eax // return new value ret SET_SIZE(atomic_or_ushort_nv) SET_SIZE(atomic_or_16_nv) @@ -527,7 +527,7 @@ lock btsq %rsi, (%rdi) jnc 1f - decl %eax + decl %eax // return -1 1: ret SET_SIZE(atomic_set_long_excl) @@ -537,7 +537,7 @@ lock btrq %rsi, (%rdi) jc 1f - decl %eax + decl %eax // return -1 1: ret SET_SIZE(atomic_clear_long_excl) ==== //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/common/atomic/i386/atomic.S#2 (text+ko) ==== @@ -75,28 +75,28 @@ ENTRY(atomic_inc_8_nv) ALTENTRY(atomic_inc_uchar_nv) - movl 4(%esp), %edx - movb (%edx), %al + movl 4(%esp), %edx // %edx = target address + movb (%edx), %al // %al = old value 1: - leal 1(%eax), %ecx + leal 1(%eax), %ecx // %cl = new value lock - cmpxchgb %cl, (%edx) + cmpxchgb %cl, (%edx) // try to stick it in jne 1b - movzbl %cl, %eax + movzbl %cl, %eax // return new value ret SET_SIZE(atomic_inc_uchar_nv) SET_SIZE(atomic_inc_8_nv) ENTRY(atomic_inc_16_nv) ALTENTRY(atomic_inc_ushort_nv) - movl 4(%esp), %edx - movw (%edx), %ax + movl 4(%esp), %edx // %edx = target address + movw (%edx), %ax // %ax = old value 1: - leal 1(%eax), %ecx + leal 1(%eax), %ecx // %cx = new value lock - cmpxchgw %cx, (%edx) + cmpxchgw %cx, (%edx) // try to stick it in jne 1b - movzwl %cx, %eax + movzwl %cx, %eax // return new value ret SET_SIZE(atomic_inc_ushort_nv) SET_SIZE(atomic_inc_16_nv) @@ -104,14 +104,14 @@ ENTRY(atomic_inc_32_nv) ALTENTRY(atomic_inc_uint_nv) ALTENTRY(atomic_inc_ulong_nv) - movl 4(%esp), %edx - movl (%edx), %eax + movl 4(%esp), %edx // %edx = target address + movl (%edx), %eax // %eax = old value 1: - leal 1(%eax), %ecx + leal 1(%eax), %ecx // %ecx = new value lock - cmpxchgl %ecx, (%edx) + cmpxchgl %ecx, (%edx) // try to stick it in jne 1b - movl %ecx, %eax + movl %ecx, %eax // return new value ret SET_SIZE(atomic_inc_ulong_nv) SET_SIZE(atomic_inc_uint_nv) @@ -121,20 +121,20 @@ ALTENTRY(atomic_inc_64_nv) pushl %edi pushl %ebx - movl 12(%esp), %edi + movl 12(%esp), %edi // %edi = target address movl (%edi), %eax - movl 4(%edi), %edx + movl 4(%edi), %edx // %edx:%eax = old value 1: xorl %ebx, %ebx xorl %ecx, %ecx - incl %ebx + incl %ebx // %ecx:%ebx = 1 addl %eax, %ebx - adcl %edx, %ecx + adcl %edx, %ecx // add in the carry from inc lock - cmpxchg8b (%edi) + cmpxchg8b (%edi) // try to stick it in jne 1b movl %ebx, %eax - movl %ecx, %edx + movl %ecx, %edx // return new value popl %ebx popl %edi ret @@ -172,28 +172,28 @@ ENTRY(atomic_dec_8_nv) ALTENTRY(atomic_dec_uchar_nv) - movl 4(%esp), %edx - movb (%edx), %al + movl 4(%esp), %edx // %edx = target address + movb (%edx), %al // %al = old value 1: - leal -1(%eax), %ecx + leal -1(%eax), %ecx // %cl = new value lock - cmpxchgb %cl, (%edx) + cmpxchgb %cl, (%edx) // try to stick it in jne 1b - movzbl %cl, %eax + movzbl %cl, %eax // return new value ret SET_SIZE(atomic_dec_uchar_nv) SET_SIZE(atomic_dec_8_nv) ENTRY(atomic_dec_16_nv) ALTENTRY(atomic_dec_ushort_nv) - movl 4(%esp), %edx - movw (%edx), %ax + movl 4(%esp), %edx // %edx = target address + movw (%edx), %ax // %ax = old value 1: - leal -1(%eax), %ecx + leal -1(%eax), %ecx // %cx = new value lock - cmpxchgw %cx, (%edx) + cmpxchgw %cx, (%edx) // try to stick it in jne 1b - movzwl %cx, %eax + movzwl %cx, %eax // return new value ret SET_SIZE(atomic_dec_ushort_nv) SET_SIZE(atomic_dec_16_nv) @@ -201,14 +201,14 @@ ENTRY(atomic_dec_32_nv) ALTENTRY(atomic_dec_uint_nv) ALTENTRY(atomic_dec_ulong_nv) - movl 4(%esp), %edx - movl (%edx), %eax + movl 4(%esp), %edx // %edx = target address + movl (%edx), %eax // %eax = old value 1: - leal -1(%eax), %ecx + leal -1(%eax), %ecx // %ecx = new value lock - cmpxchgl %ecx, (%edx) + cmpxchgl %ecx, (%edx) // try to stick it in jne 1b - movl %ecx, %eax + movl %ecx, %eax // return new value ret SET_SIZE(atomic_dec_ulong_nv) SET_SIZE(atomic_dec_uint_nv) @@ -218,21 +218,21 @@ ALTENTRY(atomic_dec_64_nv) pushl %edi pushl %ebx - movl 12(%esp), %edi + movl 12(%esp), %edi // %edi = target address movl (%edi), %eax - movl 4(%edi), %edx + movl 4(%edi), %edx // %edx:%eax = old value 1: xorl %ebx, %ebx xorl %ecx, %ecx not %ecx - not %ebx + not %ebx // %ecx:%ebx = -1 addl %eax, %ebx - adcl %edx, %ecx + adcl %edx, %ecx // add in the carry from inc lock - cmpxchg8b (%edi) + cmpxchg8b (%edi) // try to stick it in jne 1b movl %ebx, %eax - movl %ecx, %edx + movl %ecx, %edx // return new value popl %ebx popl %edi ret @@ -305,30 +305,30 @@ ENTRY(atomic_add_8_nv) ALTENTRY(atomic_add_char_nv) - movl 4(%esp), %edx - movb (%edx), %al + movl 4(%esp), %edx // %edx = target address + movb (%edx), %al // %al = old value 1: - movl 8(%esp), %ecx - addb %al, %cl + movl 8(%esp), %ecx // %ecx = delta + addb %al, %cl // %cl = new value lock - cmpxchgb %cl, (%edx) + cmpxchgb %cl, (%edx) // try to stick it in jne 1b - movzbl %cl, %eax + movzbl %cl, %eax // return new value ret SET_SIZE(atomic_add_char_nv) SET_SIZE(atomic_add_8_nv) ENTRY(atomic_add_16_nv) ALTENTRY(atomic_add_short_nv) - movl 4(%esp), %edx - movw (%edx), %ax + movl 4(%esp), %edx // %edx = target address + movw (%edx), %ax // %ax = old value 1: - movl 8(%esp), %ecx - addw %ax, %cx + movl 8(%esp), %ecx // %ecx = delta + addw %ax, %cx // %cx = new value lock - cmpxchgw %cx, (%edx) + cmpxchgw %cx, (%edx) // try to stick it in jne 1b - movzwl %cx, %eax + movzwl %cx, %eax // return new value ret SET_SIZE(atomic_add_short_nv) SET_SIZE(atomic_add_16_nv) @@ -337,15 +337,15 @@ ALTENTRY(atomic_add_int_nv) ALTENTRY(atomic_add_ptr_nv) ALTENTRY(atomic_add_long_nv) - movl 4(%esp), %edx - movl (%edx), %eax + movl 4(%esp), %edx // %edx = target address + movl (%edx), %eax // %eax = old value 1: - movl 8(%esp), %ecx - addl %eax, %ecx + movl 8(%esp), %ecx // %ecx = delta + addl %eax, %ecx // %ecx = new value lock - cmpxchgl %ecx, (%edx) + cmpxchgl %ecx, (%edx) // try to stick it in jne 1b - movl %ecx, %eax + movl %ecx, %eax // return new value ret SET_SIZE(atomic_add_long_nv) SET_SIZE(atomic_add_ptr_nv) @@ -356,19 +356,19 @@ ALTENTRY(atomic_add_64_nv) pushl %edi pushl %ebx - movl 12(%esp), %edi + movl 12(%esp), %edi // %edi = target address movl (%edi), %eax - movl 4(%edi), %edx + movl 4(%edi), %edx // %edx:%eax = old value 1: movl 16(%esp), %ebx - movl 20(%esp), %ecx + movl 20(%esp), %ecx // %ecx:%ebx = delta addl %eax, %ebx - adcl %edx, %ecx + adcl %edx, %ecx // %ecx:%ebx = new value lock - cmpxchg8b (%edi) + cmpxchg8b (%edi) // try to stick it in jne 1b movl %ebx, %eax - movl %ecx, %edx + movl %ecx, %edx // return new value popl %ebx popl %edi ret @@ -377,30 +377,30 @@ ENTRY(atomic_or_8_nv) ALTENTRY(atomic_or_uchar_nv) - movl 4(%esp), %edx - movb (%edx), %al + movl 4(%esp), %edx // %edx = target address + movb (%edx), %al // %al = old value 1: - movl 8(%esp), %ecx - orb %al, %cl + movl 8(%esp), %ecx // %ecx = delta + orb %al, %cl // %cl = new value lock - cmpxchgb %cl, (%edx) + cmpxchgb %cl, (%edx) // try to stick it in jne 1b - movzbl %cl, %eax + movzbl %cl, %eax // return new value ret SET_SIZE(atomic_or_uchar_nv) SET_SIZE(atomic_or_8_nv) ENTRY(atomic_or_16_nv) ALTENTRY(atomic_or_ushort_nv) - movl 4(%esp), %edx - movw (%edx), %ax + movl 4(%esp), %edx // %edx = target address + movw (%edx), %ax // %ax = old value 1: - movl 8(%esp), %ecx - orw %ax, %cx + movl 8(%esp), %ecx // %ecx = delta + orw %ax, %cx // %cx = new value lock - cmpxchgw %cx, (%edx) + cmpxchgw %cx, (%edx) // try to stick it in jne 1b - movzwl %cx, %eax + movzwl %cx, %eax // return new value ret SET_SIZE(atomic_or_ushort_nv) SET_SIZE(atomic_or_16_nv) @@ -408,15 +408,15 @@ ENTRY(atomic_or_32_nv) ALTENTRY(atomic_or_uint_nv) ALTENTRY(atomic_or_ulong_nv) - movl 4(%esp), %edx - movl (%edx), %eax + movl 4(%esp), %edx // %edx = target address + movl (%edx), %eax // %eax = old value 1: - movl 8(%esp), %ecx - orl %eax, %ecx + movl 8(%esp), %ecx // %ecx = delta + orl %eax, %ecx // %ecx = new value lock - cmpxchgl %ecx, (%edx) + cmpxchgl %ecx, (%edx) // try to stick it in jne 1b - movl %ecx, %eax + movl %ecx, %eax // return new value ret SET_SIZE(atomic_or_ulong_nv) SET_SIZE(atomic_or_uint_nv) @@ -426,19 +426,19 @@ ALTENTRY(atomic_or_64_nv) pushl %edi pushl %ebx - movl 12(%esp), %edi + movl 12(%esp), %edi // %edi = target address movl (%edi), %eax - movl 4(%edi), %edx + movl 4(%edi), %edx // %edx:%eax = old value 1: movl 16(%esp), %ebx - movl 20(%esp), %ecx + movl 20(%esp), %ecx // %ecx:%ebx = delta orl %eax, %ebx - orl %edx, %ecx + orl %edx, %ecx // %ecx:%ebx = new value lock - cmpxchg8b (%edi) + cmpxchg8b (%edi) // try to stick it in jne 1b movl %ebx, %eax - movl %ecx, %edx + movl %ecx, %edx // return new value popl %ebx popl %edi ret @@ -447,30 +447,30 @@ ENTRY(atomic_and_8_nv) ALTENTRY(atomic_and_uchar_nv) - movl 4(%esp), %edx - movb (%edx), %al + movl 4(%esp), %edx // %edx = target address + movb (%edx), %al // %al = old value 1: - movl 8(%esp), %ecx - andb %al, %cl + movl 8(%esp), %ecx // %ecx = delta + andb %al, %cl // %cl = new value lock - cmpxchgb %cl, (%edx) + cmpxchgb %cl, (%edx) // try to stick it in jne 1b - movzbl %cl, %eax + movzbl %cl, %eax // return new value ret SET_SIZE(atomic_and_uchar_nv) SET_SIZE(atomic_and_8_nv) ENTRY(atomic_and_16_nv) ALTENTRY(atomic_and_ushort_nv) - movl 4(%esp), %edx - movw (%edx), %ax + movl 4(%esp), %edx // %edx = target address + movw (%edx), %ax // %ax = old value 1: - movl 8(%esp), %ecx - andw %ax, %cx + movl 8(%esp), %ecx // %ecx = delta + andw %ax, %cx // %cx = new value lock - cmpxchgw %cx, (%edx) + cmpxchgw %cx, (%edx) // try to stick it in jne 1b - movzwl %cx, %eax + movzwl %cx, %eax // return new value ret SET_SIZE(atomic_and_ushort_nv) SET_SIZE(atomic_and_16_nv) @@ -478,15 +478,15 @@ ENTRY(atomic_and_32_nv) ALTENTRY(atomic_and_uint_nv) ALTENTRY(atomic_and_ulong_nv) - movl 4(%esp), %edx - movl (%edx), %eax + movl 4(%esp), %edx // %edx = target address + movl (%edx), %eax // %eax = old value 1: - movl 8(%esp), %ecx - andl %eax, %ecx + movl 8(%esp), %ecx // %ecx = delta + andl %eax, %ecx // %ecx = new value lock - cmpxchgl %ecx, (%edx) + cmpxchgl %ecx, (%edx) // try to stick it in jne 1b - movl %ecx, %eax + movl %ecx, %eax // return new value ret SET_SIZE(atomic_and_ulong_nv) SET_SIZE(atomic_and_uint_nv) @@ -496,19 +496,19 @@ ALTENTRY(atomic_and_64_nv) pushl %edi pushl %ebx - movl 12(%esp), %edi + movl 12(%esp), %edi // %edi = target address movl (%edi), %eax - movl 4(%edi), %edx + movl 4(%edi), %edx // %edx:%eax = old value 1: movl 16(%esp), %ebx - movl 20(%esp), %ecx + movl 20(%esp), %ecx // %ecx:%ebx = delta andl %eax, %ebx - andl %edx, %ecx + andl %edx, %ecx // %ecx:%ebx = new value lock - cmpxchg8b (%edi) + cmpxchg8b (%edi) // try to stick it in jne 1b movl %ebx, %eax - movl %ecx, %edx + movl %ecx, %edx // return new value popl %ebx popl %edi ret @@ -608,7 +608,7 @@ movl 16(%esp), %ebx movl 20(%esp), %ecx movl (%esi), %eax - movl 4(%esi), %edx + movl 4(%esi), %edx // %edx:%eax = old value 1: lock cmpxchg8b (%esi) @@ -619,25 +619,25 @@ SET_SIZE(atomic_swap_64) ENTRY(atomic_set_long_excl) - movl 4(%esp), %edx - movl 8(%esp), %ecx + movl 4(%esp), %edx // %edx = target address + movl 8(%esp), %ecx // %ecx = bit id xorl %eax, %eax lock btsl %ecx, (%edx) jnc 1f - decl %eax + decl %eax // return -1 1: ret SET_SIZE(atomic_set_long_excl) ENTRY(atomic_clear_long_excl) - movl 4(%esp), %edx - movl 8(%esp), %ecx + movl 4(%esp), %edx // %edx = target address + movl 8(%esp), %ecx // %ecx = bit id xorl %eax, %eax lock btrl %ecx, (%edx) jc 1f - decl %eax + decl %eax // return -1 1: ret SET_SIZE(atomic_clear_long_excl) ==== //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/dnlc.c#2 (text+ko) ==== @@ -53,6 +53,7 @@ #include #include #include +#include #include #include @@ -285,8 +286,10 @@ static ncache_t *dnlc_get(uchar_t namlen); static ncache_t *dnlc_search(vnode_t *dp, char *name, uchar_t namlen, int hash); static void do_dnlc_reduce_cache(void *); +static void dnlc_lowvnodes(void *arg __unused, int nvnodes); static kstat_t *dnlc_ksp = NULL; +static eventhandler_tag dnlc_event_lowvnodes = NULL; /* * Initialize the directory cache. @@ -305,7 +308,7 @@ #if 0 dnlc_nentries_low_water = 4 * (v.v_proc + maxusers) + 320; #else - dnlc_nentries_low_water = vm_kmem_size / 20480; + dnlc_nentries_low_water = (desiredvnodes * 49) / 100; #endif ncsize = dnlc_nentries_low_water + (dnlc_nentries_low_water / dnlc_low_water_divisor); @@ -363,6 +366,9 @@ dnlc_ksp->ks_data = (void *) &ncs; kstat_install(dnlc_ksp); } + + dnlc_event_lowvnodes = EVENTHANDLER_REGISTER(vfs_lowvnodes, + dnlc_lowvnodes, NULL, EVENTHANDLER_PRI_FIRST); } static void @@ -371,6 +377,9 @@ nc_hash_t *hp; int i; + if (dnlc_event_lowvnodes != NULL) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Apr 15 08:14:50 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 95B1A16A406; Sun, 15 Apr 2007 08:14:50 +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 6515E16A403 for ; Sun, 15 Apr 2007 08:14:50 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 3DD1013C457 for ; Sun, 15 Apr 2007 08:14:50 +0000 (UTC) (envelope-from scottl@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 l3F8EoGn026188 for ; Sun, 15 Apr 2007 08:14:50 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3F8En4D026185 for perforce@freebsd.org; Sun, 15 Apr 2007 08:14:49 GMT (envelope-from scottl@freebsd.org) Date: Sun, 15 Apr 2007 08:14:49 GMT Message-Id: <200704150814.l3F8En4D026185@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 118148 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: Sun, 15 Apr 2007 08:14:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=118148 Change 118148 by scottl@scottl-x64 on 2007/04/15 08:13:54 Remove stale TODO list. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/TODO#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Sun Apr 15 17:15:12 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 85A2C16A404; Sun, 15 Apr 2007 17:15:12 +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 3D35F16A402 for ; Sun, 15 Apr 2007 17:15:12 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2BA9313C457 for ; Sun, 15 Apr 2007 17:15:12 +0000 (UTC) (envelope-from mjacob@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 l3FHFCJs075293 for ; Sun, 15 Apr 2007 17:15:12 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3FHFAxe075281 for perforce@freebsd.org; Sun, 15 Apr 2007 17:15:10 GMT (envelope-from mjacob@freebsd.org) Date: Sun, 15 Apr 2007 17:15:10 GMT Message-Id: <200704151715.l3FHFAxe075281@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 118181 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: Sun, 15 Apr 2007 17:15:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=118181 Change 118181 by mjacob@mjexp on 2007/04/15 17:14:35 IFC Affected files ... .. //depot/projects/mjexp/lib/libarchive/Makefile#9 integrate .. //depot/projects/mjexp/lib/libarchive/archive.h.in#10 integrate .. //depot/projects/mjexp/lib/libarchive/archive_platform.h#6 integrate .. //depot/projects/mjexp/lib/libarchive/archive_read_extract.c#8 integrate .. //depot/projects/mjexp/lib/libarchive/archive_read_support_format_ar.c#3 integrate .. //depot/projects/mjexp/lib/libarchive/archive_read_support_format_tar.c#9 integrate .. //depot/projects/mjexp/lib/libarchive/archive_read_support_format_zip.c#5 integrate .. //depot/projects/mjexp/lib/libarchive/archive_write_disk.c#6 integrate .. //depot/projects/mjexp/lib/libarchive/archive_write_set_compression_none.c#6 integrate .. //depot/projects/mjexp/lib/libarchive/archive_write_set_format_ar.c#2 integrate .. //depot/projects/mjexp/lib/libarchive/archive_write_set_format_by_name.c#4 integrate .. //depot/projects/mjexp/lib/libarchive/config_freebsd.h#4 integrate .. //depot/projects/mjexp/lib/libarchive/test/test_acl_basic.c#2 integrate .. //depot/projects/mjexp/lib/libarchive/test/test_acl_pax.c#2 integrate .. //depot/projects/mjexp/lib/libarchive/test/test_read_data_large.c#2 integrate .. //depot/projects/mjexp/lib/libarchive/test/test_read_extract.c#2 integrate .. //depot/projects/mjexp/lib/libarchive/test/test_read_format_ar.c#2 integrate .. //depot/projects/mjexp/lib/libarchive/test/test_read_large.c#2 integrate .. //depot/projects/mjexp/lib/libarchive/test/test_read_position.c#2 integrate .. //depot/projects/mjexp/lib/libarchive/test/test_read_truncated.c#2 integrate .. //depot/projects/mjexp/lib/libarchive/test/test_tar_filenames.c#2 integrate .. //depot/projects/mjexp/lib/libarchive/test/test_write_disk_perms.c#3 integrate .. //depot/projects/mjexp/lib/libarchive/test/test_write_disk_secure.c#2 integrate .. //depot/projects/mjexp/lib/libarchive/test/test_write_format_ar.c#2 integrate .. //depot/projects/mjexp/lib/libarchive/test/test_write_format_tar.c#2 integrate .. //depot/projects/mjexp/lib/libarchive/test/test_write_open_memory.c#2 integrate .. //depot/projects/mjexp/sys/cam/cam_ccb.h#4 integrate .. //depot/projects/mjexp/sys/cam/cam_periph.c#4 integrate .. //depot/projects/mjexp/sys/cam/cam_periph.h#2 integrate .. //depot/projects/mjexp/sys/cam/cam_sim.c#2 integrate .. //depot/projects/mjexp/sys/cam/cam_sim.h#2 integrate .. //depot/projects/mjexp/sys/cam/cam_xpt.c#8 integrate .. //depot/projects/mjexp/sys/cam/cam_xpt.h#5 integrate .. //depot/projects/mjexp/sys/cam/cam_xpt_periph.h#2 integrate .. //depot/projects/mjexp/sys/cam/scsi/scsi_cd.c#3 integrate .. //depot/projects/mjexp/sys/cam/scsi/scsi_ch.c#3 integrate .. //depot/projects/mjexp/sys/cam/scsi/scsi_da.c#7 integrate .. //depot/projects/mjexp/sys/cam/scsi/scsi_low.c#4 integrate .. //depot/projects/mjexp/sys/cam/scsi/scsi_pass.c#3 integrate .. //depot/projects/mjexp/sys/cam/scsi/scsi_pt.c#3 integrate .. //depot/projects/mjexp/sys/cam/scsi/scsi_sa.c#3 integrate .. //depot/projects/mjexp/sys/cam/scsi/scsi_ses.c#3 integrate .. //depot/projects/mjexp/sys/cam/scsi/scsi_sg.c#3 integrate .. //depot/projects/mjexp/sys/cam/scsi/scsi_targ_bh.c#3 integrate .. //depot/projects/mjexp/sys/cam/scsi/scsi_target.c#4 integrate .. //depot/projects/mjexp/sys/compat/linprocfs/linprocfs.c#10 integrate .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/dnlc.c#3 integrate .. //depot/projects/mjexp/sys/dev/aac/aac_cam.c#5 integrate .. //depot/projects/mjexp/sys/dev/advansys/advansys.c#5 integrate .. //depot/projects/mjexp/sys/dev/advansys/adwcam.c#6 integrate .. //depot/projects/mjexp/sys/dev/aha/aha.c#5 integrate .. //depot/projects/mjexp/sys/dev/ahb/ahb.c#7 integrate .. //depot/projects/mjexp/sys/dev/aic/aic.c#4 integrate .. //depot/projects/mjexp/sys/dev/aic7xxx/aic79xx_osm.c#4 integrate .. //depot/projects/mjexp/sys/dev/aic7xxx/aic7xxx_osm.c#4 integrate .. //depot/projects/mjexp/sys/dev/amd/amd.c#6 integrate .. //depot/projects/mjexp/sys/dev/amr/amr_cam.c#4 integrate .. //depot/projects/mjexp/sys/dev/arcmsr/arcmsr.c#10 integrate .. //depot/projects/mjexp/sys/dev/asr/asr.c#6 integrate .. //depot/projects/mjexp/sys/dev/ata/atapi-cam.c#6 integrate .. //depot/projects/mjexp/sys/dev/buslogic/bt.c#5 integrate .. //depot/projects/mjexp/sys/dev/ciss/ciss.c#6 integrate .. //depot/projects/mjexp/sys/dev/cxgb/sys/uipc_mvec.c#4 integrate .. //depot/projects/mjexp/sys/dev/dpt/dpt_scsi.c#5 integrate .. //depot/projects/mjexp/sys/dev/esp/ncr53c9x.c#4 integrate .. //depot/projects/mjexp/sys/dev/firewire/sbp.c#6 integrate .. //depot/projects/mjexp/sys/dev/firewire/sbp_targ.c#3 integrate .. //depot/projects/mjexp/sys/dev/hptmv/entry.c#5 integrate .. //depot/projects/mjexp/sys/dev/iir/iir.c#4 integrate .. //depot/projects/mjexp/sys/dev/isp/isp_freebsd.c#16 integrate .. //depot/projects/mjexp/sys/dev/mly/mly.c#6 integrate .. //depot/projects/mjexp/sys/dev/mpt/mpt_cam.c#16 integrate .. //depot/projects/mjexp/sys/dev/ppbus/vpo.c#3 integrate .. //depot/projects/mjexp/sys/dev/rr232x/osm_bsd.c#3 integrate .. //depot/projects/mjexp/sys/dev/sym/sym_hipd.c#6 integrate .. //depot/projects/mjexp/sys/dev/trm/trm.c#6 integrate .. //depot/projects/mjexp/sys/dev/twa/tw_osl_cam.c#4 integrate .. //depot/projects/mjexp/sys/dev/usb/umass.c#7 integrate .. //depot/projects/mjexp/sys/dev/wds/wd7000.c#4 integrate .. //depot/projects/mjexp/sys/fs/procfs/procfs_dbregs.c#2 integrate .. //depot/projects/mjexp/sys/fs/procfs/procfs_fpregs.c#2 integrate .. //depot/projects/mjexp/sys/fs/procfs/procfs_regs.c#2 integrate .. //depot/projects/mjexp/sys/netinet/sctp_output.c#9 integrate .. //depot/projects/mjexp/sys/netinet/sctp_structs.h#8 integrate .. //depot/projects/mjexp/sys/netinet/sctp_uio.h#8 integrate .. //depot/projects/mjexp/sys/netinet/sctp_var.h#7 integrate .. //depot/projects/mjexp/sys/netinet/sctputil.h#6 integrate .. //depot/projects/mjexp/sys/nfsserver/nfs_srvsock.c#4 integrate .. //depot/projects/mjexp/sys/pci/ncr.c#5 integrate .. //depot/projects/mjexp/sys/sys/proc.h#12 integrate Differences ... ==== //depot/projects/mjexp/lib/libarchive/Makefile#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libarchive/Makefile,v 1.68 2007/04/14 18:24:42 kientzle Exp $ +# $FreeBSD: src/lib/libarchive/Makefile,v 1.70 2007/04/15 00:53:38 kientzle Exp $ LIB= archive DPADD= ${LIBBZ2} ${LIBZ} @@ -9,7 +9,7 @@ # Major: Bumped ONLY when API/ABI breakage happens (see SHLIB_MAJOR) # Minor: Bumped when significant new features are added # Revision: Bumped on any notable change -VERSION= 2.0.30 +VERSION= 2.0.31 ARCHIVE_API_MAJOR!= echo ${VERSION} | sed -e 's/[^0-9]/./g' -e 's/\..*//' ARCHIVE_API_MINOR!= echo ${VERSION} | sed -e 's/[^0-9]/./g' -e 's/[0-9]*\.//' -e 's/\..*//' @@ -59,6 +59,7 @@ archive_read_support_compression_gzip.c \ archive_read_support_compression_none.c \ archive_read_support_format_all.c \ + archive_read_support_format_ar.c \ archive_read_support_format_cpio.c \ archive_read_support_format_empty.c \ archive_read_support_format_iso9660.c \ ==== //depot/projects/mjexp/lib/libarchive/archive.h.in#10 (text+ko) ==== @@ -22,7 +22,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/lib/libarchive/archive.h.in,v 1.41 2007/04/03 05:34:36 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive.h.in,v 1.42 2007/04/14 22:34:10 kientzle Exp $ */ #ifndef ARCHIVE_H_INCLUDED @@ -178,7 +178,7 @@ #define ARCHIVE_FORMAT_ZIP 0x50000 #define ARCHIVE_FORMAT_EMPTY 0x60000 #define ARCHIVE_FORMAT_AR 0x70000 -#define ARCHIVE_FORMAT_AR_SVR4 (ARCHIVE_FORMAT_AR | 1) +#define ARCHIVE_FORMAT_AR_GNU (ARCHIVE_FORMAT_AR | 1) #define ARCHIVE_FORMAT_AR_BSD (ARCHIVE_FORMAT_AR | 2) /*- ==== //depot/projects/mjexp/lib/libarchive/archive_platform.h#6 (text+ko) ==== @@ -22,7 +22,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/lib/libarchive/archive_platform.h,v 1.25 2007/04/12 04:44:21 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive_platform.h,v 1.26 2007/04/15 00:53:38 kientzle Exp $ */ /* @@ -67,6 +67,23 @@ #include #endif +/* Some platforms lack the standard *_MAX definitions. */ +#if !HAVE_DECL_SIZE_MAX +#define SIZE_MAX (~(size_t)0) +#endif +#if !HAVE_DECL_UINT32_MAX +#define UINT32_MAX (~(uint32_t)0) +#endif +#if !HAVE_DECL_UINT64_MAX +#define UINT64_MAX (~(uint64_t)0) +#endif +#if !HAVE_DECL_INT64_MAX +#define INT64_MAX ((int64_t)(UINT64_MAX >> 1)) +#endif +#if !HAVE_DECL_INT64_MIN +#define INT64_MIN ((int64_t)(~INT64_MAX)) +#endif + /* * If this platform has , acl_create(), acl_init(), * acl_set_file(), and ACL_USER, we assume it has the rest of the ==== //depot/projects/mjexp/lib/libarchive/archive_read_extract.c#8 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.55 2007/04/07 03:37:59 cperciva Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.57 2007/04/15 01:01:20 kientzle Exp $"); #ifdef HAVE_SYS_TYPES_H #include @@ -95,8 +95,13 @@ archive_write_disk_set_skip_file(a->extract->ad, a->skip_file_dev, a->skip_file_ino); r = archive_write_header(a->extract->ad, entry); - if (r == ARCHIVE_OK) - /* If there's an FD, pour data into it. */ + if (r != ARCHIVE_OK) + /* If _write_header failed, copy the error. */ + archive_set_error(&a->archive, + archive_errno(extract->ad), + "%s", archive_error_string(extract->ad)); + else + /* Otherwise, pour data into the entry. */ r = copy_data(_a, a->extract->ad); r2 = archive_write_finish_entry(a->extract->ad); /* Use the first message. */ ==== //depot/projects/mjexp/lib/libarchive/archive_read_support_format_ar.c#3 (text+ko) ==== @@ -26,8 +26,11 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_ar.c,v 1.3 2007/04/14 08:42:50 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_ar.c,v 1.5 2007/04/15 00:53:38 kientzle Exp $"); +#ifdef HAVE_SYS_STAT_H +#include +#endif #ifdef HAVE_ERRNO_H #include #endif @@ -70,16 +73,6 @@ #define AR_fmag_offset 58 #define AR_fmag_size 2 -/* - * "ar" magic numbers. - */ -#define ARMAG "!\n" -#define SARMAG 8 /* strlen(ARMAG); */ -#define AR_EFMT1 "#1/" -#define SAR_EFMT1 3 /* strlen(AR_EFMT1); */ -#define ARFMAG "`\n" -#define SARFMAG 2 /* strlen(ARFMAG); */ - #define isdigit(x) (x) >= '0' && (x) <= '9' static int archive_read_format_ar_bid(struct archive_read *a); @@ -89,32 +82,12 @@ static int archive_read_format_ar_skip(struct archive_read *a); static int archive_read_format_ar_read_header(struct archive_read *a, struct archive_entry *e); -static int64_t ar_atol8(const char *p, unsigned char_cnt); -static int64_t ar_atol10(const char *p, unsigned char_cnt); -static int ar_parse_string_table(struct archive_read *, struct ar *, +static uint64_t ar_atol8(const char *p, unsigned char_cnt); +static uint64_t ar_atol10(const char *p, unsigned char_cnt); +static int ar_parse_gnu_filename_table(struct archive_read *, struct ar *, const void *, size_t); - -/* - * ANSI C99 defines constants for these, but not everyone supports - * those constants, so I define a couple of static variables here and - * compute the values. These calculations should be portable to any - * 2s-complement architecture. - */ -#ifdef UINT64_MAX -static const uint64_t max_uint64 = UINT64_MAX; -#else -static const uint64_t max_uint64 = ~(uint64_t)0; -#endif -#ifdef INT64_MAX -static const int64_t max_int64 = INT64_MAX; -#else -static const int64_t max_int64 = (int64_t)((~(uint64_t)0) >> 1); -#endif -#ifdef INT64_MIN -static const int64_t min_int64 = INT64_MIN; -#else -static const int64_t min_int64 = (int64_t)(~((~(uint64_t)0) >> 1)); -#endif +static int ar_parse_common_header(struct ar *ar, struct archive_entry *, + const char *h); int archive_read_support_format_ar(struct archive *_a) @@ -177,16 +150,15 @@ if (ar->bid > 0) return (ar->bid); - bytes_read = (a->compression_read_ahead)(a, &h, SARMAG); - if (bytes_read < SARMAG) - return (-1); - /* - * Verify the global header. + * Verify the 8-byte file signature. * TODO: Do we need to check more than this? */ - if (strncmp((const char*)h, ARMAG, SARMAG) == 0) { - ar->bid = SARMAG; + bytes_read = (a->compression_read_ahead)(a, &h, 8); + if (bytes_read < 8) + return (-1); + if (strncmp((const char*)h, "!\n", 8) == 0) { + ar->bid = 64; return (ar->bid); } return (-1); @@ -196,199 +168,247 @@ archive_read_format_ar_read_header(struct archive_read *a, struct archive_entry *entry) { - int r; - size_t bsd_append; - ssize_t bytes; - int64_t nval; - size_t tab_size; - char *fname, *p; + char filename[AR_name_size + 1]; struct ar *ar; + uint64_t number; /* Used to hold parsed numbers before validation. */ + ssize_t bytes_read; + size_t bsd_name_length, entry_size; + char *p; const void *b; const char *h; + int r; - bsd_append = 0; + ar = (struct ar*)*(a->pformat_data); - if (!a->archive.archive_format) { - a->archive.archive_format = ARCHIVE_FORMAT_AR; - a->archive.archive_format_name = "Unix Archiver"; - } - if (a->archive.file_position == 0) { /* * We are now at the beginning of the archive, * so we need first consume the ar global header. */ - (a->compression_read_consume)(a, SARMAG); + (a->compression_read_consume)(a, 8); + /* Set a default format code for now. */ + a->archive.archive_format = ARCHIVE_FORMAT_AR; } - /* Read 60-byte header */ - bytes = (a->compression_read_ahead)(a, &b, 60); - if (bytes < 60) { - /* - * We just encountered an incomplete ar file, - * though the _bid function accepted it. - */ + /* Read the header for the next file entry. */ + bytes_read = (a->compression_read_ahead)(a, &b, 60); + if (bytes_read < 60) { + /* Broken header. */ return (ARCHIVE_EOF); } (a->compression_read_consume)(a, 60); - h = (const char *)b; - /* Consistency check */ - if (strncmp(h + AR_fmag_offset, ARFMAG, SARFMAG) != 0) { + /* Verify the magic signature on the file header. */ + if (strncmp(h + AR_fmag_offset, "`\n", 2) != 0) { archive_set_error(&a->archive, EINVAL, "Consistency check failed"); return (ARCHIVE_WARN); } - ar = (struct ar*)*(a->pformat_data); + /* Copy filename into work buffer. */ + strncpy(filename, h + AR_name_offset, AR_name_size); + filename[AR_name_size] = '\0'; - if (strncmp(h + AR_name_offset, "//", 2) == 0) { + /* + * Guess the format variant based on the filename. + */ + if (a->archive.archive_format == ARCHIVE_FORMAT_AR) { + /* We don't already know the variant, so let's guess. */ + /* + * Biggest clue is presence of '/': GNU starts special + * filenames with '/', appends '/' as terminator to + * non-special names, so anything with '/' should be + * GNU except for BSD long filenames. + */ + if (strncmp(filename, "#1/", 3) == 0) + a->archive.archive_format = ARCHIVE_FORMAT_AR_BSD; + else if (strchr(filename, '/') != NULL) + a->archive.archive_format = ARCHIVE_FORMAT_AR_GNU; + else if (strncmp(filename, "__.SYMDEF", 9) == 0) + a->archive.archive_format = ARCHIVE_FORMAT_AR_BSD; /* - * An archive member with ar_name "//" is an archive - * string table. + * XXX Do GNU/SVR4 'ar' programs ever omit trailing '/' + * if name exactly fills 16-byte field? If so, we + * can't assume entries without '/' are BSD. XXX */ - nval = ar_atol10(h + AR_size_offset, AR_size_size); - if (nval < 0 || nval > SIZE_MAX) { + } + + /* Update format name from the code. */ + if (a->archive.archive_format == ARCHIVE_FORMAT_AR_GNU) + a->archive.archive_format_name = "ar (GNU/SVR4)"; + else if (a->archive.archive_format == ARCHIVE_FORMAT_AR_BSD) + a->archive.archive_format_name = "ar (BSD)"; + else + a->archive.archive_format_name = "ar"; + + /* + * Remove trailing spaces from the filename. GNU and BSD + * variants both pad filename area out with spaces. + * This will only be wrong if GNU/SVR4 'ar' implementations + * omit trailing '/' for 16-char filenames and we have + * a 16-char filename that ends in ' '. + */ + p = filename + AR_name_size - 1; + while (p >= filename && *p == ' ') { + *p = '\0'; + p--; + } + + /* + * Remove trailing slash unless first character is '/'. + * (BSD entries never end in '/', so this will only trim + * GNU-format entries. GNU special entries start with '/' + * and are not terminated in '/', so we don't trim anything + * that starts with '/'.) + */ + if (filename[0] != '/' && *p == '/') + *p = '\0'; + + /* + * '//' is the GNU filename table. + * Later entries can refer to names in this table. + */ + if (strcmp(filename, "//") == 0) { + /* This must come before any call to _read_ahead. */ + ar_parse_common_header(ar, entry, h); + archive_entry_copy_pathname(entry, filename); + archive_entry_set_mode(entry, + S_IFREG | (archive_entry_mode(entry) & 0777)); + /* Get the size of the filename table. */ + number = ar_atol10(h + AR_size_offset, AR_size_size); + if (number > SIZE_MAX) { archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, - "String table too large"); + "Filename table too large"); return (ARCHIVE_FATAL); } - tab_size = (size_t)nval; - bytes = (a->compression_read_ahead)(a, &b, tab_size); - if (bytes <= 0) + entry_size = (size_t)number; + /* Read the filename table into memory. */ + bytes_read = (a->compression_read_ahead)(a, &b, entry_size); + if (bytes_read <= 0) return (ARCHIVE_FATAL); - if (bytes < nval) { + if ((size_t)bytes_read < entry_size) { archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, "Truncated input file"); return (ARCHIVE_FATAL); } + /* + * Don't consume the contents, so the client will + * also get a shot at reading it. + */ - r = ar_parse_string_table(a, ar, b, tab_size); - if (r == ARCHIVE_OK) { - /* - * Archive string table only have ar_name and ar_size fileds - * in its header. - */ - archive_entry_copy_pathname(entry, "//"); - h = (const char *)b; - nval = ar_atol10(h + AR_size_offset, AR_size_size); - archive_entry_set_size(entry, nval); - - ar->entry_offset = 0; - ar->entry_bytes_remaining = nval; - ar->entry_padding = ar->entry_bytes_remaining % 2; - } - return (r); + /* Parse the filename table. */ + return (ar_parse_gnu_filename_table(a, ar, b, entry_size)); } - if (h[AR_name_offset] == '/' && isdigit(h[AR_name_offset + 1])) { + /* + * GNU variant handles long filenames by storing / + * to indicate a name stored in the filename table. + */ + if (filename[0] == '/' && isdigit(filename[1])) { + number = ar_atol10(h + AR_name_offset + 1, AR_name_size - 1); /* - * Archive member is common format with SVR4/GNU variant. - * "/" followed by one or more digit(s) in the ar_name - * filed indicates an index to the string table. + * If we can't look up the real name, warn and return + * the entry with the wrong name. */ - if (ar->strtab == NULL) { + if (ar->strtab == NULL || number > ar->strtab_size) { archive_set_error(&a->archive, EINVAL, - "String table does not exist"); + "Can't find long filename for entry"); + archive_entry_copy_pathname(entry, filename); + /* Parse the time, owner, mode, size fields. */ + ar_parse_common_header(ar, entry, h); return (ARCHIVE_WARN); } - nval = ar_atol10(h + AR_name_offset + 1, AR_name_size - 1); - if (nval < 0 || nval > ar->strtab_size) { - archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, - "String table overflow"); - return (ARCHIVE_FATAL); - } - archive_entry_copy_pathname(entry, &ar->strtab[(size_t)nval]); - goto remain; + archive_entry_copy_pathname(entry, &ar->strtab[(size_t)number]); + /* Parse the time, owner, mode, size fields. */ + return (ar_parse_common_header(ar, entry, h)); } - if (strncmp(h + AR_name_offset, AR_EFMT1, SAR_EFMT1) == 0) { - /* - * Archive member is common format with BSD variant. - * AR_EFMT1 is followed by one or more digit(s) indicating - * the length of the real filename which is appended - * to the header. - */ - nval = ar_atol10(h + AR_name_offset + SAR_EFMT1, - AR_name_size - SAR_EFMT1); - if (nval < 0 || nval >= SIZE_MAX) { + /* + * BSD handles long filenames by storing "#1/" followed by the + * length of filename as a decimal number, then prepends the + * the filename to the file contents. + */ + if (strncmp(filename, "#1/", 3) == 0) { + /* Parse the time, owner, mode, size fields. */ + /* This must occur before _read_ahead is called again. */ + ar_parse_common_header(ar, entry, h); + + /* Parse the size of the name, adjust the file size. */ + number = ar_atol10(h + AR_name_offset + 3, AR_name_size - 3); + if ((off_t)number > ar->entry_bytes_remaining) { archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, "Bad input file size"); return (ARCHIVE_FATAL); } - bsd_append = (size_t)nval; - bytes = (a->compression_read_ahead)(a, &b, bsd_append); - if (bytes <= 0) + bsd_name_length = (size_t)number; + ar->entry_bytes_remaining -= bsd_name_length; + /* Adjust file size reported to client. */ + archive_entry_set_size(entry, ar->entry_bytes_remaining); + + /* Read the long name into memory. */ + bytes_read = (a->compression_read_ahead)(a, &b, bsd_name_length); + if (bytes_read <= 0) return (ARCHIVE_FATAL); - if (bytes < nval) { + if ((size_t)bytes_read < bsd_name_length) { archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, "Truncated input file"); return (ARCHIVE_FATAL); } + (a->compression_read_consume)(a, bsd_name_length); - (a->compression_read_consume)(a, bsd_append); - - fname = (char *)malloc(bsd_append + 1); - if (fname == NULL) { + /* Store it in the entry. */ + p = (char *)malloc(bsd_name_length + 1); + if (p == NULL) { archive_set_error(&a->archive, ENOMEM, "Can't allocate fname buffer"); return (ARCHIVE_FATAL); } - strncpy(fname, b, bsd_append); - fname[bsd_append] = '\0'; - archive_entry_copy_pathname(entry, fname); - free(fname); - fname = NULL; - - goto remain; + strncpy(p, b, bsd_name_length); + p[bsd_name_length] = '\0'; + archive_entry_copy_pathname(entry, p); + free(p); + return (ARCHIVE_OK); } /* - * "/" followed by one or more spaces indicate a - * SVR4/GNU archive symbol table. - * + * "/" is the SVR4/GNU archive symbol table. */ - if (strncmp(h + AR_name_offset, "/ ", 2) == 0) { + if (strcmp(filename, "/") == 0) { archive_entry_copy_pathname(entry, "/"); - goto remain; + /* Parse the time, owner, mode, size fields. */ + r = ar_parse_common_header(ar, entry, h); + /* Force the file type to a regular file. */ + archive_entry_set_mode(entry, + S_IFREG | (archive_entry_mode(entry) & 0777)); + return (r); } + /* - * "__.SYMDEF" indicates a BSD archive symbol table. + * "__.SYMDEF" is a BSD archive symbol table. */ - if (strncmp(h + AR_name_offset, "__.SYMDEF", 9) == 0) { - archive_entry_copy_pathname(entry, "__.SYMDEF"); - goto remain; + if (strcmp(filename, "__.SYMDEF") == 0) { + archive_entry_copy_pathname(entry, filename); + /* Parse the time, owner, mode, size fields. */ + return (ar_parse_common_header(ar, entry, h)); } /* - * Otherwise, the ar_name fields stores the real - * filename. - * SVR4/GNU variant append a '/' to mark the end of - * filename, while BSD variant use a space. + * Otherwise, this is a standard entry. The filename + * has already been trimmed as much as possible, based + * on our current knowledge of the format. */ - fname = (char *)malloc(AR_name_size + 1); - strncpy(fname, h + AR_name_offset, AR_name_size); - fname[AR_name_size] = '\0'; + archive_entry_copy_pathname(entry, filename); + return (ar_parse_common_header(ar, entry, h)); +} - if ((p = strchr(fname, '/')) != NULL) { - /* SVR4/GNU format */ - *p = '\0'; - archive_entry_copy_pathname(entry, fname); - free(fname); - fname = NULL; - goto remain; - } - - /* BSD format */ - if ((p = strchr(fname, ' ')) != NULL) - *p = '\0'; - archive_entry_copy_pathname(entry, fname); - free(fname); - fname = NULL; +static int +ar_parse_common_header(struct ar *ar, struct archive_entry *entry, + const char *h) +{ + uint64_t n; -remain: /* Copy remaining header */ archive_entry_set_mtime(entry, (time_t)ar_atol10(h + AR_date_offset, AR_date_size), 0L); @@ -398,28 +418,12 @@ (gid_t)ar_atol10(h + AR_gid_offset, AR_gid_size)); archive_entry_set_mode(entry, (mode_t)ar_atol8(h + AR_mode_offset, AR_mode_size)); - nval = ar_atol10(h + AR_size_offset, AR_size_size); + n = ar_atol10(h + AR_size_offset, AR_size_size); ar->entry_offset = 0; - ar->entry_padding = nval % 2; - - /* - * For BSD variant, we should subtract the length of - * the appended filename string from ar_size to get the - * real file size. But remember we should do this only - * after we had calculated the padding. - */ - if (bsd_append > nval) { - archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, - "Truncated input file"); - return (ARCHIVE_FATAL); - } - if (bsd_append > 0) - nval -= bsd_append; - - archive_entry_set_size(entry, nval); - ar->entry_bytes_remaining = nval; - + ar->entry_padding = n % 2; + archive_entry_set_size(entry, n); + ar->entry_bytes_remaining = n; return (ARCHIVE_OK); } @@ -441,7 +445,6 @@ } if (bytes_read < 0) return (ARCHIVE_FATAL); - /* XXX I don't get this. */ if (bytes_read > ar->entry_bytes_remaining) bytes_read = (ssize_t)ar->entry_bytes_remaining; *size = bytes_read; @@ -496,7 +499,7 @@ } static int -ar_parse_string_table(struct archive_read *a, struct ar *ar, +ar_parse_gnu_filename_table(struct archive_read *a, struct ar *ar, const void *h, size_t size) { char *p; @@ -550,68 +553,53 @@ return (ARCHIVE_WARN); } -static int64_t +static uint64_t ar_atol8(const char *p, unsigned char_cnt) { - int64_t l, limit, last_digit_limit; - int digit, sign, base; + uint64_t l, limit, last_digit_limit; + unsigned int digit, base; base = 8; - limit = max_int64 / base; - last_digit_limit = max_int64 % base; + limit = UINT64_MAX / base; + last_digit_limit = UINT64_MAX % base; - while (*p == ' ' || *p == '\t') + while ((*p == ' ' || *p == '\t') && char_cnt-- > 0) p++; - if (*p == '-') { - sign = -1; - p++; - } else - sign = 1; l = 0; digit = *p - '0'; - while (digit >= 0 && digit < base && char_cnt-- > 0) { + while (*p >= '0' && digit < base && char_cnt-- > 0) { if (l>limit || (l == limit && digit > last_digit_limit)) { - l = max_uint64; /* Truncate on overflow. */ + l = UINT64_MAX; /* Truncate on overflow. */ break; } l = (l * base) + digit; digit = *++p - '0'; } - return (sign < 0) ? -l : l; + return (l); } -/* - * XXX This is not really correct for negative numbers, - * as min_int64_t can never be returned. That one is unused BTW. - */ -static int64_t +static uint64_t ar_atol10(const char *p, unsigned char_cnt) { - int64_t l, limit, last_digit_limit; - int base, digit, sign; + uint64_t l, limit, last_digit_limit; + unsigned int base, digit; base = 10; - limit = max_int64 / base; - last_digit_limit = max_int64 % base; + limit = UINT64_MAX / base; + last_digit_limit = UINT64_MAX % base; - while (*p == ' ' || *p == '\t') - p++; - if (*p == '-') { - sign = -1; + while ((*p == ' ' || *p == '\t') && char_cnt-- > 0) p++; - } else - sign = 1; - l = 0; digit = *p - '0'; - while (digit >= 0 && digit < base && char_cnt-- > 0) { + while (*p >= '0' && digit < base && char_cnt-- > 0) { if (l > limit || (l == limit && digit > last_digit_limit)) { - l = max_uint64; /* Truncate on overflow. */ + l = UINT64_MAX; /* Truncate on overflow. */ break; } l = (l * base) + digit; digit = *++p - '0'; } - return (sign < 0) ? -l : l; + return (l); } ==== //depot/projects/mjexp/lib/libarchive/archive_read_support_format_tar.c#9 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tar.c,v 1.53 2007/04/12 04:42:57 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tar.c,v 1.54 2007/04/15 00:53:38 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -225,28 +225,6 @@ static int utf8_decode(wchar_t *, const char *, size_t length); static char *wide_to_narrow(const wchar_t *wval); -/* - * ANSI C99 defines constants for these, but not everyone supports - * those constants, so I define a couple of static variables here and - * compute the values. These calculations should be portable to any - * 2s-complement architecture. - */ -#ifdef UINT64_MAX -static const uint64_t max_uint64 = UINT64_MAX; -#else -static const uint64_t max_uint64 = ~(uint64_t)0; -#endif -#ifdef INT64_MAX -static const int64_t max_int64 = INT64_MAX; -#else -static const int64_t max_int64 = (int64_t)((~(uint64_t)0) >> 1); -#endif -#ifdef INT64_MIN -static const int64_t min_int64 = INT64_MIN; -#else -static const int64_t min_int64 = (int64_t)(~((~(uint64_t)0) >> 1)); -#endif - int archive_read_support_format_gnutar(struct archive *a) { @@ -1379,8 +1357,8 @@ int sign; int64_t limit, last_digit_limit; - limit = max_int64 / 10; - last_digit_limit = max_int64 % 10; + limit = INT64_MAX / 10; + last_digit_limit = INT64_MAX % 10; s = 0; sign = 1; @@ -1392,7 +1370,7 @@ digit = *p - '0'; if (s > limit || (s == limit && digit > last_digit_limit)) { - s = max_uint64; + s = UINT64_MAX; break; } s = (s * 10) + digit; @@ -1593,8 +1571,8 @@ int digit, sign, base; base = 8; - limit = max_int64 / base; - last_digit_limit = max_int64 % base; + limit = INT64_MAX / base; + last_digit_limit = INT64_MAX % base; while (*p == ' ' || *p == '\t') p++; @@ -1608,7 +1586,7 @@ digit = *p - '0'; while (digit >= 0 && digit < base && char_cnt-- > 0) { if (l>limit || (l == limit && digit > last_digit_limit)) { - l = max_uint64; /* Truncate on overflow. */ + l = UINT64_MAX; /* Truncate on overflow. */ break; } l = (l * base) + digit; @@ -1630,8 +1608,8 @@ int base, digit, sign; base = 10; - limit = max_int64 / base; - last_digit_limit = max_int64 % base; + limit = INT64_MAX / base; + last_digit_limit = INT64_MAX % base; while (*p == ' ' || *p == '\t') p++; @@ -1645,7 +1623,7 @@ digit = *p - '0'; while (digit >= 0 && digit < base && char_cnt-- > 0) { if (l > limit || (l == limit && digit > last_digit_limit)) { - l = max_uint64; /* Truncate on overflow. */ + l = UINT64_MAX; /* Truncate on overflow. */ break; } l = (l * base) + digit; @@ -1668,8 +1646,8 @@ int64_t l, upper_limit, lower_limit; const unsigned char *p = (const unsigned char *)_p; - upper_limit = max_int64 / 256; - lower_limit = min_int64 / 256; + upper_limit = INT64_MAX / 256; + lower_limit = INT64_MIN / 256; /* Pad with 1 or 0 bits, depending on sign. */ if ((0x40 & *p) == 0x40) @@ -1679,10 +1657,10 @@ l = (l << 6) | (0x3f & *p++); while (--char_cnt > 0) { if (l > upper_limit) { - l = max_int64; /* Truncate on overflow */ + l = INT64_MAX; /* Truncate on overflow */ break; } else if (l < lower_limit) { - l = min_int64; + l = INT64_MIN; break; } l = (l << 8) | (0xff & (int64_t)*p++); ==== //depot/projects/mjexp/lib/libarchive/archive_read_support_format_zip.c#5 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_zip.c,v 1.11 2007/03/03 07:37:36 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_zip.c,v 1.12 2007/04/15 00:53:38 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -137,9 +137,6 @@ static time_t zip_time(const char *); static void process_extra(const void* extra, struct zip* zip); -/* Largest 32-bit unsigned value, stored in a 64-bit constant. */ -static const uint64_t max_uint32 = (((uint64_t)1) << 32) - 1; - int archive_read_support_format_zip(struct archive *_a) { @@ -412,8 +409,8 @@ return (ARCHIVE_WARN); } /* Size field only stores the lower 32 bits of the actual size. */ - if ((zip->uncompressed_size & max_uint32) - != (zip->entry_uncompressed_bytes_read & max_uint32)) { + if ((zip->uncompressed_size & UINT32_MAX) + != (zip->entry_uncompressed_bytes_read & UINT32_MAX)) { archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, "ZIP uncompressed data is wrong size"); return (ARCHIVE_WARN); ==== //depot/projects/mjexp/lib/libarchive/archive_write_disk.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk.c,v 1.8 2007/04/14 02:37:22 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk.c,v 1.10 2007/04/15 04:43:12 kientzle Exp $"); #ifdef HAVE_SYS_TYPES_H #include @@ -897,7 +897,7 @@ times.modtime = p->mtime; times.actime = p->atime; - utime(p->name, times); + utime(p->name, ×); #endif } if (p->fixup & TODO_MODE_BASE) @@ -922,6 +922,10 @@ struct archive_write_disk *a = (struct archive_write_disk *)_a; int ret; ret = _archive_write_close(&a->archive); + if (a->cleanup_gid != NULL && a->lookup_gid_data != NULL) + (a->cleanup_gid)(a->lookup_gid_data); + if (a->cleanup_uid != NULL && a->lookup_uid_data != NULL) + (a->cleanup_uid)(a->lookup_uid_data); archive_string_free(&a->_name_data); archive_string_free(&a->archive.error_string); archive_string_free(&a->path_safe); @@ -1452,7 +1456,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Apr 15 17:59:09 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 B59FE16A402; Sun, 15 Apr 2007 17:59:09 +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 29D3916A40D for ; Sun, 15 Apr 2007 17:59:09 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 1940F13C45D for ; Sun, 15 Apr 2007 17:59:09 +0000 (UTC) (envelope-from csjp@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 l3FHx86J082669 for ; Sun, 15 Apr 2007 17:59:08 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3FHx8de082666 for perforce@freebsd.org; Sun, 15 Apr 2007 17:59:08 GMT (envelope-from csjp@freebsd.org) Date: Sun, 15 Apr 2007 17:59:08 GMT Message-Id: <200704151759.l3FHx8de082666@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 118188 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: Sun, 15 Apr 2007 17:59:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=118188 Change 118188 by csjp@csjp_xor on 2007/04/15 17:59:05 Add support for parsing zonename tokens. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#25 edit .. //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#33 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#46 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#61 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#25 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#24 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#25 $ */ #ifndef _BSM_AUDIT_RECORD_H_ @@ -85,6 +85,7 @@ /* XXXRW: Additional X11 tokens not defined? */ #define AUT_CMD 0x51 #define AUT_EXIT 0x52 +#define AUT_ZONENAME 0x60 /* XXXRW: OpenBSM AUT_HOST 0x70? */ #define AUT_ARG64 0x71 #define AUT_RETURN64 0x72 @@ -330,6 +331,7 @@ token_t *au_to_text(char *text); token_t *au_to_kevent(struct kevent *kev); token_t *au_to_trailer(int rec_size); +token_t *au_to_zonename(char *zonename); __END_DECLS ==== //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#33 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#32 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#33 $ */ #ifndef _LIBBSM_H_ @@ -653,6 +653,15 @@ char *text; } au_text_t; +/* + * zonename length 2 bytes + * zonename text N bytes + 1 NULL terminator + */ +typedef struct { + u_int16_t len; + char *zonename; +} au_zonename_t; + typedef struct { u_int32_t ident; u_int16_t filter; @@ -721,6 +730,7 @@ au_kevent_t kevent; au_invalid_t invalid; au_trailer_t trail; + au_zonename_t zonename; } tt; /* The token is one of the above types */ }; ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#46 (text+ko) ==== @@ -32,7 +32,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#45 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#46 $ */ #include @@ -3860,6 +3860,36 @@ /* + * size 2 bytes; + * zonename size bytes; + */ + +static int +fetch_zonename_tok(tokenstr_t *tok, char *buf, int len) +{ + int err = 0; + + READ_TOKEN_U_INT16(buf, len, tok->tt.zonename.len, tok->len, err); + if (err) + return (-1); + SET_PTR(buf, len, tok->tt.zonename.zonename, tok->tt.zonename.len, + tok->len, err); + if (err) + return (-1); + return (0); +} + +static void +print_zonename_tok(FILE *fp, tokenstr_t *tok, char *del, char raw, + __unused char sfrm, int xml) +{ + + print_tok_type(fp, tok->id, "zone", raw, xml); + print_delim(fp, del); + print_string(fp, tok->tt.zonename.zonename, tok->tt.zonename.len); +} + +/* * Reads the token beginning at buf into tok. */ int @@ -3991,6 +4021,9 @@ case AUT_DATA: return (fetch_arb_tok(tok, buf, len)); + case AUT_ZONENAME: + return (fetch_zonename_tok(tok, buf, len)); + default: return (fetch_invalid_tok(tok, buf, len)); } @@ -4160,6 +4193,10 @@ print_socketex32_tok(outfp, tok, del, raw, sfrm, AU_PLAIN); return; + case AUT_ZONENAME: + print_zonename_tok(outfp, tok, del, raw, sfrm, AU_PLAIN); + return; + default: print_invalid_tok(outfp, tok, del, raw, sfrm, AU_PLAIN); } ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#61 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#60 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#61 $ */ #include @@ -1220,6 +1220,28 @@ } /* + * token ID 1 byte + * zonename length 2 bytes + * zonename N bytes + 1 terminating NULL byte + */ +token_t * +au_to_zonename(char *zonename) +{ + u_char *dptr = NULL; + u_int16_t textlen; + token_t *t; + + textlen = strlen(zonename); + textlen += 1; + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + sizeof(u_int16_t) + textlen); + ADD_U_CHAR(dptr, AUT_ZONENAME); + ADD_U_INT16(dptr, textlen); + ADD_STRING(dptr, zonename, textlen); + return (t); +} + + +/* * token ID 1 byte * count 4 bytes * text count null-terminated strings From owner-p4-projects@FreeBSD.ORG Sun Apr 15 18:02:13 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 87E4016A406; Sun, 15 Apr 2007 18:02:13 +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 562FB16A401 for ; Sun, 15 Apr 2007 18:02:13 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 47D6D13C487 for ; Sun, 15 Apr 2007 18:02:13 +0000 (UTC) (envelope-from csjp@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 l3FI2DSX083421 for ; Sun, 15 Apr 2007 18:02:13 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3FI2Dbh083418 for perforce@freebsd.org; Sun, 15 Apr 2007 18:02:13 GMT (envelope-from csjp@freebsd.org) Date: Sun, 15 Apr 2007 18:02:13 GMT Message-Id: <200704151802.l3FI2Dbh083418@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 118189 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: Sun, 15 Apr 2007 18:02:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=118189 Change 118189 by csjp@csjp_xor on 2007/04/15 18:01:45 Remove gratuitous whitespace Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#62 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#62 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#61 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#62 $ */ #include @@ -1240,7 +1240,6 @@ return (t); } - /* * token ID 1 byte * count 4 bytes From owner-p4-projects@FreeBSD.ORG Sun Apr 15 18:14:29 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 F3E9916A406; Sun, 15 Apr 2007 18:14:28 +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 B27E316A403 for ; Sun, 15 Apr 2007 18:14:28 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id A371A13C448 for ; Sun, 15 Apr 2007 18:14:28 +0000 (UTC) (envelope-from csjp@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 l3FIESmu086865 for ; Sun, 15 Apr 2007 18:14:28 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3FIES9Y086862 for perforce@freebsd.org; Sun, 15 Apr 2007 18:14:28 GMT (envelope-from csjp@freebsd.org) Date: Sun, 15 Apr 2007 18:14:28 GMT Message-Id: <200704151814.l3FIES9Y086862@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 118190 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: Sun, 15 Apr 2007 18:14:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=118190 Change 118190 by csjp@csjp_xor on 2007/04/15 18:14:20 Teach audit_submit about getaudit_addr() Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#24 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#24 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#23 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#24 $ */ #ifdef __APPLE__ @@ -66,8 +66,9 @@ long acond; va_list ap; pid_t pid; - int error, afd; + int error, afd, subj_ex; struct auditinfo ai; + struct auditinfo_addr aia; if (auditon(A_GETCOND, &acond, sizeof(acond)) < 0) { /* @@ -84,6 +85,7 @@ } if (acond == AUC_NOAUDIT) return (0); + /* XXXCSJP we should be doing a pre-select here */ afd = au_open(); if (afd < 0) { error = errno; @@ -92,7 +94,20 @@ errno = error; return (-1); } - if (getaudit(&ai) < 0) { + /* + * Some operating systems do not have getaudit_addr(2) implemented + * yet. So we try to use getaudit(2) first, if the subject is + * using IPv6, then we will have to try getaudit_addr(2). Failing + * this, we return error. + */ + subj_ex = 0; + error = getaudit(&ai); + if (error < 0 && errno == E2BIG) { + error = getaudit_addr(&aia, sizeof(aia)); + if (error == 0) + subj_ex = 1; + } + if (error < 0) { error = errno; syslog(LOG_AUTH | LOG_ERR, "audit: getaudit failed: %s", strerror(errno)); @@ -100,8 +115,12 @@ return (-1); } pid = getpid(); - token = au_to_subject32(auid, geteuid(), getegid(), - getuid(), getgid(), pid, pid, &ai.ai_termid); + if (subj_ex == 0) + token = au_to_subject32(auid, geteuid(), getegid(), + getuid(), getgid(), pid, pid, &ai.ai_termid); + else + token = au_to_subject_ex(auid, geteuid(), getegid(), + getuid(), getgid(), pid, pid, &aia.ai_termid); if (token == NULL) { syslog(LOG_AUTH | LOG_ERR, "audit: unable to build subject token"); From owner-p4-projects@FreeBSD.ORG Sun Apr 15 18:24:42 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 0841416A406; Sun, 15 Apr 2007 18:24:42 +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 C25C216A402 for ; Sun, 15 Apr 2007 18:24:41 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B3BD913C48A for ; Sun, 15 Apr 2007 18:24:41 +0000 (UTC) (envelope-from csjp@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 l3FIOf43088300 for ; Sun, 15 Apr 2007 18:24:41 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3FIOfvf088295 for perforce@freebsd.org; Sun, 15 Apr 2007 18:24:41 GMT (envelope-from csjp@freebsd.org) Date: Sun, 15 Apr 2007 18:24:41 GMT Message-Id: <200704151824.l3FIOfvf088295@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 118191 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: Sun, 15 Apr 2007 18:24:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=118191 Change 118191 by csjp@csjp_xor on 2007/04/15 18:24:15 Update HISTORY for recent changes Affected files ... .. //depot/projects/trustedbsd/openbsm/HISTORY#50 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/HISTORY#50 (text+ko) ==== @@ -3,6 +3,8 @@ - Fix endian issues when processing IPv6 addresses for extended subject and process tokens. - gcc41 warnings clean. +- Teach audit_submit(3) about getaudit_addr(2). +- Add support for zonename tokens. OpenBSM 1.0 alpha 13 @@ -282,4 +284,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/HISTORY#49 $ +$P4: //depot/projects/trustedbsd/openbsm/HISTORY#50 $ From owner-p4-projects@FreeBSD.ORG Sun Apr 15 18:55:21 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 2B73E16A414; Sun, 15 Apr 2007 18:55:21 +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 01A4816A412 for ; Sun, 15 Apr 2007 18:55:21 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E63E513C4BA for ; Sun, 15 Apr 2007 18:55:20 +0000 (UTC) (envelope-from csjp@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 l3FItKBw093191 for ; Sun, 15 Apr 2007 18:55:20 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3FItKD0093180 for perforce@freebsd.org; Sun, 15 Apr 2007 18:55:20 GMT (envelope-from csjp@freebsd.org) Date: Sun, 15 Apr 2007 18:55:20 GMT Message-Id: <200704151855.l3FItKD0093180@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 118194 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: Sun, 15 Apr 2007 18:55:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=118194 Change 118194 by csjp@csjp_xor on 2007/04/15 18:54:41 add XML support for zone name token Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#47 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#47 (text+ko) ==== @@ -32,7 +32,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#46 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#47 $ */ #include @@ -392,6 +392,10 @@ case AUT_DATA: fprintf(fp, ""); break; + + case AUT_ZONENAME: + fprintf(fp, "/>"); + break; } } @@ -559,6 +563,10 @@ case AUT_DATA: fprintf(fp, "id, "zone", raw, xml); - print_delim(fp, del); - print_string(fp, tok->tt.zonename.zonename, tok->tt.zonename.len); + if (xml) { + open_attr(fp, "name"); + print_string(fp, tok->tt.zonename.zonename, + tok->tt.zonename.len); + close_attr(fp); + close_tag(fp, tok->id); + } else { + print_delim(fp, del); + print_string(fp, tok->tt.zonename.zonename, + tok->tt.zonename.len); + } } /* @@ -4367,6 +4384,10 @@ print_socketex32_tok(outfp, tok, del, raw, sfrm, AU_XML); return; + case AUT_ZONENAME: + print_zonename_tok(outfp, tok, del, raw, sfrm, AU_XML); + return; + default: print_invalid_tok(outfp, tok, del, raw, sfrm, AU_XML); } From owner-p4-projects@FreeBSD.ORG Sun Apr 15 19:10:09 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 E139716A403; Sun, 15 Apr 2007 19:10:08 +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 BD7D816A40F for ; Sun, 15 Apr 2007 19:10:08 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 51B6813C4BA for ; Sun, 15 Apr 2007 19:10:08 +0000 (UTC) (envelope-from mjacob@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 l3FJA7Gc097248 for ; Sun, 15 Apr 2007 19:10:07 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3FJA7NO097244 for perforce@freebsd.org; Sun, 15 Apr 2007 19:10:07 GMT (envelope-from mjacob@freebsd.org) Date: Sun, 15 Apr 2007 19:10:07 GMT Message-Id: <200704151910.l3FJA7NO097244@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 118196 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: Sun, 15 Apr 2007 19:10:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=118196 Change 118196 by mjacob@mjexp on 2007/04/15 19:09:51 IFC Affected files ... .. //depot/projects/mjexp/sys/dev/cxgb/sys/uipc_mvec.c#5 integrate Differences ... ==== //depot/projects/mjexp/sys/dev/cxgb/sys/uipc_mvec.c#5 (text+ko) ==== @@ -29,7 +29,7 @@ ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/cxgb/sys/uipc_mvec.c,v 1.8 2007/04/15 15:30:45 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/sys/uipc_mvec.c,v 1.9 2007/04/15 19:03:45 mjacob Exp $"); #include #include @@ -594,8 +594,8 @@ error = _bus_dmamap_load_buffer(dmat, NULL, data, len, NULL, flags, &lastaddr, segs, nsegs, first); - DPRINTF("%d: addr=0x%lx len=%ld\n", i, segs[i].ds_addr, - segs[i].ds_len); + DPRINTF("%d: addr=0x%jx len=%ju\n", i, + (uintmax_t)segs[i].ds_addr, (uintmax_t)segs[i].ds_len); first = 0; } } From owner-p4-projects@FreeBSD.ORG Sun Apr 15 19:52:01 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 3BE8D16A402; Sun, 15 Apr 2007 19:52:01 +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 E63A316A400 for ; Sun, 15 Apr 2007 19:52:00 +0000 (UTC) (envelope-from karma@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id D362A13C457 for ; Sun, 15 Apr 2007 19:52:00 +0000 (UTC) (envelope-from karma@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 l3FJq0Ec005063 for ; Sun, 15 Apr 2007 19:52:00 GMT (envelope-from karma@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3FJq08D005058 for perforce@freebsd.org; Sun, 15 Apr 2007 19:52:00 GMT (envelope-from karma@FreeBSD.org) Date: Sun, 15 Apr 2007 19:52:00 GMT Message-Id: <200704151952.l3FJq08D005058@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to karma@FreeBSD.org using -f From: Alexey Mikhailov To: Perforce Change Reviews Cc: Subject: PERFORCE change 118199 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: Sun, 15 Apr 2007 19:52:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=118199 Change 118199 by karma@karma_ez on 2007/04/15 19:50:59 Branch of OpenBSM tree which will be my initial playground. Affected files ... .. //depot/projects/soc2007/karma_audit/contrib/openbsm/FREEBSD-upgrade#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/HISTORY#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/LICENSE#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/Makefile.am#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/Makefile.in#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/README#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/TODO#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/VERSION#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/aclocal.m4#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/autogen.sh#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/bin/Makefile.am#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/bin/Makefile.in#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/bin/audit/Makefile.am#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/bin/audit/Makefile.in#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/bin/audit/audit.8#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/bin/audit/audit.c#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/bin/auditd/Makefile.am#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/bin/auditd/Makefile.in#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/bin/auditd/audit_warn.c#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/bin/auditd/auditd.8#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/bin/auditd/auditd.c#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/bin/auditd/auditd.h#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/bin/auditfilterd/Makefile.am#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/bin/auditfilterd/Makefile.in#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/bin/auditfilterd/auditfilterd.8#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/bin/auditfilterd/auditfilterd.c#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/bin/auditfilterd/auditfilterd.h#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/bin/auditfilterd/auditfilterd_conf.c#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/bin/auditreduce/Makefile.am#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/bin/auditreduce/Makefile.in#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/bin/auditreduce/auditreduce.1#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/bin/auditreduce/auditreduce.c#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/bin/auditreduce/auditreduce.h#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/bin/praudit/Makefile.am#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/bin/praudit/Makefile.in#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/bin/praudit/praudit.1#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/bin/praudit/praudit.c#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/bsm/Makefile.am#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/bsm/Makefile.in#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/bsm/audit_filter.h#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/bsm/audit_uevents.h#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/bsm/libbsm.h#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/compat/endian.h#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/compat/queue.h#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/compat/strlcat.h#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/config/config.guess#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/config/config.h#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/config/config.h.in#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/config/config.sub#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/config/depcomp#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/config/install-sh#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/config/ltmain.sh#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/config/missing#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/configure#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/configure.ac#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/etc/audit_class#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/etc/audit_control#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/etc/audit_event#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/etc/audit_filter#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/etc/audit_user#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/etc/audit_warn#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/libbsm/Makefile.am#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/libbsm/Makefile.in#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/libbsm/au_class.3#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/libbsm/au_control.3#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/libbsm/au_event.3#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/libbsm/au_free_token.3#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/libbsm/au_io.3#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/libbsm/au_mask.3#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/libbsm/au_open.3#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/libbsm/au_token.3#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/libbsm/au_user.3#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/libbsm/audit_submit.3#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/libbsm/bsm_audit.c#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/libbsm/bsm_class.c#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/libbsm/bsm_control.c#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/libbsm/bsm_event.c#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/libbsm/bsm_flags.c#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/libbsm/bsm_io.c#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/libbsm/bsm_mask.c#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/libbsm/bsm_notify.c#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/libbsm/bsm_token.c#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/libbsm/bsm_user.c#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/libbsm/bsm_wrappers.c#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/libbsm/libbsm.3#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/man/Makefile.am#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/man/Makefile.in#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/man/audit.2#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/man/audit.log.5#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/man/audit_class.5#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/man/audit_control.5#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/man/audit_event.5#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/man/audit_user.5#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/man/audit_warn.5#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/man/auditctl.2#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/man/auditon.2#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/man/getaudit.2#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/man/getauid.2#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/man/setaudit.2#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/man/setauid.2#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/modules/Makefile.am#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/modules/Makefile.in#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/modules/auditfilter_noop/Makefile.am#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/modules/auditfilter_noop/Makefile.in#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/modules/auditfilter_noop/auditfilter_noop.c#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/test/Makefile.am#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/test/Makefile.in#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/test/bsm/Makefile.am#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/test/bsm/Makefile.in#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/test/bsm/generate.c#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/test/reference/arg32_record#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/test/reference/arg32_token#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/test/reference/data_record#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/test/reference/data_token#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/test/reference/file_record#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/test/reference/file_token#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/test/reference/header32_token#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/test/reference/in_addr_record#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/test/reference/in_addr_token#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/test/reference/ip_record#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/test/reference/ip_token#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/test/reference/ipc_record#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/test/reference/ipc_token#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/test/reference/iport_record#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/test/reference/iport_token#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/test/reference/opaque_record#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/test/reference/opaque_token#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/test/reference/path_record#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/test/reference/path_token#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/test/reference/process32_record#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/test/reference/process32_token#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/test/reference/process32ex_record#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/test/reference/process32ex_token#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/test/reference/return32_record#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/test/reference/return32_token#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/test/reference/seq_record#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/test/reference/seq_token#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/test/reference/subject32_record#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/test/reference/subject32_token#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/test/reference/subject32ex_record#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/test/reference/subject32ex_token-IPv4#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/test/reference/subject32ex_token-IPv6#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/test/reference/text_record#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/test/reference/text_token#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/test/reference/trailer_token#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/test/samples/execve-long-args.trail#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/tools/Makefile.am#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/tools/Makefile.in#1 branch .. //depot/projects/soc2007/karma_audit/contrib/openbsm/tools/audump.c#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Sun Apr 15 20:12:27 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 1D03F16A403; Sun, 15 Apr 2007 20:12:26 +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 7815916A400 for ; Sun, 15 Apr 2007 20:12:26 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 669FA13C459 for ; Sun, 15 Apr 2007 20:12:26 +0000 (UTC) (envelope-from lulf@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 l3FKCQE0009520 for ; Sun, 15 Apr 2007 20:12:26 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3FKCQFg009517 for perforce@freebsd.org; Sun, 15 Apr 2007 20:12:26 GMT (envelope-from lulf@FreeBSD.org) Date: Sun, 15 Apr 2007 20:12:26 GMT Message-Id: <200704152012.l3FKCQFg009517@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 118200 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: Sun, 15 Apr 2007 20:12:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=118200 Change 118200 by lulf@lulf_vimes on 2007/04/15 20:12:24 - Branch from my mentors branch. Affected files ... .. //depot/projects/soc2007/lulf/gvinum_fixup/Makefile#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/Makefile.inc1#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sbin/Makefile#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sbin/Makefile.inc#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sbin/gvinum/Makefile#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sbin/gvinum/gvinum.8#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sbin/gvinum/gvinum.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sbin/gvinum/gvinum.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/Makefile#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/Makefile.amd64#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/Makefile.arm#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/Makefile.i386#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/Makefile.ia64#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/Makefile.pc98#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/Makefile.powerpc#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/Makefile.sparc64#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/Makefile.sun4v#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/NOTES#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/defines#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/files#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/files.amd64#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/files.arm#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/files.i386#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/files.ia64#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/files.pc98#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/files.powerpc#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/files.sparc64#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/files.sun4v#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/kern.mk#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/kern.post.mk#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/kern.pre.mk#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/kmod.mk#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/kmod_syms.awk#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/ldscript.amd64#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/ldscript.arm#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/ldscript.i386#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/ldscript.ia64#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/ldscript.powerpc#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/ldscript.sparc64#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/makeLINT.mk#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/makeLINT.sed#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/newvers.sh#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/options#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/options.amd64#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/options.arm#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/options.i386#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/options.ia64#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/options.pc98#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/options.powerpc#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/options.sparc64#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/options.sun4v#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/systags.sh#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/bde/g_bde.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/bde/g_bde.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/bde/g_bde_crypt.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/bde/g_bde_lock.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/bde/g_bde_work.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/cache/g_cache.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/cache/g_cache.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/concat/g_concat.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/concat/g_concat.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/eli/g_eli.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/eli/g_eli.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/eli/g_eli_crypto.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/eli/g_eli_ctl.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/eli/g_eli_integrity.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/eli/g_eli_key.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/eli/g_eli_privacy.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/eli/pkcs5v2.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/eli/pkcs5v2.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/gate/g_gate.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/gate/g_gate.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/geom.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/geom_aes.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/geom_bsd.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/geom_bsd_enc.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/geom_ccd.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/geom_ctl.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/geom_ctl.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/geom_dev.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/geom_disk.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/geom_disk.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/geom_dump.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/geom_event.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/geom_fox.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/geom_int.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/geom_io.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/geom_kern.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/geom_mbr.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/geom_mbr_enc.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/geom_pc98.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/geom_pc98_enc.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/geom_slice.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/geom_slice.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/geom_subr.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/geom_sunlabel.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/geom_sunlabel_enc.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/geom_vfs.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/geom_vfs.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/geom_vol_ffs.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/journal/g_journal.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/journal/g_journal.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/journal/g_journal_ufs.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/label/g_label.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/label/g_label.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/label/g_label_ext2fs.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/label/g_label_iso9660.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/label/g_label_msdosfs.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/label/g_label_msdosfs.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/label/g_label_ntfs.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/label/g_label_reiserfs.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/label/g_label_ufs.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/mirror/g_mirror.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/mirror/g_mirror.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/mirror/g_mirror_ctl.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/multipath/g_multipath.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/multipath/g_multipath.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/nop/g_nop.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/nop/g_nop.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/notes#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/part/g_part.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/part/g_part.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/part/g_part_apm.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/part/g_part_gpt.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/part/g_part_if.m#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/raid3/g_raid3.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/raid3/g_raid3.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/raid3/g_raid3_ctl.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/shsec/g_shsec.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/shsec/g_shsec.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/stripe/g_stripe.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/stripe/g_stripe.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/uzip/g_uzip.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_drive.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_events.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_init.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_list.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_move.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_plex.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_raid5.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_raid5.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_rename.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_rm.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_share.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_share.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_state.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_subr.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_var.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_volume.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/zero/g_zero.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/Makefile#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/acpica/Makefile#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/acpica/OsdEnvironment.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/acpica/acpi_machdep.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/acpica/acpi_wakecode.S#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/acpica/acpi_wakeup.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/acpica/genwakecode.sh#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/acpica/madt.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/bios/apm.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/bios/apm.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/bios/mca_machdep.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/bios/mca_machdep.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/bios/smapi.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/bios/smapi_bios.S#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/bios/smbios.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/bios/vpd.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/compile/.cvsignore#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/conf/.cvsignore#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/conf/DEFAULTS#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/conf/GENERIC#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/conf/GENERIC.hints#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/conf/MAC#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/conf/Makefile#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/conf/NOTES#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/conf/PAE#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/conf/XBOX#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/cpufreq/est.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/cpufreq/p4tcc.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/cpufreq/powernow.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/cpufreq/smist.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/i386/apic_vector.s#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/i386/atomic.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/i386/autoconf.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/i386/bios.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/i386/bioscall.s#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/i386/bpf_jit_machdep.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/i386/bpf_jit_machdep.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/i386/busdma_machdep.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/i386/db_disasm.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/i386/db_interface.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/i386/db_trace.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/i386/dump_machdep.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/i386/elan-mmcr.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/i386/elf_machdep.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/i386/exception.s#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/i386/gdb_machdep.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/i386/genassym.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/i386/geode.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/i386/i686_mem.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/i386/identcpu.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/i386/in_cksum.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/i386/initcpu.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/i386/intr_machdep.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/i386/io.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/i386/io_apic.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/i386/k6_mem.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/i386/legacy.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/i386/local_apic.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/i386/locore.s#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/i386/longrun.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/i386/machdep.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/i386/mem.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/i386/minidump_machdep.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/i386/mp_clock.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/i386/mp_machdep.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/i386/mp_watchdog.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/i386/mpboot.s#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/i386/mptable.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/i386/mptable_pci.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/i386/msi.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/i386/nexus.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/i386/perfmon.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/i386/pmap.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/i386/ptrace_machdep.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/i386/support.s#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/i386/swtch.s#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/i386/symbols.raw#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/i386/sys_machdep.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/i386/trap.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/i386/tsc.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/i386/uio_machdep.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/i386/vm86.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/i386/vm86bios.s#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/i386/vm_machdep.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/ibcs2/Makefile#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/ibcs2/coff.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/ibcs2/ibcs2_dirent.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/ibcs2/ibcs2_errno.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/ibcs2/ibcs2_errno.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/ibcs2/ibcs2_fcntl.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/ibcs2/ibcs2_fcntl.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/ibcs2/ibcs2_ioctl.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/ibcs2/ibcs2_ioctl.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/ibcs2/ibcs2_ipc.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/ibcs2/ibcs2_ipc.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/ibcs2/ibcs2_isc.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/ibcs2/ibcs2_isc_syscall.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/ibcs2/ibcs2_isc_sysent.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/ibcs2/ibcs2_misc.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/ibcs2/ibcs2_mount.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/ibcs2/ibcs2_msg.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/ibcs2/ibcs2_other.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/ibcs2/ibcs2_proto.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/ibcs2/ibcs2_signal.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/ibcs2/ibcs2_signal.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/ibcs2/ibcs2_socksys.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/ibcs2/ibcs2_socksys.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/ibcs2/ibcs2_stat.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/ibcs2/ibcs2_stat.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/ibcs2/ibcs2_statfs.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/ibcs2/ibcs2_stropts.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/ibcs2/ibcs2_syscall.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/ibcs2/ibcs2_sysent.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/ibcs2/ibcs2_sysi86.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/ibcs2/ibcs2_sysvec.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/ibcs2/ibcs2_termios.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/ibcs2/ibcs2_time.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/ibcs2/ibcs2_types.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/ibcs2/ibcs2_unistd.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/ibcs2/ibcs2_ustat.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/ibcs2/ibcs2_util.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/ibcs2/ibcs2_util.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/ibcs2/ibcs2_utime.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/ibcs2/ibcs2_utsname.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/ibcs2/ibcs2_xenix.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/ibcs2/ibcs2_xenix.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/ibcs2/ibcs2_xenix_syscall.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/ibcs2/ibcs2_xenix_sysent.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/ibcs2/imgact_coff.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/ibcs2/syscalls.conf#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/ibcs2/syscalls.isc#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/ibcs2/syscalls.isc.conf#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/ibcs2/syscalls.master#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/ibcs2/syscalls.xenix#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/ibcs2/syscalls.xenix.conf#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/_bus.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/_inttypes.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/_limits.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/_stdint.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/_types.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/acpica_machdep.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/apicreg.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/apicvar.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/apm_bios.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/apm_segments.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/asm.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/asmacros.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/atomic.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/bootinfo.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/bus.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/bus_dma.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/clock.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/cpu.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/cpufunc.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/cputypes.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/cserial.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/db_machdep.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/elan_mmcr.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/elf.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/endian.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/exec.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/float.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/floatingpoint.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/frame.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/gdb_machdep.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/i4b_cause.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/i4b_debug.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/i4b_ioctl.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/i4b_rbch_ioctl.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/i4b_tel_ioctl.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/i4b_trace.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/ieeefp.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/if_wl_wavelan.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/in_cksum.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/intr_machdep.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/ioctl_bt848.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/ioctl_meteor.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/iodev.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/kdb.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/legacyvar.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/limits.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/md_var.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/memdev.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/metadata.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/minidump.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/mp_watchdog.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/mptable.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/mutex.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/npx.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/param.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/pc/bios.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/pc/display.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/pc/vesa.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/pcaudioio.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/pcb.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/pcb_ext.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/pci_cfgreg.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/pcpu.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/pecoff_machdep.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/perfmon.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/pmap.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/pmc_mdep.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/ppireg.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/privatespace.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/proc.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/profile.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/psl.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/ptrace.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/reg.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/reloc.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/resource.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/runq.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/segments.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/setjmp.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/sf_buf.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/sigframe.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/signal.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/smapi.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/smp.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/speaker.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/specialreg.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/stdarg.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/sysarch.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/timerreg.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/trap.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/tss.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/ucontext.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/varargs.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/vm86.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/vmparam.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/xbox.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/isa/atpic.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/isa/atpic_vector.s#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/isa/ccbque.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/isa/clock.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/isa/elcr.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/isa/elink.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/isa/elink.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/isa/icu.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/isa/isa.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/isa/isa.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/isa/isa_dma.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/isa/nmi.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/isa/npx.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/isa/pmtimer.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/isa/prof_machdep.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/isa/spic.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/isa/spicreg.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/isa/vesa.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/linux/Makefile#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/linux/imgact_linux.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/linux/linux.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/linux/linux_dummy.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/linux/linux_genassym.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/linux/linux_ipc64.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/linux/linux_locore.s#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/linux/linux_machdep.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/linux/linux_proto.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/linux/linux_ptrace.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/linux/linux_syscall.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/linux/linux_sysent.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/linux/linux_sysvec.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/linux/syscalls.conf#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/linux/syscalls.master#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/pci/pci_bus.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/pci/pci_cfgreg.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/pci/pci_pir.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/svr4/svr4_genassym.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/svr4/svr4_locore.s#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/svr4/svr4_machdep.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/svr4/svr4_machdep.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/xbox/pic16l.s#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/xbox/xbox.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/xbox/xboxfb.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/Make.tags.inc#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/Makefile#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/bus_if.m#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/clock_if.m#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/cpufreq_if.m#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/device_if.m#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/genassym.sh#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/imgact_aout.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/imgact_elf.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/imgact_elf32.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/imgact_elf64.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/imgact_gzip.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/imgact_shell.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/inflate.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/init_main.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/init_sysent.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_acct.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_alq.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_clock.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_condvar.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_conf.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_context.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_cpu.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_descrip.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_environment.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_event.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_exec.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_exit.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_fork.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_idle.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_intr.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_jail.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_kse.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_kthread.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_ktr.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_ktrace.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_linker.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_lock.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_lockf.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_malloc.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_mbuf.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_mib.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_module.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_mtxpool.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_mutex.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_ntptime.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_physio.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_pmc.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_poll.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_priv.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_proc.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_prot.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_resource.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_rwlock.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_sema.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_shutdown.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_sig.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_subr.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_switch.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_sx.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_synch.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_syscalls.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_sysctl.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_tc.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_thr.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_thread.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_time.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_timeout.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_umtx.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_uuid.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_xxx.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/ksched.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/link_elf.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/link_elf_obj.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/linker_if.m#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/makesyscalls.sh#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/md4c.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/md5c.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/p1003_1b.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/posix4_mib.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/sched_4bsd.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/sched_core.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/sched_ule.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/serdev_if.m#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/subr_acl_posix1e.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/subr_autoconf.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/subr_blist.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/subr_bus.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/subr_clock.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/subr_devstat.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/subr_disk.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/subr_eventhandler.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/subr_fattime.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/subr_firmware.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/subr_hints.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/subr_kdb.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/subr_kobj.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/subr_lock.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/subr_log.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/subr_mbpool.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/subr_mchain.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/subr_module.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/subr_msgbuf.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/subr_param.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/subr_pcpu.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/subr_power.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/subr_prf.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/subr_prof.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/subr_rman.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/subr_rtc.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/subr_sbuf.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/subr_scanf.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/subr_sleepqueue.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/subr_smp.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/subr_stack.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/subr_taskqueue.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/subr_trap.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/subr_turnstile.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/subr_unit.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/subr_witness.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/sys_generic.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/sys_pipe.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/sys_process.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/sys_socket.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/syscalls.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/syscalls.master#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/systrace_args.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/sysv_ipc.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/sysv_msg.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/sysv_sem.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/sysv_shm.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/tty.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/tty_compat.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/tty_conf.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/tty_cons.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/tty_pts.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/tty_pty.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/tty_subr.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/tty_tty.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/uipc_accf.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/uipc_cow.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/uipc_debug.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/uipc_domain.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/uipc_mbuf.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/uipc_mbuf2.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/uipc_mqueue.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/uipc_sem.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/uipc_sockbuf.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/uipc_socket.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/uipc_syscalls.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/uipc_usrreq.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/vfs_acl.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/vfs_aio.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/vfs_bio.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/vfs_cache.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/vfs_cluster.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/vfs_default.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/vfs_export.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/vfs_extattr.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/vfs_hash.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/vfs_init.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/vfs_lookup.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/vfs_mount.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/vfs_subr.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/vfs_syscalls.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/vfs_vnops.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/vnode_if.src#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/modules/Makefile#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/modules/Makefile.inc#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/modules/geom/Makefile#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/modules/geom/Makefile.inc#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/modules/geom/geom_vinum/Makefile#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/_bus_dma.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/_elf_solaris.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/_iovec.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/_lock.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/_mutex.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/_null.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/_pthreadtypes.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/_rwlock.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/_semaphore.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/_sigset.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/_sx.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/_task.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/_timespec.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/_timeval.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/_types.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/aac_ioctl.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/acct.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/acl.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/agpio.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/aio.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/alq.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/apm.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/assym.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/ata.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/bio.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/bitstring.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/blist.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/buf.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/bufobj.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/bus.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/bus_dma.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/callout.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/cdefs.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/cdio.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/cdrio.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/chio.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/clist.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/clock.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/condvar.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/conf.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/cons.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/consio.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/copyright.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/cpu.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/ctype.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/dataacq.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/device_port.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/devicestat.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/digiio.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/dir.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/dirent.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/disk.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/disklabel.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/diskmbr.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/diskpc98.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/dkstat.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/domain.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/dvdio.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/elf.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/elf32.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/elf64.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/elf_common.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/elf_generic.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/endian.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/errno.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/eui64.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/event.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/eventhandler.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/eventvar.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/exec.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/extattr.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/fbio.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/fcntl.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/fdcio.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/file.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/filedesc.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/filio.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/firmware.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/fnv_hash.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/gmon.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/gpt.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/hash.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/iconv.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/imgact.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/imgact_aout.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/imgact_elf.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/inflate.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/interrupt.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/ioccom.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/ioctl.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/ioctl_compat.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/ipc.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/ipmi.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/jail.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/joystick.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/kbio.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/kdb.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/kenv.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/kernel.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/kerneldump.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/kobj.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/kse.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/ksem.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/kthread.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/ktr.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/ktrace.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/libkern.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/limits.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/linedisc.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/link_aout.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/link_elf.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/linker.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/linker_set.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/lock.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/lock_profile.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/lockf.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/lockmgr.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/mac.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/malloc.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/mbpool.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/mbuf.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/mchain.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/md4.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/md5.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/mdioctl.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/memrange.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/mman.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/module.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/mount.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/mouse.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/mqueue.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/msg.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/msgbuf.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/mtio.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/mutex.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/namei.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/nlist_aout.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/param.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/pciio.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/pcpu.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/pioctl.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/pipe.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/pmc.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/pmckern.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/pmclog.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/poll.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/posix4.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/power.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/priority.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/priv.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/proc.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/procfs.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/protosw.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/ptio.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/ptrace.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/queue.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/random.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/reboot.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/refcount.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/regression.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/resource.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/resourcevar.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/rman.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/rtprio.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/runq.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/rwlock.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/sbuf.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/sched.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/select.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/selinfo.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/sem.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/sema.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/semaphore.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/serial.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/sf_buf.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/shm.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/sigio.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/signal.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/signalvar.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/sleepqueue.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/smp.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/snoop.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/socket.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/socketvar.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/sockio.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/soundcard.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/stack.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/stat.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/statvfs.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/stddef.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/stdint.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/sun_disklabel.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/sx.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/syscall.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/syscall.mk#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/syscallsubr.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/sysctl.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/sysent.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/syslimits.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/syslog.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/sysproto.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/systm.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/taskqueue.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/termios.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/thr.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/tiio.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/time.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/timeb.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/timepps.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/timers.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/times.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/timespec.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/timetc.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/timex.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/tree.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/tty.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/ttychars.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/ttycom.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/ttydefaults.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/ttydev.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/turnstile.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/types.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/ucontext.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/ucred.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/uio.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/umtx.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/un.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/unistd.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/unpcb.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/user.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/utsname.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/uuid.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/vmmeter.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/vnode.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/wait.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/watchdog.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/xrpuio.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/tools/acpi_quirks2h.awk#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/tools/bus_macro.sh#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/tools/emu10k1-mkalsa.sh#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/tools/fw_stub.awk#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/tools/makeobjops.awk#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/tools/miidevs2h.awk#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/tools/pccarddevs2h.awk#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/tools/usbdevs2h.awk#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/tools/vnode_if.awk#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/default_pager.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/device_pager.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/memguard.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/memguard.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/phys_pager.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/pmap.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/redzone.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/redzone.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/swap_pager.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/swap_pager.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/uma.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/uma_core.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/uma_dbg.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/uma_dbg.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/uma_int.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/vm.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/vm_contig.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/vm_extern.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/vm_fault.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/vm_glue.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/vm_init.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/vm_kern.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/vm_kern.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/vm_map.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/vm_map.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/vm_meter.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/vm_mmap.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/vm_object.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/vm_object.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/vm_page.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/vm_page.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/vm_pageout.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/vm_pageout.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/vm_pageq.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/vm_pager.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/vm_pager.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/vm_param.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/vm_unix.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/vm_zeroidle.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/vnode_pager.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/vnode_pager.h#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Sun Apr 15 20:16:32 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 12A2616A403; Sun, 15 Apr 2007 20:16:32 +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 CEFC416A400 for ; Sun, 15 Apr 2007 20:16:31 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id BD32213C458 for ; Sun, 15 Apr 2007 20:16:31 +0000 (UTC) (envelope-from lulf@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 l3FKGV25010181 for ; Sun, 15 Apr 2007 20:16:31 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3FKGV3L010178 for perforce@freebsd.org; Sun, 15 Apr 2007 20:16:31 GMT (envelope-from lulf@FreeBSD.org) Date: Sun, 15 Apr 2007 20:16:31 GMT Message-Id: <200704152016.l3FKGV3L010178@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 118201 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: Sun, 15 Apr 2007 20:16:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=118201 Change 118201 by lulf@lulf_vimes on 2007/04/15 20:15:40 - Let my main branch get to know the changes in it's children. Affected files ... .. //depot/projects/soc2007/lulf/gvinum_main/Makefile#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/Makefile.inc1#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sbin/Makefile#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sbin/Makefile.inc#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sbin/gvinum/Makefile#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sbin/gvinum/gvinum.8#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sbin/gvinum/gvinum.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sbin/gvinum/gvinum.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/Makefile#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/Makefile.amd64#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/Makefile.arm#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/Makefile.i386#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/Makefile.ia64#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/Makefile.pc98#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/Makefile.powerpc#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/Makefile.sparc64#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/Makefile.sun4v#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/NOTES#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/defines#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/files#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/files.amd64#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/files.arm#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/files.i386#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/files.ia64#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/files.pc98#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/files.powerpc#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/files.sparc64#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/files.sun4v#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/kern.mk#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/kern.post.mk#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/kern.pre.mk#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/kmod.mk#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/kmod_syms.awk#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/ldscript.amd64#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/ldscript.arm#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/ldscript.i386#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/ldscript.ia64#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/ldscript.powerpc#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/ldscript.sparc64#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/makeLINT.mk#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/makeLINT.sed#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/newvers.sh#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/options#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/options.amd64#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/options.arm#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/options.i386#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/options.ia64#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/options.pc98#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/options.powerpc#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/options.sparc64#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/options.sun4v#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/systags.sh#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/bde/g_bde.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/bde/g_bde.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/bde/g_bde_crypt.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/bde/g_bde_lock.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/bde/g_bde_work.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/cache/g_cache.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/cache/g_cache.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/concat/g_concat.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/concat/g_concat.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/eli/g_eli.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/eli/g_eli.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/eli/g_eli_crypto.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/eli/g_eli_ctl.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/eli/g_eli_integrity.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/eli/g_eli_key.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/eli/g_eli_privacy.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/eli/pkcs5v2.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/eli/pkcs5v2.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/gate/g_gate.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/gate/g_gate.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/geom.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/geom_aes.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/geom_bsd.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/geom_bsd_enc.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/geom_ccd.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/geom_ctl.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/geom_ctl.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/geom_dev.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/geom_disk.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/geom_disk.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/geom_dump.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/geom_event.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/geom_fox.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/geom_int.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/geom_io.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/geom_kern.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/geom_mbr.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/geom_mbr_enc.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/geom_pc98.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/geom_pc98_enc.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/geom_slice.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/geom_slice.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/geom_subr.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/geom_sunlabel.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/geom_sunlabel_enc.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/geom_vfs.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/geom_vfs.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/geom_vol_ffs.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/journal/g_journal.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/journal/g_journal.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/journal/g_journal_ufs.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/label/g_label.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/label/g_label.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/label/g_label_ext2fs.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/label/g_label_iso9660.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/label/g_label_msdosfs.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/label/g_label_msdosfs.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/label/g_label_ntfs.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/label/g_label_reiserfs.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/label/g_label_ufs.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/mirror/g_mirror.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/mirror/g_mirror.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/mirror/g_mirror_ctl.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/multipath/g_multipath.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/multipath/g_multipath.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/nop/g_nop.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/nop/g_nop.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/notes#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/part/g_part.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/part/g_part.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/part/g_part_apm.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/part/g_part_gpt.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/part/g_part_if.m#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/raid3/g_raid3.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/raid3/g_raid3.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/raid3/g_raid3_ctl.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/shsec/g_shsec.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/shsec/g_shsec.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/stripe/g_stripe.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/stripe/g_stripe.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/uzip/g_uzip.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/vinum/geom_vinum.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/vinum/geom_vinum.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/vinum/geom_vinum_drive.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/vinum/geom_vinum_events.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/vinum/geom_vinum_init.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/vinum/geom_vinum_list.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/vinum/geom_vinum_move.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/vinum/geom_vinum_plex.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/vinum/geom_vinum_raid5.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/vinum/geom_vinum_raid5.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/vinum/geom_vinum_rename.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/vinum/geom_vinum_rm.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/vinum/geom_vinum_share.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/vinum/geom_vinum_share.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/vinum/geom_vinum_state.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/vinum/geom_vinum_subr.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/vinum/geom_vinum_var.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/vinum/geom_vinum_volume.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/zero/g_zero.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/Makefile#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/acpica/Makefile#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/acpica/OsdEnvironment.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/acpica/acpi_machdep.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/acpica/acpi_wakecode.S#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/acpica/acpi_wakeup.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/acpica/genwakecode.sh#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/acpica/madt.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/bios/apm.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/bios/apm.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/bios/mca_machdep.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/bios/mca_machdep.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/bios/smapi.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/bios/smapi_bios.S#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/bios/smbios.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/bios/vpd.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/compile/.cvsignore#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/conf/.cvsignore#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/conf/DEFAULTS#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/conf/GENERIC#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/conf/GENERIC.hints#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/conf/MAC#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/conf/Makefile#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/conf/NOTES#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/conf/PAE#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/conf/XBOX#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/cpufreq/est.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/cpufreq/p4tcc.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/cpufreq/powernow.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/cpufreq/smist.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/apic_vector.s#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/atomic.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/autoconf.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/bios.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/bioscall.s#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/bpf_jit_machdep.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/bpf_jit_machdep.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/busdma_machdep.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/db_disasm.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/db_interface.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/db_trace.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/dump_machdep.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/elan-mmcr.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/elf_machdep.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/exception.s#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/gdb_machdep.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/genassym.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/geode.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/i686_mem.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/identcpu.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/in_cksum.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/initcpu.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/intr_machdep.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/io.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/io_apic.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/k6_mem.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/legacy.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/local_apic.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/locore.s#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/longrun.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/machdep.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/mem.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/minidump_machdep.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/mp_clock.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/mp_machdep.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/mp_watchdog.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/mpboot.s#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/mptable.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/mptable_pci.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/msi.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/nexus.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/perfmon.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/pmap.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/ptrace_machdep.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/support.s#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/swtch.s#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/symbols.raw#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/sys_machdep.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/trap.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/tsc.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/uio_machdep.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/vm86.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/vm86bios.s#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/vm_machdep.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/ibcs2/Makefile#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/ibcs2/coff.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/ibcs2/ibcs2_dirent.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/ibcs2/ibcs2_errno.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/ibcs2/ibcs2_errno.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/ibcs2/ibcs2_fcntl.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/ibcs2/ibcs2_fcntl.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/ibcs2/ibcs2_ioctl.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/ibcs2/ibcs2_ioctl.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/ibcs2/ibcs2_ipc.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/ibcs2/ibcs2_ipc.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/ibcs2/ibcs2_isc.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/ibcs2/ibcs2_isc_syscall.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/ibcs2/ibcs2_isc_sysent.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/ibcs2/ibcs2_misc.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/ibcs2/ibcs2_mount.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/ibcs2/ibcs2_msg.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/ibcs2/ibcs2_other.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/ibcs2/ibcs2_proto.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/ibcs2/ibcs2_signal.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/ibcs2/ibcs2_signal.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/ibcs2/ibcs2_socksys.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/ibcs2/ibcs2_socksys.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/ibcs2/ibcs2_stat.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/ibcs2/ibcs2_stat.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/ibcs2/ibcs2_statfs.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/ibcs2/ibcs2_stropts.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/ibcs2/ibcs2_syscall.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/ibcs2/ibcs2_sysent.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/ibcs2/ibcs2_sysi86.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/ibcs2/ibcs2_sysvec.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/ibcs2/ibcs2_termios.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/ibcs2/ibcs2_time.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/ibcs2/ibcs2_types.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/ibcs2/ibcs2_unistd.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/ibcs2/ibcs2_ustat.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/ibcs2/ibcs2_util.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/ibcs2/ibcs2_util.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/ibcs2/ibcs2_utime.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/ibcs2/ibcs2_utsname.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/ibcs2/ibcs2_xenix.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/ibcs2/ibcs2_xenix.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/ibcs2/ibcs2_xenix_syscall.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/ibcs2/ibcs2_xenix_sysent.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/ibcs2/imgact_coff.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/ibcs2/syscalls.conf#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/ibcs2/syscalls.isc#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/ibcs2/syscalls.isc.conf#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/ibcs2/syscalls.master#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/ibcs2/syscalls.xenix#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/ibcs2/syscalls.xenix.conf#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/_bus.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/_inttypes.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/_limits.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/_stdint.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/_types.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/acpica_machdep.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/apicreg.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/apicvar.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/apm_bios.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/apm_segments.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/asm.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/asmacros.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/atomic.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/bootinfo.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/bus.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/bus_dma.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/clock.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/cpu.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/cpufunc.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/cputypes.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/cserial.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/db_machdep.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/elan_mmcr.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/elf.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/endian.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/exec.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/float.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/floatingpoint.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/frame.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/gdb_machdep.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/i4b_cause.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/i4b_debug.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/i4b_ioctl.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/i4b_rbch_ioctl.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/i4b_tel_ioctl.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/i4b_trace.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/ieeefp.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/if_wl_wavelan.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/in_cksum.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/intr_machdep.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/ioctl_bt848.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/ioctl_meteor.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/iodev.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/kdb.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/legacyvar.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/limits.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/md_var.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/memdev.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/metadata.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/minidump.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/mp_watchdog.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/mptable.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/mutex.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/npx.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/param.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/pc/bios.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/pc/display.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/pc/vesa.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/pcaudioio.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/pcb.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/pcb_ext.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/pci_cfgreg.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/pcpu.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/pecoff_machdep.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/perfmon.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/pmap.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/pmc_mdep.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/ppireg.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/privatespace.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/proc.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/profile.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/psl.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/ptrace.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/reg.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/reloc.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/resource.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/runq.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/segments.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/setjmp.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/sf_buf.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/sigframe.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/signal.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/smapi.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/smp.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/speaker.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/specialreg.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/stdarg.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/sysarch.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/timerreg.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/trap.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/tss.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/ucontext.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/varargs.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/vm86.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/vmparam.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/xbox.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/isa/atpic.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/isa/atpic_vector.s#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/isa/ccbque.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/isa/clock.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/isa/elcr.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/isa/elink.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/isa/elink.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/isa/icu.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/isa/isa.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/isa/isa.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/isa/isa_dma.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/isa/nmi.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/isa/npx.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/isa/pmtimer.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/isa/prof_machdep.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/isa/spic.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/isa/spicreg.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/isa/vesa.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/linux/Makefile#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/linux/imgact_linux.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/linux/linux.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/linux/linux_dummy.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/linux/linux_genassym.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/linux/linux_ipc64.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/linux/linux_locore.s#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/linux/linux_machdep.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/linux/linux_proto.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/linux/linux_ptrace.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/linux/linux_syscall.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/linux/linux_sysent.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/linux/linux_sysvec.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/linux/syscalls.conf#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/linux/syscalls.master#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/pci/pci_bus.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/pci/pci_cfgreg.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/pci/pci_pir.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/svr4/svr4_genassym.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/svr4/svr4_locore.s#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/svr4/svr4_machdep.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/svr4/svr4_machdep.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/xbox/pic16l.s#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/xbox/xbox.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/xbox/xboxfb.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/Make.tags.inc#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/Makefile#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/bus_if.m#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/clock_if.m#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/cpufreq_if.m#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/device_if.m#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/genassym.sh#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/imgact_aout.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/imgact_elf.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/imgact_elf32.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/imgact_elf64.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/imgact_gzip.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/imgact_shell.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/inflate.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/init_main.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/init_sysent.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_acct.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_alq.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_clock.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_condvar.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_conf.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_context.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_cpu.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_descrip.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_environment.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_event.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_exec.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_exit.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_fork.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_idle.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_intr.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_jail.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_kse.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_kthread.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_ktr.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_ktrace.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_linker.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_lock.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_lockf.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_malloc.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_mbuf.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_mib.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_module.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_mtxpool.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_mutex.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_ntptime.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_physio.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_pmc.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_poll.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_priv.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_proc.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_prot.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_resource.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_rwlock.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_sema.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_shutdown.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_sig.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_subr.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_switch.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_sx.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_synch.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_syscalls.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_sysctl.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_tc.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_thr.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_thread.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_time.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_timeout.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_umtx.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_uuid.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_xxx.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/ksched.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/link_elf.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/link_elf_obj.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/linker_if.m#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/makesyscalls.sh#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/md4c.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/md5c.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/p1003_1b.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/posix4_mib.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/sched_4bsd.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/sched_core.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/sched_ule.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/serdev_if.m#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/subr_acl_posix1e.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/subr_autoconf.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/subr_blist.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/subr_bus.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/subr_clock.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/subr_devstat.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/subr_disk.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/subr_eventhandler.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/subr_fattime.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/subr_firmware.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/subr_hints.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/subr_kdb.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/subr_kobj.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/subr_lock.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/subr_log.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/subr_mbpool.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/subr_mchain.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/subr_module.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/subr_msgbuf.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/subr_param.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/subr_pcpu.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/subr_power.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/subr_prf.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/subr_prof.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/subr_rman.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/subr_rtc.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/subr_sbuf.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/subr_scanf.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/subr_sleepqueue.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/subr_smp.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/subr_stack.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/subr_taskqueue.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/subr_trap.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/subr_turnstile.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/subr_unit.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/subr_witness.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/sys_generic.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/sys_pipe.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/sys_process.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/sys_socket.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/syscalls.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/syscalls.master#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/systrace_args.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/sysv_ipc.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/sysv_msg.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/sysv_sem.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/sysv_shm.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/tty.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/tty_compat.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/tty_conf.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/tty_cons.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/tty_pts.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/tty_pty.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/tty_subr.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/tty_tty.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/uipc_accf.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/uipc_cow.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/uipc_debug.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/uipc_domain.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/uipc_mbuf.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/uipc_mbuf2.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/uipc_mqueue.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/uipc_sem.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/uipc_sockbuf.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/uipc_socket.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/uipc_syscalls.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/uipc_usrreq.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/vfs_acl.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/vfs_aio.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/vfs_bio.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/vfs_cache.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/vfs_cluster.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/vfs_default.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/vfs_export.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/vfs_extattr.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/vfs_hash.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/vfs_init.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/vfs_lookup.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/vfs_mount.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/vfs_subr.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/vfs_syscalls.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/vfs_vnops.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/vnode_if.src#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/modules/Makefile#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/modules/Makefile.inc#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/modules/geom/Makefile#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/modules/geom/Makefile.inc#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/modules/geom/geom_vinum/Makefile#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/_bus_dma.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/_elf_solaris.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/_iovec.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/_lock.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/_mutex.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/_null.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/_pthreadtypes.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/_rwlock.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/_semaphore.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/_sigset.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/_sx.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/_task.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/_timespec.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/_timeval.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/_types.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/aac_ioctl.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/acct.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/acl.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/agpio.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/aio.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/alq.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/apm.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/assym.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/ata.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/bio.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/bitstring.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/blist.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/buf.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/bufobj.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/bus.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/bus_dma.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/callout.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/cdefs.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/cdio.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/cdrio.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/chio.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/clist.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/clock.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/condvar.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/conf.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/cons.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/consio.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/copyright.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/cpu.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/ctype.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/dataacq.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/device_port.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/devicestat.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/digiio.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/dir.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/dirent.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/disk.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/disklabel.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/diskmbr.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/diskpc98.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/dkstat.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/domain.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/dvdio.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/elf.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/elf32.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/elf64.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/elf_common.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/elf_generic.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/endian.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/errno.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/eui64.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/event.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/eventhandler.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/eventvar.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/exec.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/extattr.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/fbio.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/fcntl.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/fdcio.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/file.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/filedesc.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/filio.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/firmware.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/fnv_hash.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/gmon.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/gpt.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/hash.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/iconv.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/imgact.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/imgact_aout.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/imgact_elf.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/inflate.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/interrupt.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/ioccom.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/ioctl.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/ioctl_compat.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/ipc.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/ipmi.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/jail.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/joystick.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/kbio.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/kdb.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/kenv.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/kernel.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/kerneldump.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/kobj.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/kse.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/ksem.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/kthread.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/ktr.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/ktrace.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/libkern.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/limits.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/linedisc.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/link_aout.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/link_elf.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/linker.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/linker_set.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/lock.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/lock_profile.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/lockf.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/lockmgr.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/mac.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/malloc.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/mbpool.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/mbuf.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/mchain.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/md4.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/md5.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/mdioctl.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/memrange.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/mman.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/module.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/mount.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/mouse.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/mqueue.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/msg.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/msgbuf.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/mtio.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/mutex.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/namei.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/nlist_aout.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/param.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/pciio.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/pcpu.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/pioctl.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/pipe.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/pmc.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/pmckern.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/pmclog.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/poll.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/posix4.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/power.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/priority.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/priv.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/proc.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/procfs.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/protosw.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/ptio.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/ptrace.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/queue.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/random.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/reboot.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/refcount.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/regression.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/resource.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/resourcevar.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/rman.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/rtprio.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/runq.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/rwlock.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/sbuf.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/sched.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/select.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/selinfo.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/sem.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/sema.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/semaphore.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/serial.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/sf_buf.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/shm.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/sigio.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/signal.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/signalvar.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/sleepqueue.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/smp.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/snoop.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/socket.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/socketvar.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/sockio.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/soundcard.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/stack.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/stat.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/statvfs.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/stddef.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/stdint.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/sun_disklabel.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/sx.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/syscall.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/syscall.mk#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/syscallsubr.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/sysctl.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/sysent.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/syslimits.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/syslog.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/sysproto.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/systm.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/taskqueue.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/termios.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/thr.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/tiio.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/time.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/timeb.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/timepps.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/timers.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/times.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/timespec.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/timetc.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/timex.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/tree.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/tty.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/ttychars.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/ttycom.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/ttydefaults.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/ttydev.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/turnstile.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/types.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/ucontext.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/ucred.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/uio.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/umtx.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/un.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/unistd.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/unpcb.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/user.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/utsname.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/uuid.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/vmmeter.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/vnode.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/wait.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/watchdog.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/xrpuio.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/tools/acpi_quirks2h.awk#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/tools/bus_macro.sh#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/tools/emu10k1-mkalsa.sh#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/tools/fw_stub.awk#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/tools/makeobjops.awk#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/tools/miidevs2h.awk#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/tools/pccarddevs2h.awk#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/tools/usbdevs2h.awk#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/tools/vnode_if.awk#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/default_pager.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/device_pager.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/memguard.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/memguard.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/phys_pager.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/pmap.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/redzone.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/redzone.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/swap_pager.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/swap_pager.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/uma.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/uma_core.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/uma_dbg.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/uma_dbg.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/uma_int.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/vm.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/vm_contig.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/vm_extern.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/vm_fault.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/vm_glue.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/vm_init.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/vm_kern.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/vm_kern.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/vm_map.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/vm_map.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/vm_meter.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/vm_mmap.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/vm_object.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/vm_object.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/vm_page.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/vm_page.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/vm_pageout.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/vm_pageout.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/vm_pageq.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/vm_pager.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/vm_pager.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/vm_param.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/vm_unix.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/vm_zeroidle.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/vnode_pager.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/vnode_pager.h#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Sun Apr 15 22:31:18 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 5552416A409; Sun, 15 Apr 2007 22:31:18 +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 1B30216A407 for ; Sun, 15 Apr 2007 22:31:18 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 0988D13C484 for ; Sun, 15 Apr 2007 22:31:18 +0000 (UTC) (envelope-from gcooper@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 l3FMVHjv043006 for ; Sun, 15 Apr 2007 22:31:17 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3FMVHGP043003 for perforce@freebsd.org; Sun, 15 Apr 2007 22:31:17 GMT (envelope-from gcooper@FreeBSD.org) Date: Sun, 15 Apr 2007 22:31:17 GMT Message-Id: <200704152231.l3FMVHGP043003@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Cc: Subject: PERFORCE change 118206 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: Sun, 15 Apr 2007 22:31:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=118206 Change 118206 by gcooper@optimus-revised_pkgtools on 2007/04/15 22:30:29 These files are being checked in for part a. of my SoC project. Will provide README and TODO soon, after talking to Kirill , my mentor. Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/LOCATIONS#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkgtools-2.2.6/COPYING#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkgtools-2.2.6/ChangeLog#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkgtools-2.2.6/Makefile#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkgtools-2.2.6/Makefile.compat#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkgtools-2.2.6/Makefile.inc#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkgtools-2.2.6/NEWS#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkgtools-2.2.6/README#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkgtools-2.2.6/bin/Makefile#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkgtools-2.2.6/bin/pkg_fetch#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkgtools-2.2.6/bin/pkg_glob#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkgtools-2.2.6/bin/pkg_sort#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkgtools-2.2.6/bin/pkgdb#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkgtools-2.2.6/bin/portcvsweb#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkgtools-2.2.6/bin/portsclean#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkgtools-2.2.6/bin/portsdb#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkgtools-2.2.6/bin/portupgrade#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkgtools-2.2.6/bin/portversion#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkgtools-2.2.6/etc/Makefile#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkgtools-2.2.6/etc/pkgtools.conf#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkgtools-2.2.6/etc/pkgtools.sh#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkgtools-2.2.6/etc/status-pkg.sh#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkgtools-2.2.6/lib/Makefile#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkgtools-2.2.6/lib/pkg.rb#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkgtools-2.2.6/lib/pkgdb.rb#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkgtools-2.2.6/lib/pkgdbtools.rb#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkgtools-2.2.6/lib/pkginfo.rb#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkgtools-2.2.6/lib/pkgmisc.rb#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkgtools-2.2.6/lib/pkgtools.rb#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkgtools-2.2.6/lib/pkgtsort.rb#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkgtools-2.2.6/lib/pkgversion.rb#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkgtools-2.2.6/lib/portinfo.rb#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkgtools-2.2.6/lib/ports.rb#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkgtools-2.2.6/lib/portsdb.rb#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkgtools-2.2.6/man/Makefile#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkgtools-2.2.6/man/pkg_deinstall.1#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkgtools-2.2.6/man/pkg_fetch.1#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkgtools-2.2.6/man/pkg_glob.1#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkgtools-2.2.6/man/pkg_sort.1#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkgtools-2.2.6/man/pkgdb.1#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkgtools-2.2.6/man/pkgtools.conf.5#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkgtools-2.2.6/man/portcvsweb.1#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkgtools-2.2.6/man/portsclean.1#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkgtools-2.2.6/man/portsdb.1#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkgtools-2.2.6/man/portupgrade.1#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkgtools-2.2.6/man/portversion.1#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkgtools-2.2.6/misc/Makefile#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkgtools-2.2.6/misc/Makefile.inc#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkgtools-2.2.6/misc/bash/Makefile#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkgtools-2.2.6/misc/bash/complete.sample#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkgtools-2.2.6/misc/tcsh/Makefile#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkgtools-2.2.6/misc/tcsh/complete.sample#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkgtools-2.2.6/misc/zsh/Makefile#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkgtools-2.2.6/misc/zsh/_pkgtools#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkgtools-2.2.6/tests/test_all.rb#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkgtools-2.2.6/tests/test_pkgdb.rb#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkgtools-2.2.6/tests/test_pkginfo.rb#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkgtools-2.2.6/tests/test_pkgtsort.rb#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkgtools-2.2.6/tests/test_pkgversion.rb#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkgtools-2.2.6/tests/test_portinfo.rb#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkgtools-2.2.6/tests/test_portsdb.rb#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/Makefile#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/Makefile.com#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/Makefile.inc1#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/Makefile.targ#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/usr.sbin/Makefile#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/usr.sbin/Makefile.inc#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/usr.sbin/pkg_install/Makefile#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/usr.sbin/pkg_install/Makefile.inc#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/usr.sbin/pkg_install/README#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/usr.sbin/pkg_install/add/Makefile#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/usr.sbin/pkg_install/add/add.h#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/usr.sbin/pkg_install/add/extract.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/usr.sbin/pkg_install/add/futil.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/usr.sbin/pkg_install/add/main.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/usr.sbin/pkg_install/add/perform.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/usr.sbin/pkg_install/add/pkg_add.1#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/usr.sbin/pkg_install/create/Makefile#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/usr.sbin/pkg_install/create/create.h#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/usr.sbin/pkg_install/create/main.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/usr.sbin/pkg_install/create/perform.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/usr.sbin/pkg_install/create/pkg_create.1#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/usr.sbin/pkg_install/create/pl.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/usr.sbin/pkg_install/delete/Makefile#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/usr.sbin/pkg_install/delete/delete.h#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/usr.sbin/pkg_install/delete/main.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/usr.sbin/pkg_install/delete/perform.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/usr.sbin/pkg_install/delete/pkg_delete.1#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/usr.sbin/pkg_install/info/Makefile#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/usr.sbin/pkg_install/info/info.h#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/usr.sbin/pkg_install/info/main.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/usr.sbin/pkg_install/info/perform.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/usr.sbin/pkg_install/info/pkg_info.1#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/usr.sbin/pkg_install/info/show.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/usr.sbin/pkg_install/lib/Makefile#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/usr.sbin/pkg_install/lib/deps.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/usr.sbin/pkg_install/lib/exec.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/usr.sbin/pkg_install/lib/file.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/usr.sbin/pkg_install/lib/global.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/usr.sbin/pkg_install/lib/lib.h#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/usr.sbin/pkg_install/lib/match.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/usr.sbin/pkg_install/lib/msg.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/usr.sbin/pkg_install/lib/pen.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/usr.sbin/pkg_install/lib/pkgwrap.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/usr.sbin/pkg_install/lib/plist.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/usr.sbin/pkg_install/lib/str.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/usr.sbin/pkg_install/lib/url.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/usr.sbin/pkg_install/lib/version.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/usr.sbin/pkg_install/sign/Makefile#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/usr.sbin/pkg_install/sign/README#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/usr.sbin/pkg_install/sign/check.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/usr.sbin/pkg_install/sign/common.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/usr.sbin/pkg_install/sign/extern.h#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/usr.sbin/pkg_install/sign/gzip.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/usr.sbin/pkg_install/sign/gzip.h#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/usr.sbin/pkg_install/sign/main.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/usr.sbin/pkg_install/sign/pgp.h#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/usr.sbin/pkg_install/sign/pgp_check.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/usr.sbin/pkg_install/sign/pgp_sign.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/usr.sbin/pkg_install/sign/pkg_sign.1#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/usr.sbin/pkg_install/sign/sha1.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/usr.sbin/pkg_install/sign/sign.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/usr.sbin/pkg_install/sign/stand.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/usr.sbin/pkg_install/sign/stand.h#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/usr.sbin/pkg_install/sign/x509.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/usr.sbin/pkg_install/tkpkg#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/usr.sbin/pkg_install/version/Makefile#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/usr.sbin/pkg_install/version/main.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/usr.sbin/pkg_install/version/perform.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/usr.sbin/pkg_install/version/pkg_version.1#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/usr.sbin/pkg_install/version/test-pkg_version.sh#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/src/usr.sbin/pkg_install/version/version.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Apr 16 08:28:30 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 581D216A403; Mon, 16 Apr 2007 08:28:30 +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 1F36B16A400 for ; Mon, 16 Apr 2007 08:28:30 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id D8A7613C469 for ; Mon, 16 Apr 2007 08:28:29 +0000 (UTC) (envelope-from lulf@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 l3G8STGQ007476 for ; Mon, 16 Apr 2007 08:28:29 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3G8STDW007473 for perforce@freebsd.org; Mon, 16 Apr 2007 08:28:29 GMT (envelope-from lulf@FreeBSD.org) Date: Mon, 16 Apr 2007 08:28:29 GMT Message-Id: <200704160828.l3G8STDW007473@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 118216 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: Mon, 16 Apr 2007 08:28:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=118216 Change 118216 by lulf@lulf_vimes on 2007/04/16 08:28:06 - Add an initial TODO and a little README. Affected files ... .. //depot/projects/soc2007/lulf/README#1 add .. //depot/projects/soc2007/lulf/TODO#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Apr 16 09:33:52 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 85FC516A404; Mon, 16 Apr 2007 09:33:52 +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 382DD16A402 for ; Mon, 16 Apr 2007 09:33:52 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 268B213C45E for ; Mon, 16 Apr 2007 09:33:52 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3G9XqRX027414 for ; Mon, 16 Apr 2007 09:33:52 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3G9Xnmt027390 for perforce@freebsd.org; Mon, 16 Apr 2007 09:33:49 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 16 Apr 2007 09:33:49 GMT Message-Id: <200704160933.l3G9Xnmt027390@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 118218 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: Mon, 16 Apr 2007 09:33:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=118218 Change 118218 by rwatson@rwatson_cinnamon on 2007/04/16 09:33:14 Integrate OpenBSM 1.0 alphas 13 and 14 (tentative) from OpenBSM branch to Audit3 branch: OpenBSM 1.0 alpha 14 - Fix endian issues when processing IPv6 addresses for extended subject and process tokens. - gcc41 warnings clean. - Teach audit_submit(3) about getaudit_addr(2). - Add support for zonename tokens. OpenBSM 1.0 alpha 13 - compat/clock_gettime.h now provides a compatibility implementation of clock_gettime(), which fixes building on Mac OS X. - Countless man page improvements, markup fixes, content fixs, etc. - XML printing support via "praudit -x". - audit.log.5 expanded to include additional BSM token types. - Added encoding and decoding routines for process64_ex, process32_ex, subject32_ex, header64, and attr64 tokens. - Additional audit event identifiers for listen, mlockall/ munlockall, getpath, POSIX message queues, and mandatory access control. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#18 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/README#17 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/TODO#13 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/VERSION#16 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/audit.8#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.8#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.c#18 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditfilterd/auditfilterd.8#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditfilterd/auditfilterd.c#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/auditreduce.1#10 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/praudit/praudit.1#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/praudit/praudit.c#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/libbsm.h#21 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/compat/clock_gettime.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/configure#16 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/configure.ac#17 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_event#19 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_class.3#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_control.3#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_event.3#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_free_token.3#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_io.3#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_mask.3#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_open.3#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_token.3#9 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_user.3#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/audit_submit.3#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#21 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_notify.c#12 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_wrappers.c#14 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/libbsm.3#11 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit.2#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit.log.5#11 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit_class.5#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit_control.5#11 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit_event.5#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit_user.5#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit_warn.5#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/auditctl.2#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/auditon.2#9 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/getaudit.2#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/getauid.2#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/setaudit.2#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/setauid.2#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/bsm/generate.c#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/process32ex_record#3 delete .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/process32ex_record-IPv4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/process32ex_record-IPv6#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/process32ex_token#3 delete .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/process32ex_token-IPv4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/process32ex_token-IPv6#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/process64_record#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/process64_token#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/process64ex_record-IPv4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/process64ex_record-IPv6#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/process64ex_token-IPv4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/process64ex_token-IPv6#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/audump.c#10 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#18 (text+ko) ==== @@ -1,3 +1,23 @@ +OpenBSM 1.0 alpha 14 + +- Fix endian issues when processing IPv6 addresses for extended subject + and process tokens. +- gcc41 warnings clean. +- Teach audit_submit(3) about getaudit_addr(2). +- Add support for zonename tokens. + +OpenBSM 1.0 alpha 13 + +- compat/clock_gettime.h now provides a compatibility implementation of + clock_gettime(), which fixes building on Mac OS X. +- Countless man page improvements, markup fixes, content fixs, etc. +- XML printing support via "praudit -x". +- audit.log.5 expanded to include additional BSM token types. +- Added encoding and decoding routines for process64_ex, process32_ex, + subject32_ex, header64, and attr64 tokens. +- Additional audit event identifiers for listen, mlockall/munlockall, + getpath, POSIX message queues, and mandatory access control. + OpenBSM 1.0 alpha 12 - Correct bug in auditreduce which prevented the -c option from working @@ -264,4 +284,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#17 $ +$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#18 $ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/README#17 (text+ko) ==== @@ -76,6 +76,9 @@ Martin Fong Pawel Worach Martin Englund + Ruslan Ermilov + Martin Voros + Diego Giagio In addition, Coverity, Inc.'s Prevent(tm) static analysis tool and Gimpel Software's FlexeLint tool were used to identify a number of bugs in the @@ -97,4 +100,4 @@ http://www.TrustedBSD.org/ -$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/README#16 $ +$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/README#17 $ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/TODO#13 (text+ko) ==== @@ -1,4 +1,3 @@ -- Teach praudit how to general XML format BSM streams. - Teach libbsm about any additional 64-bit token types that are present in more recent Solaris versions. - Build a regression test suite for libbsm that generates each token @@ -20,4 +19,4 @@ - Put hostname in trail file name. - Document audit_warn event arguments. -$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/TODO#12 $ +$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/TODO#13 $ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/VERSION#16 (text+ko) ==== @@ -1,1 +1,1 @@ -OPENBSM_1_0_ALPHA_12 +OPENBSM_1_0_ALPHA_14 ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/audit.8#5 (text+ko) ==== @@ -2,20 +2,20 @@ .\" All rights reserved. .\" .\" @APPLE_BSD_LICENSE_HEADER_START@ -.\" +.\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: -.\" +.\" .\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. +.\" notice, this list of conditions and the following disclaimer. .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. +.\" documentation and/or other materials provided with the distribution. .\" 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of .\" its contributors may be used to endorse or promote products derived -.\" from this software without specific prior written permission. -.\" +.\" from this software without specific prior written permission. +.\" .\" THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY .\" EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED .\" WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE @@ -26,32 +26,27 @@ .\" ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -.\" +.\" .\" @APPLE_BSD_LICENSE_HEADER_END@ .\" -.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/audit.8#4 $ +.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/audit.8#5 $ .\" -.Dd January 24, 2004 +.Dd October 2, 2006 .Dt AUDIT 8 .Os .Sh NAME .Nm audit .Nd audit management utility .Sh SYNOPSIS -.Nm audit -.Op Fl nst -.Op Ar file +.Nm +.Fl n | s | t .Sh DESCRIPTION The -.Nm +.Nm utility controls the state of the audit system. -The optional -.Ar file -operand specifies the location of the audit control input file (default -.Pa /etc/security/audit_control ) . -.Pp -The options are as follows: -.Bl -tag -width Ds +One of the following flags is required as an argument to +.Nm : +.Bl -tag -width indent .It Fl n Forces the audit system to close the existing audit log file and rotate to a new log file in a location specified in the audit control file. @@ -69,22 +64,27 @@ .Xr auditd 8 daemon must already be running. .Sh FILES -.Bl -tag -width "/etc/security/audit_control" -compact +.Bl -tag -width ".Pa /etc/security/audit_control" -compact .It Pa /etc/security/audit_control -Default audit policy file used to configure the auditing system. +Audit policy file used to configure the auditing system. .El .Sh SEE ALSO +.Xr audit 4 , .Xr audit_control 5 , .Xr auditd 8 +.Sh HISTORY +The OpenBSM implementation was created by McAfee Research, the security +division of McAfee Inc., under contract to Apple Computer Inc.\& in 2004. +It was subsequently adopted by the TrustedBSD Project as the foundation for +the OpenBSM distribution. .Sh AUTHORS +.An -nosplit This software was created by McAfee Research, the security research division of McAfee, Inc., under contract to Apple Computer Inc. -Additional authors include Wayne Salamon, Robert Watson, and SPARTA Inc. +Additional authors include +.An Wayne Salamon , +.An Robert Watson , +and SPARTA Inc. .Pp The Basic Security Module (BSM) interface to audit records and audit event stream format were defined by Sun Microsystems. -.Sh HISTORY -The OpenBSM implementation was created by McAfee Research, the security -division of McAfee Inc., under contract to Apple Computer Inc. in 2004. -It was subsequently adopted by the TrustedBSD Project as the foundation for -the OpenBSM distribution. ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.8#6 (text+ko) ==== @@ -29,46 +29,35 @@ .\" .\" @APPLE_BSD_LICENSE_HEADER_END@ .\" -.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.8#5 $ +.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.8#6 $ .\" -.Dd January 24, 2004 +.Dd October 2, 2006 .Dt AUDITD 8 .Os .Sh NAME .Nm auditd .Nd audit log management daemon .Sh SYNOPSIS -.Nm auditd -.Op Fl dhs +.Nm +.Op Fl d .Sh DESCRIPTION The .Nm -daemon responds to requests from the audit(1) utility and notifications -from the kernel. It manages the resulting audit log files and specified +daemon responds to requests from the +.Xr audit 8 +utility and notifications +from the kernel. +It manages the resulting audit log files and specified log file locations. .Pp The options are as follows: -.Bl -tag -width Ds +.Bl -tag -width indent .It Fl d -Starts the daemon in debug mode - it will not daemonize. +Starts the daemon in debug mode \[em] it will not daemonize. .El -.Pp -The historical -.Fl h -and -.Fl s -flags are now configured using -.Xr audit_control 5 -policy flags -.Dv ahlt -and -.Dv cnt , -and are no longer available as arguments to -.Xr auditd 8 . .Sh NOTE -.Pp To assure uninterrupted audit support, the -.Nm auditd +.Nm daemon should not be started and stopped manually. Instead, the .Xr audit 8 @@ -78,28 +67,51 @@ .Pa audit_control file. .Pp -.\" Sending a SIGHUP to a running -.\" .Nm auditd +.\" Sending a +.\" .Dv SIGHUP +.\" to a running +.\" .Nm .\" daemon will force it to exit. -Sending a SIGTERM to a running -.Nm auditd +Sending a +.Dv SIGTERM +to a running +.Nm daemon will force it to exit. .Sh FILES -.Bl -tag -width "/var/audit" -compact +.Bl -tag -width ".Pa /var/audit" -compact .It Pa /var/audit Default directory for storing audit log files. .El +.Sh COMPATIBILITY +The historical +.Fl h +and +.Fl s +flags are now configured using +.Xr audit_control 5 +policy flags +.Cm ahlt +and +.Cm cnt , +and are no longer available as arguments to +.Nm . .Sh SEE ALSO +.Xr audit 4 , +.Xr audit_control 5 , .Xr audit 8 +.Sh HISTORY +The OpenBSM implementation was created by McAfee Research, the security +division of McAfee Inc., under contract to Apple Computer Inc.\& in 2004. +It was subsequently adopted by the TrustedBSD Project as the foundation for +the OpenBSM distribution. .Sh AUTHORS +.An -nosplit This software was created by McAfee Research, the security research division of McAfee, Inc., under contract to Apple Computer Inc. -Additional authors include Wayne Salamon, Robert Watson, and SPARTA Inc. +Additional authors include +.An Wayne Salamon , +.An Robert Watson , +and SPARTA Inc. .Pp The Basic Security Module (BSM) interface to audit records and audit event stream format were defined by Sun Microsystems. -.Sh HISTORY -The OpenBSM implementation was created by McAfee Research, the security -division of McAfee Inc., under contract to Apple Computer Inc. in 2004. -It was subsequently adopted by the TrustedBSD Project as the foundation for -the OpenBSM distribution. ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.c#18 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.c#17 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.c#18 $ */ #include @@ -865,7 +865,7 @@ syslog(LOG_ERR, "Could not create audit startup event."); else { /* - * XXXCSJP Perhaps we wan't more robust audit records for + * XXXCSJP Perhaps we want more robust audit records for * audit start up and shutdown. This might include capturing * failures to initialize the audit subsystem? */ @@ -896,7 +896,7 @@ int debug = 0; int rc; - while ((ch = getopt(argc, argv, "dhs")) != -1) { + while ((ch = getopt(argc, argv, "d")) != -1) { switch(ch) { case 'd': /* Debug option. */ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditfilterd/auditfilterd.8#3 (text+ko) ==== @@ -23,18 +23,19 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditfilterd/auditfilterd.8#2 $ +.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditfilterd/auditfilterd.8#3 $ .\" -.Dd March 27, 2006 +.Dd October 3, 2006 .Dt AUDITFILTERD 8 .Os .Sh NAME .Nm auditfilterd .Nd audit filter daemon .Sh SYNOPSIS -.Nm auditfilterd +.Nm .Op Fl d .Op Fl c Ar conffile +.Op Fl p Ar pipefile .Op Fl t Ar trailfile .Sh DESCRIPTION The @@ -44,18 +45,23 @@ It is configured using the .Xr audit_filter 5 configuration file. +The source can either be a pipe or a file. .Pp The options are as follows: -.Bl -tag -width Ds -.It Fl d -Starts the daemon in debug mode - it will not daemonize. +.Bl -tag -width indent .It Fl c Ar conffile Specify an alternative configuration file. +.It Fl d +Starts the daemon in debug mode \[em] it will not daemonize. +.It Fl p Ar pipefile +Specify a pipe as an alternative source of audit event records. +Default is +.Pa /dev/auditpipe . .It Fl t Ar trailfile -Specify an alternative source of audit event records. +Specify a file as an alternative source of audit event records. .El .Sh FILES -.Bl -tag -width "/etc/security/audit_filterd" -compact +.Bl -tag -width ".Pa /etc/security/audit_filterd" -compact .It Pa /etc/security/audit_filterd Default configuration file for .Nm . @@ -66,12 +72,13 @@ .Sh SEE ALSO .Xr audit 8 , .Xr auditd 8 -.Sh AUTHORS -The -.Nm -daemon and audit filter APIs were created by Robert Watson. .Sh HISTORY The OpenBSM implementation was created by McAfee Research, the security -division of McAfee Inc., under contract to Apple Computer Inc. in 2004. +division of McAfee Inc., under contract to Apple Computer Inc.\& in 2004. It was subsequently adopted by the TrustedBSD Project as the foundation for the OpenBSM distribution. +.Sh AUTHORS +The +.Nm +daemon and audit filter APIs were created by +.An Robert Watson . ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditfilterd/auditfilterd.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditfilterd/auditfilterd.c#5 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditfilterd/auditfilterd.c#6 $ */ /* @@ -48,6 +48,10 @@ #include #endif +#ifndef HAVE_CLOCK_GETTIME +#include +#endif + #include #include @@ -76,7 +80,7 @@ usage(void) { - fprintf(stderr, "auditfilterd [-c conffile] [-d] [-p pipefile]" + fprintf(stderr, "auditfilterd [-d] [-c conffile] [-p pipefile]" " [-t trailfile]\n"); fprintf(stderr, " -c Specify configuration file (default: %s)\n", AUDITFILTERD_CONFFILE); ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/auditreduce.1#10 (text+ko) ==== @@ -1,18 +1,18 @@ .\" Copyright (c) 2004 Apple Computer, Inc. .\" All rights reserved. -.\" +.\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: .\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. +.\" notice, this list of conditions and the following disclaimer. .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. +.\" documentation and/or other materials provided with the distribution. .\" 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of .\" its contributors may be used to endorse or promote products derived -.\" from this software without specific prior written permission. -.\" +.\" from this software without specific prior written permission. +.\" .\" THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -25,7 +25,7 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/auditreduce.1#9 $ +.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/auditreduce.1#10 $ .\" .Dd January 24, 2004 .Dt AUDITREDUCE 1 @@ -34,44 +34,43 @@ .Nm auditreduce .Nd "select records from audit trail files" .Sh SYNOPSIS -.Nm auditreduce +.Nm .Op Fl A -.Op Fl a Ar YYYYMMDD[HH[MM[SS]]] -.Op Fl b Ar YYYYMMDD[HH[MM[SS]]] +.Op Fl a Ar YYYYMMDD Ns Op Ar HH Ns Op Ar MM Ns Op Ar SS +.Op Fl b Ar YYYYMMDD Ns Op Ar HH Ns Op Ar MM Ns Op Ar SS .Op Fl c Ar flags .Op Fl d Ar YYYYMMDD .Op Fl e Ar euid .Op Fl f Ar egid .Op Fl g Ar rgid +.Op Fl j Ar id +.Op Fl m Ar event +.Op Fl o Ar object Ns = Ns Ar value .Op Fl r Ar ruid .Op Fl u Ar auid -.Op Fl j Ar id -.Op Fl m Ar event -.Op Fl o Ar object=value -.Op Ar file ... +.Op Ar .Sh DESCRIPTION The -.Nm +.Nm utility selects records from the audit trail files based on the specified criteria. Matching audit records are printed to the standard output in their raw binary form. -If no filename is specified, the standard input is used +If no +.Ar file +argument is specified, the standard input is used by default. -Use the -.Nm praudit +Use the +.Xr praudit 1 utility to print the selected audit records in human-readable form. -See -.Xr praudit 1 -for more information. .Pp The options are as follows: -.Bl -tag -width Ds +.Bl -tag -width indent .It Fl A Select all records. -.It Fl a Ar YYYYMMDD[HH[MM[SS]]] +.It Fl a Ar YYYYMMDD Ns Op Ar HH Ns Op Ar MM Ns Op Ar SS Select records that occurred after or on the given datetime. -.It Fl b Ar YYYYMMDD[HH[MM[SS]]] +.It Fl b Ar YYYYMMDD Ns Op Ar HH Ns Op Ar MM Ns Op Ar SS Select records that occurred before the given datetime. .It Fl c Ar flags Select records matching the given audit classes specified as a comma @@ -86,15 +85,11 @@ or .Fl b . .It Fl e Ar euid -Select records with the given effective user id or name. +Select records with the given effective user ID or name. .It Fl f Ar egid -Select records with the given effective group id or name. +Select records with the given effective group ID or name. .It Fl g Ar rgid -Select records with the given real group id or name. -.It Fl r Ar ruid -Select records with the given real user id or name. -.It Fl u Ar auid -Select records with the given audit id. +Select records with the given real group ID or name. .It Fl j Ar id Select records having a subject token with matching ID. .It Fl m Ar event @@ -102,45 +97,53 @@ See .Xr audit_event 5 for a description of audit event names and numbers. -.It Fl o Ar object=value -.Bl -tag -width Ds -.It Nm file +.It Fl o Ar object Ns = Ns Ar value +.Bl -tag -width ".Cm msgqid" +.It Cm file Select records containing path tokens, where the pathname matches one of the comma delimited extended regular expression contained in given specification. -Regular expressions which are prefixed with a tilde (~) are excluded +Regular expressions which are prefixed with a tilde +.Pq Ql ~ +are excluded from the search results. These extended regular expressions are processed from left to right, and a path will either be selected or deslected based on the first match. .Pp -Since commas are used to delimit the regular expressions, a backslash (\\) -character should be used to escape the comma if it's a part of the search +Since commas are used to delimit the regular expressions, a backslash +.Pq Ql \e +character should be used to escape the comma if it is a part of the search pattern. -.It Nm msgqid -Select records containing the given message queue id. -.It Nm pid -Select records containing the given process id. -.It Nm semid -Select records containing the given semaphore id. -.It Nm shmid -Select records containing the given shared memory id. +.It Cm msgqid +Select records containing the given message queue ID. +.It Cm pid +Select records containing the given process ID. +.It Cm semid +Select records containing the given semaphore ID. +.It Cm shmid +Select records containing the given shared memory ID. .El +.It Fl r Ar ruid +Select records with the given real user ID or name. +.It Fl u Ar auid +Select records with the given audit ID. .El -.Sh Examples -.Pp +.Sh EXAMPLES To select all records associated with effective user ID root from the audit log .Pa /var/audit/20031016184719.20031017122634 : +.Bd -literal -offset indent +auditreduce -e root \e + /var/audit/20031016184719.20031017122634 +.Ed .Pp -.Nm --e root /var/audit/20031016184719.20031017122634 -.Pp To select all .Xr setlogin 2 events from that log: -.Pp -.Nm --m AUE_SETLOGIN /var/audit/20031016184719.20031017122634 +.Bd -literal -offset indent +auditreduce -m AUE_SETLOGIN \e + /var/audit/20031016184719.20031017122634 +.Ed .Pp Output from the above command lines will typically be piped to a new trail file, or via standard output to the @@ -148,36 +151,43 @@ command. .Pp Select all records containing a path token where the pathname contains -.Pa /etc/master.passwd -.Pp -.Nm --ofile="/etc/master.passwd" /var/audit/20031016184719.20031017122634 +.Pa /etc/master.passwd : +.Bd -literal -offset indent +auditreduce -o file="/etc/master.passwd" \e + /var/audit/20031016184719.20031017122634 +.Ed .Pp Select all records containing path tokens, where the pathname is a TTY device: +.Bd -literal -offset indent +auditreduce -o file="/dev/tty[a-zA-Z][0-9]+" \e + /var/audit/20031016184719.20031017122634 +.Ed .Pp -.Nm --ofile="/dev/tty[a-zA-Z][0-9]+" /var/audit/20031016184719.20031017122634 -.Pp Select all records containing path tokens, where the pathname is a TTY except for -.Pa /dev/ttyp2 -.Pp -.Nm --ofile="~/dev/ttyp2,/dev/tty[a-zA-Z][0-9]+" /var/audit/20031016184719.20031017122634 +.Pa /dev/ttyp2 : +.Bd -literal -offset indent +auditreduce -o file="~/dev/ttyp2,/dev/tty[a-zA-Z][0-9]+" \e + /var/audit/20031016184719.20031017122634 +.Ed .Sh SEE ALSO .Xr praudit 1 , .Xr audit_control 5 , .Xr audit_event 5 +.Sh HISTORY +The OpenBSM implementation was created by McAfee Research, the security +division of McAfee Inc., under contract to Apple Computer Inc.\& in 2004. +It was subsequently adopted by the TrustedBSD Project as the foundation for +the OpenBSM distribution. .Sh AUTHORS +.An -nosplit This software was created by McAfee Research, the security research division of McAfee, Inc., under contract to Apple Computer Inc. -Additional authors include Wayne Salamon, Robert Watson, and SPARTA Inc. +Additional authors include +.An Wayne Salamon , +.An Robert Watson , +and SPARTA Inc. .Pp The Basic Security Module (BSM) interface to audit records and audit event stream format were defined by Sun Microsystems. -.Sh HISTORY -The OpenBSM implementation was created by McAfee Research, the security -division of McAfee Inc., under contract to Apple Computer Inc. in 2004. -It was subsequently adopted by the TrustedBSD Project as the foundation for -the OpenBSM distribution. ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/praudit/praudit.1#7 (text+ko) ==== @@ -1,18 +1,18 @@ .\" Copyright (c) 2004 Apple Computer, Inc. .\" All rights reserved. -.\" +.\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: .\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. +.\" notice, this list of conditions and the following disclaimer. .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. +.\" documentation and/or other materials provided with the distribution. .\" 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of .\" its contributors may be used to endorse or promote products derived -.\" from this software without specific prior written permission. -.\" +.\" from this software without specific prior written permission. +.\" .\" THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -25,73 +25,94 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/praudit/praudit.1#6 $ +.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/praudit/praudit.1#7 $ .\" -.Dd January 24, 2004 +.Dd November 5, 2006 .Dt PRAUDIT 1 .Os .Sh NAME .Nm praudit .Nd "print the contents of audit trail files" .Sh SYNOPSIS -.Nm praudit -.Op Fl lrs +.Nm +.Op Fl lpx +.Op Fl r | s .Op Fl d Ar del -.Op Ar file ... +.Op Ar .Sh DESCRIPTION The -.Nm +.Nm utility prints the contents of the audit trail files to the standard output in human-readable form. -If no filename is specified, the standard input is used +If no +.Ar file +argument is specified, the standard input is used by default. .Pp The options are as follows: -.Bl -tag -width Ds +.Bl -tag -width indent +.It Fl d Ar del +Specifies the delimiter. +The default delimiter is the comma. .It Fl l Prints the entire record on the same line. If this option is not specified, every token is displayed on a different line. +.It Fl p +Specify this option if input to +.Nm +is piped from the +.Xr tail 1 +utility. +This causes +.Nm +to sync to the start of the next record. .It Fl r Prints the records in their raw, numeric form. -This option is exclusive from -.Fl s +This option is exclusive from +.Fl s . .It Fl s Prints the tokens in their short form. Short text representations for record and event type are displayed. This option is exclusive from -.Fl r -.It Fl d Ar del -Specifies the delimiter. -The default delimiter is the comma. +.Fl r . +.It Fl x +Print audit records in the XML output format. .El .Pp If the raw or short forms are not specified, the default is to print the tokens in their long form. Events are displayed as per their descriptions given in .Pa /etc/security/audit_event ; -uids and gids are expanded to their names; +UIDs and GIDs are expanded to their names; dates and times are displayed in human-readable format. .Sh FILES -.Bl -tag -width "/etc/security/audit_control" -compact +.Bl -tag -width ".Pa /etc/security/audit_control" -compact .It Pa /etc/security/audit_class -Descriptions of audit event classes +Descriptions of audit event classes. .It Pa /etc/security/audit_event -Descriptions of audit events +Descriptions of audit events. .El .Sh SEE ALSO +.Xr auditreduce 1 , +.Xr audit 4 , +.Xr auditpipe 4 , .Xr audit_class 5 , .Xr audit_event 5 +.Sh HISTORY +The OpenBSM implementation was created by McAfee Research, the security +division of McAfee Inc., under contract to Apple Computer Inc.\& in 2004. +It was subsequently adopted by the TrustedBSD Project as the foundation for +the OpenBSM distribution. .Sh AUTHORS +.An -nosplit This software was created by McAfee Research, the security research division of McAfee, Inc., under contract to Apple Computer Inc. -Additional authors include Wayne Salamon, Robert Watson, and SPARTA Inc. +Additional authors include +.An Wayne Salamon , +.An Robert Watson , +and SPARTA Inc. .Pp The Basic Security Module (BSM) interface to audit records and audit event stream format were defined by Sun Microsystems. -.Sh HISTORY -The OpenBSM implementation was created by McAfee Research, the security -division of McAfee Inc., under contract to Apple Computer Inc. in 2004. -It was subsequently adopted by the TrustedBSD Project as the foundation for -the OpenBSM distribution. ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/praudit/praudit.c#6 (text+ko) ==== @@ -1,5 +1,6 @@ /* * Copyright (c) 2004 Apple Computer, Inc. + * Copyright (c) 2006 Martin Voros * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/praudit/praudit.c#5 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/praudit/praudit.c#6 $ */ /* @@ -34,7 +35,7 @@ */ /* - * praudit [-lrs] [-ddel] [filenames] + * praudit [-lpx] [-r | -s] [-d del] [file ...] */ #include @@ -51,12 +52,14 @@ static int raw = 0; static int shortfrm = 0; static int partial = 0; +static int xml = 0; static void -usage() +usage(void) { - fprintf(stderr, "Usage: praudit [-lrs] [-ddel] [filenames]\n"); + fprintf(stderr, "usage: praudit [-lpx] [-r | -s] [-d del] " + "[file ...]\n"); exit(1); } @@ -88,11 +91,17 @@ if (-1 == au_fetch_tok(&tok, buf + bytesread, reclen - bytesread)) break; - au_print_tok(stdout, &tok, del, raw, shortfrm); + if (xml) + au_print_tok_xml(stdout, &tok, del, raw, + shortfrm); + else + au_print_tok(stdout, &tok, del, raw, + shortfrm); bytesread += tok.len; - if (oneline) - printf("%s", del); - else + if (oneline) { + if (!xml) + printf("%s", del); + } else printf("\n"); } free(buf); @@ -109,12 +118,20 @@ int i; FILE *fp; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Apr 16 09:37:58 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 4420316A409; Mon, 16 Apr 2007 09:37:58 +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 F393C16A407 for ; Mon, 16 Apr 2007 09:37:57 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C81CF13C469 for ; Mon, 16 Apr 2007 09:37:57 +0000 (UTC) (envelope-from lulf@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 l3G9bvI6028193 for ; Mon, 16 Apr 2007 09:37:57 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3G9bvob028190 for perforce@freebsd.org; Mon, 16 Apr 2007 09:37:57 GMT (envelope-from lulf@FreeBSD.org) Date: Mon, 16 Apr 2007 09:37:57 GMT Message-Id: <200704160937.l3G9bvob028190@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 118219 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: Mon, 16 Apr 2007 09:37:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=118219 Change 118219 by lulf@lulf_vimes on 2007/04/16 09:37:40 - Edit TODO. - Import more of lukas' work. - Change event structure to contain one more argument. - Change all functions using gv_post_event to add extra argument. - Enable setstate, and make it use the new EVENT system. Also create EVENT types for this. Affected files ... .. //depot/projects/soc2007/lulf/TODO#2 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sbin/gvinum/gvinum.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum.c#2 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum.h#2 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_events.c#2 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_plex.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_raid5.h#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_rm.c#2 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_state.c#2 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_var.h#2 edit Differences ... ==== //depot/projects/soc2007/lulf/TODO#2 (text+ko) ==== @@ -5,4 +5,6 @@ 3. Integrate concat/stripe/mirror routines 4. Implement working RAID5 to the new gvinum. 5. Implementing routines for syncing raid 5 (in the 'start' command). -6. Run some tests to make sure the new gvinum code-base is good enough. +6. Make sure other parts is function correctly, and implement what perhaps is +not implemented yet. +7. Run some tests to make sure the new gvinum code-base is good enough. ==== //depot/projects/soc2007/lulf/gvinum_fixup/sbin/gvinum/gvinum.c#2 (text+ko) ==== @@ -854,16 +854,19 @@ * event thread will be free for the g_wither_geom() call from * gv_unload(). It's silly, but it works. */ + printf("unloading " GVINUMMOD " kernel module... "); + fflush(stdout); if ((err = kldunload(fileid)) != 0 && (errno == EAGAIN)) { sleep(1); err = kldunload(fileid); } if (err != 0) { + printf(" failed!\n"); warn("cannot unload " GVINUMMOD); return; } - warnx(GVINUMMOD " unloaded"); + printf("done\n"); exit(0); } ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum.c#2 (text+ko) ==== @@ -71,7 +71,7 @@ g_trace(G_T_TOPOLOGY, "gv_orphan(%s)", gp->name); - gv_post_event(sc, GV_EVENT_DRIVE_LOST, d, NULL); + gv_post_event(sc, GV_EVENT_DRIVE_LOST, d, NULL, NULL); } static void @@ -184,7 +184,7 @@ sc = gp->softc; if (sc != NULL) { - gv_post_event(sc, GV_EVENT_THREAD_EXIT, NULL, NULL); + gv_post_event(sc, GV_EVENT_THREAD_EXIT, NULL, NULL, NULL); gp->softc = NULL; g_wither_geom(gp, ENXIO); return (EAGAIN); @@ -238,7 +238,7 @@ d = g_malloc(sizeof(*d), M_WAITOK | M_ZERO); bcopy(d2, d, sizeof(*d)); - gv_post_event(sc, GV_EVENT_CREATE_DRIVE, d, NULL); + gv_post_event(sc, GV_EVENT_CREATE_DRIVE, d, NULL, NULL); } /* ... then volume definitions ... */ @@ -255,7 +255,7 @@ v = g_malloc(sizeof(*v), M_WAITOK | M_ZERO); bcopy(v2, v, sizeof(*v)); - gv_post_event(sc, GV_EVENT_CREATE_VOLUME, v, NULL); + gv_post_event(sc, GV_EVENT_CREATE_VOLUME, v, NULL, NULL); } /* ... then plex definitions ... */ @@ -272,7 +272,7 @@ p = g_malloc(sizeof(*p), M_WAITOK | M_ZERO); bcopy(p2, p, sizeof(*p)); - gv_post_event(sc, GV_EVENT_CREATE_PLEX, p, NULL); + gv_post_event(sc, GV_EVENT_CREATE_PLEX, p, NULL, NULL); } /* ... and, finally, subdisk definitions. */ @@ -289,10 +289,10 @@ s = g_malloc(sizeof(*s), M_WAITOK | M_ZERO); bcopy(s2, s, sizeof(*s)); - gv_post_event(sc, GV_EVENT_CREATE_SD, s, NULL); + gv_post_event(sc, GV_EVENT_CREATE_SD, s, NULL, NULL); } - gv_post_event(sc, GV_EVENT_SAVE_CONFIG, sc, NULL); + gv_post_event(sc, GV_EVENT_SAVE_CONFIG, sc, NULL, NULL); return (0); } @@ -315,7 +315,7 @@ /* Save our configuration back to disk. */ } else if (!strcmp(verb, "saveconfig")) { - gv_post_event(sc, GV_EVENT_SAVE_CONFIG, sc, NULL); + gv_post_event(sc, GV_EVENT_SAVE_CONFIG, sc, NULL, NULL); /* Return configuration in string form. */ } else if (!strcmp(verb, "getconfig")) { @@ -351,9 +351,9 @@ } else if (!strcmp(verb, "start")) { gv_start_obj(gp, req); +#endif } else if (!strcmp(verb, "setstate")) { gv_setstate(gp, req); -#endif } else gctl_error(req, "Unknown verb parameter"); } @@ -400,7 +400,7 @@ /* Check if what we've been given is a valid vinum drive. */ if (vhdr != NULL) { if (vhdr->magic == GV_MAGIC) - gv_post_event(sc, GV_EVENT_DRIVE_TASTED, pp, NULL); + gv_post_event(sc, GV_EVENT_DRIVE_TASTED, pp, NULL, NULL); g_free(vhdr); } @@ -418,6 +418,7 @@ struct gv_sd *s; struct gv_drive *d; struct bio *bp; + int newstate, flags, err; sc = arg; KASSERT(sc != NULL, ("NULL sc")); @@ -503,6 +504,32 @@ gv_save_config(sc); break; + case GV_EVENT_SET_SD_STATE: + printf("VINUM: event 'setstate sd'\n"); + s = ev->arg1; + newstate = *(int *)ev->arg2; + flags = *(int *)ev->arg3; + err = gv_set_sd_state(s, newstate, flags); + if (err) + printf("VINUM: error setting subdisk " + "state\n"); + /* XXX: Handle these errors better, provide + * ERROR CODES.*/ + break; + + case GV_EVENT_SET_DRIVE_STATE: + printf("VINUM: event 'setstate drive'\n"); + d = ev->arg1; + newstate = *(int *)ev->arg2; + flags = *(int *)ev->arg3; + err = gv_set_drive_state(d, newstate, flags); + if (err) + printf("VINUM: error setting drive " + "state"); + /* XXX: Handle these errors better, provide + * ERROR CODES.*/ + break; + case GV_EVENT_THREAD_EXIT: printf("VINUM: event 'thread exit'\n"); g_free(ev); @@ -532,8 +559,22 @@ } mtx_unlock(&sc->queue_mtx); + /* A bio that is coming up from an underlying device. */ if (bp->bio_cflags & GV_BIO_DONE) { gv_bio_done(sc, bp); + /* A bio that interfered with another bio. */ + } else if (bp->bio_cflags & GV_BIO_ONHOLD) { + s = bp->bio_caller1; + p = s->plex_sc; + /* Is it still locked out? */ + if (gv_stripe_active(p, bp)) { + /* Park the bio on the waiting queue. */ + bioq_disksort(p->wqueue, bp); + } else { + bp->bio_cflags &= ~GV_BIO_ONHOLD; + g_io_request(bp, s->drive_sc->consumer); + } + /* A fresh bio, scheduled it down. */ } else { gv_volume_start(sc, bp); } ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum.h#2 (text+ko) ==== @@ -87,7 +87,7 @@ off_t gv_plex_size(struct gv_plex *); void gv_worker(void *); -void gv_post_event(struct gv_softc *, int, void *, void *); +void gv_post_event(struct gv_softc *, int, void *, void *, void *); void gv_drive_tasted(struct gv_softc *, struct g_provider *); void gv_drive_lost(struct gv_softc *, struct gv_drive *); void gv_setup_objects(struct gv_softc *); ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_events.c#2 (text+ko) ==== @@ -42,7 +42,8 @@ #include void -gv_post_event(struct gv_softc *sc, int event, void *arg1, void *arg2) +gv_post_event(struct gv_softc *sc, int event, void *arg1, void *arg2, + void *arg3) { struct gv_event *ev; @@ -50,6 +51,7 @@ ev->type = event; ev->arg1 = arg1; ev->arg2 = arg2; + ev->arg3 = arg3; mtx_lock(&sc->queue_mtx); TAILQ_INSERT_TAIL(&sc->equeue, ev, events); @@ -172,7 +174,7 @@ if (cp->nstart != cp->nend) { printf("VINUM: dead drive '%s' has still active " "requests, can't detach consumer\n", d->name); - gv_post_event(sc, GV_EVENT_DRIVE_LOST, d, NULL); + gv_post_event(sc, GV_EVENT_DRIVE_LOST, d, NULL, NULL); return; } g_topology_lock(); ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_plex.c#2 (text+ko) ==== @@ -330,15 +330,19 @@ struct bio *cbp, *pbp; struct gv_bioq *bq, *bq2; struct gv_raid5_packet *wp; + off_t completed; int i; + completed = 0; sc = p->vinumconf; wp = bp->bio_caller2; switch (bp->bio_parent->bio_cmd) { case BIO_READ: - if (wp == NULL) + if (wp == NULL) { + completed = bp->bio_completed; break; + } TAILQ_FOREACH_SAFE(bq, &wp->bits, queue, bq2) { if (bq->bp == bp) { @@ -350,7 +354,7 @@ } } if (TAILQ_EMPTY(&wp->bits)) { - bp->bio_parent->bio_completed += wp->length; + completed = wp->length; if (wp->lockbase != -1) { TAILQ_REMOVE(&p->packets, wp, list); /* Bring the waiting bios back into the game. */ @@ -368,8 +372,11 @@ break; case BIO_WRITE: - if (wp == NULL) + /* XXX can this ever happen? */ + if (wp == NULL) { + completed = bp->bio_completed; break; + } /* Check if we need to handle parity data. */ TAILQ_FOREACH_SAFE(bq, &wp->bits, queue, bq2) { @@ -395,7 +402,7 @@ /* All of our sub-requests have finished. */ if (i) { - bp->bio_parent->bio_completed += wp->length; + completed = wp->length; TAILQ_REMOVE(&p->packets, wp, list); /* Bring the waiting bios back into the game. */ pbp = bioq_takefirst(p->wqueue); @@ -415,6 +422,7 @@ pbp = bp->bio_parent; if (pbp->bio_error == 0) pbp->bio_error = bp->bio_error; + pbp->bio_completed += completed; /* When the original request is finished, we deliver it. */ pbp->bio_inbed++; ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_raid5.h#2 (text+ko) ==== @@ -52,7 +52,6 @@ TAILQ_ENTRY(gv_raid5_packet) list; /* Entry in plex's packet list. */ }; -int gv_stripe_active(struct gv_plex *, struct bio *); int gv_raid5_request(struct gv_plex *, struct gv_raid5_packet *, struct bio *, caddr_t, off_t, off_t); int gv_check_raid5(struct gv_plex *, struct gv_raid5_packet *, ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_rm.c#2 (text+ko) ==== @@ -83,7 +83,7 @@ return; } - gv_post_event(sc, GV_EVENT_RM_VOLUME, v, NULL); + gv_post_event(sc, GV_EVENT_RM_VOLUME, v, NULL, NULL); break; case GV_TYPE_PLEX: @@ -108,7 +108,7 @@ return; } - gv_post_event(sc, GV_EVENT_RM_PLEX, p, NULL); + gv_post_event(sc, GV_EVENT_RM_PLEX, p, NULL, NULL); break; case GV_TYPE_SD: @@ -121,7 +121,7 @@ return; } - gv_post_event(sc, GV_EVENT_RM_SD, s, NULL); + gv_post_event(sc, GV_EVENT_RM_SD, s, NULL, NULL); break; case GV_TYPE_DRIVE: @@ -140,7 +140,7 @@ return; } - gv_post_event(sc, GV_EVENT_RM_DRIVE, d, NULL); + gv_post_event(sc, GV_EVENT_RM_DRIVE, d, NULL, NULL); break; default: @@ -149,7 +149,7 @@ } } - gv_post_event(sc, GV_EVENT_SAVE_CONFIG, sc, NULL); + gv_post_event(sc, GV_EVENT_SAVE_CONFIG, sc, NULL, NULL); } /* Resets configuration */ @@ -170,15 +170,15 @@ } /* Then if not, we remove everything. */ LIST_FOREACH_SAFE(v, &sc->volumes, volume, v2) - gv_post_event(sc, GV_EVENT_RM_VOLUME, v, NULL); + gv_post_event(sc, GV_EVENT_RM_VOLUME, v, NULL, NULL); LIST_FOREACH_SAFE(p, &sc->plexes, plex, p2) - gv_post_event(sc, GV_EVENT_RM_PLEX, p, NULL); + gv_post_event(sc, GV_EVENT_RM_PLEX, p, NULL, NULL); LIST_FOREACH_SAFE(s, &sc->subdisks, sd, s2) - gv_post_event(sc, GV_EVENT_RM_SD, s, NULL); + gv_post_event(sc, GV_EVENT_RM_SD, s, NULL, NULL); LIST_FOREACH_SAFE(d, &sc->drives, drive, d2) - gv_post_event(sc, GV_EVENT_RM_DRIVE, d, NULL); + gv_post_event(sc, GV_EVENT_RM_DRIVE, d, NULL, NULL); - gv_post_event(sc, GV_EVENT_SAVE_CONFIG, sc, NULL); + gv_post_event(sc, GV_EVENT_SAVE_CONFIG, sc, NULL, NULL); return (0); } ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_state.c#2 (text+ko) ==== @@ -44,7 +44,7 @@ struct gv_sd *s; struct gv_drive *d; char *obj, *state; - int err, f, *flags, newstate, type; + int f, *flags, newstate, type; f = 0; obj = gctl_get_param(req, "object", NULL); @@ -83,9 +83,8 @@ break; } s = gv_find_sd(sc, obj); - err = gv_set_sd_state(s, newstate, f); - if (err) - gctl_error(req, "cannot set subdisk state"); + + gv_post_event(sc, GV_EVENT_SET_SD_STATE, s, &newstate, &f); break; case GV_TYPE_DRIVE: @@ -95,9 +94,8 @@ break; } d = gv_find_drive(sc, obj); - err = gv_set_drive_state(d, newstate, f); - if (err) - gctl_error(req, "cannot set drive state"); + + gv_post_event(sc, GV_EVENT_SET_DRIVE_STATE, d, &newstate, &f); break; default: ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_var.h#2 (text+ko) ==== @@ -160,23 +160,26 @@ TAILQ_ENTRY(gv_bioq) queue; }; -#define GV_EVENT_DRIVE_TASTED 1 -#define GV_EVENT_DRIVE_LOST 2 -#define GV_EVENT_THREAD_EXIT 3 -#define GV_EVENT_CREATE_DRIVE 4 -#define GV_EVENT_CREATE_VOLUME 5 -#define GV_EVENT_CREATE_PLEX 6 -#define GV_EVENT_CREATE_SD 7 -#define GV_EVENT_SAVE_CONFIG 8 -#define GV_EVENT_RM_VOLUME 9 -#define GV_EVENT_RM_PLEX 10 -#define GV_EVENT_RM_SD 11 -#define GV_EVENT_RM_DRIVE 12 +#define GV_EVENT_DRIVE_TASTED 1 +#define GV_EVENT_DRIVE_LOST 2 +#define GV_EVENT_THREAD_EXIT 3 +#define GV_EVENT_CREATE_DRIVE 4 +#define GV_EVENT_CREATE_VOLUME 5 +#define GV_EVENT_CREATE_PLEX 6 +#define GV_EVENT_CREATE_SD 7 +#define GV_EVENT_SAVE_CONFIG 8 +#define GV_EVENT_RM_VOLUME 9 +#define GV_EVENT_RM_PLEX 10 +#define GV_EVENT_RM_SD 11 +#define GV_EVENT_RM_DRIVE 12 +#define GV_EVENT_SET_SD_STATE 13 +#define GV_EVENT_SET_DRIVE_STATE 14 struct gv_event { int type; void *arg1; void *arg2; + void *arg3; TAILQ_ENTRY(gv_event) events; }; From owner-p4-projects@FreeBSD.ORG Mon Apr 16 09:37:59 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 1CF6316A537; Mon, 16 Apr 2007 09:37:59 +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 D605616A400 for ; Mon, 16 Apr 2007 09:37:58 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 3F39213C448 for ; Mon, 16 Apr 2007 09:37:58 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3G9bwSB028203 for ; Mon, 16 Apr 2007 09:37:58 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3G9bvUq028196 for perforce@freebsd.org; Mon, 16 Apr 2007 09:37:57 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 16 Apr 2007 09:37:57 GMT Message-Id: <200704160937.l3G9bvUq028196@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 118220 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: Mon, 16 Apr 2007 09:37:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=118220 Change 118220 by rwatson@rwatson_cinnamon on 2007/04/16 09:37:45 After removing extra entries from the branch spec of the trustedbsd_openbsm_audit3 branch to remove sys entries, complete integration from OpenBSM branch to audit3. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#29 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_record.h#17 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#24 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#24 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#23 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#24 $ */ #include @@ -212,9 +212,46 @@ token_t * au_to_attr64(struct vnode_au_info *vni) { + token_t *t; + u_char *dptr = NULL; + u_int16_t pad0_16 = 0; + u_int16_t pad0_32 = 0; + + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 2 * sizeof(u_int16_t) + + 3 * sizeof(u_int32_t) + sizeof(u_int64_t) * 2); + if (t == NULL) + return (NULL); + + ADD_U_CHAR(dptr, AUT_ATTR64); + + /* + * Darwin defines the size for the file mode + * as 2 bytes; BSM defines 4 so pad with 0 + */ + ADD_U_INT16(dptr, pad0_16); + ADD_U_INT16(dptr, vni->vn_mode); + + ADD_U_INT32(dptr, vni->vn_uid); + ADD_U_INT32(dptr, vni->vn_gid); + ADD_U_INT32(dptr, vni->vn_fsid); + + /* + * Some systems use 32-bit file ID's, other's use 64-bit file IDs. + * Attempt to handle both, and let the compiler sort it out. If we + * could pick this out at compile-time, it would be better, so as to + * avoid the else case below. + */ + if (sizeof(vni->vn_fileid) == sizeof(uint32_t)) { + ADD_U_INT32(dptr, pad0_32); + ADD_U_INT32(dptr, vni->vn_fileid); + } else if (sizeof(vni->vn_fileid) == sizeof(uint64_t)) + ADD_U_INT64(dptr, vni->vn_fileid); + else + ADD_U_INT64(dptr, 0LL); + + ADD_U_INT64(dptr, vni->vn_dev); - errno = ENOTSUP; - return (NULL); + return (t); } token_t * @@ -308,7 +345,7 @@ au_to_groups(int *groups) { - return (au_to_newgroups(AUDIT_MAX_GROUPS, groups)); + return (au_to_newgroups(AUDIT_MAX_GROUPS, (gid_t*)groups)); } /* @@ -382,6 +419,8 @@ /* * token ID 1 byte * ip header 20 bytes + * + * The IP header should be submitted in network byte order. */ token_t * au_to_ip(struct ip *ip) @@ -394,9 +433,6 @@ return (NULL); ADD_U_CHAR(dptr, AUT_IP); - /* - * XXXRW: Any byte order work needed on the IP header before writing? - */ ADD_MEM(dptr, ip, sizeof(struct ip)); return (t); @@ -650,19 +686,34 @@ } token_t * -au_to_process64(__unused au_id_t auid, __unused uid_t euid, - __unused gid_t egid, __unused uid_t ruid, __unused gid_t rgid, - __unused pid_t pid, __unused au_asid_t sid, __unused au_tid_t *tid) +au_to_process64(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, gid_t rgid, + pid_t pid, au_asid_t sid, au_tid_t *tid) { + token_t *t; + u_char *dptr = NULL; + + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 8 * sizeof(u_int32_t) + + sizeof(u_int64_t)); + if (t == NULL) + return (NULL); - errno = ENOTSUP; - return (NULL); + ADD_U_CHAR(dptr, AUT_PROCESS64); + ADD_U_INT32(dptr, auid); + ADD_U_INT32(dptr, euid); + ADD_U_INT32(dptr, egid); + ADD_U_INT32(dptr, ruid); + ADD_U_INT32(dptr, rgid); + ADD_U_INT32(dptr, pid); + ADD_U_INT32(dptr, sid); + ADD_U_INT64(dptr, tid->port); + ADD_MEM(dptr, &tid->machine, sizeof(u_int32_t)); + + return (t); } token_t * -au_to_process(__unused au_id_t auid, __unused uid_t euid, - __unused gid_t egid, __unused uid_t ruid, __unused gid_t rgid, - __unused pid_t pid, __unused au_asid_t sid, __unused au_tid_t *tid) +au_to_process(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, gid_t rgid, + pid_t pid, au_asid_t sid, au_tid_t *tid) { return (au_to_process32(auid, euid, egid, ruid, rgid, pid, sid, @@ -713,11 +764,11 @@ ADD_U_INT32(dptr, sid); ADD_U_INT32(dptr, tid->at_port); ADD_U_INT32(dptr, tid->at_type); - ADD_U_INT32(dptr, tid->at_addr[0]); + ADD_MEM(dptr, &tid->at_addr[0], sizeof(u_int32_t)); if (tid->at_type == AU_IPv6) { - ADD_U_INT32(dptr, tid->at_addr[1]); - ADD_U_INT32(dptr, tid->at_addr[2]); - ADD_U_INT32(dptr, tid->at_addr[3]); + ADD_MEM(dptr, &tid->at_addr[1], sizeof(u_int32_t)); + ADD_MEM(dptr, &tid->at_addr[2], sizeof(u_int32_t)); + ADD_MEM(dptr, &tid->at_addr[3], sizeof(u_int32_t)); } return (t); @@ -727,9 +778,42 @@ au_to_process64_ex(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, gid_t rgid, pid_t pid, au_asid_t sid, au_tid_addr_t *tid) { + token_t *t; + u_char *dptr = NULL; + + if (tid->at_type == AU_IPv4) + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + + 7 * sizeof(u_int32_t) + sizeof(u_int64_t) + + 2 * sizeof(u_int32_t)); + else if (tid->at_type == AU_IPv6) + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + + 7 * sizeof(u_int32_t) + sizeof(u_int64_t) + + 5 * sizeof(u_int32_t)); + else { + errno = EINVAL; + return (NULL); + } + if (t == NULL) + return (NULL); + + ADD_U_CHAR(dptr, AUT_PROCESS64_EX); + ADD_U_INT32(dptr, auid); + ADD_U_INT32(dptr, euid); + ADD_U_INT32(dptr, egid); + ADD_U_INT32(dptr, ruid); + ADD_U_INT32(dptr, rgid); + ADD_U_INT32(dptr, pid); + ADD_U_INT32(dptr, sid); + ADD_U_INT64(dptr, tid->at_port); + ADD_U_INT32(dptr, tid->at_type); + ADD_MEM(dptr, &tid->at_addr[0], sizeof(u_int32_t)); + if (tid->at_type == AU_IPv6) { + ADD_MEM(dptr, &tid->at_addr[1], sizeof(u_int32_t)); + ADD_MEM(dptr, &tid->at_addr[2], sizeof(u_int32_t)); + ADD_MEM(dptr, &tid->at_addr[3], sizeof(u_int32_t)); + } - errno = ENOTSUP; - return (NULL); + return (t); } token_t * @@ -944,9 +1028,26 @@ au_to_subject64(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, gid_t rgid, pid_t pid, au_asid_t sid, au_tid_t *tid) { + token_t *t; + u_char *dptr = NULL; + + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 7 * sizeof(u_int32_t) + + sizeof(u_int64_t) + sizeof(u_int32_t)); + if (t == NULL) + return (NULL); - errno = ENOTSUP; - return (NULL); + ADD_U_CHAR(dptr, AUT_SUBJECT64); + ADD_U_INT32(dptr, auid); + ADD_U_INT32(dptr, euid); + ADD_U_INT32(dptr, egid); + ADD_U_INT32(dptr, ruid); + ADD_U_INT32(dptr, rgid); + ADD_U_INT32(dptr, pid); + ADD_U_INT32(dptr, sid); + ADD_U_INT64(dptr, tid->port); + ADD_MEM(dptr, &tid->machine, sizeof(u_int32_t)); + + return (t); } token_t * @@ -1002,12 +1103,10 @@ ADD_U_INT32(dptr, sid); ADD_U_INT32(dptr, tid->at_port); ADD_U_INT32(dptr, tid->at_type); - ADD_U_INT32(dptr, tid->at_addr[0]); - if (tid->at_type == AU_IPv6) { - ADD_U_INT32(dptr, tid->at_addr[1]); - ADD_U_INT32(dptr, tid->at_addr[2]); - ADD_U_INT32(dptr, tid->at_addr[3]); - } + if (tid->at_type == AU_IPv6) + ADD_MEM(dptr, &tid->at_addr[0], 4 * sizeof(u_int32_t)); + else + ADD_MEM(dptr, &tid->at_addr[0], sizeof(u_int32_t)); return (t); } @@ -1016,9 +1115,40 @@ au_to_subject64_ex(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, gid_t rgid, pid_t pid, au_asid_t sid, au_tid_addr_t *tid) { + token_t *t; + u_char *dptr = NULL; - errno = ENOTSUP; - return (NULL); + if (tid->at_type == AU_IPv4) + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + + 7 * sizeof(u_int32_t) + sizeof(u_int64_t) + + 2 * sizeof(u_int32_t)); + else if (tid->at_type == AU_IPv6) + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + + 7 * sizeof(u_int32_t) + sizeof(u_int64_t) + + 5 * sizeof(u_int32_t)); + else { + errno = EINVAL; + return (NULL); + } + if (t == NULL) + return (NULL); + + ADD_U_CHAR(dptr, AUT_SUBJECT64_EX); + ADD_U_INT32(dptr, auid); + ADD_U_INT32(dptr, euid); + ADD_U_INT32(dptr, egid); + ADD_U_INT32(dptr, ruid); + ADD_U_INT32(dptr, rgid); + ADD_U_INT32(dptr, pid); + ADD_U_INT32(dptr, sid); + ADD_U_INT64(dptr, tid->at_port); + ADD_U_INT32(dptr, tid->at_type); + if (tid->at_type == AU_IPv6) + ADD_MEM(dptr, &tid->at_addr[0], 4 * sizeof(u_int32_t)); + else + ADD_MEM(dptr, &tid->at_addr[0], sizeof(u_int32_t)); + + return (t); } token_t * @@ -1090,6 +1220,27 @@ } /* + * token ID 1 byte + * zonename length 2 bytes + * zonename N bytes + 1 terminating NULL byte + */ +token_t * +au_to_zonename(char *zonename) +{ + u_char *dptr = NULL; + u_int16_t textlen; + token_t *t; + + textlen = strlen(zonename); + textlen += 1; + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + sizeof(u_int16_t) + textlen); + ADD_U_CHAR(dptr, AUT_ZONENAME); + ADD_U_INT16(dptr, textlen); + ADD_STRING(dptr, zonename, textlen); + return (t); +} + +/* * token ID 1 byte * count 4 bytes * text count null-terminated strings @@ -1166,6 +1317,33 @@ return (t); } +token_t * +au_to_header64_tm(int rec_size, au_event_t e_type, au_emod_t e_mod, + struct timeval tm) +{ + token_t *t; + u_char *dptr = NULL; + u_int32_t timems; + + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + sizeof(u_int32_t) + + sizeof(u_char) + 2 * sizeof(u_int16_t) + 2 * sizeof(u_int64_t)); + if (t == NULL) + return (NULL); + + ADD_U_CHAR(dptr, AUT_HEADER64); + ADD_U_INT32(dptr, rec_size); + ADD_U_CHAR(dptr, AUDIT_HEADER_VERSION_OPENBSM); + ADD_U_INT16(dptr, e_type); + ADD_U_INT16(dptr, e_mod); + + timems = tm.tv_usec/1000; + /* Add the timestamp */ + ADD_U_INT64(dptr, tm.tv_sec); + ADD_U_INT64(dptr, timems); /* We need time in ms. */ + + return (t); +} + #if !defined(KERNEL) && !defined(_KERNEL) token_t * au_to_header32(int rec_size, au_event_t e_type, au_emod_t e_mod) @@ -1181,9 +1359,11 @@ au_to_header64(__unused int rec_size, __unused au_event_t e_type, __unused au_emod_t e_mod) { + struct timeval tm; - errno = ENOTSUP; - return (NULL); + if (gettimeofday(&tm, NULL) == -1) + return (NULL); + return (au_to_header64_tm(rec_size, e_type, e_mod, tm)); } token_t * From owner-p4-projects@FreeBSD.ORG Mon Apr 16 09:42:05 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 CE9D716A407; Mon, 16 Apr 2007 09:42:04 +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 6D1F616A401 for ; Mon, 16 Apr 2007 09:42:04 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5C12D13C45E for ; Mon, 16 Apr 2007 09:42:04 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3G9g4bV029203 for ; Mon, 16 Apr 2007 09:42:04 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3G9g3ZY029187 for perforce@freebsd.org; Mon, 16 Apr 2007 09:42:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 16 Apr 2007 09:42:03 GMT Message-Id: <200704160942.l3G9g3ZY029187@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 118221 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: Mon, 16 Apr 2007 09:42:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=118221 Change 118221 by rwatson@rwatson_cinnamon on 2007/04/16 09:41:52 Integrate new OpenBSM parts from contrib/openbsm to sys; adapt some new token construction functions for the kernel environment. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#32 integrate .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#24 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#31 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#32 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#31 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#32 $ * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.9 2006/09/25 12:22:07 rwatson Exp $ */ @@ -475,6 +475,28 @@ #define AUE_READDIR 43118 /* Linux. */ #define AUE_IOPL 43119 /* Linux. */ #define AUE_VM86 43120 /* Linux. */ +#define AUE_MAC_GET_PROC 43121 /* FreeBSD. */ +#define AUE_MAC_SET_PROC 43122 /* FreeBSD. */ +#define AUE_MAC_GET_FD 43123 /* FreeBSD. */ +#define AUE_MAC_GET_FILE 43124 /* FreeBSD. */ +#define AUE_MAC_SET_FD 43125 /* FreeBSD. */ +#define AUE_MAC_SET_FILE 43126 /* FreeBSD. */ +#define AUE_MAC_SYSCALL 43127 /* FreeBSD. */ +#define AUE_MAC_GET_PID 43128 /* FreeBSD. */ +#define AUE_MAC_GET_LINK 43129 /* FreeBSD. */ +#define AUE_MAC_SET_LINK 43130 /* FreeBSD. */ +#define AUE_MAC_EXECVE 43131 /* FreeBSD. */ +#define AUE_GETPATH_FROMFD 43132 /* FreeBSD. */ +#define AUE_GETPATH_FROMADDR 43133 /* FreeBSD. */ +#define AUE_MQ_OPEN 43134 /* FreeBSD. */ +#define AUE_MQ_SETATTR 43135 /* FreeBSD. */ +#define AUE_MQ_TIMEDRECEIVE 43136 /* FreeBSD. */ +#define AUE_MQ_TIMEDSEND 43137 /* FreeBSD. */ +#define AUE_MQ_NOTIFY 43138 /* FreeBSD. */ +#define AUE_MQ_UNLINK 43139 /* FreeBSD. */ +#define AUE_LISTEN 43140 /* FreeBSD/Darwin/Linux. */ +#define AUE_MLOCKALL 43141 /* FreeBSD. */ +#define AUE_MUNLOCKALL 43142 /* FreeBSD. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the @@ -572,16 +594,13 @@ #define AUE_GETSOCKOPT AUE_NULL #define AUE_GTSOCKOPT AUE_GETSOCKOPT /* XXX: Typo in Darwin. */ #define AUE_ISSETUGID AUE_NULL -#define AUE_LISTEN AUE_NULL #define AUE_LSTATV AUE_NULL #define AUE_MADVISE AUE_NULL #define AUE_MINCORE AUE_NULL #define AUE_MKCOMPLEX AUE_NULL -#define AUE_MLOCKALL AUE_NULL #define AUE_MODWATCH AUE_NULL #define AUE_MSGCL AUE_NULL #define AUE_MSYNC AUE_NULL -#define AUE_MUNLOCKALL AUE_NULL #define AUE_PREAD AUE_NULL #define AUE_PWRITE AUE_NULL #define AUE_PREADV AUE_NULL ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#24 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#23 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#24 $ * $FreeBSD: src/sys/bsm/audit_record.h,v 1.6 2006/09/21 07:27:02 rwatson Exp $ */ @@ -86,6 +86,7 @@ /* XXXRW: Additional X11 tokens not defined? */ #define AUT_CMD 0x51 #define AUT_EXIT 0x52 +#define AUT_ZONENAME 0x60 /* XXXRW: OpenBSM AUT_HOST 0x70? */ #define AUT_ARG64 0x71 #define AUT_RETURN64 0x72 @@ -247,6 +248,8 @@ token_t *au_to_header32_tm(int rec_size, au_event_t e_type, au_emod_t e_mod, struct timeval tm); +token_t *au_to_header64_tm(int rec_size, au_event_t e_type, au_emod_t e_mod, + struct timeval tm); #if !defined(KERNEL) && !defined(_KERNEL) token_t *au_to_header(int rec_size, au_event_t e_type, au_emod_t e_mod); token_t *au_to_header32(int rec_size, au_event_t e_type, au_emod_t e_mod); @@ -329,6 +332,7 @@ token_t *au_to_text(char *text); token_t *au_to_kevent(struct kevent *kev); token_t *au_to_trailer(int rec_size); +token_t *au_to_zonename(char *zonename); __END_DECLS ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#31 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#30 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#31 $ * $FreeBSD: src/sys/security/audit/audit_bsm_token.c,v 1.9 2006/12/28 22:18:43 rwatson Exp $ */ @@ -179,8 +179,44 @@ token_t * au_to_attr64(struct vnode_au_info *vni) { + token_t *t; + u_char *dptr = NULL; + u_int16_t pad0_16 = 0; + u_int16_t pad0_32 = 0; + + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 2 * sizeof(u_int16_t) + + 3 * sizeof(u_int32_t) + sizeof(u_int64_t) * 2); + + ADD_U_CHAR(dptr, AUT_ATTR64); + + /* + * Darwin defines the size for the file mode + * as 2 bytes; BSM defines 4 so pad with 0 + */ + ADD_U_INT16(dptr, pad0_16); + ADD_U_INT16(dptr, vni->vn_mode); + + ADD_U_INT32(dptr, vni->vn_uid); + ADD_U_INT32(dptr, vni->vn_gid); + ADD_U_INT32(dptr, vni->vn_fsid); + + /* + * Some systems use 32-bit file ID's, other's use 64-bit file IDs. + * Attempt to handle both, and let the compiler sort it out. If we + * could pick this out at compile-time, it would be better, so as to + * avoid the else case below. + */ + if (sizeof(vni->vn_fileid) == sizeof(uint32_t)) { + ADD_U_INT32(dptr, pad0_32); + ADD_U_INT32(dptr, vni->vn_fileid); + } else if (sizeof(vni->vn_fileid) == sizeof(uint64_t)) + ADD_U_INT64(dptr, vni->vn_fileid); + else + ADD_U_INT64(dptr, 0LL); + + ADD_U_INT64(dptr, vni->vn_dev); - return (NULL); + return (t); } token_t * @@ -269,7 +305,7 @@ au_to_groups(int *groups) { - return (au_to_newgroups(AUDIT_MAX_GROUPS, groups)); + return (au_to_newgroups(AUDIT_MAX_GROUPS, (gid_t*)groups)); } /* @@ -577,18 +613,32 @@ } token_t * -au_to_process64(__unused au_id_t auid, __unused uid_t euid, - __unused gid_t egid, __unused uid_t ruid, __unused gid_t rgid, - __unused pid_t pid, __unused au_asid_t sid, __unused au_tid_t *tid) +au_to_process64(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, gid_t rgid, + pid_t pid, au_asid_t sid, au_tid_t *tid) { + token_t *t; + u_char *dptr = NULL; + + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 8 * sizeof(u_int32_t) + + sizeof(u_int64_t)); + + ADD_U_CHAR(dptr, AUT_PROCESS64); + ADD_U_INT32(dptr, auid); + ADD_U_INT32(dptr, euid); + ADD_U_INT32(dptr, egid); + ADD_U_INT32(dptr, ruid); + ADD_U_INT32(dptr, rgid); + ADD_U_INT32(dptr, pid); + ADD_U_INT32(dptr, sid); + ADD_U_INT64(dptr, tid->port); + ADD_MEM(dptr, &tid->machine, sizeof(u_int32_t)); - return (NULL); + return (t); } token_t * -au_to_process(__unused au_id_t auid, __unused uid_t euid, - __unused gid_t egid, __unused uid_t ruid, __unused gid_t rgid, - __unused pid_t pid, __unused au_asid_t sid, __unused au_tid_t *tid) +au_to_process(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, gid_t rgid, + pid_t pid, au_asid_t sid, au_tid_t *tid) { return (au_to_process32(auid, euid, egid, ruid, rgid, pid, sid, @@ -635,10 +685,13 @@ ADD_U_INT32(dptr, sid); ADD_U_INT32(dptr, tid->at_port); ADD_U_INT32(dptr, tid->at_type); - if (tid->at_type == AU_IPv6) - ADD_MEM(dptr, &tid->at_addr[0], 4 * sizeof(u_int32_t)); - else - ADD_MEM(dptr, &tid->at_addr[0], sizeof(u_int32_t)); + ADD_MEM(dptr, &tid->at_addr[0], sizeof(u_int32_t)); + if (tid->at_type == AU_IPv6) { + ADD_MEM(dptr, &tid->at_addr[1], sizeof(u_int32_t)); + ADD_MEM(dptr, &tid->at_addr[2], sizeof(u_int32_t)); + ADD_MEM(dptr, &tid->at_addr[3], sizeof(u_int32_t)); + } + return (t); } @@ -646,8 +699,40 @@ au_to_process64_ex(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, gid_t rgid, pid_t pid, au_asid_t sid, au_tid_addr_t *tid) { + token_t *t; + u_char *dptr = NULL; + + if (tid->at_type == AU_IPv4) + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + + 7 * sizeof(u_int32_t) + sizeof(u_int64_t) + + 2 * sizeof(u_int32_t)); + else if (tid->at_type == AU_IPv6) + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + + 7 * sizeof(u_int32_t) + sizeof(u_int64_t) + + 5 * sizeof(u_int32_t)); + else { + errno = EINVAL; + return (NULL); + } + + ADD_U_CHAR(dptr, AUT_PROCESS64_EX); + ADD_U_INT32(dptr, auid); + ADD_U_INT32(dptr, euid); + ADD_U_INT32(dptr, egid); + ADD_U_INT32(dptr, ruid); + ADD_U_INT32(dptr, rgid); + ADD_U_INT32(dptr, pid); + ADD_U_INT32(dptr, sid); + ADD_U_INT64(dptr, tid->at_port); + ADD_U_INT32(dptr, tid->at_type); + ADD_MEM(dptr, &tid->at_addr[0], sizeof(u_int32_t)); + if (tid->at_type == AU_IPv6) { + ADD_MEM(dptr, &tid->at_addr[1], sizeof(u_int32_t)); + ADD_MEM(dptr, &tid->at_addr[2], sizeof(u_int32_t)); + ADD_MEM(dptr, &tid->at_addr[3], sizeof(u_int32_t)); + } - return (NULL); + return (t); } token_t * @@ -917,8 +1002,24 @@ au_to_subject64(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, gid_t rgid, pid_t pid, au_asid_t sid, au_tid_t *tid) { + token_t *t; + u_char *dptr = NULL; - return (NULL); + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 7 * sizeof(u_int32_t) + + sizeof(u_int64_t) + sizeof(u_int32_t)); + + ADD_U_CHAR(dptr, AUT_SUBJECT64); + ADD_U_INT32(dptr, auid); + ADD_U_INT32(dptr, euid); + ADD_U_INT32(dptr, egid); + ADD_U_INT32(dptr, ruid); + ADD_U_INT32(dptr, rgid); + ADD_U_INT32(dptr, pid); + ADD_U_INT32(dptr, sid); + ADD_U_INT64(dptr, tid->port); + ADD_MEM(dptr, &tid->machine, sizeof(u_int32_t)); + + return (t); } token_t * @@ -970,10 +1071,11 @@ ADD_U_INT32(dptr, sid); ADD_U_INT32(dptr, tid->at_port); ADD_U_INT32(dptr, tid->at_type); - if (tid->at_type == AU_IPv6) + if (tid->at_type == AU_IPv6) ADD_MEM(dptr, &tid->at_addr[0], 4 * sizeof(u_int32_t)); - else + else ADD_MEM(dptr, &tid->at_addr[0], sizeof(u_int32_t)); + return (t); } @@ -981,8 +1083,38 @@ au_to_subject64_ex(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, gid_t rgid, pid_t pid, au_asid_t sid, au_tid_addr_t *tid) { + token_t *t; + u_char *dptr = NULL; + + if (tid->at_type == AU_IPv4) + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + + 7 * sizeof(u_int32_t) + sizeof(u_int64_t) + + 2 * sizeof(u_int32_t)); + else if (tid->at_type == AU_IPv6) + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + + 7 * sizeof(u_int32_t) + sizeof(u_int64_t) + + 5 * sizeof(u_int32_t)); + else { + errno = EINVAL; + return (NULL); + } + + ADD_U_CHAR(dptr, AUT_SUBJECT64_EX); + ADD_U_INT32(dptr, auid); + ADD_U_INT32(dptr, euid); + ADD_U_INT32(dptr, egid); + ADD_U_INT32(dptr, ruid); + ADD_U_INT32(dptr, rgid); + ADD_U_INT32(dptr, pid); + ADD_U_INT32(dptr, sid); + ADD_U_INT64(dptr, tid->at_port); + ADD_U_INT32(dptr, tid->at_type); + if (tid->at_type == AU_IPv6) + ADD_MEM(dptr, &tid->at_addr[0], 4 * sizeof(u_int32_t)); + else + ADD_MEM(dptr, &tid->at_addr[0], sizeof(u_int32_t)); - return (NULL); + return (t); } token_t * @@ -1101,6 +1233,27 @@ } /* + * token ID 1 byte + * zonename length 2 bytes + * zonename N bytes + 1 terminating NULL byte + */ +token_t * +au_to_zonename(char *zonename) +{ + u_char *dptr = NULL; + u_int16_t textlen; + token_t *t; + + textlen = strlen(zonename); + textlen += 1; + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + sizeof(u_int16_t) + textlen); + ADD_U_CHAR(dptr, AUT_ZONENAME); + ADD_U_INT16(dptr, textlen); + ADD_STRING(dptr, zonename, textlen); + return (t); +} + +/* * token ID 1 byte * count 4 bytes * text count null-terminated strings @@ -1174,6 +1327,31 @@ return (t); } +token_t * +au_to_header64_tm(int rec_size, au_event_t e_type, au_emod_t e_mod, + struct timeval tm) +{ + token_t *t; + u_char *dptr = NULL; + u_int32_t timems; + + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + sizeof(u_int32_t) + + sizeof(u_char) + 2 * sizeof(u_int16_t) + 2 * sizeof(u_int64_t)); + + ADD_U_CHAR(dptr, AUT_HEADER64); + ADD_U_INT32(dptr, rec_size); + ADD_U_CHAR(dptr, AUDIT_HEADER_VERSION_OPENBSM); + ADD_U_INT16(dptr, e_type); + ADD_U_INT16(dptr, e_mod); + + timems = tm.tv_usec/1000; + /* Add the timestamp */ + ADD_U_INT64(dptr, tm.tv_sec); + ADD_U_INT64(dptr, timems); /* We need time in ms. */ + + return (t); +} + /* * token ID 1 byte * trailer magic number 2 bytes From owner-p4-projects@FreeBSD.ORG Mon Apr 16 10:24:22 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 3C6F116A406; Mon, 16 Apr 2007 10:24:22 +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 ED63316A403 for ; Mon, 16 Apr 2007 10:24:21 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id DB77C13C483 for ; Mon, 16 Apr 2007 10:24:21 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3GAOLcW037411 for ; Mon, 16 Apr 2007 10:24:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3GAO6r7037376 for perforce@freebsd.org; Mon, 16 Apr 2007 10:24:06 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 16 Apr 2007 10:24:06 GMT Message-Id: <200704161024.l3GAO6r7037376@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 118224 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: Mon, 16 Apr 2007 10:24:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=118224 Change 118224 by rwatson@rwatson_zoo on 2007/04/16 10:23:56 Integrate TrustedBSD audit3 branch. Affected files ... .. //depot/projects/trustedbsd/audit3/ObsoleteFiles.inc#13 integrate .. //depot/projects/trustedbsd/audit3/cddl/lib/libzpool/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/cmd/zpool/zpool_main.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/cmd/ztest/ztest.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/lib/libzfs/common/libzfs.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/lib/libzpool/common/kernel.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/FREEBSD-upgrade#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/KNOWNBUGS#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/PGPKEYS#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/RELEASE_NOTES#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/cf/README#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/cf/cf/knecht.mc#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/cf/cf/submit.cf#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/cf/feature/access_db.m4#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/cf/feature/badmx.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/sendmail/cf/feature/block_bad_helo.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/sendmail/cf/feature/dnsbl.m4#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/cf/feature/enhdnsbl.m4#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/cf/feature/require_rdns.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/sendmail/cf/m4/proto.m4#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/cf/m4/version.m4#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/cf/mailer/smtp.m4#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/contrib/cidrexpand#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/contrib/qtool.pl#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/doc/op/op.me#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/editmap/Makefile.m4#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/include/libmilter/mfapi.h#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/include/libmilter/mfdef.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/include/libmilter/milter.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/include/sm/conf.h#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/include/sm/errstring.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/include/sm/heap.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/include/sm/ldap.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/include/sm/misc.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/sendmail/include/sm/os/sm_os_qnx.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/sendmail/include/sm/sendmail.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/sendmail/include/sm/tailq.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/Makefile.m4#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/README#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/comm.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/api.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/design.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/index.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/installation.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/other.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/overview.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/sample.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/smfi_addheader.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/smfi_addrcpt.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/smfi_addrcpt_par.html#1 branch .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/smfi_chgfrom.html#1 branch .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/smfi_chgheader.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/smfi_delrcpt.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/smfi_getpriv.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/smfi_getsymval.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/smfi_insheader.html#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/smfi_main.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/smfi_opensocket.html#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/smfi_progress.html#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/smfi_quarantine.html#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/smfi_register.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/smfi_replacebody.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/smfi_setbacklog.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/smfi_setconn.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/smfi_setdbg.html#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/smfi_setmlreply.html#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/smfi_setpriv.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/smfi_setreply.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/smfi_setsymlist.html#1 branch .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/smfi_settimeout.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/smfi_stop.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/smfi_version.html#1 branch .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/xxfi_abort.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/xxfi_body.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/xxfi_close.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/xxfi_connect.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/xxfi_data.html#1 branch .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/xxfi_envfrom.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/xxfi_envrcpt.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/xxfi_eoh.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/xxfi_eom.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/xxfi_header.html#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/xxfi_helo.html#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/xxfi_negotiate.html#1 branch .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/xxfi_unknown.html#1 branch .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/engine.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/example.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/handler.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/libmilter.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/listener.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/main.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/monitor.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/smfi.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/worker.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/Makefile.m4#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/config.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/exc.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/exc.html#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/findfp.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/flags.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/ldap.c#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/local.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/memstat.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/snprintf.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/t-memstat.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/t-qic.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/t-sem.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/util.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/vfscanf.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsmdb/Makefile.m4#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsmutil/Makefile.m4#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/mail.local/Makefile.m4#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/mail.local/mail.local.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/mailstats/Makefile.m4#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/makemap/Makefile.m4#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/praliases/Makefile.m4#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/rmail/Makefile.m4#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/smrsh/Makefile.m4#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/Makefile.m4#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/README#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/TRACEFLAGS#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/TUNING#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/alias.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/arpadate.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/collect.c#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/conf.c#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/conf.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/control.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/daemon.c#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/daemon.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/deliver.c#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/domain.c#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/envelope.c#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/err.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/headers.c#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/helpfile#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/macro.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/mailq.1#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/main.c#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/map.c#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/map.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/mci.c#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/milter.c#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/mime.c#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/parseaddr.c#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/queue.c#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/ratectrl.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/readcf.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/recipient.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/sasl.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/savemail.c#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/sendmail.h#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/sm_resolve.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/srvrsmtp.c#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/stab.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/stats.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/timers.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/tls.c#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/udb.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/usersmtp.c#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/util.c#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/version.c#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/test/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/vacation/Makefile.m4#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/vacation/vacation.c#4 integrate .. //depot/projects/trustedbsd/audit3/etc/defaults/rc.conf#21 integrate .. //depot/projects/trustedbsd/audit3/etc/devd.conf#9 integrate .. //depot/projects/trustedbsd/audit3/etc/mtree/BSD.root.dist#9 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/FILESYSTEMS#2 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/Makefile#18 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/NETWORKING#4 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/hostid#1 branch .. //depot/projects/trustedbsd/audit3/etc/rc.d/ipfilter#6 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/ipsec#5 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/kldxref#4 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/mountcritremote#7 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/netoptions#3 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/pf#10 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/pflog#9 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/pfsync#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/gen/Symbol.map#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/gen/sysctl.3#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/i386/Symbol.map#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/stdlib/strtol.3#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/ptrace.2#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libmilter/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libsm/Makefile#7 integrate .. //depot/projects/trustedbsd/audit3/libexec/rtld-elf/Makefile#6 integrate .. //depot/projects/trustedbsd/audit3/libexec/rtld-elf/Symbol.map#2 integrate .. //depot/projects/trustedbsd/audit3/libexec/rtld-elf/Versions.def#2 integrate .. //depot/projects/trustedbsd/audit3/libexec/rtld-elf/i386/Symbol.map#2 integrate .. //depot/projects/trustedbsd/audit3/release/doc/en_US.ISO8859-1/relnotes/article.sgml#3 integrate .. //depot/projects/trustedbsd/audit3/sbin/ifconfig/Makefile#6 integrate .. //depot/projects/trustedbsd/audit3/sbin/ifconfig/ifconfig.8#17 integrate .. //depot/projects/trustedbsd/audit3/sbin/ifconfig/iftrunk.c#1 branch .. //depot/projects/trustedbsd/audit3/share/man/man4/Makefile#17 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/trunk.4#1 branch .. //depot/projects/trustedbsd/audit3/share/man/man5/rc.conf.5#17 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/hash.9#3 integrate .. //depot/projects/trustedbsd/audit3/share/misc/committers-ports.dot#2 integrate .. //depot/projects/trustedbsd/audit3/share/misc/committers-src.dot#2 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/conf/GENERIC#13 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/forth/loader.conf#14 integrate .. //depot/projects/trustedbsd/audit3/sys/cam/scsi/scsi_sg.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/cam/scsi/scsi_sg.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/linux/linux_ioctl.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/opensolaris/kern/opensolaris_kmem.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/opensolaris/kern/opensolaris_kobj.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/opensolaris/kern/opensolaris_misc.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/compat/opensolaris/kern/opensolaris_string.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/opensolaris/sys/kmem.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/opensolaris/sys/kobj.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/opensolaris/sys/lock.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/compat/opensolaris/sys/misc.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/compat/opensolaris/sys/mutex.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/opensolaris/sys/rwlock.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/opensolaris/sys/string.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/NOTES#20 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/files#29 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/files.ia64#10 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/utmisc.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/opensolaris/uts/common/fs/zfs/spa.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/opensolaris/uts/common/fs/zfs/zap.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/opensolaris/uts/common/sys/fs/zfs.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-all.h#11 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-chipset.c#21 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-dma.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ath/ah_osdep.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/cxgb_adapter.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/cxgb_lro.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/cxgb_osdep.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/cxgb_sge.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/sys/mvec.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/sys/uipc_mvec.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/mii/brgphy.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mii/miidevs#9 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/msk/if_msk.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/eli/g_eli.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/conf/GENERIC#14 integrate .. //depot/projects/trustedbsd/audit3/sys/ia64/conf/GENERIC#11 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_jail.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_mib.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/uipc_mqueue.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_mount.c#23 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_subr.c#18 integrate .. //depot/projects/trustedbsd/audit3/sys/libkern/index.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/libkern/rindex.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/Makefile#18 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/cxgb/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/dpt/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/if_trunk/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/sys/modules/libalias/libalias/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/zfs/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sys/net/ieee8023ad_lacp.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/net/ieee8023ad_lacp.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/net/if.c#17 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_ethersubr.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_trunk.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/net/if_trunk.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/net/if_var.h#12 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/in_pcb.c#17 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_input.c#16 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_output.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_sack.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_subr.c#15 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_syncache.c#14 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_timer.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_timer.h#9 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_usrreq.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_var.h#12 integrate .. //depot/projects/trustedbsd/audit3/sys/netipsec/ipsec_osdep.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/pc98/conf/GENERIC#12 integrate .. //depot/projects/trustedbsd/audit3/sys/powerpc/conf/GENERIC#12 integrate .. //depot/projects/trustedbsd/audit3/sys/rpc/types.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/sparc64/conf/GENERIC#12 integrate .. //depot/projects/trustedbsd/audit3/sys/sparc64/include/nexusvar.h#2 delete .. //depot/projects/trustedbsd/audit3/sys/sun4v/conf/GENERIC#4 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/hash.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/kernel.h#11 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/libkern.h#9 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/mutex.h#10 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/param.h#15 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/priv.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/sysctl.h#11 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/systm.h#14 integrate .. //depot/projects/trustedbsd/audit3/sys/ufs/ffs/ffs_snapshot.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/ufs/ffs/ffs_softdep.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/phys_pager.c#5 integrate .. //depot/projects/trustedbsd/audit3/tools/regression/netinet/ipsockopt/ipsockopt.c#5 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/net80211/wesside/wesside/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/net80211/wesside/wesside/aircrack-ptw-lib.c#1 branch .. //depot/projects/trustedbsd/audit3/tools/tools/net80211/wesside/wesside/aircrack-ptw-lib.h#1 branch .. //depot/projects/trustedbsd/audit3/tools/tools/net80211/wesside/wesside/wesside.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/gcore/elfcore.c#4 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/kdump/kdump.c#8 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/kdump/kdump_subr.h#3 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/kdump/mksubr#5 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/netstat/mcast.c#5 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/sed/TEST/math.sed#2 delete .. //depot/projects/trustedbsd/audit3/usr.bin/tar/write.c#10 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/touch/touch.1#3 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/touch/touch.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/truss/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/truss/amd64-fbsd.c#4 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/truss/extern.h#5 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/truss/i386-fbsd.c#6 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/truss/i386-linux.c#5 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/truss/ia64-fbsd.c#5 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/truss/main.c#6 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/truss/powerpc-fbsd.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/truss/setup.c#4 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/truss/sparc64-fbsd.c#5 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/truss/syscall.h#5 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/truss/syscalls.c#8 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/truss/truss.1#7 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/truss/truss.h#4 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/uuidgen/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/ifmcstat/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/ifmcstat/ifmcstat.8#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/ifmcstat/ifmcstat.c#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sendmail/Makefile#7 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/ObsoleteFiles.inc#13 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.77 2007/03/28 07:49:57 delphij Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.78 2007/04/09 19:16:48 pjd Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,8 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20070409: uuidgen moved to /bin/ +OLD_FILES+=usr/bin/uuidgen # 20070328: bzip2 1.0.4 OLD_FILES+=usr/share/info/bzip2.info.gz # 20070303: libarchive 2.0 ==== //depot/projects/trustedbsd/audit3/cddl/lib/libzpool/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/cddl/lib/libzpool/Makefile,v 1.1 2007/04/06 01:08:57 pjd Exp $ +# $FreeBSD: src/cddl/lib/libzpool/Makefile,v 1.2 2007/04/07 23:54:53 pjd Exp $ .include "${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/Makefile.files" @@ -11,7 +11,7 @@ # LIST_SRCS .PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/os # ATOMIC_SRCS -.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/arch/${MACHINE_ARCH} +.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/atomic/${MACHINE_ARCH} LIB= zpool SHLIB_MAJOR?=1 ==== //depot/projects/trustedbsd/audit3/contrib/opensolaris/cmd/zpool/zpool_main.c#2 (text+ko) ==== @@ -1082,6 +1082,10 @@ "incompatible version.\n")); break; + case ZPOOL_STATUS_HOSTID_MISMATCH: + (void) printf(gettext("status: The pool was last accessed by " + "another system.\n")); + break; default: /* * No other status can be seen when importing pools. @@ -1098,6 +1102,10 @@ "imported using its name or numeric identifier, " "though\n\tsome features will not be available " "without an explicit 'zpool upgrade'.\n")); + else if (reason == ZPOOL_STATUS_HOSTID_MISMATCH) + (void) printf(gettext("action: The pool can be " + "imported using its name or numeric " + "identifier and\n\tthe '-f' flag.\n")); else (void) printf(gettext("action: The pool can be " "imported using its name or numeric " @@ -1187,10 +1195,37 @@ "is formatted using a newer ZFS version\n"), name); return (1); } else if (state != POOL_STATE_EXPORTED && !force) { - (void) fprintf(stderr, gettext("cannot import '%s': pool " - "may be in use from other system\n"), name); - (void) fprintf(stderr, gettext("use '-f' to import anyway\n")); - return (1); + uint64_t hostid; + + if (nvlist_lookup_uint64(config, ZPOOL_CONFIG_HOSTID, + &hostid) == 0) { + if ((unsigned long)hostid != gethostid()) { + char *hostname; + uint64_t timestamp; + time_t t; + + verify(nvlist_lookup_string(config, + ZPOOL_CONFIG_HOSTNAME, &hostname) == 0); + verify(nvlist_lookup_uint64(config, + ZPOOL_CONFIG_TIMESTAMP, ×tamp) == 0); + t = timestamp; + (void) fprintf(stderr, gettext("cannot import " + "'%s': pool may be in use from other " + "system, it was last accessed by %s " + "(hostid: 0x%lx) on %s"), name, hostname, + (unsigned long)hostid, + asctime(localtime(&t))); + (void) fprintf(stderr, gettext("use '-f' to " + "import anyway\n")); + return (1); + } + } else { + (void) fprintf(stderr, gettext("cannot import '%s': " + "pool may be in use from other system\n"), name); + (void) fprintf(stderr, gettext("use '-f' to import " + "anyway\n")); + return (1); + } } if (zpool_import(g_zfs, config, newname, altroot) != 0) ==== //depot/projects/trustedbsd/audit3/contrib/opensolaris/cmd/ztest/ztest.c#2 (text+ko) ==== @@ -246,6 +246,8 @@ #define ZTEST_DIROBJ_BLOCKSIZE (1 << 10) #define ZTEST_DIRSIZE 256 +static void usage(boolean_t); + /* * These libumem hooks provide a reasonable set of defaults for the allocator's * debugging facilities. @@ -303,13 +305,17 @@ if (toupper(buf[0]) == ends[i]) break; } - if (i == strlen(ends)) - fatal(0, "invalid bytes suffix: %s", buf); + if (i == strlen(ends)) { + (void) fprintf(stderr, "ztest: invalid bytes suffix: %s\n", + buf); + usage(B_FALSE); + } if (buf[1] == '\0' || (toupper(buf[1]) == 'B' && buf[2] == '\0')) { return (10*i); } - fatal(0, "invalid bytes suffix: %s", buf); - return (-1); + (void) fprintf(stderr, "ztest: invalid bytes suffix: %s\n", buf); + usage(B_FALSE); + /* NOTREACHED */ } static uint64_t @@ -320,32 +326,40 @@ val = strtoull(buf, &end, 0); if (end == buf) { - fatal(0, "bad numeric value: %s", buf); + (void) fprintf(stderr, "ztest: bad numeric value: %s\n", buf); + usage(B_FALSE); } else if (end[0] == '.') { double fval = strtod(buf, &end); fval *= pow(2, str2shift(end)); - if (fval > UINT64_MAX) - fatal(0, "value too large: %s", buf); + if (fval > UINT64_MAX) { + (void) fprintf(stderr, "ztest: value too large: %s\n", + buf); + usage(B_FALSE); + } val = (uint64_t)fval; } else { int shift = str2shift(end); - if (shift >= 64 || (val << shift) >> shift != val) - fatal(0, "value too large: %s", buf); + if (shift >= 64 || (val << shift) >> shift != val) { + (void) fprintf(stderr, "ztest: value too large: %s\n", + buf); + usage(B_FALSE); + } val <<= shift; } return (val); } static void -usage(void) +usage(boolean_t requested) { char nice_vdev_size[10]; char nice_gang_bang[10]; + FILE *fp = requested ? stdout : stderr; nicenum(zopt_vdev_size, nice_vdev_size); nicenum(zio_gang_bang, nice_gang_bang); - (void) printf("Usage: %s\n" + (void) fprintf(fp, "Usage: %s\n" "\t[-v vdevs (default: %llu)]\n" "\t[-s size_of_each_vdev (default: %s)]\n" "\t[-a alignment_shift (default: %d) (use 0 for random)]\n" @@ -364,6 +378,7 @@ "\t[-T time] total run time (default: %llu sec)\n" "\t[-P passtime] time per pass (default: %llu sec)\n" "\t[-z zil failure rate (default: fail every 2^%llu allocs)]\n" + "\t[-h] (print help)\n" "", cmdname, (u_longlong_t)zopt_vdevs, /* -v */ @@ -382,7 +397,7 @@ (u_longlong_t)zopt_time, /* -T */ (u_longlong_t)zopt_passtime, /* -P */ (u_longlong_t)zio_zil_fail_shift); /* -z */ - exit(1); + exit(requested ? 0 : 1); } static uint64_t @@ -422,7 +437,7 @@ zio_zil_fail_shift = 5; while ((opt = getopt(argc, argv, - "v:s:a:m:r:R:d:t:g:i:k:p:f:VET:P:z:")) != EOF) { + "v:s:a:m:r:R:d:t:g:i:k:p:f:VET:P:z:h")) != EOF) { value = 0; switch (opt) { case 'v': @@ -496,9 +511,12 @@ case 'z': zio_zil_fail_shift = MIN(value, 16); break; + case 'h': + usage(B_TRUE); + break; case '?': default: - usage(); + usage(B_FALSE); break; } } ==== //depot/projects/trustedbsd/audit3/contrib/opensolaris/lib/libzfs/common/libzfs.h#2 (text+ko) ==== @@ -98,6 +98,7 @@ EZFS_POOLPROPS, /* couldn't retrieve pool props */ EZFS_POOL_NOTSUP, /* ops not supported for this type of pool */ EZFS_POOL_INVALARG, /* invalid argument for this pool operation */ + EZFS_NAMETOOLONG, /* dataset name is too long */ EZFS_UNKNOWN }; @@ -192,6 +193,7 @@ ZPOOL_STATUS_CORRUPT_DATA, /* data errors in user (meta)data */ ZPOOL_STATUS_FAILING_DEV, /* device experiencing errors */ ZPOOL_STATUS_VERSION_NEWER, /* newer on-disk version */ + ZPOOL_STATUS_HOSTID_MISMATCH, /* last accessed by another system */ /* * The following are not faults per se, but still an error possibly ==== //depot/projects/trustedbsd/audit3/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#2 (text+ko) ==== @@ -379,7 +379,7 @@ uint_t i, nspares; boolean_t config_seen; uint64_t best_txg; - char *name; + char *name, *hostname; zfs_cmd_t zc = { 0 }; uint64_t version, guid; size_t len; @@ -388,6 +388,7 @@ nvlist_t **child = NULL; uint_t c; boolean_t isactive; + uint64_t hostid; if (nvlist_alloc(&ret, 0, 0) != 0) goto nomem; @@ -430,6 +431,8 @@ * pool guid * name * pool state + * hostid (if available) + * hostname (if available) */ uint64_t state; @@ -453,6 +456,20 @@ if (nvlist_add_uint64(config, ZPOOL_CONFIG_POOL_STATE, state) != 0) goto nomem; + hostid = 0; + if (nvlist_lookup_uint64(tmp, + ZPOOL_CONFIG_HOSTID, &hostid) == 0) { + if (nvlist_add_uint64(config, + ZPOOL_CONFIG_HOSTID, hostid) != 0) + goto nomem; + verify(nvlist_lookup_string(tmp, + ZPOOL_CONFIG_HOSTNAME, + &hostname) == 0); + if (nvlist_add_string(config, + ZPOOL_CONFIG_HOSTNAME, + hostname) != 0) + goto nomem; + } config_seen = B_TRUE; } @@ -622,6 +639,20 @@ } /* + * Restore the original information read from the actual label. + */ + (void) nvlist_remove(config, ZPOOL_CONFIG_HOSTID, + DATA_TYPE_UINT64); + (void) nvlist_remove(config, ZPOOL_CONFIG_HOSTNAME, + DATA_TYPE_STRING); + if (hostid != 0) { + verify(nvlist_add_uint64(config, ZPOOL_CONFIG_HOSTID, + hostid) == 0); + verify(nvlist_add_string(config, ZPOOL_CONFIG_HOSTNAME, + hostname) == 0); + } + + /* * Add this pool to the list of configs. */ verify(nvlist_lookup_string(config, ZPOOL_CONFIG_POOL_NAME, ==== //depot/projects/trustedbsd/audit3/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#2 (text+ko) ==== @@ -19,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Copyright 2007 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -43,6 +43,7 @@ #include #include +#include #include "libzfs_impl.h" /* @@ -50,7 +51,7 @@ * in libzfs.h. Note that there are some status results which go past the end * of this table, and hence have no associated message ID. */ -static char *msgid_table[] = { +static char *zfs_msgid_table[] = { "ZFS-8000-14", "ZFS-8000-2Q", "ZFS-8000-3C", @@ -60,7 +61,8 @@ "ZFS-8000-72", "ZFS-8000-8A", "ZFS-8000-9P", - "ZFS-8000-A5" + "ZFS-8000-A5", + "ZFS-8000-EY" }; /* @@ -69,7 +71,7 @@ * and the article referred to by 'zpool status' must match that indicated by * the syslog error message. We override missing data as well as corrupt pool. */ -static char *msgid_table_active[] = { +static char *zfs_msgid_table_active[] = { "ZFS-8000-14", "ZFS-8000-D3", /* overridden */ "ZFS-8000-D3", /* overridden */ @@ -82,7 +84,7 @@ "ZFS-8000-CS", /* overridden */ }; -#define NMSGID (sizeof (msgid_table) / sizeof (msgid_table[0])) +#define NMSGID (sizeof (zfs_msgid_table) / sizeof (zfs_msgid_table[0])) /* ARGSUSED */ static int @@ -178,6 +180,8 @@ uint_t vsc; uint64_t nerr; uint64_t version; + uint64_t stateval; + uint64_t hostid = 0; verify(nvlist_lookup_uint64(config, ZPOOL_CONFIG_VERSION, &version) == 0); @@ -185,6 +189,16 @@ &nvroot) == 0); verify(nvlist_lookup_uint64_array(nvroot, ZPOOL_CONFIG_STATS, (uint64_t **)&vs, &vsc) == 0); + verify(nvlist_lookup_uint64(config, ZPOOL_CONFIG_POOL_STATE, + &stateval) == 0); + (void) nvlist_lookup_uint64(config, ZPOOL_CONFIG_HOSTID, &hostid); + + /* + * Pool last accessed by another system. + */ + if (hostid != 0 && (unsigned long)hostid != gethostid() && + stateval == POOL_STATE_ACTIVE) + return (ZPOOL_STATUS_HOSTID_MISMATCH); /* * Newer on-disk version. @@ -270,7 +284,7 @@ if (ret >= NMSGID) *msgid = NULL; else - *msgid = msgid_table_active[ret]; + *msgid = zfs_msgid_table_active[ret]; return (ret); } @@ -283,7 +297,7 @@ if (ret >= NMSGID) *msgid = NULL; else - *msgid = msgid_table[ret]; + *msgid = zfs_msgid_table[ret]; return (ret); } ==== //depot/projects/trustedbsd/audit3/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#2 (text+ko) ==== @@ -167,6 +167,8 @@ case EZFS_POOL_INVALARG: return (dgettext(TEXT_DOMAIN, "invalid argument for " "this pool operation")); + case EZFS_NAMETOOLONG: + return (dgettext(TEXT_DOMAIN, "dataset name is too long")); case EZFS_UNKNOWN: return (dgettext(TEXT_DOMAIN, "unknown error")); default: @@ -306,6 +308,11 @@ "dataset is busy")); zfs_verror(hdl, EZFS_BUSY, fmt, ap); break; + + case ENAMETOOLONG: + zfs_verror(hdl, EZFS_NAMETOOLONG, fmt, ap); + break; + default: zfs_error_aux(hdl, strerror(errno)); zfs_verror(hdl, EZFS_UNKNOWN, fmt, ap); @@ -490,6 +497,21 @@ hdl->libzfs_printerr = printerr; } +static int +libzfs_load(void) +{ + int error; + + if (modfind("zfs") < 0) { + /* Not present in kernel, try loading it. */ + if (kldload("zfs") < 0 || modfind("zfs") < 0) { + if (errno != EEXIST) + return (error); + } + } + return (0); +} + libzfs_handle_t * libzfs_init(void) { @@ -500,8 +522,12 @@ } if ((hdl->libzfs_fd = open(ZFS_DEV, O_RDWR)) < 0) { - free(hdl); - return (NULL); + if (libzfs_load() == 0) + hdl->libzfs_fd = open(ZFS_DEV, O_RDWR); + if (hdl->libzfs_fd < 0) { + free(hdl); + return (NULL); + } } if ((hdl->libzfs_mnttab = fopen(MNTTAB, "r")) == NULL) { ==== //depot/projects/trustedbsd/audit3/contrib/opensolaris/lib/libzpool/common/kernel.c#2 (text+ko) ==== @@ -37,6 +37,7 @@ #include #include #include +#include /* * Emulation of kernel services in userland. @@ -45,6 +46,11 @@ int hz = 119; /* frequency when using gethrtime() >> 23 for lbolt */ uint64_t physmem; vnode_t *rootdir = (vnode_t *)0xabcd1234; +char hw_serial[11]; + +struct utsname utsname = { + "userland", "libzpool", "1", "1", "na" +}; /* * ========================================================================= @@ -770,6 +776,17 @@ return (random_get_bytes_common(ptr, len, "/dev/urandom")); } +int +ddi_strtoul(const char *hw_serial, char **nptr, int base, unsigned long *result) +{ + char *end; + + *result = strtoul(hw_serial, &end, base); + if (*result == 0) + return (errno); + return (0); +} + /* * ========================================================================= * kernel emulation setup & teardown @@ -795,6 +812,8 @@ dprintf("physmem = %llu pages (%.2f GB)\n", physmem, (double)physmem * sysconf(_SC_PAGE_SIZE) / (1ULL << 30)); + snprintf(hw_serial, sizeof (hw_serial), "%ld", gethostid()); + spa_init(mode); } ==== //depot/projects/trustedbsd/audit3/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#2 (text+ko) ==== @@ -290,6 +290,7 @@ #define kmem_alloc(_s, _f) umem_alloc(_s, _f) #define kmem_zalloc(_s, _f) umem_zalloc(_s, _f) #define kmem_free(_b, _s) umem_free(_b, _s) +#define kmem_size() (physmem * PAGESIZE) #define kmem_cache_create(_a, _b, _c, _d, _e, _f, _g, _h, _i) \ umem_cache_create(_a, _b, _c, _d, _e, _f, _g, _h, _i) #define kmem_cache_destroy(_c) umem_cache_destroy(_c) @@ -436,6 +437,14 @@ #define zone_dataset_visible(x, y) (1) #define INGLOBALZONE(z) (1) +/* + * Hostname information + */ +extern struct utsname utsname; +extern char hw_serial[]; +extern int ddi_strtoul(const char *str, char **nptr, int base, + unsigned long *result); + #ifdef __cplusplus } #endif @@ -481,12 +490,15 @@ #define SX_SYSINIT(name, lock, desc) #define SYSCTL_DECL(...) +#define SYSCTL_NODE(...) #define SYSCTL_INT(...) -#define SYSCTL_NODE(...) +#define SYSCTL_ULONG(...) #ifdef TUNABLE_INT #undef TUNABLE_INT +#undef TUNABLE_ULONG #endif #define TUNABLE_INT(...) +#define TUNABLE_ULONG(...) /* Errors */ ==== //depot/projects/trustedbsd/audit3/contrib/sendmail/FREEBSD-upgrade#8 (text+ko) ==== @@ -1,6 +1,6 @@ -$FreeBSD: src/contrib/sendmail/FREEBSD-upgrade,v 1.32 2006/08/17 05:14:33 gshapiro Exp $ +$FreeBSD: src/contrib/sendmail/FREEBSD-upgrade,v 1.33 2007/04/09 01:46:43 gshapiro Exp $ -sendmail 8.13.8 +sendmail 8.14.1 originals can be found at: ftp://ftp.sendmail.org/pub/sendmail/ For the import of sendmail, the following files were removed: @@ -21,8 +21,8 @@ Imported using: - cvs import -m 'Import sendmail 8.13.8' \ - src/contrib/sendmail SENDMAIL v8_13_8 + cvs import -m 'Import sendmail 8.14.1' \ + src/contrib/sendmail SENDMAIL v8_14_1 After importing, bump the version of src/etc/sendmail/freebsd*mc so mergemaster will merge /etc/mail/freebsd*cf: @@ -97,4 +97,4 @@ usr.sbin/mailwrapper/Makefile gshapiro@FreeBSD.org -16-August-2006 +08-April-2007 ==== //depot/projects/trustedbsd/audit3/contrib/sendmail/KNOWNBUGS#4 (text+ko) ==== @@ -29,10 +29,10 @@ * Null bytes are not handled properly in headers. Sendmail should handle full binary data. As it stands, it handles - all values in the body, but only 0x01-0x80 and 0xA0-0xFF in - the header. Notably missing is 0x00, which would require a major - restructuring of the code -- for example, almost no C library support - could be used to handle strings. + all values in the body, but not 0x00 in the header. Changing + this would require a major restructuring of the code -- for + example, almost no C library support could be used to handle + strings. * Header checks are not called if header value is too long or empty. @@ -170,7 +170,7 @@ When sendmail is doing 8->7 bit MIME conversions, and the message contains certain MIME body types that cannot be converted to 7-bit, - sendmail will strip the message to 7-bit. + sendmail will pass the message as 8-bit. * 7->8 bit MIME conversion @@ -235,9 +235,9 @@ Sendmail will deliver to a fail if the file is owned by the DefaultUser or has the set-user-ID bit set. Unfortunately, some systems clear that bit - when a file is modified. Sendmail compensates by resetting the file mode + when a file is modified. Sendmail compensates by resetting the file mode back to it's original settings. Unfortunately, there's still a - permission failure race as sendmail checks the permissions before locking + permission failure race as sendmail checks the permissions before locking the file. This is unavoidable as sendmail must verify the file is safe to open before opening it. A file can not be locked until it is open. @@ -247,4 +247,4 @@ be used if set instead of LOCAL_RELAY ($R). This will be fixed in a future version. -$Revision: 8.57 $, Last updated $Date: 2004/12/02 23:39:01 $ +$Revision: 8.59 $, Last updated $Date: 2007/02/21 23:13:58 $ ==== //depot/projects/trustedbsd/audit3/contrib/sendmail/PGPKEYS#6 (text+ko) ==== @@ -142,6 +142,82 @@ -----END PGP PUBLIC KEY BLOCK----- Type Bits KeyID Created Expires Algorithm Use +pub 1024 0x7093B841 2006-12-16 ---------- RSA Sign & Encrypt >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Apr 16 10:52:00 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 0355C16A402; Mon, 16 Apr 2007 10:52:00 +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 C90B216A401 for ; Mon, 16 Apr 2007 10:51:59 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B94C913C45A for ; Mon, 16 Apr 2007 10:51:59 +0000 (UTC) (envelope-from zec@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 l3GApxbl044270 for ; Mon, 16 Apr 2007 10:51:59 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3GApuxA044256 for perforce@freebsd.org; Mon, 16 Apr 2007 10:51:56 GMT (envelope-from zec@FreeBSD.org) Date: Mon, 16 Apr 2007 10:51:56 GMT Message-Id: <200704161051.l3GApuxA044256@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 118226 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: Mon, 16 Apr 2007 10:52:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=118226 Change 118226 by zec@zec_tca51 on 2007/04/16 10:51:52 Integrate offline changes: - s/vnet_base/vnet/ s/vnetb/vnet/ s/VNETB/VNET/; - do not compile in any of the expensive sanity checks in sys/sys/vimage.h if INVARIANTS are not configured; - minor adjustments to allow the entire tree to be compiled without INVARIANTS and with VIMAGE defined; - virtualize a large percentage of the remaining "global" net.inet.tcp sysctls. This is not to preclude discussions whether virtualizing those knobs makes much sense, but serves as an experiment to increase the overhead of resolving virtualized symbols before engaging in any serious performance measurements (clean vs. virtualized); - add support for VLAN virtualization that seems to never have hit the p4; vlan devices can now be reassigned from one stack instance to another even if the "base" ifnet resides in a different stack instance; - pf can now be kldloaded, but is not virtualized (yet) Affected files ... .. //depot/projects/vimage/src/sys/compat/linprocfs/linprocfs.c#5 edit .. //depot/projects/vimage/src/sys/compat/linux/linux_ioctl.c#3 edit .. //depot/projects/vimage/src/sys/contrib/pf/net/pf.c#3 edit .. //depot/projects/vimage/src/sys/contrib/pf/net/pf_if.c#2 edit .. //depot/projects/vimage/src/sys/contrib/pf/net/pf_ioctl.c#3 edit .. //depot/projects/vimage/src/sys/kern/kern_linker.c#5 edit .. //depot/projects/vimage/src/sys/kern/kern_synch.c#6 edit .. //depot/projects/vimage/src/sys/kern/kern_sysctl.c#5 edit .. //depot/projects/vimage/src/sys/kern/kern_uuid.c#4 edit .. //depot/projects/vimage/src/sys/kern/kern_vimage.c#16 edit .. //depot/projects/vimage/src/sys/kern/sys_socket.c#5 edit .. //depot/projects/vimage/src/sys/kern/tty.c#5 edit .. //depot/projects/vimage/src/sys/kern/uipc_socket.c#8 edit .. //depot/projects/vimage/src/sys/kern/uipc_syscalls.c#6 edit .. //depot/projects/vimage/src/sys/kern/vfs_export.c#6 edit .. //depot/projects/vimage/src/sys/net/bpf.c#7 edit .. //depot/projects/vimage/src/sys/net/if.c#9 edit .. //depot/projects/vimage/src/sys/net/if_clone.c#5 edit .. //depot/projects/vimage/src/sys/net/if_ethersubr.c#8 edit .. //depot/projects/vimage/src/sys/net/if_gif.c#4 edit .. //depot/projects/vimage/src/sys/net/if_gif.h#3 edit .. //depot/projects/vimage/src/sys/net/if_gre.c#2 edit .. //depot/projects/vimage/src/sys/net/if_loop.c#9 edit .. //depot/projects/vimage/src/sys/net/if_mib.c#3 edit .. //depot/projects/vimage/src/sys/net/if_ppp.c#5 edit .. //depot/projects/vimage/src/sys/net/if_spppsubr.c#4 edit .. //depot/projects/vimage/src/sys/net/if_stf.c#5 edit .. //depot/projects/vimage/src/sys/net/if_vlan.c#4 edit .. //depot/projects/vimage/src/sys/net/netisr.c#3 edit .. //depot/projects/vimage/src/sys/net/raw_cb.c#3 edit .. //depot/projects/vimage/src/sys/net/raw_usrreq.c#3 edit .. //depot/projects/vimage/src/sys/net/route.c#5 edit .. //depot/projects/vimage/src/sys/net/rtsock.c#7 edit .. //depot/projects/vimage/src/sys/net/vnet.h#4 edit .. //depot/projects/vimage/src/sys/netgraph/ng_base.c#6 edit .. //depot/projects/vimage/src/sys/netgraph/ng_ether.c#6 edit .. //depot/projects/vimage/src/sys/netgraph/vnetgraph.h#3 edit .. //depot/projects/vimage/src/sys/netinet/if_ether.c#9 edit .. //depot/projects/vimage/src/sys/netinet/igmp.c#8 edit .. //depot/projects/vimage/src/sys/netinet/in.c#6 edit .. //depot/projects/vimage/src/sys/netinet/in_gif.c#5 edit .. //depot/projects/vimage/src/sys/netinet/in_pcb.c#7 edit .. //depot/projects/vimage/src/sys/netinet/in_rmx.c#5 edit .. //depot/projects/vimage/src/sys/netinet/ip_fastfwd.c#6 edit .. //depot/projects/vimage/src/sys/netinet/ip_fw.h#4 edit .. //depot/projects/vimage/src/sys/netinet/ip_fw2.c#11 edit .. //depot/projects/vimage/src/sys/netinet/ip_fw_pfil.c#5 edit .. //depot/projects/vimage/src/sys/netinet/ip_icmp.c#4 edit .. //depot/projects/vimage/src/sys/netinet/ip_input.c#10 edit .. //depot/projects/vimage/src/sys/netinet/ip_mroute.c#3 edit .. //depot/projects/vimage/src/sys/netinet/ip_options.c#4 edit .. //depot/projects/vimage/src/sys/netinet/ip_output.c#6 edit .. //depot/projects/vimage/src/sys/netinet/raw_ip.c#7 edit .. //depot/projects/vimage/src/sys/netinet/tcp_hostcache.c#10 edit .. //depot/projects/vimage/src/sys/netinet/tcp_input.c#8 edit .. //depot/projects/vimage/src/sys/netinet/tcp_output.c#6 edit .. //depot/projects/vimage/src/sys/netinet/tcp_sack.c#5 edit .. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#12 edit .. //depot/projects/vimage/src/sys/netinet/tcp_syncache.c#7 edit .. //depot/projects/vimage/src/sys/netinet/tcp_timer.c#8 edit .. //depot/projects/vimage/src/sys/netinet/tcp_usrreq.c#6 edit .. //depot/projects/vimage/src/sys/netinet/udp_usrreq.c#8 edit .. //depot/projects/vimage/src/sys/netinet/vinet.h#12 edit .. //depot/projects/vimage/src/sys/netinet6/dest6.c#3 edit .. //depot/projects/vimage/src/sys/netinet6/frag6.c#4 edit .. //depot/projects/vimage/src/sys/netinet6/icmp6.c#7 edit .. //depot/projects/vimage/src/sys/netinet6/in6.c#6 edit .. //depot/projects/vimage/src/sys/netinet6/in6_gif.c#5 edit .. //depot/projects/vimage/src/sys/netinet6/in6_ifattach.c#7 edit .. //depot/projects/vimage/src/sys/netinet6/in6_pcb.c#6 edit .. //depot/projects/vimage/src/sys/netinet6/in6_rmx.c#5 edit .. //depot/projects/vimage/src/sys/netinet6/in6_src.c#6 edit .. //depot/projects/vimage/src/sys/netinet6/ip6_forward.c#4 edit .. //depot/projects/vimage/src/sys/netinet6/ip6_input.c#8 edit .. //depot/projects/vimage/src/sys/netinet6/ip6_mroute.c#6 edit .. //depot/projects/vimage/src/sys/netinet6/ip6_output.c#5 edit .. //depot/projects/vimage/src/sys/netinet6/mld6.c#6 edit .. //depot/projects/vimage/src/sys/netinet6/nd6.c#9 edit .. //depot/projects/vimage/src/sys/netinet6/nd6_nbr.c#5 edit .. //depot/projects/vimage/src/sys/netinet6/nd6_rtr.c#5 edit .. //depot/projects/vimage/src/sys/netinet6/raw_ip6.c#7 edit .. //depot/projects/vimage/src/sys/netinet6/route6.c#3 edit .. //depot/projects/vimage/src/sys/netinet6/scope6.c#7 edit .. //depot/projects/vimage/src/sys/netinet6/udp6_output.c#4 edit .. //depot/projects/vimage/src/sys/netinet6/udp6_usrreq.c#8 edit .. //depot/projects/vimage/src/sys/netinet6/vinet6.h#5 edit .. //depot/projects/vimage/src/sys/nfsclient/nfs_diskless.c#4 edit .. //depot/projects/vimage/src/sys/nfsclient/nfs_vnops.c#4 edit .. //depot/projects/vimage/src/sys/sys/vimage.h#16 edit Differences ... ==== //depot/projects/vimage/src/sys/compat/linprocfs/linprocfs.c#5 (text+ko) ==== @@ -969,7 +969,7 @@ static int linprocfs_donetdev(PFS_FILL_ARGS) { - INIT_VNET_NET(curthread->td_vimage->v_vnetb); + INIT_VNET_NET(curthread->td_vimage->v_vnet); char ifname[16]; /* XXX LINUX_IFNAMSIZ */ struct ifnet *ifp; ==== //depot/projects/vimage/src/sys/compat/linux/linux_ioctl.c#3 (text+ko) ==== @@ -2032,7 +2032,7 @@ int linux_ifname(struct ifnet *ifp, char *buffer, size_t buflen) { - INIT_VNET_NET(ifp->if_vnetb); + INIT_VNET_NET(ifp->if_vnet); struct ifnet *ifscan; int ethno; @@ -2066,7 +2066,7 @@ static struct ifnet * ifname_linux_to_bsd(const char *lxname, char *bsdname) { - INIT_VNET_NET(curthread->td_vimage->v_vnetb); + INIT_VNET_NET(curthread->td_vimage->v_vnet); struct ifnet *ifp; int len, unit; char *ep; @@ -2107,7 +2107,7 @@ static int linux_ifconf(struct thread *td, struct ifconf *uifc) { - INIT_VNET_NET(td->td_vimage->v_vnetb); + INIT_VNET_NET(td->td_vimage->v_vnet); #ifdef COMPAT_LINUX32 struct l_ifconf ifc; #else ==== //depot/projects/vimage/src/sys/contrib/pf/net/pf.c#3 (text+ko) ==== @@ -39,6 +39,7 @@ #ifdef __FreeBSD__ #include "opt_inet.h" #include "opt_inet6.h" +#include "opt_vimage.h" #endif #ifdef __FreeBSD__ @@ -81,15 +82,18 @@ #ifdef __FreeBSD__ #include #include +#include #else #include #endif +#include #include #include #include #include +#include #include #include #include @@ -122,6 +126,7 @@ #include #include #ifdef __FreeBSD__ +#include #include #include #endif @@ -1595,6 +1600,7 @@ u_int8_t flags, u_int16_t win, u_int16_t mss, u_int8_t ttl, int tag, struct ether_header *eh, struct ifnet *ifp) { + INIT_VNET_INET(curvnet); struct mbuf *m; int len = 0, tlen; /* make the compiler happy */ #ifdef INET @@ -1729,13 +1735,13 @@ h->ip_hl = sizeof(*h) >> 2; h->ip_tos = IPTOS_LOWDELAY; #ifdef __FreeBSD__ - h->ip_off = path_mtu_discovery ? IP_DF : 0; + h->ip_off = V_path_mtu_discovery ? IP_DF : 0; h->ip_len = len; #else h->ip_off = htons(ip_mtudisc ? IP_DF : 0); h->ip_len = htons(len); #endif - h->ip_ttl = ttl ? ttl : ip_defttl; + h->ip_ttl = ttl ? ttl : V_ip_defttl; h->ip_sum = 0; if (eh == NULL) { #ifdef __FreeBSD__ @@ -2697,6 +2703,7 @@ pf_socket_lookup(uid_t *uid, gid_t *gid, int direction, struct pf_pdesc *pd) #endif { + INIT_VNET_INET(curvnet); struct pf_addr *saddr, *daddr; u_int16_t sport, dport; #ifdef __FreeBSD__ @@ -2724,7 +2731,7 @@ sport = pd->hdr.tcp->th_sport; dport = pd->hdr.tcp->th_dport; #ifdef __FreeBSD__ - pi = &tcbinfo; + pi = &V_tcbinfo; #else tb = &tcbtable; #endif @@ -2733,7 +2740,7 @@ sport = pd->hdr.udp->uh_sport; dport = pd->hdr.udp->uh_dport; #ifdef __FreeBSD__ - pi = &udbinfo; + pi = &V_udbinfo; #else tb = &udbtable; #endif @@ -2868,10 +2875,11 @@ u_int16_t pf_get_mss(struct mbuf *m, int off, u_int16_t th_off, sa_family_t af) { + INIT_VNET_INET(curvnet); int hlen; u_int8_t hdr[60]; u_int8_t *opt, optlen; - u_int16_t mss = tcp_mssdflt; + u_int16_t mss = V_tcp_mssdflt; hlen = th_off << 2; /* hlen <= sizeof(hdr) */ if (hlen <= sizeof(struct tcphdr)) @@ -2906,6 +2914,7 @@ u_int16_t pf_calc_mss(struct pf_addr *addr, sa_family_t af, u_int16_t offer) { + INIT_VNET_INET(curvnet); #ifdef INET struct sockaddr_in *dst; struct route ro; @@ -2916,7 +2925,7 @@ #endif /* INET6 */ struct rtentry *rt = NULL; int hlen = 0; /* make the compiler happy */ - u_int16_t mss = tcp_mssdflt; + u_int16_t mss = V_tcp_mssdflt; switch (af) { #ifdef INET @@ -2964,7 +2973,7 @@ if (rt && rt->rt_ifp) { mss = rt->rt_ifp->if_mtu - hlen - sizeof(struct tcphdr); - mss = max(tcp_mssdflt, mss); + mss = max(V_tcp_mssdflt, mss); RTFREE(rt); } mss = min(mss, offer); @@ -3009,6 +3018,7 @@ struct ifqueue *ifq) #endif { + INIT_VNET_INET(curvnet); struct pf_rule *nr = NULL; struct pf_addr *saddr = pd->src, *daddr = pd->dst; struct tcphdr *th = pd->hdr.tcp; @@ -3024,7 +3034,7 @@ int rewrite = 0; struct pf_tag *pftag = NULL; int tag = -1; - u_int16_t mss = tcp_mssdflt; + u_int16_t mss = V_tcp_mssdflt; int asd = 0; if (pf_check_congestion(ifq)) { @@ -5700,6 +5710,7 @@ pf_route(struct mbuf **m, struct pf_rule *r, int dir, struct ifnet *oifp, struct pf_state *s) { + INIT_VNET_INET(curvnet); struct mbuf *m0, *m1; struct m_tag *mtag; struct route iproute; @@ -5767,7 +5778,7 @@ if (r->rt == PF_FASTROUTE) { rtalloc(ro); if (ro->ro_rt == 0) { - ipstat.ips_noroute++; + V_ipstat.ips_noroute++; goto bad; } @@ -5898,14 +5909,14 @@ if ((ifp->if_capabilities & IFCAP_CSUM_IPv4) && ifp->if_bridge == NULL) { m0->m_pkthdr.csum |= M_IPV4_CSUM_OUT; - ipstat.ips_outhwcsum++; + V_ipstat.ips_outhwcsum++; } else { ip->ip_sum = 0; ip->ip_sum = in_cksum(m0, ip->ip_hl << 2); } /* Update relevant hardware checksum stats for TCP/UDP */ if (m0->m_pkthdr.csum & M_TCPV4_CSUM_OUT) - tcpstat.tcps_outhwcsum++; + V_tcpstat.tcps_outhwcsum++; else if (m0->m_pkthdr.csum & M_UDPV4_CSUM_OUT) udpstat.udps_outhwcsum++; error = (*ifp->if_output)(ifp, m0, sintosa(dst), NULL); @@ -5917,7 +5928,7 @@ * Must be able to put at least 8 bytes per fragment. */ if (ip->ip_off & htons(IP_DF)) { - ipstat.ips_cantfrag++; + V_ipstat.ips_cantfrag++; if (r->rt != PF_DUPTO) { #ifdef __FreeBSD__ /* icmp_error() expects host byte ordering */ @@ -5974,7 +5985,7 @@ } if (error == 0) - ipstat.ips_fragmented++; + V_ipstat.ips_fragmented++; done: if (r->rt != PF_DUPTO) @@ -6181,6 +6192,8 @@ int pf_check_proto_cksum(struct mbuf *m, int off, int len, u_int8_t p, sa_family_t af) { + INIT_VNET_INET(curvnet); + INIT_VNET_INET6(curvnet); u_int16_t sum = 0; int hw_assist = 0; struct ip *ip; @@ -6259,17 +6272,17 @@ if (sum) { switch (p) { case IPPROTO_TCP: - tcpstat.tcps_rcvbadsum++; + V_tcpstat.tcps_rcvbadsum++; break; case IPPROTO_UDP: - udpstat.udps_badsum++; + V_udpstat.udps_badsum++; break; case IPPROTO_ICMP: - icmpstat.icps_checksum++; + V_icmpstat.icps_checksum++; break; #ifdef INET6 case IPPROTO_ICMPV6: - icmp6stat.icp6s_checksum++; + V_icmp6stat.icp6s_checksum++; break; #endif /* INET6 */ } @@ -6355,17 +6368,17 @@ m->m_pkthdr.csum |= flag_bad; switch (p) { case IPPROTO_TCP: - tcpstat.tcps_rcvbadsum++; + V_tcpstat.tcps_rcvbadsum++; break; case IPPROTO_UDP: - udpstat.udps_badsum++; + V_udpstat.udps_badsum++; break; case IPPROTO_ICMP: - icmpstat.icps_checksum++; + V_icmpstat.icps_checksum++; break; #ifdef INET6 case IPPROTO_ICMPV6: - icmp6stat.icp6s_checksum++; + V_icmp6stat.icp6s_checksum++; break; #endif /* INET6 */ } ==== //depot/projects/vimage/src/sys/contrib/pf/net/pf_if.c#2 (text+ko) ==== @@ -34,6 +34,7 @@ #if defined(__FreeBSD__) #include "opt_inet.h" #include "opt_inet6.h" +#include "opt_vimage.h" #endif #include @@ -50,7 +51,9 @@ #include #endif #include +#include +#include #include #include @@ -130,6 +133,7 @@ pfi_initialize(void) { #ifdef __FreeBSD__ + INIT_VNET_NET(curvnet); struct ifnet *ifp; #endif @@ -149,7 +153,7 @@ /* XXX_IMPORT */ PF_LOCK(); IFNET_RLOCK(); - TAILQ_FOREACH(ifp, &ifnet, if_link) { + TAILQ_FOREACH(ifp, &V_ifnet, if_link) { IFNET_RUNLOCK(); pfi_attach_ifnet(ifp); IFNET_RLOCK(); @@ -171,6 +175,7 @@ void pfi_cleanup(void) { + INIT_VNET_NET(curvnet); struct pfi_kif *p, key; struct ifnet *ifp; @@ -184,7 +189,7 @@ IFNET_RLOCK(); /* release PFI_IFLAG_INSTANCE */ - TAILQ_FOREACH(ifp, &ifnet, if_link) { + TAILQ_FOREACH(ifp, &V_ifnet, if_link) { strlcpy(key.pfik_name, ifp->if_xname, sizeof(key.pfik_name)); p = RB_FIND(pfi_ifhead, &pfi_ifs, &key); if (p != NULL) { ==== //depot/projects/vimage/src/sys/contrib/pf/net/pf_ioctl.c#3 (text+ko) ==== @@ -40,6 +40,7 @@ #ifdef __FreeBSD__ #include "opt_inet.h" #include "opt_inet6.h" +#include "opt_vimage.h" #endif #ifdef __FreeBSD__ @@ -84,11 +85,13 @@ #include #include #include +#include #else #include #include #endif +#include #include #include #include @@ -3438,6 +3441,7 @@ pf_check6_in(void *arg, struct mbuf **m, struct ifnet *ifp, int dir, struct inpcb *inp) { + INIT_VNET_NET(curvnet); /* * IPv6 is not affected by ip_len/ip_off byte order changes. */ @@ -3448,7 +3452,7 @@ * order to support scoped addresses. In order to support stateful * filtering we have change this to lo0 as it is the case in IPv4. */ - chk = pf_test6(PF_IN, (*m)->m_flags & M_LOOP ? &loif[0] : ifp, m, + chk = pf_test6(PF_IN, (*m)->m_flags & M_LOOP ? &V_loif[0] : ifp, m, NULL, inp); if (chk && *m) { m_freem(*m); ==== //depot/projects/vimage/src/sys/kern/kern_linker.c#5 (text+ko) ==== @@ -866,7 +866,7 @@ return (EPERM); #endif - CURVNETB_SET(td->td_vimage->v_vnetb); + CURVNET_SET(td->td_vimage->v_vnet); /* * If file does not contain a qualified name or any dot in it @@ -895,7 +895,7 @@ *fileid = lf->id; unlock: KLD_UNLOCK(); - CURVNETB_RESTORE(); + CURVNET_RESTORE(); return (error); } @@ -937,7 +937,7 @@ VNET_ASSERT(td->td_vimage == &vimage_0); /* XXX is this necessary at all? */ VNET_ASSERT(td == curthread); - CURVNETB_SET(td->td_vimage->v_vnetb); + CURVNET_SET(td->td_vimage->v_vnet); KLD_LOCK(); lf = linker_find_file_by_id(fileid); @@ -969,7 +969,7 @@ PMC_CALL_HOOK(td, PMC_FN_KLD_UNLOAD, (void *) &pkm); #endif KLD_UNLOCK(); - CURVNETB_RESTORE(); + CURVNET_RESTORE(); return (error); } @@ -1182,9 +1182,9 @@ } #ifdef VIMAGE if (lf == NULL) { - CURVNETB_SET(td->td_vimage->v_vnetb); + CURVNET_SET(td->td_vimage->v_vnet); error = vi_symlookup(&lookup, symstr); - CURVNETB_RESTORE(); + CURVNET_RESTORE(); if (error == 0) { error = copyout(&lookup, uap->data, sizeof(lookup)); ==== //depot/projects/vimage/src/sys/kern/kern_synch.c#6 (text+ko) ==== ==== //depot/projects/vimage/src/sys/kern/kern_sysctl.c#5 (text+ko) ==== @@ -1437,7 +1437,7 @@ req.lock = REQ_LOCKED; SYSCTL_LOCK(); - CURVNETB_SET(curthread->td_vimage->v_vnetb); + CURVNET_SET(curthread->td_vimage->v_vnet); VNET_ASSERT(td == curthread); do { @@ -1449,7 +1449,7 @@ if (req.lock == REQ_WIRED && req.validlen > 0) vsunlock(req.oldptr, req.validlen); - CURVNETB_RESTORE(); + CURVNET_RESTORE(); SYSCTL_UNLOCK(); if (error && error != ENOMEM) ==== //depot/projects/vimage/src/sys/kern/kern_uuid.c#4 (text+ko) ==== @@ -91,7 +91,7 @@ static void uuid_node(uint16_t *node) { - INIT_VNET_NET(curvnetb); + INIT_VNET_NET(curvnet); struct ifnet *ifp; struct ifaddr *ifa; struct sockaddr_dl *sdl; ==== //depot/projects/vimage/src/sys/kern/kern_vimage.c#16 (text+ko) ==== @@ -66,10 +66,10 @@ struct vimage vimage_0; struct vprocg vprocg_0; struct vcpu vcpu_0; -struct vnet_base vnetb_0; +struct vnet vnet_0; struct vimage_list_head vimage_head; -struct vnetb_list_head vnetb_head; +struct vnet_list_head vnet_head; struct vprocg_list_head vprocg_head; struct vcpu_list_head vcpu_head; @@ -98,9 +98,9 @@ &vnet_modules[modinfo->id], mod_le); if (modinfo->i_attach) { - VNETB_ITERLOOP_BEGIN_QUIET(); + VNET_ITERLOOP_BEGIN_QUIET(); modinfo->i_attach(); - VNETB_ITERLOOP_END(); + VNET_ITERLOOP_END(); } } @@ -110,9 +110,9 @@ VNET_ASSERT(vnet_modules[modinfo->id].modinfo == modinfo) if (modinfo->i_detach) { - VNETB_ITERLOOP_BEGIN_QUIET(); + VNET_ITERLOOP_BEGIN_QUIET(); modinfo->i_detach(); - VNETB_ITERLOOP_END(); + VNET_ITERLOOP_END(); } vnet_modules[modinfo->id].modinfo = NULL; @@ -120,22 +120,22 @@ &vnet_modules[modinfo->id], mod_le); } -struct vimage *vnetb2vimage(vnetb) - struct vnet_base *vnetb; +struct vimage *vnet2vimage(vnet) + struct vnet *vnet; { struct vimage *vip; LIST_FOREACH(vip, &vimage_head, vi_le) - if (vip->v_vnetb == vnetb) + if (vip->v_vnet == vnet) return(vip); - panic("vnetb2vimage"); /* must never happen */ + panic("vnet2vimage"); /* must never happen */ } -char *vnetb_name(vnetb) - struct vnet_base *vnetb; +char *vnet_name(vnet) + struct vnet *vnet; { - return(vnetb2vimage(vnetb)->vi_name); + return(vnet2vimage(vnet)->vi_name); } @@ -164,24 +164,24 @@ struct vimage *vip; { struct vimage *new_vip; - struct vnet_base *new_vnetb = NULL; + struct vnet *new_vnet = NULL; u_char eaddr[6]; if (vi_req == NULL || strcmp(vi_req->vi_name, "-") == 0) { if (vip == &vimage_0) return (ENXIO); - new_vnetb = vip->vi_parent->v_vnetb; + new_vnet = vip->vi_parent->v_vnet; } else LIST_FOREACH(new_vip, &vimage_head, vi_le) { if (!vi_child_of(vip, new_vip)) continue; if (strcmp(vi_req->vi_name, new_vip->vi_name) == 0) { - new_vnetb = new_vip->v_vnetb; + new_vnet = new_vip->v_vnet; break; } } - if (new_vnetb == NULL) + if (new_vnet == NULL) return (ENXIO); if (ifp == NULL) @@ -192,9 +192,9 @@ if (vi_req != NULL) { struct ifnet *t_ifp; - CURVNETB_SET_QUIET(new_vnetb); + CURVNET_SET_QUIET(new_vnet); t_ifp = ifunit(vi_req->vi_parent_name); - CURVNETB_RESTORE(); + CURVNET_RESTORE(); if (t_ifp != NULL) return (EEXIST); } @@ -207,10 +207,11 @@ * This is tricky. First we have to detach the interface, * and then reattach it to the target vnet. Before doing * that, we reassing the interface unit number to look nice - * in the target vnetb. + * in the target vnet. */ switch (ifp->if_type) { case IFT_ETHER: + case IFT_L2VLAN: bcopy(IF_LLADDR(ifp), eaddr, 6); ether_ifdetach(ifp); break; @@ -220,8 +221,8 @@ } ifp->if_bpf = NULL; - CURVNETB_SET_QUIET(new_vnetb); - INIT_VNET_NET(new_vnetb); + CURVNET_SET_QUIET(new_vnet); + INIT_VNET_NET(new_vnet); /* * Try to find an empty slot below if_index. If we fail, take * the next slot. @@ -244,6 +245,7 @@ switch (ifp->if_type) { case IFT_ETHER: + case IFT_L2VLAN: ether_ifattach(ifp, eaddr); break; default: @@ -256,7 +258,7 @@ sprintf(vi_req->vi_chroot, "%s%d", ifp->if_dname, ifp->if_dunit); - CURVNETB_RESTORE(); + CURVNET_RESTORE(); return (0); } @@ -318,8 +320,8 @@ sizeof (vi_req->vi_parent_name)); else vi_req->vi_parent_name[0] = 0; - vi_req->vi_if_count = vip_r->v_vnetb->ifccnt; - vi_req->vi_sock_count = vip_r->v_vnetb->sockcnt; + vi_req->vi_if_count = vip_r->v_vnet->ifccnt; + vi_req->vi_sock_count = vip_r->v_vnet->sockcnt; break; case SIOCSPVIMAGE: @@ -370,7 +372,7 @@ mapentry->name != NULL; mapentry++) { if (strcmp(symstr, mapentry->name) == 0) { lookup->symvalue = - (int) curvnetb->mod_data[i]; + (int) curvnet->mod_data[i]; lookup->symvalue += mapentry->offset; lookup->symsize = mapentry->size; return 0; @@ -388,7 +390,7 @@ int maxsock, tsc_hashs, tsc_buckl; { struct vimage *vip; - struct vnet_base *vnetb; + struct vnet *vnet; struct vprocg *vprocg; struct vcpu *vcpu; struct domain *dp; @@ -408,12 +410,12 @@ bzero(vip, sizeof(struct vimage)); vip->vi_id = last_vi_id++; - vnetb = malloc(sizeof(struct vnet_base), M_VNET, M_NOWAIT); - if (vnetb == NULL) - panic("vi_alloc: malloc failed for vnetb \"%s\"\n", name); - bzero(vnetb, sizeof(struct vnet_base)); - vip->v_vnetb = vnetb; - vnetb->vnet_magic_n = VNET_MAGIC_N; + vnet = malloc(sizeof(struct vnet), M_VNET, M_NOWAIT); + if (vnet == NULL) + panic("vi_alloc: malloc failed for vnet \"%s\"\n", name); + bzero(vnet, sizeof(struct vnet)); + vip->v_vnet = vnet; + vnet->vnet_magic_n = VNET_MAGIC_N; vprocg = malloc(sizeof(struct vprocg), M_VPROCG, M_NOWAIT); if (vprocg == NULL) @@ -430,7 +432,7 @@ /* Some initialization stuff... */ sprintf(vip->vi_name, "%s", name); - CURVNETB_SET_QUIET(vnetb); + CURVNET_SET_QUIET(vnet); /* * Initialize modules with ORDER_1ST flag set @@ -471,10 +473,10 @@ modlnk_i->modinfo->i_attach(); } - CURVNETB_RESTORE(); + CURVNET_RESTORE(); LIST_INSERT_HEAD(&vimage_head, vip, vi_le); - LIST_INSERT_HEAD(&vnetb_head, vnetb, vnetb_le); + LIST_INSERT_HEAD(&vnet_head, vnet, vnet_le); LIST_INSERT_HEAD(&vprocg_head, vprocg, vprocg_le); LIST_INSERT_HEAD(&vcpu_head, vcpu, vcpu_le); @@ -484,22 +486,22 @@ /* - * Destroy a vnetb - unlink all linked lists, free all the memory, stop all + * Destroy a vnet - unlink all linked lists, free all the memory, stop all * the timers... How can one ever be sure to have done *all* the necessary * steps? */ static void vi_destroy(struct vimage *vip) { - struct vnet_base *vnetb = vip->v_vnetb; + struct vnet *vnet = vip->v_vnet; struct vprocg *vprocg = vip->v_procg; struct vcpu *vcpu = vip->v_cpu; struct ifnet *ifp; - CURVNETB_SET_QUIET(vnetb); - INIT_VNET_NET(vnetb); + CURVNET_SET_QUIET(vnet); + INIT_VNET_NET(vnet); - /* return all interfaces to the parent vnetb */ + /* return all interfaces to the parent vnet */ while ((ifp = TAILQ_FIRST(&V_ifnet)) != NULL) { if (ifp->if_flags & IFF_LOOPBACK) { bpfdetach(ifp); @@ -516,18 +518,18 @@ for (dp = domains; dp; dp = dp->dom_next) for (pr = dp->dom_protoswNPROTOSW; pr > dp->dom_protosw;) if ((--pr)->pr_destroy) - (*pr->pr_destroy)(vnetb); + (*pr->pr_destroy)(vnet); - free((caddr_t)vnetb->ifnet_addrs, M_IFADDR); - free((caddr_t)vnetb->ifindex2ifnet, M_IFADDR); + free((caddr_t)vnet->ifnet_addrs, M_IFADDR); + free((caddr_t)vnet->ifindex2ifnet, M_IFADDR); #endif - CURVNETB_RESTORE(); + CURVNET_RESTORE(); - /* hopefully, we are finally OK to free the vnetb container itself! */ - LIST_REMOVE(vnetb, vnetb_le); - vnetb->vnet_magic_n = -1; - free(vnetb, M_VNET); + /* hopefully, we are finally OK to free the vnet container itself! */ + LIST_REMOVE(vnet, vnet_le); + vnet->vnet_magic_n = -1; + free(vnet, M_VNET); LIST_REMOVE(vprocg, vprocg_le); free(vprocg, M_VPROCG); @@ -544,34 +546,34 @@ vi_init(void *unused) { LIST_INIT(&vimage_head); - LIST_INIT(&vnetb_head); + LIST_INIT(&vnet_head); LIST_INIT(&vprocg_head); LIST_INIT(&vcpu_head); LIST_INSERT_HEAD(&vimage_head, &vimage_0, vi_le); - LIST_INSERT_HEAD(&vnetb_head, &vnetb_0, vnetb_le); + LIST_INSERT_HEAD(&vnet_head, &vnet_0, vnet_le); LIST_INSERT_HEAD(&vprocg_head, &vprocg_0, vprocg_le); LIST_INSERT_HEAD(&vcpu_head, &vcpu_0, vcpu_le); sprintf(vimage_0.vi_name, "default"); - vimage_0.v_vnetb = &vnetb_0; + vimage_0.v_vnet = &vnet_0; vimage_0.v_procg = &vprocg_0; vimage_0.v_cpu = &vcpu_0; - vnetb_0.vnet_magic_n = VNET_MAGIC_N; + vnet_0.vnet_magic_n = VNET_MAGIC_N; TAILQ_INIT(&vnet_modlink_head); /* - * We MUST clear curvnetb in vi_init_done before going SMP. + * We MUST clear curvnet in vi_init_done before going SMP. */ - curvnetb = &vnetb_0; + curvnet = &vnet_0; } static void vi_init_done(void *unused) { - curvnetb = NULL; + curvnet = NULL; } SYSINIT(vimage, SI_SUB_VIMAGE, SI_ORDER_FIRST, vi_init, NULL) ==== //depot/projects/vimage/src/sys/kern/sys_socket.c#5 (text+ko) ==== @@ -88,9 +88,9 @@ return (error); } #endif - CURVNETB_SET(so->so_vnetb); + CURVNET_SET(so->so_vnet); error = soreceive(so, 0, uio, 0, 0, 0); - CURVNETB_RESTORE(); + CURVNET_RESTORE(); NET_UNLOCK_GIANT(); return (error); } @@ -131,7 +131,7 @@ int error = 0; NET_LOCK_GIANT(); - CURVNETB_SET(so->so_vnetb); + CURVNET_SET(so->so_vnet); switch (cmd) { case FIONBIO: @@ -213,7 +213,7 @@ (so, cmd, data, 0, td)); break; } - CURVNETB_RESTORE(); + CURVNET_RESTORE(); NET_UNLOCK_GIANT(); return(error); } ==== //depot/projects/vimage/src/sys/kern/tty.c#5 (text+ko) ==== @@ -1141,7 +1141,7 @@ if (t == tp->t_line) return (0); s = spltty(); - CURVNETB_SET(curthread->td_vimage->v_vnetb); /* XXX */ + CURVNET_SET(curthread->td_vimage->v_vnet); /* XXX */ ttyld_close(tp, flag); tp->t_line = t; /* XXX: we should use the correct cdev here */ @@ -1157,7 +1157,7 @@ tp->t_line = TTYDISC; (void)ttyld_open(tp, tp->t_dev); } - CURVNETB_RESTORE(); + CURVNET_RESTORE(); splx(s); return (error); break; @@ -3131,9 +3131,9 @@ goto out; goto open_top; } - CURVNETB_SET(curthread->td_vimage->v_vnetb); /* XXX */ + CURVNET_SET(curthread->td_vimage->v_vnet); /* XXX */ error = ttyld_open(tp, dev); - CURVNETB_RESTORE(); + CURVNET_RESTORE(); ttyldoptim(tp); if (tp->t_state & TS_ISOPEN && ISCALLOUT(dev)) tp->t_actout = TRUE; @@ -3150,9 +3150,9 @@ struct tty *tp; tp = dev->si_tty; - CURVNETB_SET(curthread->td_vimage->v_vnetb); /* XXX */ + CURVNET_SET(curthread->td_vimage->v_vnet); /* XXX */ ttyld_close(tp, flag); - CURVNETB_RESTORE(); + CURVNET_RESTORE(); ttyldoptim(tp); tt_close(tp); tp->t_do_timestamp = 0; ==== //depot/projects/vimage/src/sys/kern/uipc_socket.c#8 (text+ko) ==== @@ -262,7 +262,7 @@ * soalloc() returns a socket with a ref count of 0. */ static struct socket * -soalloc(struct vnet_base *vnetb) +soalloc(struct vnet *vnet) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Apr 16 11:41:01 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 EA8B716A404; Mon, 16 Apr 2007 11:41:00 +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 A5FFD16A400 for ; Mon, 16 Apr 2007 11:41:00 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 9584713C468 for ; Mon, 16 Apr 2007 11:41:00 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3GBf0KX053706 for ; Mon, 16 Apr 2007 11:41:00 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3GBf0X2053695 for perforce@freebsd.org; Mon, 16 Apr 2007 11:41:00 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 16 Apr 2007 11:41:00 GMT Message-Id: <200704161141.l3GBf0X2053695@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 118228 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: Mon, 16 Apr 2007 11:41:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=118228 Change 118228 by rwatson@rwatson_cinnamon on 2007/04/16 11:39:59 When an invalid address type is passed to functions building tokens, panic. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#32 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#32 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#31 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#32 $ * $FreeBSD: src/sys/security/audit/audit_bsm_token.c,v 1.9 2006/12/28 22:18:43 rwatson Exp $ */ @@ -710,10 +710,9 @@ GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 7 * sizeof(u_int32_t) + sizeof(u_int64_t) + 5 * sizeof(u_int32_t)); - else { - errno = EINVAL; - return (NULL); - } + else + panic("au_to_process64_ex: invalidate at_type (%d)", + tid->at_type); ADD_U_CHAR(dptr, AUT_PROCESS64_EX); ADD_U_INT32(dptr, auid); @@ -1094,10 +1093,9 @@ GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 7 * sizeof(u_int32_t) + sizeof(u_int64_t) + 5 * sizeof(u_int32_t)); - else { - errno = EINVAL; - return (NULL); - } + else + panic("au_to_subject64_ex: invalid at_type (%d)", + tid->at_type); ADD_U_CHAR(dptr, AUT_SUBJECT64_EX); ADD_U_INT32(dptr, auid); From owner-p4-projects@FreeBSD.ORG Mon Apr 16 11:52:15 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 8B19516A406; Mon, 16 Apr 2007 11:52:15 +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 6221216A402 for ; Mon, 16 Apr 2007 11:52:15 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 466BB13C459 for ; Mon, 16 Apr 2007 11:52:15 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3GBqFBT055871 for ; Mon, 16 Apr 2007 11:52:15 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3GBqFUA055868 for perforce@freebsd.org; Mon, 16 Apr 2007 11:52:15 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 16 Apr 2007 11:52:15 GMT Message-Id: <200704161152.l3GBqFUA055868@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 118230 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: Mon, 16 Apr 2007 11:52:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=118230 Change 118230 by rwatson@rwatson_cinnamon on 2007/04/16 11:51:19 Add man page references to au_to_zonename(3). Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/au_token.3#12 edit .. //depot/projects/trustedbsd/openbsm/libbsm/libbsm.3#12 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/au_token.3#12 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_token.3#11 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_token.3#12 $ .\" .Dd April 19, 2005 .Dt AU_TOKEN 3 @@ -72,7 +72,8 @@ .Nm au_to_header , .Nm au_to_header32 , .Nm au_to_header64 , -.Nm au_to_trailer +.Nm au_to_trailer , +.Nm au_to_zonename .Nd "routines for generating BSM audit tokens" .Sh LIBRARY .Lb libbsm @@ -196,6 +197,8 @@ .Fn au_to_header64 "int rec_size" "au_event_t e_type" "au_emod_t e_mod" .Ft "token_t *" .Fn au_to_trailer "int rec_size" +.Ft "token_t *" +.Fn au_to_zonename "char *zonename" .Sh DESCRIPTION These interfaces support the allocation of BSM audit tokens, represented by .Vt token_t , ==== //depot/projects/trustedbsd/openbsm/libbsm/libbsm.3#12 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/libbsm.3#11 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/libbsm.3#12 $ .\" .Dd April 19, 2005 .Dt LIBBSM 3 @@ -177,7 +177,8 @@ .Xr au_to_subject32_ex 3 , .Xr au_to_subject64_ex 3 , .Xr au_to_text 3 , -.Xr au_to_trailer 3 . +.Xr au_to_trailer 3 , +.Xr au_to_zonename 3 . .Ss Audit User Interfaces Audit user interfaces support the look up of information from the .Xr audit_user 5 From owner-p4-projects@FreeBSD.ORG Mon Apr 16 11:55:19 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 B166D16A409; Mon, 16 Apr 2007 11:55:19 +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 827CD16A400 for ; Mon, 16 Apr 2007 11:55:19 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 72AE313C4AE for ; Mon, 16 Apr 2007 11:55:19 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3GBtJ91056591 for ; Mon, 16 Apr 2007 11:55:19 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3GBtJ8m056588 for perforce@freebsd.org; Mon, 16 Apr 2007 11:55:19 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 16 Apr 2007 11:55:19 GMT Message-Id: <200704161155.l3GBtJ8m056588@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 118231 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: Mon, 16 Apr 2007 11:55:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=118231 Change 118231 by rwatson@rwatson_zoo on 2007/04/16 11:54:49 Integrate man page tweaks from OpenBSM branch to audit3. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_token.3#10 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/libbsm.3#12 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_token.3#10 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_token.3#9 $ +.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_token.3#10 $ .\" .Dd April 19, 2005 .Dt AU_TOKEN 3 @@ -72,7 +72,8 @@ .Nm au_to_header , .Nm au_to_header32 , .Nm au_to_header64 , -.Nm au_to_trailer +.Nm au_to_trailer , +.Nm au_to_zonename .Nd "routines for generating BSM audit tokens" .Sh LIBRARY .Lb libbsm @@ -196,6 +197,8 @@ .Fn au_to_header64 "int rec_size" "au_event_t e_type" "au_emod_t e_mod" .Ft "token_t *" .Fn au_to_trailer "int rec_size" +.Ft "token_t *" +.Fn au_to_zonename "char *zonename" .Sh DESCRIPTION These interfaces support the allocation of BSM audit tokens, represented by .Vt token_t , ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/libbsm.3#12 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/libbsm.3#11 $ +.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/libbsm.3#12 $ .\" .Dd April 19, 2005 .Dt LIBBSM 3 @@ -177,7 +177,8 @@ .Xr au_to_subject32_ex 3 , .Xr au_to_subject64_ex 3 , .Xr au_to_text 3 , -.Xr au_to_trailer 3 . +.Xr au_to_trailer 3 , +.Xr au_to_zonename 3 . .Ss Audit User Interfaces Audit user interfaces support the look up of information from the .Xr audit_user 5 From owner-p4-projects@FreeBSD.ORG Mon Apr 16 11:56:21 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 9EC8D16A407; Mon, 16 Apr 2007 11:56:21 +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 6525C16A403 for ; Mon, 16 Apr 2007 11:56:21 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5523B13C45B for ; Mon, 16 Apr 2007 11:56:21 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3GBuLrO056648 for ; Mon, 16 Apr 2007 11:56:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3GBuLmR056645 for perforce@freebsd.org; Mon, 16 Apr 2007 11:56:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 16 Apr 2007 11:56:21 GMT Message-Id: <200704161156.l3GBuLmR056645@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 118232 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: Mon, 16 Apr 2007 11:56:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=118232 Change 118232 by rwatson@rwatson_zoo on 2007/04/16 11:55:29 Hook up au_to_zonename(3) man page symlink. Affected files ... .. //depot/projects/trustedbsd/audit3/lib/libbsm/Makefile#21 edit Differences ... ==== //depot/projects/trustedbsd/audit3/lib/libbsm/Makefile#21 (text+ko) ==== @@ -143,6 +143,7 @@ au_token.3 au_to_header32.3 \ au_token.3 au_to_header64.3 \ au_token.3 au_to_trailer.3 \ + au_token.3 au_to_zonename.3 \ au_user.3 setauuser.3 \ au_user.3 endauuser.3 \ au_user.3 getauuserent.3 \ From owner-p4-projects@FreeBSD.ORG Mon Apr 16 11:57:23 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 4960416A46E; Mon, 16 Apr 2007 11:57:23 +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 1CB0F16A412 for ; Mon, 16 Apr 2007 11:57:23 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 0BA9A13C46C for ; Mon, 16 Apr 2007 11:57:23 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3GBvMYG056822 for ; Mon, 16 Apr 2007 11:57:22 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3GBvMxI056819 for perforce@freebsd.org; Mon, 16 Apr 2007 11:57:22 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 16 Apr 2007 11:57:22 GMT Message-Id: <200704161157.l3GBvMxI056819@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 118233 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: Mon, 16 Apr 2007 11:57:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=118233 Change 118233 by rwatson@rwatson_cinnamon on 2007/04/16 11:56:32 Update copyrights. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/au_token.3#13 edit .. //depot/projects/trustedbsd/openbsm/libbsm/libbsm.3#13 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/au_token.3#13 (text+ko) ==== @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2005 Robert N. M. Watson +.\" Copyright (c) 2005-2007 Robert N. M. Watson .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_token.3#12 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_token.3#13 $ .\" .Dd April 19, 2005 .Dt AU_TOKEN 3 ==== //depot/projects/trustedbsd/openbsm/libbsm/libbsm.3#13 (text+ko) ==== @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2005-2006 Robert N. M. Watson +.\" Copyright (c) 2005-2007 Robert N. M. Watson .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/libbsm.3#12 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/libbsm.3#13 $ .\" .Dd April 19, 2005 .Dt LIBBSM 3 From owner-p4-projects@FreeBSD.ORG Mon Apr 16 11:57:24 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 C63AA16A5FD; Mon, 16 Apr 2007 11:57:23 +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 8161616A5B6 for ; Mon, 16 Apr 2007 11:57:23 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6271913C448 for ; Mon, 16 Apr 2007 11:57:23 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3GBvNkO056829 for ; Mon, 16 Apr 2007 11:57:23 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3GBvNF4056825 for perforce@freebsd.org; Mon, 16 Apr 2007 11:57:23 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 16 Apr 2007 11:57:23 GMT Message-Id: <200704161157.l3GBvNF4056825@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 118234 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: Mon, 16 Apr 2007 11:57:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=118234 Change 118234 by rwatson@rwatson_zoo on 2007/04/16 11:57:09 Integrate man page copyright changes from OpenBSM to audit3. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_token.3#11 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/libbsm.3#13 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_token.3#11 (text+ko) ==== @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2005 Robert N. M. Watson +.\" Copyright (c) 2005-2007 Robert N. M. Watson .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_token.3#10 $ +.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_token.3#11 $ .\" .Dd April 19, 2005 .Dt AU_TOKEN 3 ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/libbsm.3#13 (text+ko) ==== @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2005-2006 Robert N. M. Watson +.\" Copyright (c) 2005-2007 Robert N. M. Watson .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/libbsm.3#12 $ +.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/libbsm.3#13 $ .\" .Dd April 19, 2005 .Dt LIBBSM 3 From owner-p4-projects@FreeBSD.ORG Mon Apr 16 12:11:42 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 52F4E16A406; Mon, 16 Apr 2007 12:11:42 +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 0F31516A404 for ; Mon, 16 Apr 2007 12:11:42 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id F306313C45D for ; Mon, 16 Apr 2007 12:11:41 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3GCBfRB060848 for ; Mon, 16 Apr 2007 12:11:41 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3GCBfY1060843 for perforce@freebsd.org; Mon, 16 Apr 2007 12:11:41 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 16 Apr 2007 12:11:41 GMT Message-Id: <200704161211.l3GCBfY1060843@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 118236 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: Mon, 16 Apr 2007 12:11:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=118236 Change 118236 by rwatson@rwatson_cinnamon on 2007/04/16 12:11:23 Update the OpenBSM README with respect to current programs, directories, and portability. Introduce more consistent line-wrapping (77 chars/line). Affected files ... .. //depot/projects/trustedbsd/openbsm/README#23 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/README#23 (text+ko) ==== @@ -3,11 +3,13 @@ Introduction OpenBSM provides an open source implementation of Sun's BSM Audit API. -Originally created under contract to Apple Computer by McAfee Research, -this implementation is now maintained by volunteers and the generous -contribution of several organizations. Coupled with a kernel audit -implementation, OpenBSM can be used to maintain system audit streams, and -is a foundation for an Audit-enabled system. +Originally created under contract to Apple Computer by McAfee Research, this +implementation is now maintained by volunteers and the generous contribution +of several organizations. Coupled with a kernel audit implementation, +OpenBSM can be used to maintain system audit streams, and is a foundation for +an Audit-enabled system. Portions of OpenBSM, including include files and +token-building routines, are reusable in a kernel audit implementation, and +may be found in the FreeBSD and Mac OS X kernels. Contents @@ -15,13 +17,22 @@ bin/ Audit-related command line tools bsm/ System include files for BSM + compat/ Compatibility code to build on various OS's etc/ Sample /etc/security configuration files libbsm/ Implementation of BSM library interfaces and man pages man/ System call and configuration file man pages + modules/ Directory for auditfilterd module source + test/ Test token sets and geneneration program + tools/ Tool directory, including audump to dump databases + +The following programs are included with OpenBSM: -OpenBSM currently builds on FreeBSD and Darwin. With Makefile adjustment -and minor tweaks, it should build without problems on a broad range of -POSIX-like systems. + audit Command line audit control tool + auditd Audit management daemon + auditfilterd Experimental event monitoring framework + auditreduce Audit trail reduction tool + audump Debugging tool to parse and print audit databases + praudit Tool to print audit trails Building @@ -29,7 +40,7 @@ for building on a range of operating systems, including FreeBSD, Mac OS X, and Linux. Depending on the availability of audit facilities in the underlying operating system, some components that depend on kernel audit -support are built conditionally. Typically, build will be performed using +support are built conditionally. Typically, build will be performed using: ./configure make @@ -51,13 +62,12 @@ You will need to manually propagate openbsm/etc/* into /etc on your system; this is not done automatically so as to avoid disrupting the current -configuration. Currently, the locations of these files is not -configurable. +configuration. Currently, the locations of these files is not configurable. Credits -The following organizations and individuals have contributed substantially -to the development of OpenBSM: +The following organizations and individuals have contributed substantially to +the development of OpenBSM: Apple Computer, Inc. McAfee Research, McAfee, Inc. @@ -100,4 +110,4 @@ http://www.TrustedBSD.org/ -$P4: //depot/projects/trustedbsd/openbsm/README#22 $ +$P4: //depot/projects/trustedbsd/openbsm/README#23 $ From owner-p4-projects@FreeBSD.ORG Mon Apr 16 12:34:10 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 4167616A40A; Mon, 16 Apr 2007 12:34:10 +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 07BF516A408 for ; Mon, 16 Apr 2007 12:34:10 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id EBC8C13C45A for ; Mon, 16 Apr 2007 12:34:09 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3GCY928066283 for ; Mon, 16 Apr 2007 12:34:09 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3GCY96g066279 for perforce@freebsd.org; Mon, 16 Apr 2007 12:34:09 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 16 Apr 2007 12:34:09 GMT Message-Id: <200704161234.l3GCY96g066279@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 118238 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: Mon, 16 Apr 2007 12:34:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=118238 Change 118238 by rwatson@rwatson_zoo on 2007/04/16 12:33:32 Minor white space tweak. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#48 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#48 (text+ko) ==== @@ -32,7 +32,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#47 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#48 $ */ #include @@ -3871,7 +3871,6 @@ * size 2 bytes; * zonename size bytes; */ - static int fetch_zonename_tok(tokenstr_t *tok, char *buf, int len) { From owner-p4-projects@FreeBSD.ORG Mon Apr 16 12:37:14 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 736BB16A407; Mon, 16 Apr 2007 12:37:14 +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 4253016A406 for ; Mon, 16 Apr 2007 12:37:14 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 31F4A13C46C for ; Mon, 16 Apr 2007 12:37:14 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3GCbExd066513 for ; Mon, 16 Apr 2007 12:37:14 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3GCbD4K066510 for perforce@freebsd.org; Mon, 16 Apr 2007 12:37:13 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 16 Apr 2007 12:37:13 GMT Message-Id: <200704161237.l3GCbD4K066510@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 118239 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: Mon, 16 Apr 2007 12:37:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=118239 Change 118239 by rwatson@rwatson_zoo on 2007/04/16 12:36:14 Generate BSM test files for zonename tokens. Affected files ... .. //depot/projects/trustedbsd/openbsm/test/bsm/generate.c#9 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/test/bsm/generate.c#9 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2006 Robert N. M. Watson + * Copyright (c) 2006-2007 Robert N. M. Watson * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/test/bsm/generate.c#8 $ + * $P4: //depot/projects/trustedbsd/openbsm/test/bsm/generate.c#9 $ */ /* @@ -889,6 +889,30 @@ } +static char *zonename_sample = "testzone"; + +static void +generate_zonename_token(const char *directory, const char *token_filename) +{ + token_t *zonename_token; + + zonename_token = au_to_zonename(zonename_sample); + if (zonename_token == NULL) + err(EX_UNAVAILABLE, "au_to_zonename"); + write_token(directory, token_filename, zonename_token); +} + +static void +generate_zonename_record(const char *directory, const char *record_filename) +{ + token_t *zonename_token; + + zonename_token = au_to_zonename(zonename_sample); + if (zonename_token == NULL) + err(EX_UNAVAILABLE, "au_to_zonename"); + write_record(directory, record_filename, zonename_token, AUE_NULL); +} + int main(int argc, char *argv[]) { @@ -955,6 +979,7 @@ generate_ipc_perm_token(directory, "ipc_perm_token"); generate_groups_token(directory, "groups_token"); generate_attr32_token(directory, "attr32_token"); + generate_zonename_token(directory, "zonename_token"); } if (do_records) { @@ -989,6 +1014,7 @@ generate_ipc_perm_record(directory, "ipc_perm_record"); generate_groups_record(directory, "groups_record"); generate_attr32_record(directory, "attr32_record"); + generate_zonename_record(directory, "zonename_record"); } return (0); From owner-p4-projects@FreeBSD.ORG Mon Apr 16 12:41:21 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 015BE16A409; Mon, 16 Apr 2007 12:41:21 +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 9DDDB16A403 for ; Mon, 16 Apr 2007 12:41:20 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8CFB613C484 for ; Mon, 16 Apr 2007 12:41:20 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3GCfKKm067279 for ; Mon, 16 Apr 2007 12:41:20 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3GCfKu6067276 for perforce@freebsd.org; Mon, 16 Apr 2007 12:41:20 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 16 Apr 2007 12:41:20 GMT Message-Id: <200704161241.l3GCfKu6067276@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 118241 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: Mon, 16 Apr 2007 12:41:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=118241 Change 118241 by rwatson@rwatson_zoo on 2007/04/16 12:40:55 Regenerate sample tokens/records, including new zonename tokens. Affected files ... .. //depot/projects/trustedbsd/openbsm/test/reference/arg32_record#2 edit .. //depot/projects/trustedbsd/openbsm/test/reference/arg32_token#2 edit .. //depot/projects/trustedbsd/openbsm/test/reference/data_record#2 edit .. //depot/projects/trustedbsd/openbsm/test/reference/data_token#2 edit .. //depot/projects/trustedbsd/openbsm/test/reference/file_record#2 edit .. //depot/projects/trustedbsd/openbsm/test/reference/file_token#2 edit .. //depot/projects/trustedbsd/openbsm/test/reference/header32_token#2 edit .. //depot/projects/trustedbsd/openbsm/test/reference/in_addr_record#2 edit .. //depot/projects/trustedbsd/openbsm/test/reference/in_addr_token#2 edit .. //depot/projects/trustedbsd/openbsm/test/reference/ip_record#2 edit .. //depot/projects/trustedbsd/openbsm/test/reference/ip_token#2 edit .. //depot/projects/trustedbsd/openbsm/test/reference/ipc_record#2 edit .. //depot/projects/trustedbsd/openbsm/test/reference/ipc_token#2 edit .. //depot/projects/trustedbsd/openbsm/test/reference/iport_record#2 edit .. //depot/projects/trustedbsd/openbsm/test/reference/iport_token#2 edit .. //depot/projects/trustedbsd/openbsm/test/reference/opaque_record#2 edit .. //depot/projects/trustedbsd/openbsm/test/reference/opaque_token#2 edit .. //depot/projects/trustedbsd/openbsm/test/reference/path_record#2 edit .. //depot/projects/trustedbsd/openbsm/test/reference/path_token#2 edit .. //depot/projects/trustedbsd/openbsm/test/reference/process32_record#2 edit .. //depot/projects/trustedbsd/openbsm/test/reference/process32_token#2 edit .. //depot/projects/trustedbsd/openbsm/test/reference/process32ex_record-IPv4#2 edit .. //depot/projects/trustedbsd/openbsm/test/reference/process32ex_record-IPv6#2 edit .. //depot/projects/trustedbsd/openbsm/test/reference/process32ex_token-IPv4#2 edit .. //depot/projects/trustedbsd/openbsm/test/reference/process32ex_token-IPv6#2 edit .. //depot/projects/trustedbsd/openbsm/test/reference/process64_record#2 edit .. //depot/projects/trustedbsd/openbsm/test/reference/process64_token#2 edit .. //depot/projects/trustedbsd/openbsm/test/reference/process64ex_record-IPv4#2 edit .. //depot/projects/trustedbsd/openbsm/test/reference/process64ex_record-IPv6#2 edit .. //depot/projects/trustedbsd/openbsm/test/reference/process64ex_token-IPv4#2 edit .. //depot/projects/trustedbsd/openbsm/test/reference/process64ex_token-IPv6#2 edit .. //depot/projects/trustedbsd/openbsm/test/reference/return32_record#2 edit .. //depot/projects/trustedbsd/openbsm/test/reference/return32_token#2 edit .. //depot/projects/trustedbsd/openbsm/test/reference/seq_record#2 edit .. //depot/projects/trustedbsd/openbsm/test/reference/seq_token#2 edit .. //depot/projects/trustedbsd/openbsm/test/reference/subject32_record#2 edit .. //depot/projects/trustedbsd/openbsm/test/reference/subject32_token#2 edit .. //depot/projects/trustedbsd/openbsm/test/reference/subject32ex_record#2 edit .. //depot/projects/trustedbsd/openbsm/test/reference/subject32ex_token-IPv4#2 edit .. //depot/projects/trustedbsd/openbsm/test/reference/subject32ex_token-IPv6#2 edit .. //depot/projects/trustedbsd/openbsm/test/reference/text_record#2 edit .. //depot/projects/trustedbsd/openbsm/test/reference/text_token#2 edit .. //depot/projects/trustedbsd/openbsm/test/reference/trailer_token#2 edit .. //depot/projects/trustedbsd/openbsm/test/reference/zonename_record#1 add .. //depot/projects/trustedbsd/openbsm/test/reference/zonename_token#1 add Differences ... ==== //depot/projects/trustedbsd/openbsm/test/reference/arg32_record#2 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/arg32_token#2 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/data_record#2 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/data_token#2 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/file_record#2 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/file_token#2 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/header32_token#2 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/in_addr_record#2 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/in_addr_token#2 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/ip_record#2 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/ip_token#2 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/ipc_record#2 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/ipc_token#2 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/iport_record#2 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/iport_token#2 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/opaque_record#2 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/opaque_token#2 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/path_record#2 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/path_token#2 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/process32_record#2 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/process32_token#2 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/process32ex_record-IPv4#2 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/process32ex_record-IPv6#2 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/process32ex_token-IPv4#2 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/process32ex_token-IPv6#2 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/process64_record#2 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/process64_token#2 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/process64ex_record-IPv4#2 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/process64ex_record-IPv6#2 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/process64ex_token-IPv4#2 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/process64ex_token-IPv6#2 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/return32_record#2 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/return32_token#2 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/seq_record#2 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/seq_token#2 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/subject32_record#2 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/subject32_token#2 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/subject32ex_record#2 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/subject32ex_token-IPv4#2 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/subject32ex_token-IPv6#2 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/text_record#2 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/text_token#2 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/trailer_token#2 (binary) ==== From owner-p4-projects@FreeBSD.ORG Mon Apr 16 12:59:43 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 A988516A406; Mon, 16 Apr 2007 12:59:43 +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 684A316A403 for ; Mon, 16 Apr 2007 12:59:43 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 4D1F113C4BC for ; Mon, 16 Apr 2007 12:59:43 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3GCxhqS078203 for ; Mon, 16 Apr 2007 12:59:43 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3GCxgWe078197 for perforce@freebsd.org; Mon, 16 Apr 2007 12:59:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 16 Apr 2007 12:59:42 GMT Message-Id: <200704161259.l3GCxgWe078197@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 118242 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: Mon, 16 Apr 2007 12:59:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=118242 Change 118242 by rwatson@rwatson_cinnamon on 2007/04/16 12:59:02 Integrate more OpenBSM updates into audit3 branch. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/README#18 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#22 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/bsm/generate.c#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/arg32_record#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/arg32_token#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/data_record#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/data_token#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/file_record#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/file_token#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/header32_token#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/in_addr_record#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/in_addr_token#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/ip_record#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/ip_token#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/ipc_record#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/ipc_token#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/iport_record#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/iport_token#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/opaque_record#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/opaque_token#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/path_record#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/path_token#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/process32_record#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/process32_token#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/process32ex_record-IPv4#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/process32ex_record-IPv6#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/process32ex_token-IPv4#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/process32ex_token-IPv6#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/process64_record#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/process64_token#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/process64ex_record-IPv4#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/process64ex_record-IPv6#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/process64ex_token-IPv4#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/process64ex_token-IPv6#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/return32_record#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/return32_token#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/seq_record#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/seq_token#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/subject32_record#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/subject32_token#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/subject32ex_record#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/subject32ex_token-IPv4#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/subject32ex_token-IPv6#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/text_record#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/text_token#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/trailer_token#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/zonename_record#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/zonename_token#1 branch .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_syscalls.c#32 edit Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/README#18 (text+ko) ==== @@ -3,11 +3,13 @@ Introduction OpenBSM provides an open source implementation of Sun's BSM Audit API. -Originally created under contract to Apple Computer by McAfee Research, -this implementation is now maintained by volunteers and the generous -contribution of several organizations. Coupled with a kernel audit -implementation, OpenBSM can be used to maintain system audit streams, and -is a foundation for an Audit-enabled system. +Originally created under contract to Apple Computer by McAfee Research, this +implementation is now maintained by volunteers and the generous contribution +of several organizations. Coupled with a kernel audit implementation, +OpenBSM can be used to maintain system audit streams, and is a foundation for +an Audit-enabled system. Portions of OpenBSM, including include files and +token-building routines, are reusable in a kernel audit implementation, and +may be found in the FreeBSD and Mac OS X kernels. Contents @@ -15,13 +17,22 @@ bin/ Audit-related command line tools bsm/ System include files for BSM + compat/ Compatibility code to build on various OS's etc/ Sample /etc/security configuration files libbsm/ Implementation of BSM library interfaces and man pages man/ System call and configuration file man pages + modules/ Directory for auditfilterd module source + test/ Test token sets and geneneration program + tools/ Tool directory, including audump to dump databases + +The following programs are included with OpenBSM: -OpenBSM currently builds on FreeBSD and Darwin. With Makefile adjustment -and minor tweaks, it should build without problems on a broad range of -POSIX-like systems. + audit Command line audit control tool + auditd Audit management daemon + auditfilterd Experimental event monitoring framework + auditreduce Audit trail reduction tool + audump Debugging tool to parse and print audit databases + praudit Tool to print audit trails Building @@ -29,7 +40,7 @@ for building on a range of operating systems, including FreeBSD, Mac OS X, and Linux. Depending on the availability of audit facilities in the underlying operating system, some components that depend on kernel audit -support are built conditionally. Typically, build will be performed using +support are built conditionally. Typically, build will be performed using: ./configure make @@ -51,13 +62,12 @@ You will need to manually propagate openbsm/etc/* into /etc on your system; this is not done automatically so as to avoid disrupting the current -configuration. Currently, the locations of these files is not -configurable. +configuration. Currently, the locations of these files is not configurable. Credits -The following organizations and individuals have contributed substantially -to the development of OpenBSM: +The following organizations and individuals have contributed substantially to +the development of OpenBSM: Apple Computer, Inc. McAfee Research, McAfee, Inc. @@ -100,4 +110,4 @@ http://www.TrustedBSD.org/ -$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/README#17 $ +$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/README#18 $ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#22 (text+ko) ==== @@ -32,7 +32,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#21 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#22 $ */ #include @@ -3871,7 +3871,6 @@ * size 2 bytes; * zonename size bytes; */ - static int fetch_zonename_tok(tokenstr_t *tok, char *buf, int len) { ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/test/bsm/generate.c#8 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2006 Robert N. M. Watson + * Copyright (c) 2006-2007 Robert N. M. Watson * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/test/bsm/generate.c#7 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/test/bsm/generate.c#8 $ */ /* @@ -889,6 +889,30 @@ } +static char *zonename_sample = "testzone"; + +static void +generate_zonename_token(const char *directory, const char *token_filename) +{ + token_t *zonename_token; + + zonename_token = au_to_zonename(zonename_sample); + if (zonename_token == NULL) + err(EX_UNAVAILABLE, "au_to_zonename"); + write_token(directory, token_filename, zonename_token); +} + +static void +generate_zonename_record(const char *directory, const char *record_filename) +{ + token_t *zonename_token; + + zonename_token = au_to_zonename(zonename_sample); + if (zonename_token == NULL) + err(EX_UNAVAILABLE, "au_to_zonename"); + write_record(directory, record_filename, zonename_token, AUE_NULL); +} + int main(int argc, char *argv[]) { @@ -955,6 +979,7 @@ generate_ipc_perm_token(directory, "ipc_perm_token"); generate_groups_token(directory, "groups_token"); generate_attr32_token(directory, "attr32_token"); + generate_zonename_token(directory, "zonename_token"); } if (do_records) { @@ -989,6 +1014,7 @@ generate_ipc_perm_record(directory, "ipc_perm_record"); generate_groups_record(directory, "groups_record"); generate_attr32_record(directory, "attr32_record"); + generate_zonename_record(directory, "zonename_record"); } return (0); ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/arg32_record#3 (binary) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/arg32_token#3 (binary) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/data_record#3 (binary) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/data_token#3 (binary) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/file_record#3 (binary) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/file_token#3 (binary) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/header32_token#3 (binary) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/in_addr_record#3 (binary) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/in_addr_token#3 (binary) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/ip_record#3 (binary) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/ip_token#3 (binary) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/ipc_record#3 (binary) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/ipc_token#3 (binary) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/iport_record#3 (binary) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/iport_token#3 (binary) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/opaque_record#3 (binary) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/opaque_token#3 (binary) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/path_record#3 (binary) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/path_token#3 (binary) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/process32_record#3 (binary) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/process32_token#3 (binary) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/process32ex_record-IPv4#2 (binary) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/process32ex_record-IPv6#2 (binary) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/process32ex_token-IPv4#2 (binary) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/process32ex_token-IPv6#2 (binary) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/process64_record#2 (binary) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/process64_token#2 (binary) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/process64ex_record-IPv4#2 (binary) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/process64ex_record-IPv6#2 (binary) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/process64ex_token-IPv4#2 (binary) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/process64ex_token-IPv6#2 (binary) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/return32_record#3 (binary) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/return32_token#3 (binary) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/seq_record#3 (binary) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/seq_token#3 (binary) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/subject32_record#3 (binary) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/subject32_token#3 (binary) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/subject32ex_record#3 (binary) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/subject32ex_token-IPv4#3 (binary) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/subject32ex_token-IPv6#3 (binary) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/text_record#3 (binary) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/text_token#3 (binary) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/trailer_token#3 (binary) ==== ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_syscalls.c#32 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Mon Apr 16 13:57:58 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 217D516A404; Mon, 16 Apr 2007 13:57:58 +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 E800816A401 for ; Mon, 16 Apr 2007 13:57:57 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id D4B8D13C4BD for ; Mon, 16 Apr 2007 13:57:57 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3GDvvMY088732 for ; Mon, 16 Apr 2007 13:57:57 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3GDvsJq088724 for perforce@freebsd.org; Mon, 16 Apr 2007 13:57:54 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 16 Apr 2007 13:57:54 GMT Message-Id: <200704161357.l3GDvsJq088724@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 118244 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: Mon, 16 Apr 2007 13:57:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=118244 Change 118244 by rwatson@rwatson_fledge on 2007/04/16 13:57:45 Integrate zcopybpf branch from CVS HEAD. Affected files ... .. //depot/projects/zcopybpf/src/sys/Makefile#3 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/pmap.c#4 integrate .. //depot/projects/zcopybpf/src/sys/amd64/conf/GENERIC#3 integrate .. //depot/projects/zcopybpf/src/sys/boot/forth/loader.conf#3 integrate .. //depot/projects/zcopybpf/src/sys/boot/pc98/boot0.5/Makefile#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/pc98/boot0.5/boot0.5.s#3 integrate .. //depot/projects/zcopybpf/src/sys/boot/pc98/boot0.5/ldscript#1 branch .. //depot/projects/zcopybpf/src/sys/boot/pc98/boot0.5/putssjis.s#1 branch .. //depot/projects/zcopybpf/src/sys/boot/pc98/boot0.5/selector.s#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/pc98/boot0.5/start.s#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/pc98/boot2/boot.c#2 integrate .. //depot/projects/zcopybpf/src/sys/cam/cam_ccb.h#2 integrate .. //depot/projects/zcopybpf/src/sys/cam/cam_periph.c#2 integrate .. //depot/projects/zcopybpf/src/sys/cam/cam_periph.h#2 integrate .. //depot/projects/zcopybpf/src/sys/cam/cam_sim.c#2 integrate .. //depot/projects/zcopybpf/src/sys/cam/cam_sim.h#2 integrate .. //depot/projects/zcopybpf/src/sys/cam/cam_xpt.c#4 integrate .. //depot/projects/zcopybpf/src/sys/cam/cam_xpt.h#3 integrate .. //depot/projects/zcopybpf/src/sys/cam/cam_xpt_periph.h#2 integrate .. //depot/projects/zcopybpf/src/sys/cam/scsi/scsi_cd.c#2 integrate .. //depot/projects/zcopybpf/src/sys/cam/scsi/scsi_ch.c#2 integrate .. //depot/projects/zcopybpf/src/sys/cam/scsi/scsi_da.c#4 integrate .. //depot/projects/zcopybpf/src/sys/cam/scsi/scsi_low.c#2 integrate .. //depot/projects/zcopybpf/src/sys/cam/scsi/scsi_pass.c#2 integrate .. //depot/projects/zcopybpf/src/sys/cam/scsi/scsi_pt.c#2 integrate .. //depot/projects/zcopybpf/src/sys/cam/scsi/scsi_sa.c#2 integrate .. //depot/projects/zcopybpf/src/sys/cam/scsi/scsi_ses.c#2 integrate .. //depot/projects/zcopybpf/src/sys/cam/scsi/scsi_sg.c#1 branch .. //depot/projects/zcopybpf/src/sys/cam/scsi/scsi_sg.h#1 branch .. //depot/projects/zcopybpf/src/sys/cam/scsi/scsi_targ_bh.c#2 integrate .. //depot/projects/zcopybpf/src/sys/cam/scsi/scsi_target.c#3 integrate .. //depot/projects/zcopybpf/src/sys/compat/linprocfs/linprocfs.c#4 integrate .. //depot/projects/zcopybpf/src/sys/compat/linux/linux_ioctl.c#2 integrate .. //depot/projects/zcopybpf/src/sys/compat/linux/linux_ioctl.h#2 integrate .. //depot/projects/zcopybpf/src/sys/compat/linux/linux_socket.c#3 integrate .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/kern/opensolaris_kmem.c#2 integrate .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/kern/opensolaris_kobj.c#2 integrate .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/kern/opensolaris_misc.c#1 branch .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/kern/opensolaris_string.c#2 integrate .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/kmem.h#2 integrate .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/kobj.h#2 integrate .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/lock.h#1 branch .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/misc.h#1 branch .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/mutex.h#2 integrate .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/rwlock.h#2 integrate .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/string.h#2 integrate .. //depot/projects/zcopybpf/src/sys/conf/NOTES#5 integrate .. //depot/projects/zcopybpf/src/sys/conf/files#6 integrate .. //depot/projects/zcopybpf/src/sys/conf/files.ia64#2 integrate .. //depot/projects/zcopybpf/src/sys/conf/options#5 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/utmisc.c#3 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/common/atomic/amd64/atomic.S#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/common/atomic/i386/atomic.S#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/arch/amd64/atomic.S#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/arch/i386/atomic.S#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/dnlc.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/os/taskq.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/fs/zfs.h#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/pf/net/if_pfsync.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/aac/aac_cam.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/advansys/advansys.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/advansys/adwcam.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/aha/aha.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/ahb/ahb.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/aic/aic.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/aic7xxx/aic79xx_osm.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/aic7xxx/aic7xxx_osm.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/amd/amd.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/amr/amr_cam.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/arcmsr/arcmsr.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/asr/asr.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/ata/ata-all.h#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/ata/ata-chipset.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/ata/ata-dma.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/ata/ata-lowlevel.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/ata/ata_if.m#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/ata/atapi-cam.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/ath/ah_osdep.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/buslogic/bt.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/ciss/ciss.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/cxgb_adapter.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/cxgb_lro.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/cxgb_main.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/cxgb_osdep.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/cxgb_sge.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/sys/mvec.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/cxgb/sys/uipc_mvec.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/dpt/dpt_scsi.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/esp/ncr53c9x.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/ex/if_exvar.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/firewire/fwdma.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/firewire/sbp.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/firewire/sbp_targ.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/hptmv/entry.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/iir/iir.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/isp/isp_freebsd.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/mii/brgphy.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/mii/miidevs#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/mly/mly.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/mpt/mpt_cam.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/msk/if_msk.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/ppbus/vpo.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/rr232x/osm_bsd.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pci/cmi.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/sym/sym_hipd.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/trm/trm.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/twa/tw_osl_cam.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/umass.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/usbdevs#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/wds/wd7000.c#3 integrate .. //depot/projects/zcopybpf/src/sys/fs/procfs/procfs_dbregs.c#2 integrate .. //depot/projects/zcopybpf/src/sys/fs/procfs/procfs_fpregs.c#2 integrate .. //depot/projects/zcopybpf/src/sys/fs/procfs/procfs_map.c#2 integrate .. //depot/projects/zcopybpf/src/sys/fs/procfs/procfs_regs.c#2 integrate .. //depot/projects/zcopybpf/src/sys/fs/pseudofs/pseudofs.c#3 integrate .. //depot/projects/zcopybpf/src/sys/fs/pseudofs/pseudofs.h#3 integrate .. //depot/projects/zcopybpf/src/sys/fs/pseudofs/pseudofs_fileno.c#2 integrate .. //depot/projects/zcopybpf/src/sys/fs/pseudofs/pseudofs_internal.h#2 integrate .. //depot/projects/zcopybpf/src/sys/fs/pseudofs/pseudofs_vncache.c#3 integrate .. //depot/projects/zcopybpf/src/sys/fs/pseudofs/pseudofs_vnops.c#2 integrate .. //depot/projects/zcopybpf/src/sys/geom/eli/g_eli.c#4 integrate .. //depot/projects/zcopybpf/src/sys/geom/journal/g_journal.c#3 integrate .. //depot/projects/zcopybpf/src/sys/geom/uzip/g_uzip.c#2 integrate .. //depot/projects/zcopybpf/src/sys/geom/vinum/geom_vinum.h#2 integrate .. //depot/projects/zcopybpf/src/sys/geom/vinum/geom_vinum_rm.c#2 integrate .. //depot/projects/zcopybpf/src/sys/geom/vinum/geom_vinum_share.c#2 integrate .. //depot/projects/zcopybpf/src/sys/geom/vinum/geom_vinum_subr.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/conf/GENERIC#3 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/identcpu.c#3 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/initcpu.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/minidump_machdep.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/mp_machdep.c#4 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/pmap.c#4 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/trap.c#3 integrate .. //depot/projects/zcopybpf/src/sys/i386/include/pmap.h#3 integrate .. //depot/projects/zcopybpf/src/sys/i386/include/specialreg.h#3 integrate .. //depot/projects/zcopybpf/src/sys/i386/include/vmparam.h#2 integrate .. //depot/projects/zcopybpf/src/sys/ia64/conf/GENERIC#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_jail.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_mib.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/uipc_mbuf.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/uipc_mqueue.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/uipc_syscalls.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_mount.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_subr.c#3 integrate .. //depot/projects/zcopybpf/src/sys/libkern/index.c#2 integrate .. //depot/projects/zcopybpf/src/sys/libkern/rindex.c#2 integrate .. //depot/projects/zcopybpf/src/sys/modules/Makefile#4 integrate .. //depot/projects/zcopybpf/src/sys/modules/cam/Makefile#2 integrate .. //depot/projects/zcopybpf/src/sys/modules/cxgb/Makefile#2 integrate .. //depot/projects/zcopybpf/src/sys/modules/dpt/Makefile#2 integrate .. //depot/projects/zcopybpf/src/sys/modules/if_trunk/Makefile#1 branch .. //depot/projects/zcopybpf/src/sys/modules/libalias/libalias/Makefile#2 integrate .. //depot/projects/zcopybpf/src/sys/modules/zfs/Makefile#2 integrate .. //depot/projects/zcopybpf/src/sys/net/ieee8023ad_lacp.c#1 branch .. //depot/projects/zcopybpf/src/sys/net/ieee8023ad_lacp.h#1 branch .. //depot/projects/zcopybpf/src/sys/net/if.c#4 integrate .. //depot/projects/zcopybpf/src/sys/net/if_ethersubr.c#4 integrate .. //depot/projects/zcopybpf/src/sys/net/if_trunk.c#1 branch .. //depot/projects/zcopybpf/src/sys/net/if_trunk.h#1 branch .. //depot/projects/zcopybpf/src/sys/net/if_var.h#3 integrate .. //depot/projects/zcopybpf/src/sys/netinet/in_pcb.c#3 integrate .. //depot/projects/zcopybpf/src/sys/netinet/libalias/alias_db.c#2 integrate .. //depot/projects/zcopybpf/src/sys/netinet/libalias/alias_skinny.c#2 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_constants.h#4 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_crc32.c#3 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_indata.c#4 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_input.c#4 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_output.c#4 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_pcb.c#4 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_peeloff.c#4 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_structs.h#4 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_timer.c#4 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_uio.h#4 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_usrreq.c#4 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_var.h#4 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctputil.c#4 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctputil.h#4 integrate .. //depot/projects/zcopybpf/src/sys/netinet/tcp_input.c#4 integrate .. //depot/projects/zcopybpf/src/sys/netinet/tcp_output.c#4 integrate .. //depot/projects/zcopybpf/src/sys/netinet/tcp_sack.c#3 integrate .. //depot/projects/zcopybpf/src/sys/netinet/tcp_subr.c#4 integrate .. //depot/projects/zcopybpf/src/sys/netinet/tcp_syncache.c#4 integrate .. //depot/projects/zcopybpf/src/sys/netinet/tcp_timer.c#4 integrate .. //depot/projects/zcopybpf/src/sys/netinet/tcp_timer.h#3 integrate .. //depot/projects/zcopybpf/src/sys/netinet/tcp_usrreq.c#4 integrate .. //depot/projects/zcopybpf/src/sys/netinet/tcp_var.h#4 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/ipsec.c#2 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/sctp6_usrreq.c#4 integrate .. //depot/projects/zcopybpf/src/sys/netipsec/ipsec_osdep.h#2 integrate .. //depot/projects/zcopybpf/src/sys/netnatm/natm.h#2 integrate .. //depot/projects/zcopybpf/src/sys/nfsserver/nfs_srvsock.c#3 integrate .. //depot/projects/zcopybpf/src/sys/pc98/conf/GENERIC#3 integrate .. //depot/projects/zcopybpf/src/sys/pci/ncr.c#3 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/conf/GENERIC#4 integrate .. //depot/projects/zcopybpf/src/sys/rpc/types.h#1 branch .. //depot/projects/zcopybpf/src/sys/security/audit/audit.c#3 integrate .. //depot/projects/zcopybpf/src/sys/security/audit/audit.h#2 integrate .. //depot/projects/zcopybpf/src/sys/security/audit/audit_arg.c#3 integrate .. //depot/projects/zcopybpf/src/sys/security/audit/audit_bsm.c#2 integrate .. //depot/projects/zcopybpf/src/sys/security/audit/audit_bsm_token.c#2 integrate .. //depot/projects/zcopybpf/src/sys/security/audit/audit_private.h#2 integrate .. //depot/projects/zcopybpf/src/sys/security/audit/audit_syscalls.c#3 integrate .. //depot/projects/zcopybpf/src/sys/sparc64/conf/GENERIC#3 integrate .. //depot/projects/zcopybpf/src/sys/sun4v/conf/GENERIC#3 integrate .. //depot/projects/zcopybpf/src/sys/sys/eventhandler.h#3 integrate .. //depot/projects/zcopybpf/src/sys/sys/hash.h#2 integrate .. //depot/projects/zcopybpf/src/sys/sys/kernel.h#3 integrate .. //depot/projects/zcopybpf/src/sys/sys/libkern.h#2 integrate .. //depot/projects/zcopybpf/src/sys/sys/mbuf.h#5 integrate .. //depot/projects/zcopybpf/src/sys/sys/mutex.h#4 integrate .. //depot/projects/zcopybpf/src/sys/sys/param.h#5 integrate .. //depot/projects/zcopybpf/src/sys/sys/priv.h#4 integrate .. //depot/projects/zcopybpf/src/sys/sys/proc.h#3 integrate .. //depot/projects/zcopybpf/src/sys/sys/sysctl.h#2 integrate .. //depot/projects/zcopybpf/src/sys/sys/systm.h#4 integrate .. //depot/projects/zcopybpf/src/sys/sys/unistd.h#3 integrate .. //depot/projects/zcopybpf/src/sys/ufs/ffs/ffs_snapshot.c#3 integrate .. //depot/projects/zcopybpf/src/sys/ufs/ffs/ffs_softdep.c#4 integrate .. //depot/projects/zcopybpf/src/sys/vm/phys_pager.c#3 integrate .. //depot/projects/zcopybpf/src/usr.sbin/netstat/mcast.c#3 integrate Differences ... ==== //depot/projects/zcopybpf/src/sys/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/Makefile,v 1.41 2007/03/24 22:21:01 maxim Exp $ +# $FreeBSD: src/sys/Makefile,v 1.42 2007/04/14 16:29:15 maxim Exp $ .include @@ -8,10 +8,10 @@ .endif # Directories to include in cscope name file and TAGS. -CSCOPEDIRS= cam coda compat conf contrib crypto ddb dev fs geom gnu i4b \ - isa kern libkern modules net net80211 netatalk netatm \ +CSCOPEDIRS= bsm cam coda compat conf contrib crypto ddb dev fs geom gnu \ + i4b isa kern libkern modules net net80211 netatalk netatm \ netgraph netinet netinet6 netipx netkey netnatm netncp \ - netsmb nfs nfsclient nfs4client rpc pccard pci sys \ + netsmb nfs nfsclient nfs4client rpc pccard pci security sys \ ufs vm ${ARCHDIR} ARCHDIR ?= ${MACHINE} ==== //depot/projects/zcopybpf/src/sys/amd64/amd64/pmap.c#4 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.581 2007/03/10 20:26:43 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.582 2007/04/13 16:07:29 alc Exp $"); /* * Manages physical address maps. @@ -3261,7 +3261,7 @@ pd_entry_t *pde; pt_entry_t *pte; - base = va & PG_FRAME; + base = trunc_page(va); offset = va & PAGE_MASK; size = roundup(offset + size, PAGE_SIZE); ==== //depot/projects/zcopybpf/src/sys/amd64/conf/GENERIC#3 (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 @@ -48,6 +48,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/zcopybpf/src/sys/boot/forth/loader.conf#3 (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/zcopybpf/src/sys/boot/pc98/boot0.5/Makefile#2 (text+ko) ==== @@ -1,10 +1,11 @@ -# $FreeBSD: src/sys/boot/pc98/boot0.5/Makefile,v 1.4 2004/12/21 08:47:16 ru Exp $ +# $FreeBSD: src/sys/boot/pc98/boot0.5/Makefile,v 1.6 2007/04/07 13:37:45 nyan Exp $ PROG= ${BOOT}.out INTERNALPROG= FILES= ${BOOT} NO_MAN= -SRCS= start.s boot.s boot0.5.s disk.s selector.s support.s syscons.s +SRCS= start.s boot.s boot0.5.s disk.s selector.s support.s syscons.s \ + putssjis.s CLEANFILES= ${BOOT} ${BOOT}.bin BOOT= boot0.5 @@ -13,7 +14,7 @@ # unless you are glutton for punishment. BOOT_BOOT0_ORG?= 0x0000 -LDFLAGS=-N -e start -Ttext ${BOOT_BOOT0_ORG} +LDFLAGS=-N -e start -Ttext ${BOOT_BOOT0_ORG} -Wl,-T,${.CURDIR}/ldscript # The size of boot0.5 must be 7168 bytes ${BOOT}: ${BOOT}.bin ==== //depot/projects/zcopybpf/src/sys/boot/pc98/boot0.5/boot0.5.s#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# Copyright (c) KATO Takenori, 1999, 2000. +# Copyright (c) KATO Takenori, 1999, 2000, 2007. # # All rights reserved. Unpublished rights reserved under the copyright # laws of Japan. @@ -25,7 +25,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# $FreeBSD: src/sys/boot/pc98/boot0.5/boot0.5.s,v 1.3 2007/03/17 05:30:03 kato Exp $ +# $FreeBSD: src/sys/boot/pc98/boot0.5/boot0.5.s,v 1.4 2007/04/07 08:37:04 kato Exp $ # .global main .code16 @@ -261,8 +261,8 @@ .global ishireso ishireso: .byte 0 -title: .asciz "PC98 Boot Selector Version 1.1" -copyright: .ascii "(C)Copyright 1999, 2000 KATO Takenori. " +title: .asciz "PC98 Boot Selector Version 1.2" +copyright: .ascii "(C)Copyright 1999-2007 KATO Takenori. " .asciz "All rights reserved." msg_device: .asciz "Device" msg_sasi: .asciz "SASI/IDE unit " ==== //depot/projects/zcopybpf/src/sys/boot/pc98/boot0.5/selector.s#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# Copyright (c) KATO Takenori, 1999, 2000. +# Copyright (c) KATO Takenori, 1999, 2000, 2007. # # All rights reserved. Unpublished rights reserved under the copyright # laws of Japan. @@ -25,7 +25,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# $FreeBSD: src/sys/boot/pc98/boot0.5/selector.s,v 1.2 2000/08/06 14:35:37 kato Exp $ +# $FreeBSD: src/sys/boot/pc98/boot0.5/selector.s,v 1.3 2007/04/07 08:37:04 kato Exp $ # .code16 @@ -299,6 +299,11 @@ jne dev_right movw $3, mode # N88-BASIC ret + + # XXX + .space 5, 0x90 + ret # Dummy ret @0x9ab + dev_up: cmpw $0, curdevice je devmode_loop ==== //depot/projects/zcopybpf/src/sys/boot/pc98/boot0.5/start.s#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# Copyright (c) KATO Takenori, 1999, 2000. +# Copyright (c) KATO Takenori, 1999, 2000, 2007. # # All rights reserved. Unpublished rights reserved under the copyright # laws of Japan. @@ -25,7 +25,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# $FreeBSD: src/sys/boot/pc98/boot0.5/start.s,v 1.2 2003/05/02 09:33:12 kato Exp $ +# $FreeBSD: src/sys/boot/pc98/boot0.5/start.s,v 1.3 2007/04/07 08:37:04 kato Exp $ # .global start .code16 @@ -34,8 +34,19 @@ start: jmp start1 + # Magic + .org 0x053, 0x20 + .byte 0x4e, 0x45, 0x43 + + .org 0x8f + .byte 0x32, 0x2e, 0x37, 0x30 + .org 0x2d4 start1: + # The instruction 'call 0x9ab' can be here. See also selector.s. + nop + nop + nop cli movw %cs, %ax movw %ax, %ds ==== //depot/projects/zcopybpf/src/sys/boot/pc98/boot2/boot.c#2 (text+ko) ==== @@ -49,7 +49,7 @@ */ #include -__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 @@ -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/zcopybpf/src/sys/cam/cam_ccb.h#2 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam_ccb.h,v 1.34 2006/12/03 07:19:28 mjacob Exp $ + * $FreeBSD: src/sys/cam/cam_ccb.h,v 1.35 2007/04/15 08:49:09 scottl Exp $ */ #ifndef _CAM_CAM_CCB_H @@ -242,8 +242,7 @@ typedef union { void *ptr; u_long field; - u_int8_t bytes[sizeof(void *) > sizeof(u_long) - ? sizeof(void *) : sizeof(u_long)]; + u_int8_t bytes[sizeof(uintptr_t)]; } ccb_priv_entry; typedef union { @@ -274,8 +273,12 @@ ccb_ppriv_area periph_priv; ccb_spriv_area sim_priv; u_int32_t timeout; /* Timeout value */ + + /* + * Deprecated, only for use by non-MPSAFE SIMs. All others must + * allocate and initialize their own callout storage. + */ struct callout_handle timeout_ch; - /* Callout handle used for timeouts */ }; /* Get Device Information CCB */ ==== //depot/projects/zcopybpf/src/sys/cam/cam_periph.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.64 2006/12/05 07:45:27 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.65 2007/04/15 08:49:09 scottl Exp $"); #include #include @@ -51,6 +51,7 @@ #include #include #include +#include #include #include @@ -122,6 +123,7 @@ ac_callback_t *ac_callback, ac_code code, void *arg) { struct periph_driver **p_drv; + struct cam_sim *sim; struct cam_periph *periph; struct cam_periph *cur_periph; path_id_t path_id; @@ -163,11 +165,14 @@ init_level++; + xpt_lock_buses(); for (p_drv = periph_drivers; *p_drv != NULL; p_drv++) { if (strcmp((*p_drv)->driver_name, name) == 0) break; } - + xpt_unlock_buses(); + + sim = xpt_path_sim(path); path_id = xpt_path_path_id(path); target_id = xpt_path_target_id(path); lun_id = xpt_path_lun_id(path); @@ -181,6 +186,7 @@ periph->unit_number = camperiphunit(*p_drv, path_id, target_id, lun_id); periph->immediate_priority = CAM_PRIORITY_NONE; periph->refcount = 0; + periph->sim = sim; SLIST_INIT(&periph->ccb_list); status = xpt_create_path(&path, periph, path_id, target_id, lun_id); if (status != CAM_REQ_CMP) @@ -276,14 +282,13 @@ cam_status cam_periph_acquire(struct cam_periph *periph) { - int s; if (periph == NULL) return(CAM_REQ_CMP_ERR); - s = splsoftcam(); + xpt_lock_buses(); periph->refcount++; - splx(s); + xpt_unlock_buses(); return(CAM_REQ_CMP); } @@ -291,18 +296,66 @@ void cam_periph_release(struct cam_periph *periph) { - int s; if (periph == NULL) return; - s = splsoftcam(); + xpt_lock_buses(); if ((--periph->refcount == 0) && (periph->flags & CAM_PERIPH_INVALID)) { camperiphfree(periph); } - splx(s); + xpt_unlock_buses(); + +} + +int +cam_periph_hold(struct cam_periph *periph, int priority) +{ + struct mtx *mtx; + int error; + + mtx_assert(periph->sim->mtx, MA_OWNED); + + /* + * Increment the reference count on the peripheral + * while we wait for our lock attempt to succeed + * to ensure the peripheral doesn't disappear out + * from user us while we sleep. + */ + + if (cam_periph_acquire(periph) != CAM_REQ_CMP) + return (ENXIO); + + mtx = periph->sim->mtx; + if (mtx == &Giant) + mtx = NULL; + + while ((periph->flags & CAM_PERIPH_LOCKED) != 0) { + periph->flags |= CAM_PERIPH_LOCK_WANTED; + if ((error = msleep(periph, mtx, priority, "caplck", 0)) != 0) { + cam_periph_release(periph); + return (error); + } + } + + periph->flags |= CAM_PERIPH_LOCKED; + return (0); +} + +void +cam_periph_unhold(struct cam_periph *periph) +{ + + mtx_assert(periph->sim->mtx, MA_OWNED); + + periph->flags &= ~CAM_PERIPH_LOCKED; + if ((periph->flags & CAM_PERIPH_LOCK_WANTED) != 0) { + periph->flags &= ~CAM_PERIPH_LOCK_WANTED; + wakeup(periph); + } + cam_periph_release(periph); } /* @@ -424,9 +477,7 @@ void cam_periph_invalidate(struct cam_periph *periph) { - int s; - s = splsoftcam(); /* * We only call this routine the first time a peripheral is * invalidated. The oninvalidate() routine is always called at @@ -439,11 +490,12 @@ periph->flags |= CAM_PERIPH_INVALID; periph->flags &= ~CAM_PERIPH_NEW_DEV_FOUND; + xpt_lock_buses(); if (periph->refcount == 0) camperiphfree(periph); else if (periph->refcount < 0) printf("cam_invalidate_periph: refcount < 0!!\n"); - splx(s); + xpt_unlock_buses(); } static void @@ -502,30 +554,11 @@ /* * Wait interruptibly for an exclusive lock. */ -int -cam_periph_lock(struct cam_periph *periph, int priority) +void +cam_periph_lock(struct cam_periph *periph) { - int error; - /* - * Increment the reference count on the peripheral - * while we wait for our lock attempt to succeed - * to ensure the peripheral doesn't disappear out - * from under us while we sleep. - */ - if (cam_periph_acquire(periph) != CAM_REQ_CMP) - return(ENXIO); - - while ((periph->flags & CAM_PERIPH_LOCKED) != 0) { - periph->flags |= CAM_PERIPH_LOCK_WANTED; - if ((error = tsleep(periph, priority, "caplck", 0)) != 0) { - cam_periph_release(periph); - return error; - } - } - - periph->flags |= CAM_PERIPH_LOCKED; - return 0; + mtx_lock(periph->sim->mtx); } /* @@ -534,13 +567,8 @@ void cam_periph_unlock(struct cam_periph *periph) { - periph->flags &= ~CAM_PERIPH_LOCKED; - if ((periph->flags & CAM_PERIPH_LOCK_WANTED) != 0) { - periph->flags &= ~CAM_PERIPH_LOCK_WANTED; - wakeup(periph); - } - cam_periph_release(periph); + mtx_unlock(periph->sim->mtx); } /* @@ -752,12 +780,11 @@ cam_periph_getccb(struct cam_periph *periph, u_int32_t priority) { struct ccb_hdr *ccb_h; - int s; + struct mtx *mtx; + mtx_assert(periph->sim->mtx, MA_OWNED); CAM_DEBUG(periph->path, CAM_DEBUG_TRACE, ("entering cdgetccb\n")); - s = splsoftcam(); - while (SLIST_FIRST(&periph->ccb_list) == NULL) { if (periph->immediate_priority > priority) periph->immediate_priority = priority; @@ -765,24 +792,35 @@ if ((SLIST_FIRST(&periph->ccb_list) != NULL) && (SLIST_FIRST(&periph->ccb_list)->pinfo.priority == priority)) break; - tsleep(&periph->ccb_list, PRIBIO, "cgticb", 0); + mtx_assert(periph->sim->mtx, MA_OWNED); + if (periph->sim->mtx == &Giant) + mtx = NULL; + else + mtx = periph->sim->mtx; + msleep(&periph->ccb_list, mtx, PRIBIO, "cgticb", 0); } ccb_h = SLIST_FIRST(&periph->ccb_list); SLIST_REMOVE_HEAD(&periph->ccb_list, periph_links.sle); - splx(s); return ((union ccb *)ccb_h); } void cam_periph_ccbwait(union ccb *ccb) { + struct mtx *mtx; + struct cam_sim *sim; int s; s = splsoftcam(); + sim = xpt_path_sim(ccb->ccb_h.path); + if (sim->mtx == &Giant) + mtx = NULL; + else + mtx = sim->mtx; if ((ccb->ccb_h.pinfo.index != CAM_UNQUEUED_INDEX) || ((ccb->ccb_h.status & CAM_STATUS_MASK) == CAM_REQ_INPROG)) - tsleep(&ccb->ccb_h.cbfcnp, PRIBIO, "cbwait", 0); + msleep(&ccb->ccb_h.cbfcnp, mtx, PRIBIO, "cbwait", 0); splx(s); } @@ -857,10 +895,13 @@ cam_flags camflags, u_int32_t sense_flags, struct devstat *ds) { + struct cam_sim *sim; int error; error = 0; - + sim = xpt_path_sim(ccb->ccb_h.path); + mtx_assert(sim->mtx, MA_OWNED); + /* * If the user has supplied a stats structure, and if we understand * this particular type of ccb, record the transaction start. ==== //depot/projects/zcopybpf/src/sys/cam/cam_periph.h#2 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam_periph.h,v 1.16 2005/01/05 22:34:34 imp Exp $ + * $FreeBSD: src/sys/cam/cam_periph.h,v 1.17 2007/04/15 08:49:09 scottl Exp $ */ #ifndef _CAM_CAM_PERIPH_H @@ -104,6 +104,7 @@ char *periph_name; struct cam_path *path; /* Compiled path to device */ void *softc; + struct cam_sim *sim; u_int32_t unit_number; cam_periph_type type; u_int32_t flags; @@ -113,6 +114,7 @@ #define CAM_PERIPH_INVALID 0x08 #define CAM_PERIPH_NEW_DEV_FOUND 0x10 #define CAM_PERIPH_RECOVERY_INPROG 0x20 +#define CAM_PERIPH_POLLED 0x40 u_int32_t immediate_priority; u_int32_t refcount; SLIST_HEAD(, ccb_hdr) ccb_list; /* For "immediate" requests */ @@ -136,10 +138,12 @@ char *name, cam_periph_type type, struct cam_path *, ac_callback_t *, ac_code, void *arg); struct cam_periph *cam_periph_find(struct cam_path *path, char *name); -int cam_periph_lock(struct cam_periph *periph, int priority); +void cam_periph_lock(struct cam_periph *periph); void cam_periph_unlock(struct cam_periph *periph); cam_status cam_periph_acquire(struct cam_periph *periph); void cam_periph_release(struct cam_periph *periph); +int cam_periph_hold(struct cam_periph *periph, int priority); +void cam_periph_unhold(struct cam_periph *periph); void cam_periph_invalidate(struct cam_periph *periph); int cam_periph_mapmem(union ccb *ccb, struct cam_periph_map_info *mapinfo); ==== //depot/projects/zcopybpf/src/sys/cam/cam_sim.c#2 (text+ko) ==== @@ -27,12 +27,14 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_sim.c,v 1.9 2005/07/01 15:21:29 avatar Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_sim.c,v 1.10 2007/04/15 08:49:09 scottl Exp $"); #include #include #include #include +#include +#include #include #include @@ -58,39 +60,42 @@ struct cam_sim * cam_sim_alloc(sim_action_func sim_action, sim_poll_func sim_poll, const char *sim_name, void *softc, u_int32_t unit, - int max_dev_transactions, + struct mtx *mtx, int max_dev_transactions, int max_tagged_dev_transactions, struct cam_devq *queue) { struct cam_sim *sim; - /* - * If this is the xpt layer creating a sim, then it's OK - * to wait for an allocation. - * - * XXX Should we pass in a flag to indicate that wait is OK? - */ - if (strcmp(sim_name, "xpt") == 0) - sim = (struct cam_sim *)malloc(sizeof(struct cam_sim), - M_CAMSIM, M_WAITOK); - else - sim = (struct cam_sim *)malloc(sizeof(struct cam_sim), - M_CAMSIM, M_NOWAIT); + if (mtx == NULL) + return (NULL); + + sim = (struct cam_sim *)malloc(sizeof(struct cam_sim), + M_CAMSIM, M_NOWAIT); + + if (sim == NULL) + return (NULL); - if (sim != NULL) { - sim->sim_action = sim_action; - sim->sim_poll = sim_poll; - sim->sim_name = sim_name; - sim->softc = softc; - sim->path_id = CAM_PATH_ANY; - sim->unit_number = unit; - sim->bus_id = 0; /* set in xpt_bus_register */ - sim->max_tagged_dev_openings = max_tagged_dev_transactions; - sim->max_dev_openings = max_dev_transactions; - sim->flags = 0; - callout_handle_init(&sim->c_handle); - sim->devq = queue; + sim->sim_action = sim_action; + sim->sim_poll = sim_poll; + sim->sim_name = sim_name; + sim->softc = softc; + sim->path_id = CAM_PATH_ANY; + sim->unit_number = unit; + sim->bus_id = 0; /* set in xpt_bus_register */ + sim->max_tagged_dev_openings = max_tagged_dev_transactions; + sim->max_dev_openings = max_dev_transactions; + sim->flags = 0; + sim->devq = queue; + sim->mtx = mtx; + if (mtx == &Giant) { + sim->flags |= 0; + callout_init(&sim->callout, 0); + } else { + sim->flags |= CAM_SIM_MPSAFE; + callout_init(&sim->callout, 1); } + SLIST_INIT(&sim->ccb_freeq); + return (sim); } ==== //depot/projects/zcopybpf/src/sys/cam/cam_sim.h#2 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam_sim.h,v 1.6 2005/01/05 22:34:34 imp Exp $ + * $FreeBSD: src/sys/cam/cam_sim.h,v 1.7 2007/04/15 08:49:09 scottl Exp $ */ #ifndef _CAM_CAM_SIM_H @@ -56,6 +56,7 @@ const char *sim_name, void *softc, u_int32_t unit, + struct mtx *mtx, int max_dev_transactions, int max_tagged_dev_transactions, struct cam_devq *queue); @@ -90,17 +91,33 @@ sim_poll_func sim_poll; const char *sim_name; void *softc; + struct mtx *mtx; u_int32_t path_id;/* The Boot device may set this to 0? */ u_int32_t unit_number; u_int32_t bus_id; int max_tagged_dev_openings; int max_dev_openings; u_int32_t flags; -#define CAM_SIM_REL_TIMEOUT_PENDING 0x01 - struct callout_handle c_handle; +#define CAM_SIM_REL_TIMEOUT_PENDING 0x01 +#define CAM_SIM_MPSAFE 0x02 + struct callout callout; struct cam_devq *devq; /* Device Queue to use for this SIM */ + + /* "Pool" of inactive ccbs managed by xpt_alloc_ccb and xpt_free_ccb */ + SLIST_HEAD(,ccb_hdr) ccb_freeq; + /* + * Maximum size of ccb pool. Modified as devices are added/removed + * or have their * opening counts changed. + */ + u_int max_ccbs; + /* Current count of allocated ccbs */ + u_int ccb_count; + }; +#define CAM_SIM_LOCK(sim) mtx_lock((sim)->mtx); +#define CAM_SIM_UNLOCK(sim) mtx_unlock((sim)->mtx); + static __inline u_int32_t cam_sim_path(struct cam_sim *sim) { ==== //depot/projects/zcopybpf/src/sys/cam/cam_xpt.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.175 2007/03/15 06:42:54 mjacob Exp $"); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Apr 16 14:02:04 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 5543116A403; Mon, 16 Apr 2007 14:02:04 +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 18AE416A402 for ; Mon, 16 Apr 2007 14:02:04 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 074EC13C480 for ; Mon, 16 Apr 2007 14:02:04 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3GE23DT089564 for ; Mon, 16 Apr 2007 14:02:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3GE23Ac089556 for perforce@freebsd.org; Mon, 16 Apr 2007 14:02:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 16 Apr 2007 14:02:03 GMT Message-Id: <200704161402.l3GE23Ac089556@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 118245 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: Mon, 16 Apr 2007 14:02:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=118245 Change 118245 by rwatson@rwatson_fledge on 2007/04/16 14:01:27 Add OpenBSM 1.0 alpha 14 to the TrustedBSD web page. Affected files ... .. //depot/projects/trustedbsd/www/downloads/openbsm-1.0-alpha14.tgz#1 add .. //depot/projects/trustedbsd/www/news.page#9 edit .. //depot/projects/trustedbsd/www/openbsm.page#19 edit Differences ... ==== //depot/projects/trustedbsd/www/news.page#9 (text+ko) ==== @@ -36,7 +36,7 @@ - $P4: //depot/projects/trustedbsd/www/news.page#8 $ + $P4: //depot/projects/trustedbsd/www/news.page#9 $ @@ -49,6 +49,12 @@
+
April 16, 2007 OpenBSM 1.0 alpha 14 released
+ +

OpenBSM 1.0 alpha 14 has been released. See the + OpenBSM web page for more information. +

+
November 10, 2006 SecurityFocus.com interview on the TrustedBSD Audit implementation
==== //depot/projects/trustedbsd/www/openbsm.page#19 (text+ko) ==== @@ -29,7 +29,7 @@ - $P4: //depot/projects/trustedbsd/www/openbsm.page#18 $ + $P4: //depot/projects/trustedbsd/www/openbsm.page#19 $ @@ -120,6 +120,14 @@ Please see the file README present in the OpenBSM distribution for build and installation instructions.

+

2007-04-16 - OpenBSM 1.0 alpha 14 release is a test release of the + OpenBSM code base. + In this revision, support for the zonename token type is added, a + variety of endian-related bugs in IPv6 addresses are fixed, OpenBSM + becomes warning clean for gcc1, and various man page updates are + made. + Download (480K).

+

2006-11-25 - OpenBSM 1.0 alpha 13 release is a test release of the OpenBSM code base. In this revision, man page documentation is substantially improved, From owner-p4-projects@FreeBSD.ORG Mon Apr 16 15:58:45 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 79D2A16A404; Mon, 16 Apr 2007 15:58:45 +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 4D00C16A402 for ; Mon, 16 Apr 2007 15:58:45 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 3792C13C459 for ; Mon, 16 Apr 2007 15:58:45 +0000 (UTC) (envelope-from scottl@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 l3GFwj3B010517 for ; Mon, 16 Apr 2007 15:58:45 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3GFweQx010511 for perforce@freebsd.org; Mon, 16 Apr 2007 15:58:40 GMT (envelope-from scottl@freebsd.org) Date: Mon, 16 Apr 2007 15:58:40 GMT Message-Id: <200704161558.l3GFweQx010511@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 118247 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: Mon, 16 Apr 2007 15:58:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=118247 Change 118247 by scottl@scottl-x64 on 2007/04/16 15:57:44 IFC camlock back around Affected files ... .. //depot/projects/scottl-camlock/src/UPDATING#3 integrate .. //depot/projects/scottl-camlock/src/contrib/libreadline/FREEBSD-upgrade#2 integrate .. //depot/projects/scottl-camlock/src/contrib/libreadline/display.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/opensolaris/cmd/zdb/zdb.8#2 integrate .. //depot/projects/scottl-camlock/src/contrib/opensolaris/cmd/zfs/zfs.8#2 integrate .. //depot/projects/scottl-camlock/src/contrib/opensolaris/cmd/zfs/zfs_main.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/opensolaris/cmd/zpool/zpool.8#2 integrate .. //depot/projects/scottl-camlock/src/contrib/opensolaris/cmd/ztest/ztest.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/opensolaris/lib/libzfs/common/libzfs.h#2 integrate .. //depot/projects/scottl-camlock/src/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/opensolaris/lib/libzpool/common/kernel.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#3 integrate .. //depot/projects/scottl-camlock/src/contrib/top/top.X#2 integrate .. //depot/projects/scottl-camlock/src/contrib/top/top.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/top/top.h#2 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/hostid#2 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/mountd#3 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/zfs#2 integrate .. //depot/projects/scottl-camlock/src/etc/services#2 integrate .. //depot/projects/scottl-camlock/src/include/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/include/rpc/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/include/rpc/types.h#2 delete .. //depot/projects/scottl-camlock/src/lib/libarchive/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive.h.in#3 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_entry.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_platform.h#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_extract.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_support_format_ar.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_support_format_cpio.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_support_format_tar.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_support_format_zip.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_write_disk.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_write_set_compression_none.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_write_set_format_ar.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_write_set_format_by_name.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_write_set_format_pax.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_write_set_format_ustar.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/config_freebsd.h#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/test/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/test/main.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_acl_basic.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_acl_pax.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_data_large.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_extract.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_ar.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_large.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_position.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_truncated.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_tar_filenames.c#1 branch .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_write_disk_perms.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_write_disk_secure.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_write_format_ar.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_write_format_tar.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_write_open_memory.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/sysconf.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/sys/ptrace.2#4 integrate .. //depot/projects/scottl-camlock/src/lib/libpmc/libpmc.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libpmc/pmc.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/ncurses/ncurses/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/release/Makefile.inc.docports#2 integrate .. //depot/projects/scottl-camlock/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#4 integrate .. //depot/projects/scottl-camlock/src/sbin/atm/atmconfig/diag.c#2 integrate .. //depot/projects/scottl-camlock/src/sbin/dhclient/dhclient-script#2 integrate .. //depot/projects/scottl-camlock/src/sbin/mount/mount.c#2 integrate .. //depot/projects/scottl-camlock/src/share/examples/cvsup/cvs-supfile#2 integrate .. //depot/projects/scottl-camlock/src/share/examples/cvsup/stable-supfile#2 integrate .. //depot/projects/scottl-camlock/src/share/examples/cvsup/standard-supfile#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/trunk.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/uftdi.4#2 integrate .. //depot/projects/scottl-camlock/src/share/misc/committers-ports.dot#3 integrate .. //depot/projects/scottl-camlock/src/share/misc/committers-src.dot#3 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_ccb.h#15 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_periph.h#13 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_sim.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_sim.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#57 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt_periph.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_ch.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_da.c#31 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_low.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_pass.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_pt.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_sa.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_ses.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_sg.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_targ_bh.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_target.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linprocfs/linprocfs.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/dnlc.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aac/aac_cam.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/advansys/advansys.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/advansys/adwcam.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aha/aha.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ahb/ahb.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic/aic.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx_osm.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx_osm.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/amd/amd.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/amr/amr_cam.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/arcmsr/arcmsr.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/asr/asr.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-cam.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/buslogic/bt.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ciss/ciss.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/sys/uipc_mvec.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/dpt/dpt_scsi.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/esp/ncr53c9x.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ex/if_exvar.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/firewire/fwdma.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/firewire/sbp.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/firewire/sbp_targ.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hptmv/entry.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iir/iir.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_freebsd.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mly/mly.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_cam.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ppbus/vpo.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/rr232x/osm_bsd.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sym/sym_hipd.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/trm/trm.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/twa/tw_osl_cam.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/umass.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/wds/wd7000.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/fs/procfs/procfs_dbregs.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/fs/procfs/procfs_fpregs.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/fs/procfs/procfs_map.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/fs/procfs/procfs_regs.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/fs/pseudofs/pseudofs.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/fs/pseudofs/pseudofs.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/fs/pseudofs/pseudofs_fileno.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/fs/pseudofs/pseudofs_internal.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/fs/pseudofs/pseudofs_vncache.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/fs/pseudofs/pseudofs_vnops.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_output.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_structs.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_uio.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_var.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctputil.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_input.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/netnatm/natm.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/nfsserver/nfs_srvsock.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/pci/ncr.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/sys/proc.h#17 integrate .. //depot/projects/scottl-camlock/src/tools/regression/lib/libc/nss/Makefile#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/lib/libc/nss/README#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/lib/libc/nss/mach#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/lib/libc/nss/test-getaddr.c#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/lib/libc/nss/test-getaddr.t#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/lib/libc/nss/test-getgr.c#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/lib/libc/nss/test-getgr.t#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/lib/libc/nss/test-gethostby.c#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/lib/libc/nss/test-gethostby.t#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/lib/libc/nss/test-getproto.c#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/lib/libc/nss/test-getproto.t#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/lib/libc/nss/test-getpw.c#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/lib/libc/nss/test-getpw.t#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/lib/libc/nss/test-getrpc.c#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/lib/libc/nss/test-getrpc.t#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/lib/libc/nss/test-getserv.c#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/lib/libc/nss/test-getserv.t#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/lib/libc/nss/test-getusershell.c#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/lib/libc/nss/test-getusershell.t#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/lib/libc/nss/testutil.h#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/netinet/ipblock/Makefile#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/netinet/ipblock/ipblock.c#2 delete .. //depot/projects/scottl-camlock/src/usr.bin/finger/extern.h#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/finger/finger.1#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/finger/finger.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/finger/net.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/make/parse.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/tar/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/tar/bsdtar_platform.h#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/tar/read.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/top/machine.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/whois/whois.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/adduser/adduser.conf.5#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/adduser/adduser.sh#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/bsnmpd/modules/snmp_bridge/snmp_bridge.3#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/mountd/mountd.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/rpc.lockd/lockd_lock.c#2 integrate Differences ... ==== //depot/projects/scottl-camlock/src/UPDATING#3 (text+ko) ==== @@ -21,6 +21,11 @@ developers choose to disable these features on build machines to maximize performance. +20070408: + sendmail(8) has been updated to version 8.14.1. Mail filters + (aka, milters) compiled against the libmilter included in the + base operating system should be recompiled. + 20070302: Firmwares for ipw(4) and iwi(4) are now included in the base tree. In order to use them one must agree to the respective LICENSE in @@ -758,4 +763,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.484 2007/04/03 10:04:54 brueffer Exp $ +$FreeBSD: src/UPDATING,v 1.485 2007/04/14 16:26:01 gshapiro Exp $ ==== //depot/projects/scottl-camlock/src/contrib/libreadline/FREEBSD-upgrade#2 (text+ko) ==== @@ -1,6 +1,7 @@ -# $FreeBSD: src/contrib/libreadline/FREEBSD-upgrade,v 1.9 2006/12/31 09:50:44 ache Exp $ +# $FreeBSD: src/contrib/libreadline/FREEBSD-upgrade,v 1.10 2007/04/12 14:45:25 ache Exp $ # # Official patch 001 imported as v5_2_p1 +# Official patch 002 imported as v5_2_p2 # rm doc/*.dvi doc/*.html doc/*.ps doc/*.0 doc/*.info doc/*.tex doc/texi2* doc/*.pdf ==== //depot/projects/scottl-camlock/src/contrib/libreadline/display.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/libreadline/display.c,v 1.12 2006/12/31 09:47:34 ache Exp $ */ +/* $FreeBSD: src/contrib/libreadline/display.c,v 1.13 2007/04/12 14:45:25 ache Exp $ */ /* display.c -- readline redisplay facility. */ /* Copyright (C) 1987-2006 Free Software Foundation, Inc. @@ -562,6 +562,17 @@ wrap_offset = prompt_invis_chars_first_line = 0; } +#if defined (HANDLE_MULTIBYTE) +#define CHECK_INV_LBREAKS() \ + do { \ + if (newlines >= (inv_lbsize - 2)) \ + { \ + inv_lbsize *= 2; \ + inv_lbreaks = (int *)xrealloc (inv_lbreaks, inv_lbsize * sizeof (int)); \ + _rl_wrapped_line = (int *)xrealloc (_rl_wrapped_line, inv_lbsize * sizeof (int)); \ + } \ + } while (0) +#else #define CHECK_INV_LBREAKS() \ do { \ if (newlines >= (inv_lbsize - 2)) \ @@ -570,6 +581,7 @@ inv_lbreaks = (int *)xrealloc (inv_lbreaks, inv_lbsize * sizeof (int)); \ } \ } while (0) +#endif /* HANDLE_MULTIBYTE */ #if defined (HANDLE_MULTIBYTE) #define CHECK_LPOS() \ ==== //depot/projects/scottl-camlock/src/contrib/opensolaris/cmd/zdb/zdb.8#2 (text+ko) ==== @@ -28,7 +28,6 @@ .fi .SH DESCRIPTION - .LP The \fBzdb\fR command is used by support engineers to diagnose failures and gather statistics. Since the \fBZFS\fR file system is always consistent on disk and is self-repairing, \fBzdb\fR should only be run under the direction by a support engineer. .LP @@ -36,7 +35,6 @@ .LP Any options supported by this command are internal to Sun and subject to change at any time. .SH EXIT STATUS - .LP The following exit values are returned: .sp @@ -73,7 +71,6 @@ .RE .SH ATTRIBUTES - .LP See \fBattributes\fR(5) for descriptions of the following attributes: .sp @@ -92,6 +89,5 @@ .TE .SH SEE ALSO - .LP \fBzfs\fR(1M), \fBzpool\fR(1M), \fBattributes\fR(5) ==== //depot/projects/scottl-camlock/src/contrib/opensolaris/cmd/zfs/zfs.8#2 (text+ko) ==== @@ -26,103 +26,127 @@ .nf \fBzfs\fR [\fB-?\fR] .fi + .LP .nf \fBzfs\fR \fBcreate\fR [[\fB-o\fR property=\fIvalue\fR]]... \fIfilesystem\fR .fi + .LP .nf \fBzfs\fR \fBcreate\fR [\fB-s\fR] [\fB-b\fR \fIblocksize\fR] [[\fB-o\fR property=\fIvalue\fR]]... \fB-V\fR \fIsize\fR \fIvolume\fR .fi + .LP .nf \fBzfs\fR \fBdestroy\fR [\fB-rRf\fR] \fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR .fi + .LP .nf \fBzfs\fR \fBclone\fR \fIsnapshot\fR \fIfilesystem\fR|\fIvolume\fR .fi + .LP .nf \fBzfs\fR \fBpromote\fR \fIfilesystem\fR .fi + .LP .nf \fBzfs\fR \fBrename\fR \fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR [\fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR] .fi + .LP .nf \fBzfs\fR \fBsnapshot\fR [\fB-r\fR] \fIfilesystem@name\fR|\fIvolume@name\fR .fi + .LP .nf \fBzfs\fR \fBrollback\fR [\fB-rRf\fR] \fIsnapshot\fR .fi + .LP .nf \fBzfs\fR \fBlist\fR [\fB-rH\fR] [\fB-o\fR \fIprop\fR[,\fIprop\fR] ]... [ \fB-t\fR \fItype\fR[,\fItype\fR]...] [ \fB-s\fR \fIprop\fR [\fB-s\fR \fIprop\fR]... [ \fB-S\fR \fIprop\fR [\fB-S\fR \fIprop\fR]... [\fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR|\fI/pathname\fR|.\fI/pathname\fR ... .fi + .LP .nf \fBzfs\fR \fBset\fR \fIproperty\fR=\fIvalue\fR \fIfilesystem\fR|\fIvolume\fR ... .fi + .LP .nf \fBzfs\fR \fBget\fR [\fB-rHp\fR] [\fB-o\fR \fIfield\fR[,\fIfield\fR]...] [\fB-s\fR \fIsource\fR[,\fIsource\fR]...] \fIall\fR | \fIproperty\fR[,\fIproperty\fR]... \fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR ... .fi + .LP .nf \fBzfs\fR \fBinherit\fR [\fB-r\fR] \fIproperty\fR \fIfilesystem\fR|\fIvolume\fR... ... .fi + .LP .nf \fBzfs\fR \fBmount\fR .fi + .LP .nf \fBzfs\fR \fBmount\fR [\fB-o \fIoptions\fR\fR] [\fB-O\fR] \fB-a\fR .fi + .LP .nf \fBzfs\fR \fBmount\fR [\fB-o \fIoptions\fR\fR] [\fB-O\fR] \fIfilesystem\fR .fi + .LP .nf \fBzfs\fR \fBunmount\fR [\fB-f\fR] \fB-a\fR .fi + .LP .nf \fBzfs\fR \fBunmount\fR [\fB-f\fR] \fB\fIfilesystem\fR|\fImountpoint\fR\fR .fi + .LP .nf \fBzfs\fR \fBshare\fR \fB-a\fR .fi + .LP .nf \fBzfs\fR \fBshare\fR \fIfilesystem\fR .fi + .LP .nf \fBzfs\fR \fBunshare\fR [\fB-f\fR] \fB-a\fR .fi + .LP .nf \fBzfs\fR \fBunshare\fR [\fB-f\fR] \fB\fIfilesystem\fR|\fImountpoint\fR\fR .fi + .LP .nf \fBzfs\fR \fBsend\fR [\fB-i\fR \fIsnapshot1\fR] \fB\fIsnapshot2\fR\fR .fi + .LP .nf \fBzfs\fR \fBreceive\fR [\fB-vnF\fR ] \fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR .fi + .LP .nf \fBzfs\fR \fBreceive\fR [\fB-vnF\fR ] \fB-d\fR \fB\fIfilesystem\fR\fR @@ -137,7 +161,6 @@ .fi .SH DESCRIPTION - .LP The \fBzfs\fR command configures \fBZFS\fR datasets within a \fBZFS\fR storage pool, as described in \fBzpool\fR(1M). A dataset is identified by a unique path within the \fBZFS\fR namespace. For example: @@ -186,16 +209,14 @@ A read-only version of a file system or volume at a given point in time. It is specified as \fIfilesystem@name\fR or \fIvolume@name\fR. .RE -.SS ZFS File System Hierarchy - +.SS "ZFS File System Hierarchy" .LP A \fBZFS\fR storage pool is a logical collection of devices that provide space for datasets. A storage pool is also the root of the \fBZFS\fR file system hierarchy. .LP The root of the pool can be accessed as a file system, such as mounting and unmounting, taking snapshots, and setting properties. The physical storage characteristics, however, are managed by the \fBzpool\fR(1M) command. .LP See \fBzpool\fR(1M) for more information on creating and administering pools. -.SS Snapshots - +.SS "Snapshots" .LP A snapshot is a read-only copy of a file system or volume. Snapshots can be created extremely quickly, and initially consume no additional space within the pool. As data within the active dataset changes, the snapshot consumes more data than would otherwise be shared with the active dataset. .LP @@ -203,8 +224,7 @@ .LP File system snapshots can be accessed under the ".zfs/snapshot" directory in the root of the file system. Snapshots are automatically mounted on demand and may be unmounted at regular intervals. The visibility of the ".zfs" directory can be controlled by the "snapdir" property. -.SS Clones - +.SS "Clones" .LP A clone is a writable volume or file system whose initial contents are the same as another dataset. As with snapshots, creating a clone is nearly instantaneous, and initially consumes no additional space. .LP @@ -213,8 +233,7 @@ .LP The clone parent-child dependency relationship can be reversed by using the "\fBpromote\fR" subcommand. This causes the "origin" file system to become a clone of the specified file system, which makes it possible to destroy the file system that the clone was created from. -.SS Mount Points - +.SS "Mount Points" .LP Creating a \fBZFS\fR file system is a simple operation, so the number of file systems per system will likely be numerous. To cope with this, \fBZFS\fR automatically manages mounting and unmounting file systems without the need to edit the \fB/etc/vfstab\fR file. All automatically managed file systems are mounted by \fBZFS\fR at boot time. @@ -227,8 +246,7 @@ .LP If needed, \fBZFS\fR file systems can also be managed with traditional tools (\fBmount\fR, \fBumount\fR, \fB/etc/vfstab\fR). If a file system's mount point is set to "legacy", \fBZFS\fR makes no attempt to manage the file system, and the administrator is responsible for mounting and unmounting the file system. -.SS Zones - +.SS "Zones" .LP A \fBZFS\fR file system can be added to a non-global zone by using zonecfg's "\fBadd fs\fR" subcommand. A \fBZFS\fR file system that is added to a non-global zone must have its mountpoint property set to legacy. .LP @@ -244,8 +262,7 @@ After a dataset is delegated to a non-global zone, the "zoned" property is automatically set. A zoned file system cannot be mounted in the global zone, since the zone administrator might have to set the mount point to an unacceptable value. .LP The global administrator can forcibly clear the "zoned" property, though this should be done with extreme care. The global administrator should verify that all the mount points are acceptable before clearing the property. -.SS Native Properties - +.SS "Native Properties" .LP Properties are divided into two types, native properties and user defined properties. Native properties either export internal statistics or control \fBZFS\fR behavior. In addition, native properties are either editable or read-only. User properties have no effect on \fBZFS\fR behavior, but you can use them to annotate datasets in a way that is meaningful in your environment. For more information about user properties, see the "User Properties" section. @@ -507,11 +524,13 @@ .ne 2 .mk .na -\fBcompression=\fIon\fR | \fIoff\fR | \fIlzjb\fR\fR +\fBcompression=\fIon\fR | \fIoff\fR | \fIlzjb\fR | \fIgzip\fR | \fIgzip-N\fR\fR .ad .sp .6 .RS 4n -Controls the compression algorithm used for this dataset. There is currently only one algorithm, "\fIlzjb\fR", though this may change in future releases. The default value is "off". +Controls the compression algorithm used for this dataset. The "lzjb" compression algorithm is optimized for performance while providing decent data compression. Setting compression to "on" uses the "lzjb" compression algorithm. The "gzip" +compression algorithm uses the same compression as the \fBgzip\fR(1) command. You can specify the "gzip" level by using the value "gzip-\fIN\fR", +where \fIN\fR is an integer from 1 (fastest) to 9 (best compression ratio). Currently, "gzip" is equivalent to "gzip-6" (which is also the default for \fBgzip\fR(1)). .sp This property can also be referred to by its shortened column name "compress". .RE @@ -655,10 +674,10 @@ .ad .sp .6 .RS 4n -Controls the number of copies of data stored for this dataset. These copies are in addition to any redundancy provided by the pool (for example, mirroring or raid-z). The copies are stored on different disks if possible. The space used by multiple copies is charged to the associated -file and dataset, changing the "used" property and counting against quotas and reservations. +Controls the number of copies of data stored for this dataset. These copies are in addition to any redundancy provided by the pool, for example, mirroring or raid-z. The copies are stored on different disks, if possible. The space used by multiple copies is charged to the associated +file and dataset, changing the "used" property and counting against quotas and reservations. .sp -Changing this property only affects newly-written data. Therefore, it is recommended that this property be set at file system creation time, using the "\fB-o\fR copies=" option. +Changing this property only affects newly-written data. Therefore, set this property at file system creation time by using the "\fB-o\fR copies=" option. .RE .sp @@ -672,12 +691,10 @@ Controls whether the dataset is managed from within a jail. The default value is "off". .RE -.SS iscsioptions - +.SS "iscsioptions" .LP This read-only property, which is hidden, is used by the \fBiSCSI\fR target daemon to store persistent information, such as the \fBIQN\fR. It cannot be viewed or modified using the \fBzfs\fR command. The contents are not intended for external consumers. -.SS Temporary Mount Point Properties - +.SS "Temporary Mount Point Properties" .LP When a file system is mounted, either through \fBmount\fR(1M) for legacy mounts or the "\fBzfs mount\fR" command for normal file systems, its mount options are set according to its properties. The correlation between properties and mount options is as follows: @@ -697,8 +714,7 @@ .LP In addition, these options can be set on a per-mount basis using the \fB-o\fR option, without affecting the property that is stored on disk. The values specified on the command line override the values stored in the dataset. The \fB-nosuid\fR option is an alias for "nodevices,nosetuid". These properties are reported as "temporary" by the "\fBzfs get\fR" command. If the properties are changed while the dataset is mounted, the new setting overrides any temporary settings. -.SS User Properties - +.SS "User Properties" .LP In addition to the standard native properties, \fBZFS\fR supports arbitrary user properties. User properties have no effect on \fBZFS\fR behavior, but applications or administrators can use them to annotate datasets. .LP @@ -711,8 +727,7 @@ .LP The values of user properties are arbitrary strings, are always inherited, and are never validated. All of the commands that operate on properties ("zfs list", "zfs get", "zfs set", etc.) can be used to manipulate both native properties and user properties. Use the "\fBzfs inherit\fR" command to clear a user property . If the property is not defined in any parent dataset, it is removed entirely. Property values are limited to 1024 characters. -.SS Volumes as Swap or Dump Devices - +.SS "Volumes as Swap or Dump Devices" .LP To set up a swap area, create a \fBZFS\fR volume of a specific size and then enable swap on that device. For more information, see the EXAMPLES section. .LP @@ -720,7 +735,6 @@ .LP Using a \fBZFS\fR volume as a dump device is not supported. .SH SUBCOMMANDS - .LP All subcommands that modify state are logged persistently to the pool in their original form. .sp @@ -1466,10 +1480,10 @@ .SH EXAMPLES .LP \fBExample 1 \fRCreating a ZFS File System Hierarchy - .LP The following commands create a file system named "\fBpool/home\fR" and a file system named "\fBpool/home/bob\fR". The mount point "\fB/export/home\fR" is set for the parent file system, and automatically inherited by the child file system. + .sp .in +2 .nf @@ -1479,11 +1493,12 @@ .fi .in -2 .sp + .LP \fBExample 2 \fRCreating a ZFS Snapshot - .LP The following command creates a snapshot named "yesterday". This snapshot is mounted on demand in the ".zfs/snapshot" directory at the root of the "\fBpool/home/bob\fR" file system. + .sp .in +2 .nf @@ -1491,12 +1506,13 @@ .fi .in -2 .sp + .LP \fBExample 3 \fRTaking and destroying multiple snapshots - .LP The following command creates snapshots named "\fByesterday\fR" of "\fBpool/home\fR" and all of its descendant file systems. Each snapshot is mounted on demand in the ".zfs/snapshot" directory at the root of its file system. The second command destroys the newly created snapshots. + .sp .in +2 .nf @@ -1505,11 +1521,12 @@ .fi .in -2 .sp + .LP \fBExample 4 \fRTurning Off Compression - .LP The following commands turn compression off for all file systems under "\fBpool/home\fR", but explicitly turns it on for "\fBpool/home/anne\fR". + .sp .in +2 .nf @@ -1518,11 +1535,12 @@ .fi .in -2 .sp + .LP \fBExample 5 \fRListing ZFS Datasets - .LP The following command lists all active file systems and volumes in the system. + .sp .in +2 .nf @@ -1538,11 +1556,12 @@ .fi .in -2 .sp + .LP \fBExample 6 \fRSetting a Quota on a ZFS File System - .LP The following command sets a quota of 50 gbytes for "\fBpool/home/bob\fR". + .sp .in +2 .nf @@ -1550,11 +1569,12 @@ .fi .in -2 .sp + .LP \fBExample 7 \fRListing ZFS Properties - .LP The following command lists all properties for "\fBpool/home/bob\fR". + .sp .in +2 .nf @@ -1596,6 +1616,7 @@ .LP The following command gets a single property value. + .sp .in +2 .nf @@ -1607,6 +1628,7 @@ .LP The following command lists all properties with local settings for "\fBpool/home/bob\fR". + .sp .in +2 .nf @@ -1618,11 +1640,12 @@ .fi .in -2 .sp + .LP \fBExample 8 \fRRolling Back a ZFS File System - .LP The following command reverts the contents of "\fBpool/home/anne\fR" to the snapshot named "\fByesterday\fR", deleting all intermediate snapshots. + .sp .in +2 .nf @@ -1630,11 +1653,12 @@ .fi .in -2 .sp + .LP \fBExample 9 \fRCreating a ZFS Clone - .LP The following command creates a writable file system whose initial contents are the same as "\fBpool/home/bob@yesterday\fR". + .sp .in +2 .nf @@ -1642,11 +1666,12 @@ .fi .in -2 .sp + .LP \fBExample 10 \fRPromoting a ZFS Clone - .LP The following commands illustrate how to test out changes to a file system, and then replace the original file system with the changed one, using clones, clone promotion, and renaming: + .sp .in +2 .nf @@ -1664,11 +1689,12 @@ .fi .in -2 .sp + .LP \fBExample 11 \fRInheriting ZFS Properties - .LP The following command causes "\fBpool/home/bob\fR" and "\fBpool/home/anne\fR" to inherit the "checksum" property from their parent. + .sp .in +2 .nf @@ -1676,12 +1702,13 @@ .fi .in -2 .sp + .LP \fBExample 12 \fRRemotely Replicating ZFS Data - .LP The following commands send a full stream and then an incremental stream to a remote machine, restoring them into "\fBpoolB/received/fs\fR@a" and "\fBpoolB/received/fs@b\fR", respectively. "\fBpoolB\fR" must contain the file system "\fBpoolB/received\fR", and must not initially contain "\fBpoolB/received/fs\fR". + .sp .in +2 .nf @@ -1692,12 +1719,13 @@ .fi .in -2 .sp + .LP \fBExample 13 \fRUsing the zfs receive -d Option - .LP The following command sends a full stream of "\fBpoolA/fsA/fsB@snap\fR" to a remote machine, receiving it into "\fBpoolB/received/fsA/fsB@snap\fR". The "\fBfsA/fsB@snap\fR" portion of the received snapshot's name is determined from the name of the sent snapshot. "\fBpoolB\fR" must contain the file system "\fBpoolB/received\fR". If "\fBpoolB/received/fsA\fR" does not exist, it will be created as an empty file system. + .sp .in +2 .nf @@ -1707,11 +1735,12 @@ .fi .in -2 .sp + .LP \fBExample 14 \fRCreating a ZFS volume as a Swap Device - .LP The following example shows how to create a 5-Gbyte ZFS volume and then add the volume as a swap device. + .sp .in +2 .nf @@ -1720,11 +1749,12 @@ .fi .in -2 .sp + .LP \fBExample 15 \fRSetting User Properties - .LP The following example sets the user defined "com.example:department" property for a dataset. + .sp .in +2 .nf @@ -1732,11 +1762,12 @@ .fi .in -2 .sp + .LP \fBExample 16 \fRCreating a ZFS Volume as a iSCSI Target Device - .LP The following example shows how to create a \fBZFS\fR volume as an \fBiSCSI\fR target. + .sp .in +2 .nf @@ -1754,7 +1785,6 @@ .LP After the \fBiSCSI\fR target is created, set up the \fBiSCSI\fR initiator. For more information about the Solaris \fBiSCSI\fR initiator, see the Solaris Administration Guide: Devices and File Systems. .SH EXIT STATUS - .LP The following exit values are returned: .sp @@ -1791,7 +1821,6 @@ .RE .SH ATTRIBUTES - .LP See \fBattributes\fR(5) for descriptions of the following attributes: .sp @@ -1810,6 +1839,5 @@ .TE .SH SEE ALSO - .LP -\fBssh\fR(1), \fBmount\fR(1M), \fBshare\fR(1M), \fBunshare\fR(1M), \fBzonecfg\fR(1M), \fBzpool\fR(1M), \fBchmod\fR(2), \fBstat\fR(2), \fBfsync\fR(3c), \fBdfstab\fR(4), \fBattributes\fR(5) +\fBgzip\fR(1), \fBssh\fR(1), \fBmount\fR(1M), \fBshare\fR(1M), \fBunshare\fR(1M), \fBzonecfg\fR(1M), \fBzpool\fR(1M), \fBchmod\fR(2), \fBstat\fR(2), \fBfsync\fR(3c), \fBdfstab\fR(4), \fBattributes\fR(5) ==== //depot/projects/scottl-camlock/src/contrib/opensolaris/cmd/zfs/zfs_main.c#2 (text+ko) ==== @@ -206,7 +206,8 @@ "\treceive [-vnF] -d \n")); case HELP_RENAME: return (gettext("\trename " - "\n")); + "\n" + "\trename -r ")); case HELP_ROLLBACK: return (gettext("\trollback [-rRf] \n")); case HELP_SEND: @@ -1485,7 +1486,7 @@ } /* - * zfs rename + * zfs rename [-r] * * Renames the given dataset to another of the same type. */ @@ -1494,38 +1495,57 @@ zfs_do_rename(int argc, char **argv) { zfs_handle_t *zhp; + int c; int ret; + int recurse = 0; /* check options */ - if (argc > 1 && argv[1][0] == '-') { - (void) fprintf(stderr, gettext("invalid option '%c'\n"), - argv[1][1]); - usage(B_FALSE); + while ((c = getopt(argc, argv, "r")) != -1) { + switch (c) { + case 'r': + recurse = 1; + break; + case '?': + default: + (void) fprintf(stderr, gettext("invalid option '%c'\n"), + optopt); + usage(B_FALSE); + } } + argc -= optind; + argv += optind; + /* check number of arguments */ - if (argc < 2) { + if (argc < 1) { (void) fprintf(stderr, gettext("missing source dataset " "argument\n")); usage(B_FALSE); } - if (argc < 3) { + if (argc < 2) { (void) fprintf(stderr, gettext("missing target dataset " "argument\n")); usage(B_FALSE); } - if (argc > 3) { + if (argc > 2) { (void) fprintf(stderr, gettext("too many arguments\n")); usage(B_FALSE); } - if ((zhp = zfs_open(g_zfs, argv[1], ZFS_TYPE_ANY)) == NULL) + if (recurse && strchr(argv[0], '@') == 0) { + (void) fprintf(stderr, gettext("source dataset for recursive " + "rename must be a snapshot\n")); + usage(B_FALSE); + } + + if ((zhp = zfs_open(g_zfs, argv[0], ZFS_TYPE_ANY)) == NULL) return (1); - ret = (zfs_rename(zhp, argv[2]) != 0); + ret = (zfs_rename(zhp, argv[1], recurse) != 0); if (!ret) - zpool_log_history(g_zfs, argc, argv, argv[2], B_FALSE, B_FALSE); + zpool_log_history(g_zfs, argc + optind, argv - optind, argv[1], + B_FALSE, B_FALSE); zfs_close(zhp); return (ret); ==== //depot/projects/scottl-camlock/src/contrib/opensolaris/cmd/zpool/zpool.8#2 (text+ko) ==== @@ -26,104 +26,124 @@ .nf \fBzpool\fR [\fB-?\fR] .fi + .LP .nf \fBzpool create\fR [\fB-fn\fR] [\fB-R\fR \fIroot\fR] [\fB-m\fR \fImountpoint\fR] \fIpool\fR \fIvdev ...\fR .fi + .LP .nf \fBzpool destroy\fR [\fB-f\fR] \fIpool\fR .fi + .LP .nf \fBzpool add\fR [\fB-fn\fR] \fIpool\fR \fIvdev\fR .fi + .LP .nf \fBzpool remove\fR \fIpool\fR \fIvdev\fR .fi + .LP .nf \fBzpool \fR \fBlist\fR [\fB-H\fR] [\fB-o\fR \fIfield\fR[,\fIfield\fR]*] [\fIpool\fR] ... .fi + .LP .nf \fBzpool iostat\fR [\fB-v\fR] [\fIpool\fR] ... [\fIinterval\fR [\fIcount\fR]] .fi + .LP .nf \fBzpool status\fR [\fB-xv\fR] [\fIpool\fR] ... .fi + .LP .nf \fBzpool offline\fR [\fB-t\fR] \fIpool\fR \fIdevice\fR ... .fi + .LP .nf \fBzpool online\fR \fIpool\fR \fIdevice\fR ... .fi + .LP .nf \fBzpool clear\fR \fIpool\fR [\fIdevice\fR] ... .fi + .LP .nf \fBzpool attach\fR [\fB-f\fR] \fIpool\fR \fIdevice\fR \fInew_device\fR .fi + .LP .nf \fBzpool detach\fR \fIpool\fR \fIdevice\fR .fi + .LP .nf \fBzpool replace\fR [\fB-f\fR] \fIpool\fR \fIdevice\fR [\fInew_device\fR] .fi + .LP .nf \fBzpool scrub\fR [\fB-s\fR] \fIpool\fR ... .fi + .LP .nf >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Apr 16 17:49:05 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 7352B16A40D; Mon, 16 Apr 2007 17:49:05 +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 3C36A16A40A for ; Mon, 16 Apr 2007 17:49:05 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2B50113C46A for ; Mon, 16 Apr 2007 17:49:05 +0000 (UTC) (envelope-from jhb@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 l3GHn5iH038445 for ; Mon, 16 Apr 2007 17:49:05 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3GHn4XI038442 for perforce@freebsd.org; Mon, 16 Apr 2007 17:49:04 GMT (envelope-from jhb@freebsd.org) Date: Mon, 16 Apr 2007 17:49:04 GMT Message-Id: <200704161749.l3GHn4XI038442@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 118253 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: Mon, 16 Apr 2007 17:49:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=118253 Change 118253 by jhb@jhb_mutex on 2007/04/16 17:48:17 Use kern_open() to open "/dev/null" in fdcheckstd(). Affected files ... .. //depot/projects/smpng/sys/kern/kern_descrip.c#105 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_descrip.c#105 (text+ko) ==== @@ -1813,11 +1813,9 @@ int fdcheckstd(struct thread *td) { - struct nameidata nd; struct filedesc *fdp; - struct file *fp; - register_t retval; - int fd, i, error, flags, devnull; + register_t retval, save; + int i, error, devnull; fdp = td->td_proc->p_fd; if (fdp == NULL) @@ -1829,48 +1827,14 @@ if (fdp->fd_ofiles[i] != NULL) continue; if (devnull < 0) { - int vfslocked; - error = falloc(td, &fp, &fd); - if (error != 0) - break; - /* Note extra ref on `fp' held for us by falloc(). */ - KASSERT(fd == i, ("oof, we didn't get our fd")); - NDINIT(&nd, LOOKUP, FOLLOW | MPSAFE, UIO_SYSSPACE, - "/dev/null", td); - flags = FREAD | FWRITE; - error = vn_open(&nd, &flags, 0, fd); - if (error != 0) { - /* - * Someone may have closed the entry in the - * file descriptor table, so check it hasn't - * changed before dropping the reference - * count. - */ - FILEDESC_XLOCK(fdp); - KASSERT(fdp->fd_ofiles[fd] == fp, - ("table not shared, how did it change?")); - fdp->fd_ofiles[fd] = NULL; - fdunused(fdp, fd); - FILEDESC_XUNLOCK(fdp); - fdrop(fp, td); - fdrop(fp, td); + save = td->td_retval[0]; + error = kern_open(td, "/dev/null", UIO_SYSSPACE, + O_RDWR, 0); + devnull = td->td_retval[0]; + KASSERT(devnull == i, ("oof, we didn't get our fd")); + td->td_retval[0] = save; + if (error) break; - } - vfslocked = NDHASGIANT(&nd); - NDFREE(&nd, NDF_ONLY_PNBUF); - FILE_LOCK(fp); - fp->f_flag = flags; - fp->f_vnode = nd.ni_vp; - if (fp->f_data == NULL) - fp->f_data = nd.ni_vp; - fp->f_type = DTYPE_VNODE; - if (fp->f_ops == &badfileops) - fp->f_ops = &vnops; - FILE_UNLOCK(fp); - VOP_UNLOCK(nd.ni_vp, 0, td); - VFS_UNLOCK_GIANT(vfslocked); - devnull = fd; - fdrop(fp, td); } else { error = do_dup(td, DUP_FIXED, devnull, i, &retval); if (error != 0) From owner-p4-projects@FreeBSD.ORG Mon Apr 16 18:30:57 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 352F216A406; Mon, 16 Apr 2007 18:30:57 +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 E5AE816A401 for ; Mon, 16 Apr 2007 18:30:56 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id D473713C46E for ; Mon, 16 Apr 2007 18:30:56 +0000 (UTC) (envelope-from lulf@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 l3GIUuev050769 for ; Mon, 16 Apr 2007 18:30:56 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3GIUudP050742 for perforce@freebsd.org; Mon, 16 Apr 2007 18:30:56 GMT (envelope-from lulf@FreeBSD.org) Date: Mon, 16 Apr 2007 18:30:56 GMT Message-Id: <200704161830.l3GIUudP050742@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 118254 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: Mon, 16 Apr 2007 18:30:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=118254 Change 118254 by lulf@lulf_carrot on 2007/04/16 18:30:04 - Silly C. We can't just dereference local variables, so we have to hack it up. Affected files ... .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum.c#3 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_state.c#3 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_kernel/geom_vinum.c#2 delete .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_kernel/geom_vinum.h#2 delete .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_kernel/geom_vinum_drive.c#2 delete .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_kernel/geom_vinum_init.c#2 delete .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_kernel/geom_vinum_list.c#2 delete .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_kernel/geom_vinum_move.c#2 delete .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_kernel/geom_vinum_plex.c#2 delete .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_kernel/geom_vinum_raid5.c#2 delete .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_kernel/geom_vinum_raid5.h#2 delete .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_kernel/geom_vinum_rename.c#2 delete .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_kernel/geom_vinum_rm.c#2 delete .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_kernel/geom_vinum_share.c#2 delete .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_kernel/geom_vinum_share.h#2 delete .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_kernel/geom_vinum_state.c#2 delete .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_kernel/geom_vinum_subr.c#2 delete .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_kernel/geom_vinum_var.h#2 delete .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_kernel/geom_vinum_volume.c#2 delete .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_user/Makefile#2 delete .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_user/geom_vinum.c#2 delete .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_user/geom_vinum.h#2 delete .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_user/geom_vinum_drive.c#2 delete .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_user/geom_vinum_init.c#2 delete .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_user/geom_vinum_list.c#2 delete .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_user/geom_vinum_move.c#2 delete .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_user/geom_vinum_plex.c#2 delete .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_user/geom_vinum_raid5.c#2 delete .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_user/geom_vinum_raid5.h#2 delete .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_user/geom_vinum_rename.c#2 delete .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_user/geom_vinum_rm.c#2 delete .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_user/geom_vinum_share.c#2 delete .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_user/geom_vinum_share.h#2 delete .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_user/geom_vinum_state.c#2 delete .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_user/geom_vinum_subr.c#2 delete .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_user/geom_vinum_var.h#2 delete .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_user/geom_vinum_volume.c#2 delete .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_user/gvinum.8#2 delete .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_user/gvinum.c#2 delete .. //depot/projects/soc2007/lulf/gvinum_fixup/vinum_user/gvinum.h#2 delete Differences ... ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum.c#3 (text+ko) ==== @@ -507,27 +507,31 @@ case GV_EVENT_SET_SD_STATE: printf("VINUM: event 'setstate sd'\n"); s = ev->arg1; - newstate = *(int *)ev->arg2; - flags = *(int *)ev->arg3; + newstate = *ev->arg2; + flags = *ev->arg3; err = gv_set_sd_state(s, newstate, flags); + /* XXX: Handle these errors better, provide + * ERROR CODES.*/ if (err) printf("VINUM: error setting subdisk " "state\n"); - /* XXX: Handle these errors better, provide - * ERROR CODES.*/ + free(ev->arg2); + free(ev->arg3); break; case GV_EVENT_SET_DRIVE_STATE: printf("VINUM: event 'setstate drive'\n"); d = ev->arg1; - newstate = *(int *)ev->arg2; - flags = *(int *)ev->arg3; + newstate = *ev->arg2; + flags = *ev->arg3; err = gv_set_drive_state(d, newstate, flags); + /* XXX: Handle these errors better, provide + * ERROR CODES.*/ if (err) printf("VINUM: error setting drive " "state"); - /* XXX: Handle these errors better, provide - * ERROR CODES.*/ + free(ev->arg2); + free(ev->arg3); break; case GV_EVENT_THREAD_EXIT: ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_state.c#3 (text+ko) ==== @@ -44,7 +44,7 @@ struct gv_sd *s; struct gv_drive *d; char *obj, *state; - int f, *flags, newstate, type; + int *f, *flags, *newstate, type; f = 0; obj = gctl_get_param(req, "object", NULL); @@ -77,25 +77,30 @@ break; case GV_TYPE_SD: - newstate = gv_sdstatei(state); - if (newstate < 0) { + if (gv_sdstatei(state) < 0) { gctl_error(req, "invalid subdisk state '%s'", state); break; } s = gv_find_sd(sc, obj); - - gv_post_event(sc, GV_EVENT_SET_SD_STATE, s, &newstate, &f); + newstatep = malloc(sizeof(int), M_WAITOK | M_ZERO)); + *newstatep = gv_sdstatei(state); + flagp = malloc(sizeof(int), M_WAITOK | M_ZERO)); + *flagp = f; + gv_post_event(sc, GV_EVENT_SET_SD_STATE, s, newstatep, flagp); break; case GV_TYPE_DRIVE: - newstate = gv_drivestatei(state); - if (newstate < 0) { + if (gv_drivestatei(state) < 0) { gctl_error(req, "invalid drive state '%s'", state); break; } d = gv_find_drive(sc, obj); - gv_post_event(sc, GV_EVENT_SET_DRIVE_STATE, d, &newstate, &f); + newstatep = malloc(sizeof(int), M_WAITOK | M_ZERO)); + *newstatep = gv_sdstatei(state); + flagp = malloc(sizeof(int), M_WAITOK | M_ZERO)); + *flagp = f; + gv_post_event(sc, GV_EVENT_SET_DRIVE_STATE, d, newstatep, flagp); break; default: From owner-p4-projects@FreeBSD.ORG Mon Apr 16 19:25:17 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 703EC16A404; Mon, 16 Apr 2007 19:25:17 +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 EE15416A401 for ; Mon, 16 Apr 2007 19:25:16 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id DD78D13C44C for ; Mon, 16 Apr 2007 19:25:16 +0000 (UTC) (envelope-from lulf@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 l3GJPGuk062577 for ; Mon, 16 Apr 2007 19:25:16 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3GJPGuv062574 for perforce@freebsd.org; Mon, 16 Apr 2007 19:25:16 GMT (envelope-from lulf@FreeBSD.org) Date: Mon, 16 Apr 2007 19:25:16 GMT Message-Id: <200704161925.l3GJPGuv062574@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 118257 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: Mon, 16 Apr 2007 19:25:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=118257 Change 118257 by lulf@lulf_vimes on 2007/04/16 19:24:27 - Fix compilation issues. - Now we have a working setstate. Affected files ... .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum.c#4 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum.h#3 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_state.c#4 edit Differences ... ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum.c#4 (text+ko) ==== @@ -507,31 +507,31 @@ case GV_EVENT_SET_SD_STATE: printf("VINUM: event 'setstate sd'\n"); s = ev->arg1; - newstate = *ev->arg2; - flags = *ev->arg3; + newstate = *(int *)ev->arg2; + flags = *(int *)ev->arg3; err = gv_set_sd_state(s, newstate, flags); /* XXX: Handle these errors better, provide * ERROR CODES.*/ if (err) printf("VINUM: error setting subdisk " "state\n"); - free(ev->arg2); - free(ev->arg3); + g_free(ev->arg2); + g_free(ev->arg3); break; case GV_EVENT_SET_DRIVE_STATE: printf("VINUM: event 'setstate drive'\n"); d = ev->arg1; - newstate = *ev->arg2; - flags = *ev->arg3; + newstate = *(int *)ev->arg2; + flags = *(int *)ev->arg3; err = gv_set_drive_state(d, newstate, flags); /* XXX: Handle these errors better, provide * ERROR CODES.*/ if (err) printf("VINUM: error setting drive " "state"); - free(ev->arg2); - free(ev->arg3); + g_free(ev->arg2); + g_free(ev->arg3); break; case GV_EVENT_THREAD_EXIT: ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum.h#3 (text+ko) ==== @@ -104,4 +104,6 @@ void gv_create_plex(struct gv_softc *, struct gv_plex *); void gv_create_sd(struct gv_softc *, struct gv_sd *); +int gv_stripe_active(struct gv_plex *, struct bio *); + #endif /* !_GEOM_VINUM_H_ */ ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_state.c#4 (text+ko) ==== @@ -44,7 +44,7 @@ struct gv_sd *s; struct gv_drive *d; char *obj, *state; - int *f, *flags, *newstate, type; + int f, *flags, *newstatep, *flagp, type; f = 0; obj = gctl_get_param(req, "object", NULL); @@ -82,9 +82,11 @@ break; } s = gv_find_sd(sc, obj); - newstatep = malloc(sizeof(int), M_WAITOK | M_ZERO)); + + /* XXX: Should try to avoid malloc. */ + newstatep = g_malloc(sizeof(int), M_WAITOK | M_ZERO); *newstatep = gv_sdstatei(state); - flagp = malloc(sizeof(int), M_WAITOK | M_ZERO)); + flagp = g_malloc(sizeof(int), M_WAITOK | M_ZERO); *flagp = f; gv_post_event(sc, GV_EVENT_SET_SD_STATE, s, newstatep, flagp); break; @@ -96,9 +98,10 @@ } d = gv_find_drive(sc, obj); - newstatep = malloc(sizeof(int), M_WAITOK | M_ZERO)); + /* XXX: Should try to avoid malloc. */ + newstatep = g_malloc(sizeof(int), M_WAITOK | M_ZERO); *newstatep = gv_sdstatei(state); - flagp = malloc(sizeof(int), M_WAITOK | M_ZERO)); + flagp = g_malloc(sizeof(int), M_WAITOK | M_ZERO); *flagp = f; gv_post_event(sc, GV_EVENT_SET_DRIVE_STATE, d, newstatep, flagp); break; From owner-p4-projects@FreeBSD.ORG Mon Apr 16 20:02:06 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 AF3DA16A403; Mon, 16 Apr 2007 20:02:06 +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 1C89E16A400 for ; Mon, 16 Apr 2007 20:02:06 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 0A36C13C448 for ; Mon, 16 Apr 2007 20:02:06 +0000 (UTC) (envelope-from scottl@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 l3GK25tg069461 for ; Mon, 16 Apr 2007 20:02:05 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3GK25aO069445 for perforce@freebsd.org; Mon, 16 Apr 2007 20:02:05 GMT (envelope-from scottl@freebsd.org) Date: Mon, 16 Apr 2007 20:02:05 GMT Message-Id: <200704162002.l3GK25aO069445@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 118261 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: Mon, 16 Apr 2007 20:02:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=118261 Change 118261 by scottl@scottl-x64 on 2007/04/16 20:01:40 IFC Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_da.c#32 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_sg.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/security/audit/audit_bsm_token.c#9 integrate Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#21 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.65 2007/04/15 08:49:09 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.66 2007/04/16 19:42:23 scottl Exp $"); #include #include @@ -501,7 +501,6 @@ static void camperiphfree(struct cam_periph *periph) { - int s; struct periph_driver **p_drv; for (p_drv = periph_drivers; *p_drv != NULL; p_drv++) { @@ -512,15 +511,13 @@ printf("camperiphfree: attempt to free non-existant periph\n"); return; } - - if (periph->periph_dtor != NULL) - periph->periph_dtor(periph); - - s = splsoftcam(); + TAILQ_REMOVE(&(*p_drv)->units, periph, unit_links); (*p_drv)->generation++; - splx(s); + xpt_unlock_buses(); + if (periph->periph_dtor != NULL) + periph->periph_dtor(periph); xpt_remove_periph(periph); if (periph->flags & CAM_PERIPH_NEW_DEV_FOUND) { @@ -549,6 +546,7 @@ } xpt_free_path(periph->path); free(periph, M_CAMPERIPH); + xpt_lock_buses(); } /* ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.c#20 (text+ko) ==== @@ -46,7 +46,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.98 2007/04/15 08:49:10 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.99 2007/04/16 19:41:14 scottl Exp $"); #include "opt_cd.h" @@ -486,7 +486,9 @@ xpt_print(periph->path, "removing changer entry\n"); free(softc->changer, M_DEVBUF); } + cam_periph_unlock(periph); disk_destroy(softc->disk); + cam_periph_lock(periph); free(softc, M_DEVBUF); } ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_da.c#32 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.204 2007/04/15 08:49:10 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.205 2007/04/16 19:41:14 scottl Exp $"); #include @@ -939,13 +939,9 @@ && sysctl_ctx_free(&softc->sysctl_ctx) != 0) { xpt_print(periph->path, "can't remove sysctl context\n"); } - disk_destroy(softc->disk); - /* - * XXX Gotta drop the periph lock so that the drain can complete with - * deadlocking on the lock. Hopefully dropping here is safe. - */ cam_periph_unlock(periph); + disk_destroy(softc->disk); callout_drain(&softc->sendordered_c); cam_periph_lock(periph); free(softc, M_DEVBUF); ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_sg.c#7 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sg.c,v 1.5 2007/04/15 08:49:11 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sg.c,v 1.6 2007/04/16 19:40:13 scottl Exp $"); #include #include @@ -223,8 +223,8 @@ softc = (struct sg_softc *)periph->softc; devstat_remove_entry(softc->device_stats); + destroy_dev(softc->devalias); destroy_dev(softc->dev); - destroy_dev(softc->devalias); if (bootverbose) { xpt_print(periph->path, "removing device entry\n"); } ==== //depot/projects/scottl-camlock/src/sys/security/audit/audit_bsm_token.c#9 (text) ==== @@ -31,7 +31,7 @@ * POSSIBILITY OF SUCH DAMAGE. * * $P4: //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#23 $ - * $FreeBSD: src/sys/security/audit/audit_bsm_token.c,v 1.10 2007/04/13 14:55:19 csjp Exp $ + * $FreeBSD: src/sys/security/audit/audit_bsm_token.c,v 1.11 2007/04/16 16:20:45 rwatson Exp $ */ #include @@ -49,7 +49,6 @@ #include #include -#include #include #include @@ -180,8 +179,44 @@ token_t * au_to_attr64(struct vnode_au_info *vni) { + token_t *t; + u_char *dptr = NULL; + u_int16_t pad0_16 = 0; + u_int16_t pad0_32 = 0; + + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 2 * sizeof(u_int16_t) + + 3 * sizeof(u_int32_t) + sizeof(u_int64_t) * 2); + + ADD_U_CHAR(dptr, AUT_ATTR64); + + /* + * Darwin defines the size for the file mode + * as 2 bytes; BSM defines 4 so pad with 0 + */ + ADD_U_INT16(dptr, pad0_16); + ADD_U_INT16(dptr, vni->vn_mode); + + ADD_U_INT32(dptr, vni->vn_uid); + ADD_U_INT32(dptr, vni->vn_gid); + ADD_U_INT32(dptr, vni->vn_fsid); + + /* + * Some systems use 32-bit file ID's, other's use 64-bit file IDs. + * Attempt to handle both, and let the compiler sort it out. If we + * could pick this out at compile-time, it would be better, so as to + * avoid the else case below. + */ + if (sizeof(vni->vn_fileid) == sizeof(uint32_t)) { + ADD_U_INT32(dptr, pad0_32); + ADD_U_INT32(dptr, vni->vn_fileid); + } else if (sizeof(vni->vn_fileid) == sizeof(uint64_t)) + ADD_U_INT64(dptr, vni->vn_fileid); + else + ADD_U_INT64(dptr, 0LL); - return (NULL); + ADD_U_INT64(dptr, vni->vn_dev); + + return (t); } token_t * @@ -270,7 +305,7 @@ au_to_groups(int *groups) { - return (au_to_newgroups(AUDIT_MAX_GROUPS, groups)); + return (au_to_newgroups(AUDIT_MAX_GROUPS, (gid_t*)groups)); } /* @@ -578,18 +613,32 @@ } token_t * -au_to_process64(__unused au_id_t auid, __unused uid_t euid, - __unused gid_t egid, __unused uid_t ruid, __unused gid_t rgid, - __unused pid_t pid, __unused au_asid_t sid, __unused au_tid_t *tid) +au_to_process64(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, gid_t rgid, + pid_t pid, au_asid_t sid, au_tid_t *tid) { + token_t *t; + u_char *dptr = NULL; - return (NULL); + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 8 * sizeof(u_int32_t) + + sizeof(u_int64_t)); + + ADD_U_CHAR(dptr, AUT_PROCESS64); + ADD_U_INT32(dptr, auid); + ADD_U_INT32(dptr, euid); + ADD_U_INT32(dptr, egid); + ADD_U_INT32(dptr, ruid); + ADD_U_INT32(dptr, rgid); + ADD_U_INT32(dptr, pid); + ADD_U_INT32(dptr, sid); + ADD_U_INT64(dptr, tid->port); + ADD_MEM(dptr, &tid->machine, sizeof(u_int32_t)); + + return (t); } token_t * -au_to_process(__unused au_id_t auid, __unused uid_t euid, - __unused gid_t egid, __unused uid_t ruid, __unused gid_t rgid, - __unused pid_t pid, __unused au_asid_t sid, __unused au_tid_t *tid) +au_to_process(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, gid_t rgid, + pid_t pid, au_asid_t sid, au_tid_t *tid) { return (au_to_process32(auid, euid, egid, ruid, rgid, pid, sid, @@ -647,8 +696,39 @@ au_to_process64_ex(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, gid_t rgid, pid_t pid, au_asid_t sid, au_tid_addr_t *tid) { + token_t *t; + u_char *dptr = NULL; + + if (tid->at_type == AU_IPv4) + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + + 7 * sizeof(u_int32_t) + sizeof(u_int64_t) + + 2 * sizeof(u_int32_t)); + else if (tid->at_type == AU_IPv6) + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + + 7 * sizeof(u_int32_t) + sizeof(u_int64_t) + + 5 * sizeof(u_int32_t)); + else + panic("au_to_process64_ex: invalidate at_type (%d)", + tid->at_type); - return (NULL); + ADD_U_CHAR(dptr, AUT_PROCESS64_EX); + ADD_U_INT32(dptr, auid); + ADD_U_INT32(dptr, euid); + ADD_U_INT32(dptr, egid); + ADD_U_INT32(dptr, ruid); + ADD_U_INT32(dptr, rgid); + ADD_U_INT32(dptr, pid); + ADD_U_INT32(dptr, sid); + ADD_U_INT64(dptr, tid->at_port); + ADD_U_INT32(dptr, tid->at_type); + ADD_MEM(dptr, &tid->at_addr[0], sizeof(u_int32_t)); + if (tid->at_type == AU_IPv6) { + ADD_MEM(dptr, &tid->at_addr[1], sizeof(u_int32_t)); + ADD_MEM(dptr, &tid->at_addr[2], sizeof(u_int32_t)); + ADD_MEM(dptr, &tid->at_addr[3], sizeof(u_int32_t)); + } + + return (t); } token_t * @@ -918,8 +998,24 @@ au_to_subject64(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, gid_t rgid, pid_t pid, au_asid_t sid, au_tid_t *tid) { + token_t *t; + u_char *dptr = NULL; - return (NULL); + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 7 * sizeof(u_int32_t) + + sizeof(u_int64_t) + sizeof(u_int32_t)); + + ADD_U_CHAR(dptr, AUT_SUBJECT64); + ADD_U_INT32(dptr, auid); + ADD_U_INT32(dptr, euid); + ADD_U_INT32(dptr, egid); + ADD_U_INT32(dptr, ruid); + ADD_U_INT32(dptr, rgid); + ADD_U_INT32(dptr, pid); + ADD_U_INT32(dptr, sid); + ADD_U_INT64(dptr, tid->port); + ADD_MEM(dptr, &tid->machine, sizeof(u_int32_t)); + + return (t); } token_t * @@ -982,8 +1078,37 @@ au_to_subject64_ex(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, gid_t rgid, pid_t pid, au_asid_t sid, au_tid_addr_t *tid) { + token_t *t; + u_char *dptr = NULL; + + if (tid->at_type == AU_IPv4) + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + + 7 * sizeof(u_int32_t) + sizeof(u_int64_t) + + 2 * sizeof(u_int32_t)); + else if (tid->at_type == AU_IPv6) + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + + 7 * sizeof(u_int32_t) + sizeof(u_int64_t) + + 5 * sizeof(u_int32_t)); + else + panic("au_to_subject64_ex: invalid at_type (%d)", + tid->at_type); - return (NULL); + ADD_U_CHAR(dptr, AUT_SUBJECT64_EX); + ADD_U_INT32(dptr, auid); + ADD_U_INT32(dptr, euid); + ADD_U_INT32(dptr, egid); + ADD_U_INT32(dptr, ruid); + ADD_U_INT32(dptr, rgid); + ADD_U_INT32(dptr, pid); + ADD_U_INT32(dptr, sid); + ADD_U_INT64(dptr, tid->at_port); + ADD_U_INT32(dptr, tid->at_type); + if (tid->at_type == AU_IPv6) + ADD_MEM(dptr, &tid->at_addr[0], 4 * sizeof(u_int32_t)); + else + ADD_MEM(dptr, &tid->at_addr[0], sizeof(u_int32_t)); + + return (t); } token_t * @@ -1102,6 +1227,27 @@ } /* + * token ID 1 byte + * zonename length 2 bytes + * zonename N bytes + 1 terminating NULL byte + */ +token_t * +au_to_zonename(char *zonename) +{ + u_char *dptr = NULL; + u_int16_t textlen; + token_t *t; + + textlen = strlen(zonename); + textlen += 1; + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + sizeof(u_int16_t) + textlen); + ADD_U_CHAR(dptr, AUT_ZONENAME); + ADD_U_INT16(dptr, textlen); + ADD_STRING(dptr, zonename, textlen); + return (t); +} + +/* * token ID 1 byte * count 4 bytes * text count null-terminated strings @@ -1175,6 +1321,31 @@ return (t); } +token_t * +au_to_header64_tm(int rec_size, au_event_t e_type, au_emod_t e_mod, + struct timeval tm) +{ + token_t *t; + u_char *dptr = NULL; + u_int32_t timems; + + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + sizeof(u_int32_t) + + sizeof(u_char) + 2 * sizeof(u_int16_t) + 2 * sizeof(u_int64_t)); + + ADD_U_CHAR(dptr, AUT_HEADER64); + ADD_U_INT32(dptr, rec_size); + ADD_U_CHAR(dptr, AUDIT_HEADER_VERSION_OPENBSM); + ADD_U_INT16(dptr, e_type); + ADD_U_INT16(dptr, e_mod); + + timems = tm.tv_usec/1000; + /* Add the timestamp */ + ADD_U_INT64(dptr, tm.tv_sec); + ADD_U_INT64(dptr, timems); /* We need time in ms. */ + + return (t); +} + /* * token ID 1 byte * trailer magic number 2 bytes From owner-p4-projects@FreeBSD.ORG Mon Apr 16 21:02:27 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 DC9EB16A404; Mon, 16 Apr 2007 21:02:26 +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 99A4716A401 for ; Mon, 16 Apr 2007 21:02:26 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8A99013C45B for ; Mon, 16 Apr 2007 21:02:26 +0000 (UTC) (envelope-from jhb@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 l3GL2Qa3088573 for ; Mon, 16 Apr 2007 21:02:26 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3GL2QpJ088570 for perforce@freebsd.org; Mon, 16 Apr 2007 21:02:26 GMT (envelope-from jhb@freebsd.org) Date: Mon, 16 Apr 2007 21:02:26 GMT Message-Id: <200704162102.l3GL2QpJ088570@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 118263 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: Mon, 16 Apr 2007 21:02:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=118263 Change 118263 by jhb@jhb_mutex on 2007/04/16 21:01:38 Add "show rman" and "show allrman" Affected files ... .. //depot/projects/smpng/sys/kern/subr_rman.c#33 edit Differences ... ==== //depot/projects/smpng/sys/kern/subr_rman.c#33 (text+ko) ==== @@ -55,6 +55,8 @@ * permitted. */ +#include "opt_ddb.h" + #include __FBSDID("$FreeBSD: src/sys/kern/subr_rman.c,v 1.55 2007/02/23 22:53:56 scottl Exp $"); @@ -70,6 +72,10 @@ #include #include +#ifdef DDB +#include +#endif + /* * We use a linked list rather than a bitmap because we need to be able to * represent potentially huge objects (like all of a processor's physical @@ -911,3 +917,47 @@ SYSCTL_NODE(_hw_bus, OID_AUTO, rman, CTLFLAG_RD, sysctl_rman, "kernel resource manager"); + +#ifdef DDB +static void +dump_rman(struct rman *rm) +{ + struct resource_i *r; + const char *devname; + + if (db_pager_quit) + return; + db_printf("rman: %s\n", rm->rm_descr); + db_printf(" 0x%lx-0x%lx (full range)\n", rm->rm_start, rm->rm_end); + TAILQ_FOREACH(r, &rm->rm_list, r_link) { + if (r->r_dev != NULL) { + devname = device_get_nameunit(r->r_dev); + if (devname == NULL) + devname = "nomatch"; + } else + devname = NULL; + db_printf(" 0x%lx-0x%lx ", r->r_start, r->r_end); + if (devname != NULL) + db_printf("(%s)\n", devname); + else + db_printf("----\n"); + if (db_pager_quit) + return; + } +} + +DB_SHOW_COMMAND(rman, db_show_rman) +{ + + if (have_addr) + dump_rman((struct rman *)addr); +} + +DB_SHOW_COMMAND(allrman, db_show_all_rman) +{ + struct rman *rm; + + TAILQ_FOREACH(rm, &rman_head, rm_link) + dump_rman(rm); +} +#endif From owner-p4-projects@FreeBSD.ORG Mon Apr 16 21:36:14 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 CCA4316A402; Mon, 16 Apr 2007 21:36:13 +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 861C016A40A for ; Mon, 16 Apr 2007 21:36:13 +0000 (UTC) (envelope-from julian@elischer.org) Received: from outV.internet-mail-service.net (outV.internet-mail-service.net [216.240.47.245]) by mx1.freebsd.org (Postfix) with ESMTP id 73E7413C4BC for ; Mon, 16 Apr 2007 21:36:13 +0000 (UTC) (envelope-from julian@elischer.org) Received: from mx0.idiom.com (HELO idiom.com) (216.240.32.160) by out.internet-mail-service.net (qpsmtpd/0.32) with ESMTP; Mon, 16 Apr 2007 14:04:42 -0700 Received: from [10.251.22.38] (nat.ironport.com [63.251.108.100]) by idiom.com (Postfix) with ESMTP id A22B4125B02; Mon, 16 Apr 2007 14:36:12 -0700 (PDT) Message-ID: <4623EC51.4080407@elischer.org> Date: Mon, 16 Apr 2007 14:36:17 -0700 From: Julian Elischer User-Agent: Thunderbird 1.5.0.10 (Macintosh/20070221) MIME-Version: 1.0 To: Marko Zec References: <200704161051.l3GApuxA044256@repoman.freebsd.org> In-Reply-To: <200704161051.l3GApuxA044256@repoman.freebsd.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Perforce Change Reviews Subject: Re: PERFORCE change 118226 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: Mon, 16 Apr 2007 21:36:14 -0000 Marko Zec wrote: > > - pf can now be kldloaded, but is not virtualized (yet) I was thinking that the following might be an interesting way to think about modules.. kldloading a module is 2 parts.. 1/ loading it in to memeory 2/ linking it in In the base vimage you do both, but in the others, then you only can link in modules that are already loaded. i.e. each vimage is responsible for linking the modules that it needs (?) loading a new module to memeory doesn't mean that the functionality is automatically available for all existing vimages... child images do not inherrit all the linked modules of the parent.. they need to link in those they need. From owner-p4-projects@FreeBSD.ORG Mon Apr 16 22:25:14 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 D99D916A406; Mon, 16 Apr 2007 22:25:13 +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 6AA0916A40F for ; Mon, 16 Apr 2007 22:25:13 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5B48F13C483 for ; Mon, 16 Apr 2007 22:25:13 +0000 (UTC) (envelope-from scottl@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 l3GMPDTv004451 for ; Mon, 16 Apr 2007 22:25:13 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3GMPDD2004448 for perforce@freebsd.org; Mon, 16 Apr 2007 22:25:13 GMT (envelope-from scottl@freebsd.org) Date: Mon, 16 Apr 2007 22:25:13 GMT Message-Id: <200704162225.l3GMPDD2004448@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 118268 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: Mon, 16 Apr 2007 22:25:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=118268 Change 118268 by scottl@scottl-wv1u on 2007/04/16 22:25:11 Get rid of the done_lock definitions, they aren't used at all. Affected files ... .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx_osm.c#16 edit .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx_osm.h#10 edit .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx_osm.c#14 edit .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx_osm.h#11 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx_osm.c#16 (text+ko) ==== @@ -122,7 +122,6 @@ sim = NULL; ahd_lockinit(ahd); - ahd_done_lockinit(ahd); ahd_list_lockinit(); /* @@ -201,7 +200,9 @@ struct ahd_softc *ahd; ahd = (struct ahd_softc *)arg; + ahd_lock(ahd, NULL); ahd_intr(ahd); + ahd_unlock(ahd, NULL); } /* ==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx_osm.h#10 (text+ko) ==== @@ -193,11 +193,6 @@ static __inline void ahd_lock(struct ahd_softc *, unsigned long *flags); static __inline void ahd_unlock(struct ahd_softc *, unsigned long *flags); -/* Lock held during command compeletion to the upper layer */ -static __inline void ahd_done_lockinit(struct ahd_softc *); -static __inline void ahd_done_lock(struct ahd_softc *, unsigned long *flags); -static __inline void ahd_done_unlock(struct ahd_softc *, unsigned long *flags); - /* Lock held during ahd_list manipulation and ahd softc frees */ static __inline void ahd_list_lockinit(void); static __inline void ahd_list_lock(unsigned long *flags); @@ -221,22 +216,6 @@ mtx_unlock(&ahd->platform_data->mtx); } -/* Lock held during command compeletion to the upper layer */ -static __inline void -ahd_done_lockinit(struct ahd_softc *ahd) -{ -} - -static __inline void -ahd_done_lock(struct ahd_softc *ahd, unsigned long *flags) -{ -} - -static __inline void -ahd_done_unlock(struct ahd_softc *ahd, unsigned long *flags) -{ -} - /* Lock held during ahd_list manipulation and ahd softc frees */ static __inline void ahd_list_lockinit(void) ==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx_osm.c#14 (text+ko) ==== @@ -163,7 +163,6 @@ ahc_lockinit(ahc); - ahc_done_lockinit(ahc); ahc_list_lockinit(); /* ==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx_osm.h#11 (text+ko) ==== @@ -191,11 +191,6 @@ static __inline void ahc_lock(struct ahc_softc *, unsigned long *flags); static __inline void ahc_unlock(struct ahc_softc *, unsigned long *flags); -/* Lock held during command compeletion to the upper layer */ -static __inline void ahc_done_lockinit(struct ahc_softc *); -static __inline void ahc_done_lock(struct ahc_softc *, unsigned long *flags); -static __inline void ahc_done_unlock(struct ahc_softc *, unsigned long *flags); - /* Lock held during ahc_list manipulation and ahc softc frees */ static __inline void ahc_list_lockinit(void); static __inline void ahc_list_lock(unsigned long *flags); @@ -219,22 +214,6 @@ mtx_unlock(&ahc->platform_data->mtx); } -/* Lock held during command compeletion to the upper layer */ -static __inline void -ahc_done_lockinit(struct ahc_softc *ahc) -{ -} - -static __inline void -ahc_done_lock(struct ahc_softc *ahc, unsigned long *flags) -{ -} - -static __inline void -ahc_done_unlock(struct ahc_softc *ahc, unsigned long *flags) -{ -} - /* Lock held during ahc_list manipulation and ahc softc frees */ static __inline void ahc_list_lockinit(void) From owner-p4-projects@FreeBSD.ORG Tue Apr 17 05:22:12 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 4321916A403; Tue, 17 Apr 2007 05:22:12 +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 D9B1516A401 for ; Tue, 17 Apr 2007 05:22:11 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C97C813C459 for ; Tue, 17 Apr 2007 05:22:11 +0000 (UTC) (envelope-from scottl@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 l3H5MBgE097517 for ; Tue, 17 Apr 2007 05:22:11 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3H5MBvN097514 for perforce@freebsd.org; Tue, 17 Apr 2007 05:22:11 GMT (envelope-from scottl@freebsd.org) Date: Tue, 17 Apr 2007 05:22:11 GMT Message-Id: <200704170522.l3H5MBvN097514@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 118286 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: Tue, 17 Apr 2007 05:22:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=118286 Change 118286 by scottl@scottl-wv1u on 2007/04/17 05:21:56 Put the ahc and ahd drivers into a commitable form. Affected files ... .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7770.c#5 edit .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx.c#8 edit .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx.h#7 edit .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx_osm.c#17 edit .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx_osm.h#11 edit .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx_pci.c#7 edit .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx.c#8 edit .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx.h#5 edit .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx_osm.c#15 edit .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx_osm.h#12 edit .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx_pci.c#5 edit .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic_osm_lib.c#7 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7770.c#5 (text+ko) ==== @@ -126,7 +126,6 @@ int aic7770_config(struct ahc_softc *ahc, struct aic7770_identity *entry, u_int io) { - u_long l; int error; int have_seeprom; u_int hostconf; @@ -254,7 +253,7 @@ if (error != 0) return (error); - ahc_list_lock(&l); + ahc_lock(ahc); /* * Link this softc in with all other ahc instances. */ @@ -265,7 +264,7 @@ */ ahc_outb(ahc, BCTL, ENABLE); - ahc_list_unlock(&l); + ahc_unlock(ahc); return (0); } ==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx.c#8 (text+ko) ==== @@ -5271,6 +5271,7 @@ ahd_free(ahd); ahd = NULL; } + ahd_lockinit(ahd); #ifdef AHD_DEBUG if ((ahd_debug & AHD_SHOW_MEMORY) != 0) { printf("%s: scb size = 0x%x, hscb size = 0x%x\n", @@ -5342,22 +5343,6 @@ ahd->init_level++; } -/* - * Verify that the passed in softc pointer is for a - * controller that is still configured. - */ -struct ahd_softc * -ahd_find_softc(struct ahd_softc *ahd) -{ - struct ahd_softc *list_ahd; - - TAILQ_FOREACH(list_ahd, &ahd_tailq, links) { - if (list_ahd == ahd) - return (ahd); - } - return (NULL); -} - void ahd_set_unit(struct ahd_softc *ahd, int unit) { @@ -8061,19 +8046,10 @@ static void ahd_reset_poll(void *arg) { - struct ahd_softc *ahd; + struct ahd_softc *ahd = (struct ahd_softc *)arg; u_int scsiseq1; - u_long l; - u_long s; - ahd_list_lock(&l); - ahd = ahd_find_softc((struct ahd_softc *)arg); - if (ahd == NULL) { - printf("ahd_reset_poll: Instance %p no longer exists\n", arg); - ahd_list_unlock(&l); - return; - } - ahd_lock(ahd, &s); + ahd_lock(ahd); ahd_pause(ahd); ahd_update_modes(ahd); ahd_set_modes(ahd, AHD_MODE_SCSI, AHD_MODE_SCSI); @@ -8082,8 +8058,7 @@ aic_timer_reset(&ahd->reset_timer, AHD_RESET_POLL_MS, ahd_reset_poll, ahd); ahd_unpause(ahd); - ahd_unlock(ahd, &s); - ahd_list_unlock(&l); + ahd_unlock(ahd); return; } @@ -8094,28 +8069,17 @@ ahd_unpause(ahd); ahd->flags &= ~AHD_RESET_POLL_ACTIVE; aic_release_simq(ahd); - ahd_unlock(ahd, &s); - ahd_list_unlock(&l); + ahd_unlock(ahd); } /**************************** Statistics Processing ***************************/ static void ahd_stat_timer(void *arg) { - struct ahd_softc *ahd; - u_long l; - u_long s; + struct ahd_softc *ahd = (struct ahd_softc *)arg; int enint_coal; - ahd_list_lock(&l); - ahd = ahd_find_softc((struct ahd_softc *)arg); - if (ahd == NULL) { - printf("ahd_stat_timer: Instance %p no longer exists\n", arg); - ahd_list_unlock(&l); - return; - } - ahd_lock(ahd, &s); - + ahd_lock(ahd); enint_coal = ahd->hs_mailbox & ENINT_COALESCE; if (ahd->cmdcmplt_total > ahd->int_coalescing_threshold) enint_coal |= ENINT_COALESCE; @@ -8139,8 +8103,7 @@ ahd->cmdcmplt_counts[ahd->cmdcmplt_bucket] = 0; aic_timer_reset(&ahd->stat_timer, AHD_STAT_UPDATE_MS, ahd_stat_timer, ahd); - ahd_unlock(ahd, &s); - ahd_list_unlock(&l); + ahd_unlock(ahd); } /****************************** Status Processing *****************************/ @@ -9277,15 +9240,12 @@ ahd_timeout(struct scb *scb) { struct ahd_softc *ahd; - u_long s; ahd = scb->ahd_softc; if ((scb->flags & SCB_ACTIVE) != 0) { if ((scb->flags & SCB_TIMEDOUT) == 0) { - ahd_lock(ahd, &s); LIST_INSERT_HEAD(&ahd->timedout_scbs, scb, timedout_links); - ahd_unlock(ahd, &s); scb->flags |= SCB_TIMEDOUT; } ahd_wakeup_recovery_thread(ahd); @@ -9304,14 +9264,11 @@ { struct scb *scb; struct scb *active_scb; - long s; int found; int was_paused; u_int active_scbptr; u_int last_phase; - ahd_lock(ahd, &s); - /* * Pause the controller and manually flush any * commands that have just completed but that our @@ -9337,7 +9294,6 @@ printf("%s: Timedout SCBs already complete. " "Interrupts may not be functioning.\n", ahd_name(ahd)); ahd_unpause(ahd); - ahd_unlock(ahd, &s); return; } @@ -9528,7 +9484,6 @@ } ahd_unpause(ahd); - ahd_unlock(ahd, &s); } /* @@ -9944,13 +9899,9 @@ */ if ((ahd->flags & AHD_TARGETROLE) == 0 && ccb->ccb_h.target_id != CAM_TARGET_WILDCARD) { - u_long s; - printf("Configuring Target Mode\n"); - ahd_lock(ahd, &s); if (LIST_FIRST(&ahd->pending_scbs) != NULL) { ccb->ccb_h.status = CAM_BUSY; - ahd_unlock(ahd, &s); return; } ahd->flags |= AHD_TARGETROLE; @@ -9959,7 +9910,6 @@ ahd_pause(ahd); ahd_loadseq(ahd); ahd_restart(ahd); - ahd_unlock(ahd, &s); } cel = &ccb->cel; target = ccb->ccb_h.target_id; @@ -10025,7 +9975,6 @@ } SLIST_INIT(&lstate->accept_tios); SLIST_INIT(&lstate->immed_notifies); - ahd_lock(ahd, &s); ahd_pause(ahd); if (target != CAM_TARGET_WILDCARD) { tstate->enabled_luns[lun] = lstate; @@ -10084,7 +10033,6 @@ ahd_outb(ahd, SCSISEQ1, scsiseq1); } ahd_unpause(ahd); - ahd_unlock(ahd, &s); ccb->ccb_h.status = CAM_REQ_CMP; xpt_print_path(ccb->ccb_h.path); printf("Lun now enabled for target mode\n"); @@ -10097,8 +10045,6 @@ return; } - ahd_lock(ahd, &s); - ccb->ccb_h.status = CAM_REQ_CMP; LIST_FOREACH(scb, &ahd->pending_scbs, pending_links) { struct ccb_hdr *ccbh; @@ -10108,7 +10054,6 @@ && !xpt_path_comp(ccbh->path, ccb->ccb_h.path)){ printf("CTIO pending\n"); ccb->ccb_h.status = CAM_REQ_INVALID; - ahd_unlock(ahd, &s); return; } } @@ -10124,7 +10069,6 @@ } if (ccb->ccb_h.status != CAM_REQ_CMP) { - ahd_unlock(ahd, &s); return; } @@ -10191,7 +10135,6 @@ } } ahd_unpause(ahd); - ahd_unlock(ahd, &s); } #endif } ==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx.h#7 (text+ko) ==== @@ -1398,7 +1398,6 @@ int ahd_suspend(struct ahd_softc *ahd); int ahd_resume(struct ahd_softc *ahd); void ahd_softc_insert(struct ahd_softc *); -struct ahd_softc *ahd_find_softc(struct ahd_softc *ahd); void ahd_set_unit(struct ahd_softc *, int); void ahd_set_name(struct ahd_softc *, char *); struct scb *ahd_get_scb(struct ahd_softc *ahd, u_int col_idx); ==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx_osm.c#17 (text+ko) ==== @@ -114,16 +114,12 @@ struct cam_devq *devq; struct cam_sim *sim; struct cam_path *path; - u_long s; int count; count = 0; devq = NULL; sim = NULL; - ahd_lockinit(ahd); - ahd_list_lockinit(); - /* * Create a thread to perform all recovery. */ @@ -132,7 +128,7 @@ ahd_controller_info(ahd, ahd_info); printf("%s\n", ahd_info); - ahd_lock(ahd, &s); + ahd_lock(ahd); /* * Create the device queue for our SIM(s). @@ -178,7 +174,7 @@ fail: ahd->platform_data->sim = sim; ahd->platform_data->path = path; - ahd_unlock(ahd, &s); + ahd_unlock(ahd); if (count != 0) { /* We have to wait until after any system dumps... */ ahd->platform_data->eh = @@ -200,9 +196,9 @@ struct ahd_softc *ahd; ahd = (struct ahd_softc *)arg; - ahd_lock(ahd, NULL); + ahd_lock(ahd); ahd_intr(ahd); - ahd_unlock(ahd, NULL); + ahd_unlock(ahd); } /* @@ -1269,21 +1265,14 @@ ahd_detach(device_t dev) { struct ahd_softc *ahd; - u_long l; - ahd_list_lock(&l); device_printf(dev, "detaching device\n"); ahd = device_get_softc(dev); - ahd = ahd_find_softc(ahd); - if (ahd == NULL) { - device_printf(dev, "aic7xxx already detached\n"); - ahd_list_unlock(&l); - return (ENOENT); - } + ahd_lock(ahd); TAILQ_REMOVE(&ahd_tailq, ahd, links); - ahd_list_unlock(&l); ahd_intr_enable(ahd, FALSE); bus_teardown_intr(dev, ahd->platform_data->irq, ahd->platform_data->ih); + ahd_unlock(ahd); ahd_free(ahd); return (0); } ==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx_osm.h#11 (text+ko) ==== @@ -190,14 +190,9 @@ /**************************** Locking Primitives ******************************/ /* Lock protecting internal data structures */ static __inline void ahd_lockinit(struct ahd_softc *); -static __inline void ahd_lock(struct ahd_softc *, unsigned long *flags); -static __inline void ahd_unlock(struct ahd_softc *, unsigned long *flags); +static __inline void ahd_lock(struct ahd_softc *); +static __inline void ahd_unlock(struct ahd_softc *); -/* Lock held during ahd_list manipulation and ahd softc frees */ -static __inline void ahd_list_lockinit(void); -static __inline void ahd_list_lock(unsigned long *flags); -static __inline void ahd_list_unlock(unsigned long *flags); - static __inline void ahd_lockinit(struct ahd_softc *ahd) { @@ -205,33 +200,17 @@ } static __inline void -ahd_lock(struct ahd_softc *ahd, unsigned long *flags) +ahd_lock(struct ahd_softc *ahd) { mtx_lock(&ahd->platform_data->mtx); } static __inline void -ahd_unlock(struct ahd_softc *ahd, unsigned long *flags) +ahd_unlock(struct ahd_softc *ahd) { mtx_unlock(&ahd->platform_data->mtx); } -/* Lock held during ahd_list manipulation and ahd softc frees */ -static __inline void -ahd_list_lockinit(void) -{ -} - -static __inline void -ahd_list_lock(unsigned long *flags) -{ -} - -static __inline void -ahd_list_unlock(unsigned long *flags) -{ -} - /********************************** PCI ***************************************/ int ahd_pci_map_registers(struct ahd_softc *ahd); int ahd_pci_map_int(struct ahd_softc *ahd); ==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx_pci.c#7 (text+ko) ==== @@ -314,7 +314,6 @@ ahd_pci_config(struct ahd_softc *ahd, struct ahd_pci_identity *entry) { struct scb_data *shared_scb_data; - u_long l; u_int command; uint32_t devconfig; uint16_t device; @@ -423,12 +422,12 @@ if (error != 0) return (error); - ahd_list_lock(&l); + ahd_lock(ahd); /* * Link this softc in with all other ahd instances. */ ahd_softc_insert(ahd); - ahd_list_unlock(&l); + ahd_unlock(ahd); return (0); } ==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx.c#8 (text+ko) ==== @@ -3948,6 +3948,7 @@ ahc_free(ahc); ahc = NULL; } + ahc_lockinit(ahc); return (ahc); } @@ -4029,22 +4030,6 @@ ahc->init_level++; } -/* - * Verify that the passed in softc pointer is for a - * controller that is still configured. - */ -struct ahc_softc * -ahc_find_softc(struct ahc_softc *ahc) -{ - struct ahc_softc *list_ahc; - - TAILQ_FOREACH(list_ahc, &ahc_tailq, links) { - if (list_ahc == ahc) - return (ahc); - } - return (NULL); -} - void ahc_set_unit(struct ahc_softc *ahc, int unit) { @@ -6945,7 +6930,7 @@ struct ahc_softc *ahc; ahc = scb->ahc_softc; - ahc_lock(ahc, NULL); + ahc_lock(ahc); if ((scb->flags & SCB_ACTIVE) != 0) { if ((scb->flags & SCB_TIMEDOUT) == 0) { LIST_INSERT_HEAD(&ahc->timedout_scbs, scb, @@ -6954,7 +6939,7 @@ } ahc_wakeup_recovery_thread(ahc); } - ahc_unlock(ahc, NULL); + ahc_unlock(ahc); } /* @@ -7020,13 +7005,10 @@ ahc_recover_commands(struct ahc_softc *ahc) { struct scb *scb; - long s; int found; int restart_needed; u_int last_phase; - ahc_lock(ahc, &s); - /* * Pause the controller and manually flush any * commands that have just completed but that our @@ -7046,7 +7028,6 @@ printf("%s: Timedout SCBs already complete. " "Interrupts may not be functioning.\n", ahc_name(ahc)); ahc_unpause(ahc); - ahc_unlock(ahc, &s); return; } @@ -7299,7 +7280,6 @@ ahc_restart(ahc); else ahc_unpause(ahc); - ahc_unlock(ahc, &s); } /************************* Target Mode ****************************************/ @@ -7352,7 +7332,6 @@ struct ahc_tmode_lstate *lstate; struct ccb_en_lun *cel; cam_status status; - u_long s; u_int target; u_int lun; u_int target_mask; @@ -7434,14 +7413,11 @@ */ if ((ahc->flags & AHC_TARGETROLE) == 0 && ccb->ccb_h.target_id != CAM_TARGET_WILDCARD) { - u_long s; ahc_flag saved_flags; printf("Configuring Target Mode\n"); - ahc_lock(ahc, &s); if (LIST_FIRST(&ahc->pending_scbs) != NULL) { ccb->ccb_h.status = CAM_BUSY; - ahc_unlock(ahc, &s); return; } saved_flags = ahc->flags; @@ -7462,12 +7438,10 @@ ahc->flags = saved_flags; (void)ahc_loadseq(ahc); ahc_restart(ahc); - ahc_unlock(ahc, &s); ccb->ccb_h.status = CAM_FUNC_NOTAVAIL; return; } ahc_restart(ahc); - ahc_unlock(ahc, &s); } cel = &ccb->cel; target = ccb->ccb_h.target_id; @@ -7533,7 +7507,6 @@ } SLIST_INIT(&lstate->accept_tios); SLIST_INIT(&lstate->immed_notifies); - ahc_lock(ahc, &s); ahc_pause(ahc); if (target != CAM_TARGET_WILDCARD) { tstate->enabled_luns[lun] = lstate; @@ -7599,7 +7572,6 @@ ahc_outb(ahc, SCSISEQ, scsiseq); } ahc_unpause(ahc); - ahc_unlock(ahc, &s); ccb->ccb_h.status = CAM_REQ_CMP; xpt_print_path(ccb->ccb_h.path); printf("Lun now enabled for target mode\n"); @@ -7612,8 +7584,6 @@ return; } - ahc_lock(ahc, &s); - ccb->ccb_h.status = CAM_REQ_CMP; LIST_FOREACH(scb, &ahc->pending_scbs, pending_links) { struct ccb_hdr *ccbh; @@ -7623,7 +7593,6 @@ && !xpt_path_comp(ccbh->path, ccb->ccb_h.path)){ printf("CTIO pending\n"); ccb->ccb_h.status = CAM_REQ_INVALID; - ahc_unlock(ahc, &s); return; } } @@ -7639,7 +7608,6 @@ } if (ccb->ccb_h.status != CAM_REQ_CMP) { - ahc_unlock(ahc, &s); return; } @@ -7714,7 +7682,6 @@ } } ahc_unpause(ahc); - ahc_unlock(ahc, &s); } } ==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx.h#5 (text+ko) ==== @@ -1225,7 +1225,6 @@ int ahc_suspend(struct ahc_softc *ahc); int ahc_resume(struct ahc_softc *ahc); void ahc_softc_insert(struct ahc_softc *); -struct ahc_softc *ahc_find_softc(struct ahc_softc *ahc); void ahc_set_unit(struct ahc_softc *, int); void ahc_set_name(struct ahc_softc *, char *); void ahc_alloc_scbs(struct ahc_softc *ahc); ==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx_osm.c#15 (text+ko) ==== @@ -152,7 +152,6 @@ struct cam_sim *sim2; struct cam_path *path; struct cam_path *path2; - long s; int count; count = 0; @@ -162,9 +161,6 @@ path2 = NULL; - ahc_lockinit(ahc); - ahc_list_lockinit(); - /* * Create a thread to perform all recovery. */ @@ -173,7 +169,7 @@ ahc_controller_info(ahc, ahc_info); printf("%s\n", ahc_info); - ahc_lock(ahc, &s); + ahc_lock(ahc); /* * Attach secondary channel first if the user has @@ -283,7 +279,7 @@ ahc->platform_data->sim_b = sim2; ahc->platform_data->path_b = path2; } - ahc_unlock(ahc, &s); + ahc_unlock(ahc); if (count != 0) { /* We have to wait until after any system dumps... */ @@ -305,9 +301,9 @@ struct ahc_softc *ahc; ahc = (struct ahc_softc *)arg; - ahc_lock(ahc, NULL); + ahc_lock(ahc); ahc_intr(ahc); - ahc_unlock(ahc, NULL); + ahc_unlock(ahc); } /* @@ -1153,13 +1149,9 @@ if (hscb->cdb_len > sizeof(hscb->cdb32) || (ccb_h->flags & CAM_CDB_PHYS) != 0) { - u_long s; - aic_set_transaction_status(scb, CAM_REQ_INVALID); - ahc_lock(ahc, &s); ahc_free_scb(ahc, scb); - ahc_unlock(ahc, &s); xpt_done((union ccb *)csio); return; } @@ -1441,24 +1433,14 @@ ahc_detach(device_t dev) { struct ahc_softc *ahc; - u_long l; - u_long s; - ahc_list_lock(&l); device_printf(dev, "detaching device\n"); ahc = device_get_softc(dev); - ahc = ahc_find_softc(ahc); - if (ahc == NULL) { - device_printf(dev, "aic7xxx already detached\n"); - ahc_list_unlock(&l); - return (ENOENT); - } + ahc_lock(ahc); TAILQ_REMOVE(&ahc_tailq, ahc, links); - ahc_list_unlock(&l); - ahc_lock(ahc, &s); ahc_intr_enable(ahc, FALSE); bus_teardown_intr(dev, ahc->platform_data->irq, ahc->platform_data->ih); - ahc_unlock(ahc, &s); + ahc_unlock(ahc); ahc_free(ahc); return (0); } ==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx_osm.h#12 (text+ko) ==== @@ -188,14 +188,9 @@ /**************************** Locking Primitives ******************************/ /* Lock protecting internal data structures */ static __inline void ahc_lockinit(struct ahc_softc *); -static __inline void ahc_lock(struct ahc_softc *, unsigned long *flags); -static __inline void ahc_unlock(struct ahc_softc *, unsigned long *flags); +static __inline void ahc_lock(struct ahc_softc *); +static __inline void ahc_unlock(struct ahc_softc *); -/* Lock held during ahc_list manipulation and ahc softc frees */ -static __inline void ahc_list_lockinit(void); -static __inline void ahc_list_lock(unsigned long *flags); -static __inline void ahc_list_unlock(unsigned long *flags); - static __inline void ahc_lockinit(struct ahc_softc *ahc) { @@ -203,33 +198,17 @@ } static __inline void -ahc_lock(struct ahc_softc *ahc, unsigned long *flags) +ahc_lock(struct ahc_softc *ahc) { mtx_lock(&ahc->platform_data->mtx); } static __inline void -ahc_unlock(struct ahc_softc *ahc, unsigned long *flags) +ahc_unlock(struct ahc_softc *ahc) { mtx_unlock(&ahc->platform_data->mtx); } -/* Lock held during ahc_list manipulation and ahc softc frees */ -static __inline void -ahc_list_lockinit(void) -{ -} - -static __inline void -ahc_list_lock(unsigned long *flags) -{ -} - -static __inline void -ahc_list_unlock(unsigned long *flags) -{ -} - /************************* Initialization/Teardown ****************************/ int ahc_platform_alloc(struct ahc_softc *ahc, void *platform_arg); void ahc_platform_free(struct ahc_softc *ahc); ==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx_pci.c#5 (text+ko) ==== @@ -785,7 +785,6 @@ int ahc_pci_config(struct ahc_softc *ahc, struct ahc_pci_identity *entry) { - u_long l; u_int command; u_int our_id; u_int sxfrctl1; @@ -1045,12 +1044,12 @@ if (error != 0) return (error); - ahc_list_lock(&l); + ahc_lock(ahc); /* * Link this softc in with all other ahc instances. */ ahc_softc_insert(ahc); - ahc_list_unlock(&l); + ahc_unlock(ahc); return (0); } ==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic_osm_lib.c#7 (text+ko) ==== @@ -66,12 +66,11 @@ aic_platform_timeout(void *arg) { struct scb *scb; - u_long s; scb = (struct scb *)arg; - aic_lock(scb->aic_softc, &s); + aic_lock(scb->aic_softc); aic_timeout(scb); - aic_unlock(scb->aic_softc, &s); + aic_unlock(scb->aic_softc); } int @@ -92,11 +91,8 @@ void aic_terminate_recovery_thread(struct aic_softc *aic) { - u_long s; - aic_lock(aic, &s); if (aic->platform_data->recovery_thread == NULL) { - aic_unlock(aic, &s); return; } aic->flags |= AIC_SHUTDOWN_RECOVERY; @@ -106,17 +102,15 @@ * for this interlock just for added safety. */ msleep(aic->platform_data, &aic->platform_data->mtx, PUSER, "thtrm", 0); - aic_unlock(aic, &s); } static void aic_recovery_thread(void *arg) { struct aic_softc *aic; - u_long s; aic = (struct aic_softc *)arg; - aic_lock(aic, &s); + aic_lock(aic); for (;;) { if (LIST_EMPTY(&aic->timedout_scbs) != 0 @@ -126,13 +120,13 @@ if ((aic->flags & AIC_SHUTDOWN_RECOVERY) != 0) break; - aic_unlock(aic, &s); + aic_unlock(aic); aic_recover_commands(aic); - aic_lock(aic, &s); + aic_lock(aic); } aic->platform_data->recovery_thread = NULL; wakeup(aic->platform_data); - aic_unlock(aic, &s); + aic_unlock(aic); kthread_exit(0); } From owner-p4-projects@FreeBSD.ORG Tue Apr 17 06:03:06 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 2336B16A404; Tue, 17 Apr 2007 06:03:06 +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 A2DF516A401 for ; Tue, 17 Apr 2007 06:03:05 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 91D3713C458 for ; Tue, 17 Apr 2007 06:03:05 +0000 (UTC) (envelope-from scottl@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 l3H635Rr005124 for ; Tue, 17 Apr 2007 06:03:05 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3H635t3005120 for perforce@freebsd.org; Tue, 17 Apr 2007 06:03:05 GMT (envelope-from scottl@freebsd.org) Date: Tue, 17 Apr 2007 06:03:05 GMT Message-Id: <200704170603.l3H635t3005120@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 118290 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: Tue, 17 Apr 2007 06:03:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=118290 Change 118290 by scottl@scottl-wv1u on 2007/04/17 06:02:55 IFC Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#58 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_sg.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/conf/NOTES#22 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files#21 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iicbus/icee.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_rman.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/modules/Makefile#21 integrate .. //depot/projects/scottl-camlock/src/sys/modules/if_lagg/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/modules/if_trunk/Makefile#2 delete .. //depot/projects/scottl-camlock/src/sys/net/ieee8023ad_lacp.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/net/ieee8023ad_lacp.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/net/if.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_ethersubr.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_lagg.c#1 branch .. //depot/projects/scottl-camlock/src/sys/net/if_lagg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/net/if_trunk.c#3 delete .. //depot/projects/scottl-camlock/src/sys/net/if_trunk.h#2 delete .. //depot/projects/scottl-camlock/src/sys/net/if_var.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/sys/priv.h#5 integrate Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#58 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.176 2007/04/15 08:49:09 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.177 2007/04/16 19:55:36 scottl Exp $"); #include #include @@ -74,7 +74,8 @@ /* Object for defering XPT actions to a taskqueue */ struct xpt_task { struct task task; - void *data; + void *data1; + uintptr_t data2; }; /* @@ -2952,62 +2953,13 @@ static void xpt_action_sasync_cb(void *context, int pending) { - union ccb *start_ccb; + struct async_node *cur_entry; struct xpt_task *task; - struct ccb_setasync *csa; - struct async_node *cur_entry; - struct async_list *async_head; - u_int32_t added; - int s; + uint32_t added; task = (struct xpt_task *)context; - start_ccb = (union ccb *)task->data; - csa = &start_ccb->csa; - added = csa->event_enable; - async_head = &csa->ccb_h.path->device->asyncs; - - /* - * If there is already an entry for us, simply - * update it. - */ - s = splcam(); - mtx_lock(csa->ccb_h.path->bus->sim->mtx); - cur_entry = SLIST_FIRST(async_head); - while (cur_entry != NULL) { - if ((cur_entry->callback_arg == csa->callback_arg) - && (cur_entry->callback == csa->callback)) - break; - cur_entry = SLIST_NEXT(cur_entry, links); - } - - if (cur_entry != NULL) { - /* - * If the request has no flags set, - * remove the entry. - */ - added &= ~cur_entry->event_enable; - if (csa->event_enable == 0) { - SLIST_REMOVE(async_head, cur_entry, - async_node, links); - csa->ccb_h.path->device->refcount--; - free(cur_entry, M_CAMXPT); - } else { - cur_entry->event_enable = csa->event_enable; - } - } else { - cur_entry = malloc(sizeof(*cur_entry), M_CAMXPT, - M_NOWAIT); - if (cur_entry == NULL) { - splx(s); - goto out; - } - cur_entry->event_enable = csa->event_enable; - cur_entry->callback_arg = csa->callback_arg; - cur_entry->callback = csa->callback; - SLIST_INSERT_HEAD(async_head, cur_entry, links); - csa->ccb_h.path->device->refcount++; - } - mtx_unlock(csa->ccb_h.path->bus->sim->mtx); + cur_entry = (struct async_node *)task->data1; + added = task->data2; if ((added & AC_FOUND_DEVICE) != 0) { /* @@ -3023,11 +2975,7 @@ */ xpt_for_all_busses(xptsetasyncbusfunc, cur_entry); } - splx(s); -out: - xpt_free_path(start_ccb->ccb_h.path); - xpt_free_ccb(start_ccb); free(task, M_CAMXPT); } @@ -3433,42 +3381,75 @@ } case XPT_SASYNC_CB: { - union ccb *task_ccb; - struct xpt_task *task; + struct ccb_setasync *csa; + struct async_node *cur_entry; + struct async_list *async_head; + u_int32_t added; + + csa = &start_ccb->csa; + added = csa->event_enable; + async_head = &csa->ccb_h.path->device->asyncs; /* - * Need to decouple this operation via a taqskqueue so that - * the locking doesn't become a mess. Clone the ccb so that - * we own the memory and can free it later. + * If there is already an entry for us, simply + * update it. */ - task_ccb = malloc(sizeof(union ccb), M_CAMXPT, M_NOWAIT); - if (task_ccb == NULL) { - start_ccb->ccb_h.status = CAM_RESRC_UNAVAIL; - break; + cur_entry = SLIST_FIRST(async_head); + while (cur_entry != NULL) { + if ((cur_entry->callback_arg == csa->callback_arg) + && (cur_entry->callback == csa->callback)) + break; + cur_entry = SLIST_NEXT(cur_entry, links); } - bcopy(start_ccb, task_ccb, sizeof(union ccb)); - if (xpt_create_path(&task_ccb->ccb_h.path, NULL, - start_ccb->ccb_h.path_id, - start_ccb->ccb_h.target_id, - start_ccb->ccb_h.target_lun) != - CAM_REQ_CMP) { - start_ccb->ccb_h.status = CAM_RESRC_UNAVAIL; - xpt_free_ccb(task_ccb); - break; + + if (cur_entry != NULL) { + /* + * If the request has no flags set, + * remove the entry. + */ + added &= ~cur_entry->event_enable; + if (csa->event_enable == 0) { + SLIST_REMOVE(async_head, cur_entry, + async_node, links); + csa->ccb_h.path->device->refcount--; + free(cur_entry, M_CAMXPT); + } else { + cur_entry->event_enable = csa->event_enable; + } + } else { + cur_entry = malloc(sizeof(*cur_entry), M_CAMXPT, + M_NOWAIT); + if (cur_entry == NULL) { + csa->ccb_h.status = CAM_RESRC_UNAVAIL; + break; + } + cur_entry->event_enable = csa->event_enable; + cur_entry->callback_arg = csa->callback_arg; + cur_entry->callback = csa->callback; + SLIST_INSERT_HEAD(async_head, cur_entry, links); + csa->ccb_h.path->device->refcount++; } - task = malloc(sizeof(struct xpt_task), M_CAMXPT, M_NOWAIT); - if (task == NULL) { - start_ccb->ccb_h.status = CAM_RESRC_UNAVAIL; - xpt_free_path(task_ccb->ccb_h.path); - xpt_free_ccb(task_ccb); - break; + /* + * Need to decouple this operation via a taqskqueue so that + * the locking doesn't become a mess. + */ + if ((added & (AC_FOUND_DEVICE | AC_PATH_REGISTERED)) != 0) { + struct xpt_task *task; + + task = malloc(sizeof(struct xpt_task), M_CAMXPT, + M_NOWAIT); + if (task == NULL) { + csa->ccb_h.status = CAM_RESRC_UNAVAIL; + break; + } + + TASK_INIT(&task->task, 0, xpt_action_sasync_cb, task); + task->data1 = cur_entry; + task->data2 = added; + taskqueue_enqueue(taskqueue_thread, &task->task); } - TASK_INIT(&task->task, 0, xpt_action_sasync_cb, task); - task->data = task_ccb; - taskqueue_enqueue(taskqueue_thread, &task->task); - start_ccb->ccb_h.status = CAM_REQ_CMP; break; } ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_sg.c#8 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sg.c,v 1.6 2007/04/16 19:40:13 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sg.c,v 1.7 2007/04/17 01:12:35 scottl Exp $"); #include #include @@ -103,7 +103,6 @@ struct devstat *device_stats; TAILQ_HEAD(, sg_rdwr) rdwr_done; struct cdev *dev; - struct cdev *devalias; int sg_timeout; int sg_user_timeout; uint8_t pd_type; @@ -223,7 +222,6 @@ softc = (struct sg_softc *)periph->softc; devstat_remove_entry(softc->device_stats); - destroy_dev(softc->devalias); destroy_dev(softc->dev); if (bootverbose) { xpt_print(periph->path, "removing device entry\n"); @@ -323,8 +321,7 @@ softc->dev = make_dev(&sg_cdevsw, unit2minor(periph->unit_number), UID_ROOT, GID_OPERATOR, 0600, "%s%d", periph->periph_name, periph->unit_number); - softc->devalias = make_dev_alias(softc->dev, "sg%c", - 'a' + periph->unit_number); + (void)make_dev_alias(softc->dev, "sg%c", 'a' + periph->unit_number); cam_periph_lock(periph); softc->dev->si_drv1 = periph; ==== //depot/projects/scottl-camlock/src/sys/conf/NOTES#22 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1421 2007/04/10 03:09:38 thompsa Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1422 2007/04/17 00:35:10 thompsa Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -813,7 +813,7 @@ options PPP_BSDCOMP #PPP BSD-compress support options PPP_DEFLATE #PPP zlib/deflate/gzip support options PPP_FILTER #enable bpf filtering (needs bpf) -device trunk #Trunk aggregation interface +device lagg #Link aggregation interface device ef # Multiple ethernet frames support options ETHER_II # enable Ethernet_II frame ==== //depot/projects/scottl-camlock/src/sys/conf/files#21 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1195 2007/04/10 00:35:31 thompsa Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1196 2007/04/17 00:35:10 thompsa Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1527,7 +1527,7 @@ net/bpf_filter.c optional bpf | netgraph_bpf net/bridgestp.c optional if_bridge net/bsd_comp.c optional ppp_bsdcomp -net/ieee8023ad_lacp.c optional trunk +net/ieee8023ad_lacp.c optional lagg net/if.c standard net/if_arcsubr.c optional arcnet net/if_atmsubr.c optional atm @@ -1544,6 +1544,7 @@ net/if_gif.c optional gif net/if_gre.c optional gre net/if_iso88025subr.c optional token +net/if_lagg.c optional lagg net/if_loop.c optional loop net/if_media.c standard net/if_mib.c standard @@ -1554,7 +1555,6 @@ net/if_stf.c optional stf net/if_tun.c optional tun net/if_tap.c optional tap -net/if_trunk.c optional trunk net/if_vlan.c optional vlan net/netisr.c standard net/ppp_deflate.c optional ppp_deflate ==== //depot/projects/scottl-camlock/src/sys/dev/iicbus/icee.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/iicbus/icee.c,v 1.1 2007/03/23 23:10:35 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/iicbus/icee.c,v 1.2 2007/04/17 05:48:35 imp Exp $"); /* * Generic IIC eeprom support, modeled after the AT24C family of products. */ @@ -59,10 +59,10 @@ int wr_sz; /* What's the write page size */ }; -#define ICEE_LOCK(_sc) mtx_lock_spin(&(_sc)->sc_mtx) -#define ICEE_UNLOCK(_sc) mtx_unlock_spin(&(_sc)->sc_mtx) +#define ICEE_LOCK(_sc) mtx_lock(&(_sc)->sc_mtx) +#define ICEE_UNLOCK(_sc) mtx_unlock(&(_sc)->sc_mtx) #define ICEE_LOCK_INIT(_sc) \ - mtx_init(&_sc->sc_mtx, device_get_nameunit(_sc->sc_dev), "icee", MTX_SPIN) + mtx_init(&_sc->sc_mtx, device_get_nameunit(_sc->sc_dev), "icee", MTX_DEF) #define ICEE_LOCK_DESTROY(_sc) mtx_destroy(&_sc->sc_mtx); #define ICEE_ASSERT_LOCKED(_sc) mtx_assert(&_sc->sc_mtx, MA_OWNED); #define ICEE_ASSERT_UNLOCKED(_sc) mtx_assert(&_sc->sc_mtx, MA_NOTOWNED); ==== //depot/projects/scottl-camlock/src/sys/kern/subr_rman.c#13 (text+ko) ==== @@ -55,8 +55,10 @@ * permitted. */ +#include "opt_ddb.h" + #include -__FBSDID("$FreeBSD: src/sys/kern/subr_rman.c,v 1.55 2007/02/23 22:53:56 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/subr_rman.c,v 1.56 2007/04/16 21:09:03 jhb Exp $"); #include #include @@ -70,6 +72,10 @@ #include #include +#ifdef DDB +#include +#endif + /* * We use a linked list rather than a bitmap because we need to be able to * represent potentially huge objects (like all of a processor's physical @@ -911,3 +917,47 @@ SYSCTL_NODE(_hw_bus, OID_AUTO, rman, CTLFLAG_RD, sysctl_rman, "kernel resource manager"); + +#ifdef DDB +static void +dump_rman(struct rman *rm) +{ + struct resource_i *r; + const char *devname; + + if (db_pager_quit) + return; + db_printf("rman: %s\n", rm->rm_descr); + db_printf(" 0x%lx-0x%lx (full range)\n", rm->rm_start, rm->rm_end); + TAILQ_FOREACH(r, &rm->rm_list, r_link) { + if (r->r_dev != NULL) { + devname = device_get_nameunit(r->r_dev); + if (devname == NULL) + devname = "nomatch"; + } else + devname = NULL; + db_printf(" 0x%lx-0x%lx ", r->r_start, r->r_end); + if (devname != NULL) + db_printf("(%s)\n", devname); + else + db_printf("----\n"); + if (db_pager_quit) + return; + } +} + +DB_SHOW_COMMAND(rman, db_show_rman) +{ + + if (have_addr) + dump_rman((struct rman *)addr); +} + +DB_SHOW_COMMAND(allrman, db_show_all_rman) +{ + struct rman *rm; + + TAILQ_FOREACH(rm, &rman_head, rm_link) + dump_rman(rm); +} +#endif ==== //depot/projects/scottl-camlock/src/sys/modules/Makefile#21 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/modules/Makefile,v 1.527 2007/04/10 00:41:31 thompsa Exp $ +# $FreeBSD: src/sys/modules/Makefile,v 1.528 2007/04/17 00:35:10 thompsa Exp $ .include @@ -108,12 +108,12 @@ if_faith \ if_gif \ if_gre \ + if_lagg \ ${_if_ndis} \ if_ppp \ if_sl \ if_stf \ if_tap \ - if_trunk \ if_tun \ if_vlan \ ${_iir} \ ==== //depot/projects/scottl-camlock/src/sys/net/ieee8023ad_lacp.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net/ieee8023ad_lacp.c,v 1.1 2007/04/10 00:27:25 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/net/ieee8023ad_lacp.c,v 1.2 2007/04/17 00:35:11 thompsa Exp $"); #include #include @@ -45,7 +45,7 @@ #include #include -#include +#include #include /* @@ -206,13 +206,13 @@ * lacp_input: process lacpdu */ int -lacp_input(struct trunk_port *tp, struct mbuf *m) +lacp_input(struct lagg_port *lgp, struct mbuf *m) { - struct lacp_port *lp = LACP_PORT(tp); + struct lacp_port *lp = LACP_PORT(lgp); struct lacpdu *du; int error = 0; - TRUNK_LOCK_ASSERT(tp->tp_trunk); + LAGG_LOCK_ASSERT(lgp->lp_lagg); if (__predict_false(lp->lp_flags & LACP_PORT_DETACHING)) { goto bad; @@ -284,12 +284,12 @@ static void lacp_fill_actorinfo(struct lacp_port *lp, struct lacp_peerinfo *info) { - struct trunk_port *tp = lp->lp_trunk; - struct trunk_softc *tr = tp->tp_trunk; + struct lagg_port *lgp = lp->lp_lagg; + struct lagg_softc *lgs = lgp->lp_lagg; info->lip_systemid.lsi_prio = htons(LACP_SYSTEM_PRIO); memcpy(&info->lip_systemid.lsi_mac, - IF_LLADDR(tr->tr_ifp), ETHER_ADDR_LEN); + IF_LLADDR(lgs->sc_ifp), ETHER_ADDR_LEN); info->lip_portid.lpi_prio = htons(LACP_PORT_PRIO); info->lip_portid.lpi_portno = htons(lp->lp_ifp->if_index); info->lip_state = lp->lp_state; @@ -298,12 +298,12 @@ static int lacp_xmit_lacpdu(struct lacp_port *lp) { - struct trunk_port *tp = lp->lp_trunk; + struct lagg_port *lgp = lp->lp_lagg; struct mbuf *m; struct lacpdu *du; int error; - TRUNK_LOCK_ASSERT(tp->tp_trunk); + LAGG_LOCK_ASSERT(lgp->lp_lagg); m = m_gethdr(M_DONTWAIT, MT_DATA); if (m == NULL) { @@ -316,7 +316,7 @@ memcpy(&du->ldu_eh.ether_dhost, ethermulticastaddr_slowprotocols, ETHER_ADDR_LEN); - memcpy(&du->ldu_eh.ether_shost, tp->tp_lladdr, ETHER_ADDR_LEN); + memcpy(&du->ldu_eh.ether_shost, lgp->lp_lladdr, ETHER_ADDR_LEN); du->ldu_eh.ether_type = htons(ETHERTYPE_SLOW); du->ldu_sph.sph_subtype = SLOWPROTOCOLS_SUBTYPE_LACP; @@ -345,22 +345,22 @@ * otherwise network congestion can break aggregation. */ - error = trunk_enqueue(lp->lp_ifp, m); + error = lagg_enqueue(lp->lp_ifp, m); return (error); } void -lacp_linkstate(struct trunk_port *tp) +lacp_linkstate(struct lagg_port *lgp) { - struct lacp_port *lp = LACP_PORT(tp); - struct ifnet *ifp = tp->tp_ifp; + struct lacp_port *lp = LACP_PORT(lgp); + struct ifnet *ifp = lgp->lp_ifp; struct ifmediareq ifmr; int error = 0; u_int media; uint8_t old_state; uint16_t old_key; - TRUNK_LOCK_ASSERT(tp->tp_trunk); + LAGG_LOCK_ASSERT(lgp->lp_lagg); bzero((char *)&ifmr, sizeof(ifmr)); error = (*ifp->if_ioctl)(ifp, SIOCGIFMEDIA, (caddr_t)&ifmr); @@ -407,12 +407,12 @@ } int -lacp_port_create(struct trunk_port *tp) +lacp_port_create(struct lagg_port *lgp) { - struct trunk_softc *tr = tp->tp_trunk; - struct lacp_softc *lsc = LACP_SOFTC(tr); + struct lagg_softc *lgs = lgp->lp_lagg; + struct lacp_softc *lsc = LACP_SOFTC(lgs); struct lacp_port *lp; - struct ifnet *ifp = tp->tp_ifp; + struct ifnet *ifp = lgp->lp_ifp; struct sockaddr_dl sdl; struct ifmultiaddr *rifma = NULL; int error; @@ -420,7 +420,7 @@ boolean_t active = TRUE; /* XXX should be configurable */ boolean_t fast = FALSE; /* XXX should be configurable */ - TRUNK_LOCK_ASSERT(tr); + LAGG_LOCK_ASSERT(lgs); bzero((char *)&sdl, sizeof(sdl)); sdl.sdl_len = sizeof(sdl); @@ -433,7 +433,7 @@ LLADDR(&sdl), ETHER_ADDR_LEN); error = if_addmulti(ifp, (struct sockaddr *)&sdl, &rifma); if (error) { - printf("%s: ADDMULTI failed on %s\n", __func__, tp->tp_ifname); + printf("%s: ADDMULTI failed on %s\n", __func__, lgp->lp_ifname); return (error); } @@ -442,9 +442,9 @@ if (lp == NULL) return (ENOMEM); - tp->tp_psc = (caddr_t)lp; + lgp->lp_psc = (caddr_t)lp; lp->lp_ifp = ifp; - lp->lp_trunk = tp; + lp->lp_lagg = lgp; lp->lp_lsc = lsc; LIST_INSERT_HEAD(&lsc->lsc_ports, lp, lp_next); @@ -454,21 +454,21 @@ (active ? LACP_STATE_ACTIVITY : 0) | (fast ? LACP_STATE_TIMEOUT : 0); lp->lp_aggregator = NULL; - lacp_linkstate(tp); + lacp_linkstate(lgp); lacp_sm_rx_set_expired(lp); return (0); } void -lacp_port_destroy(struct trunk_port *tp) +lacp_port_destroy(struct lagg_port *lgp) { - struct lacp_port *lp = LACP_PORT(tp); - struct ifnet *ifp = tp->tp_ifp; + struct lacp_port *lp = LACP_PORT(lgp); + struct ifnet *ifp = lgp->lp_ifp; struct sockaddr_dl sdl; int i, error; - TRUNK_LOCK_ASSERT(tp->tp_trunk); + LAGG_LOCK_ASSERT(lgp->lp_lagg); for (i = 0; i < LACP_NTIMER; i++) { LACP_TIMER_DISARM(lp, i); @@ -489,16 +489,16 @@ LLADDR(&sdl), ETHER_ADDR_LEN); error = if_delmulti(ifp, (struct sockaddr *)&sdl); if (error) - printf("%s: DELMULTI failed on %s\n", __func__, tp->tp_ifname); + printf("%s: DELMULTI failed on %s\n", __func__, lgp->lp_ifname); LIST_REMOVE(lp, lp_next); free(lp, M_DEVBUF); } int -lacp_port_isactive(struct trunk_port *tp) +lacp_port_isactive(struct lagg_port *lgp) { - struct lacp_port *lp = LACP_PORT(tp); + struct lacp_port *lp = LACP_PORT(lgp); struct lacp_softc *lsc = lp->lp_lsc; struct lacp_aggregator *la = lp->lp_aggregator; @@ -512,23 +512,23 @@ static void lacp_disable_collecting(struct lacp_port *lp) { - struct trunk_port *tp = lp->lp_trunk; + struct lagg_port *lgp = lp->lp_lagg; LACP_DPRINTF((lp, "collecting disabled\n")); lp->lp_state &= ~LACP_STATE_COLLECTING; - tp->tp_flags &= ~TRUNK_PORT_COLLECTING; + lgp->lp_flags &= ~LAGG_PORT_COLLECTING; } static void lacp_enable_collecting(struct lacp_port *lp) { - struct trunk_port *tp = lp->lp_trunk; + struct lagg_port *lgp = lp->lp_lagg; LACP_DPRINTF((lp, "collecting enabled\n")); lp->lp_state |= LACP_STATE_COLLECTING; - tp->tp_flags |= TRUNK_PORT_COLLECTING; + lgp->lp_flags |= LAGG_PORT_COLLECTING; } static void @@ -536,12 +536,12 @@ { struct lacp_aggregator *la = lp->lp_aggregator; struct lacp_softc *lsc = lp->lp_lsc; - struct trunk_port *tp = lp->lp_trunk; + struct lagg_port *lgp = lp->lp_lagg; #if defined(LACP_DEBUG) char buf[LACP_LAGIDSTR_MAX+1]; #endif /* defined(LACP_DEBUG) */ - TRUNK_LOCK_ASSERT(tp->tp_trunk); + LAGG_LOCK_ASSERT(lgp->lp_lagg); if (la == NULL || (lp->lp_state & LACP_STATE_DISTRIBUTING) == 0) { return; @@ -562,7 +562,7 @@ lacp_suppress_distributing(lsc, la); lp->lp_state &= ~LACP_STATE_DISTRIBUTING; - tp->tp_flags &= ~TRUNK_PORT_DISTRIBUTING; + lgp->lp_flags &= ~LAGG_PORT_DISTRIBUTING; if (lsc->lsc_active_aggregator == la) { lacp_select_active_aggregator(lsc); @@ -574,12 +574,12 @@ { struct lacp_aggregator *la = lp->lp_aggregator; struct lacp_softc *lsc = lp->lp_lsc; - struct trunk_port *tp = lp->lp_trunk; + struct lagg_port *lgp = lp->lp_lagg; #if defined(LACP_DEBUG) char buf[LACP_LAGIDSTR_MAX+1]; #endif /* defined(LACP_DEBUG) */ - TRUNK_LOCK_ASSERT(tp->tp_trunk); + LAGG_LOCK_ASSERT(lgp->lp_lagg); if ((lp->lp_state & LACP_STATE_DISTRIBUTING) != 0) { return; @@ -597,7 +597,7 @@ lacp_suppress_distributing(lsc, la); lp->lp_state |= LACP_STATE_DISTRIBUTING; - tp->tp_flags |= TRUNK_PORT_DISTRIBUTING; + lgp->lp_flags |= LAGG_PORT_DISTRIBUTING; if (lsc->lsc_active_aggregator != la) { lacp_select_active_aggregator(lsc); @@ -614,46 +614,46 @@ } int -lacp_attach(struct trunk_softc *tr) +lacp_attach(struct lagg_softc *lgs) { struct lacp_softc *lsc; - TRUNK_LOCK_ASSERT(tr); + LAGG_LOCK_ASSERT(lgs); lsc = malloc(sizeof(struct lacp_softc), M_DEVBUF, M_NOWAIT|M_ZERO); if (lsc == NULL) return (ENOMEM); - tr->tr_psc = (caddr_t)lsc; - lsc->lsc_trunk = tr; + lgs->sc_psc = (caddr_t)lsc; + lsc->lsc_lagg = lgs; lsc->lsc_hashkey = arc4random(); lsc->lsc_active_aggregator = NULL; TAILQ_INIT(&lsc->lsc_aggregators); LIST_INIT(&lsc->lsc_ports); - callout_init_mtx(&lsc->lsc_transit_callout, &tr->tr_mtx, 0); - callout_init_mtx(&lsc->lsc_callout, &tr->tr_mtx, 0); + callout_init_mtx(&lsc->lsc_transit_callout, &lgs->sc_mtx, 0); + callout_init_mtx(&lsc->lsc_callout, &lgs->sc_mtx, 0); - /* if the trunk is already up then do the same */ - if (tr->tr_ifp->if_drv_flags & IFF_DRV_RUNNING) - lacp_init(tr); + /* if the lagg is already up then do the same */ + if (lgs->sc_ifp->if_drv_flags & IFF_DRV_RUNNING) + lacp_init(lgs); return (0); } int -lacp_detach(struct trunk_softc *tr) +lacp_detach(struct lagg_softc *lgs) { - struct lacp_softc *lsc = LACP_SOFTC(tr); + struct lacp_softc *lsc = LACP_SOFTC(lgs); KASSERT(TAILQ_EMPTY(&lsc->lsc_aggregators), ("aggregators still active")); KASSERT(lsc->lsc_active_aggregator == NULL, ("aggregator still attached")); - tr->tr_psc = NULL; + lgs->sc_psc = NULL; callout_drain(&lsc->lsc_transit_callout); callout_drain(&lsc->lsc_callout); @@ -662,32 +662,32 @@ } void -lacp_init(struct trunk_softc *tr) +lacp_init(struct lagg_softc *lgs) { - struct lacp_softc *lsc = LACP_SOFTC(tr); + struct lacp_softc *lsc = LACP_SOFTC(lgs); callout_reset(&lsc->lsc_callout, hz, lacp_tick, lsc); } void -lacp_stop(struct trunk_softc *tr) +lacp_stop(struct lagg_softc *lgs) { - struct lacp_softc *lsc = LACP_SOFTC(tr); + struct lacp_softc *lsc = LACP_SOFTC(lgs); callout_stop(&lsc->lsc_transit_callout); callout_stop(&lsc->lsc_callout); } -struct trunk_port * -lacp_select_tx_port(struct trunk_softc *tr, struct mbuf *m) +struct lagg_port * +lacp_select_tx_port(struct lagg_softc *lgs, struct mbuf *m) { - struct lacp_softc *lsc = LACP_SOFTC(tr); + struct lacp_softc *lsc = LACP_SOFTC(lgs); struct lacp_aggregator *la; struct lacp_port *lp; uint32_t hash; int nports; - TRUNK_LOCK_ASSERT(tr); + LAGG_LOCK_ASSERT(lgs); if (__predict_false(lsc->lsc_suppress_distributing)) { LACP_DPRINTF((NULL, "%s: waiting transit\n", __func__)); @@ -703,7 +703,7 @@ nports = la->la_nports; KASSERT(nports > 0, ("no ports available")); - hash = trunk_hashmbuf(m, lsc->lsc_hashkey); + hash = lagg_hashmbuf(m, lsc->lsc_hashkey); hash %= nports; lp = TAILQ_FIRST(&la->la_ports); while (hash--) { @@ -713,7 +713,7 @@ KASSERT((lp->lp_state & LACP_STATE_DISTRIBUTING) != 0, ("aggregated port is not distributing")); - return (lp->lp_trunk); + return (lp->lp_lagg); } /* * lacp_suppress_distributing: drop transmit packets for a while @@ -780,7 +780,7 @@ /* * lacp_select_active_aggregator: select an aggregator to be used to transmit - * packets from trunk(4) interface. + * packets from lagg(4) interface. */ static void @@ -843,8 +843,8 @@ static uint16_t lacp_compose_key(struct lacp_port *lp) { - struct trunk_port *tp = lp->lp_trunk; - struct trunk_softc *tr = tp->tp_trunk; + struct lagg_port *lgp = lp->lp_lagg; + struct lagg_softc *lgs = lgp->lp_lagg; u_int media = lp->lp_media; uint16_t key; @@ -869,8 +869,8 @@ /* bit 0..4: IFM_SUBTYPE */ key = subtype; - /* bit 5..14: (some bits of) if_index of trunk device */ - key |= 0x7fe0 & ((tr->tr_ifp->if_index) << 5); + /* bit 5..14: (some bits of) if_index of lagg device */ + key |= 0x7fe0 & ((lgs->sc_ifp->if_index) << 5); /* bit 15: 0 */ } return (htons(key)); @@ -1529,13 +1529,13 @@ } int -lacp_marker_input(struct trunk_port *tp, struct mbuf *m) +lacp_marker_input(struct lagg_port *lgp, struct mbuf *m) { - struct lacp_port *lp = LACP_PORT(tp); + struct lacp_port *lp = LACP_PORT(lgp); struct markerdu *mdu; int error = 0; - TRUNK_LOCK_ASSERT(tp->tp_trunk); + LAGG_LOCK_ASSERT(lgp->lp_lagg); if (__predict_false(lp->lp_flags & LACP_PORT_DETACHING)) { goto bad; @@ -1582,8 +1582,8 @@ memcpy(&mdu->mdu_eh.ether_dhost, ðermulticastaddr_slowprotocols, ETHER_ADDR_LEN); memcpy(&mdu->mdu_eh.ether_shost, - tp->tp_lladdr, ETHER_ADDR_LEN); - error = trunk_enqueue(lp->lp_ifp, m); + lgp->lp_lladdr, ETHER_ADDR_LEN); + error = lagg_enqueue(lp->lp_ifp, m); break; case MARKER_TYPE_RESPONSE: ==== //depot/projects/scottl-camlock/src/sys/net/ieee8023ad_lacp.h#2 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/net/ieee8023ad_lacp.h,v 1.1 2007/04/10 00:27:25 thompsa Exp $ + * $FreeBSD: src/sys/net/ieee8023ad_lacp.h,v 1.2 2007/04/17 00:35:11 thompsa Exp $ */ /* @@ -177,7 +177,7 @@ TAILQ_ENTRY(lacp_port) lp_dist_q; LIST_ENTRY(lacp_port) lp_next; struct lacp_softc *lp_lsc; - struct trunk_port *lp_trunk; + struct lagg_port *lp_lagg; struct ifnet *lp_ifp; struct lacp_peerinfo lp_partner; struct lacp_peerinfo lp_actor; @@ -205,7 +205,7 @@ }; struct lacp_softc { - struct trunk_softc *lsc_trunk; + struct lagg_softc *lsc_lagg; struct lacp_aggregator *lsc_active_aggregator; TAILQ_HEAD(, lacp_aggregator) lsc_aggregators; boolean_t lsc_suppress_distributing; @@ -258,20 +258,20 @@ #define LACP_STATE_EQ(s1, s2, mask) \ ((((s1) ^ (s2)) & (mask)) == 0) -#define LACP_PORT(_tp) ((struct lacp_port *)(_tp)->tp_psc) -#define LACP_SOFTC(_tr) ((struct lacp_softc *)(_tr)->tr_psc) +#define LACP_PORT(_lp) ((struct lacp_port *)(_lp)->lp_psc) +#define LACP_SOFTC(_sc) ((struct lacp_softc *)(_sc)->sc_psc) -int lacp_input(struct trunk_port *, struct mbuf *); -int lacp_marker_input(struct trunk_port *, struct mbuf *); -struct trunk_port *lacp_select_tx_port(struct trunk_softc *, struct mbuf *); -int lacp_attach(struct trunk_softc *); -int lacp_detach(struct trunk_softc *); -void lacp_init(struct trunk_softc *); -void lacp_stop(struct trunk_softc *); -int lacp_port_create(struct trunk_port *); -void lacp_port_destroy(struct trunk_port *); -void lacp_linkstate(struct trunk_port *); -int lacp_port_isactive(struct trunk_port *); +int lacp_input(struct lagg_port *, struct mbuf *); +int lacp_marker_input(struct lagg_port *, struct mbuf *); +struct lagg_port *lacp_select_tx_port(struct lagg_softc *, struct mbuf *); +int lacp_attach(struct lagg_softc *); +int lacp_detach(struct lagg_softc *); +void lacp_init(struct lagg_softc *); +void lacp_stop(struct lagg_softc *); +int lacp_port_create(struct lagg_port *); +void lacp_port_destroy(struct lagg_port *); +void lacp_linkstate(struct lagg_port *); +int lacp_port_isactive(struct lagg_port *); /* following constants don't include terminating NUL */ #define LACP_MACSTR_MAX (2*6 + 5) ==== //depot/projects/scottl-camlock/src/sys/net/if.c#17 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)if.c 8.5 (Berkeley) 1/9/95 - * $FreeBSD: src/sys/net/if.c,v 1.270 2007/04/10 00:27:25 thompsa Exp $ + * $FreeBSD: src/sys/net/if.c,v 1.271 2007/04/17 00:35:11 thompsa Exp $ */ #include "opt_compat.h" @@ -96,7 +96,7 @@ void (*bstp_linkstate_p)(struct ifnet *ifp, int state); void (*ng_ether_link_state_p)(struct ifnet *ifp, int state); -void (*trunk_linkstate_p)(struct ifnet *ifp, int state); +void (*lagg_linkstate_p)(struct ifnet *ifp, int state); struct mbuf *(*tbr_dequeue_ptr)(struct ifaltq *, int) = NULL; @@ -1379,9 +1379,9 @@ KASSERT(bstp_linkstate_p != NULL,("if_bridge bstp not loaded!")); (*bstp_linkstate_p)(ifp, link_state); } - if (ifp->if_trunk) { - KASSERT(trunk_linkstate_p != NULL,("if_trunk not loaded!")); - (*trunk_linkstate_p)(ifp, link_state); + if (ifp->if_lagg) { + KASSERT(lagg_linkstate_p != NULL,("if_lagg not loaded!")); + (*lagg_linkstate_p)(ifp, link_state); } devctl_notify("IFNET", ifp->if_xname, ==== //depot/projects/scottl-camlock/src/sys/net/if_ethersubr.c#14 (text+ko) ==== @@ -27,7 +27,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Apr 17 10:38:53 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 5025916A409; Tue, 17 Apr 2007 10:38:53 +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 249D216A401 for ; Tue, 17 Apr 2007 10:38:53 +0000 (UTC) (envelope-from mharvan@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 1588113C46A for ; Tue, 17 Apr 2007 10:38:53 +0000 (UTC) (envelope-from mharvan@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 l3HAcqMs061642 for ; Tue, 17 Apr 2007 10:38:52 GMT (envelope-from mharvan@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3HAcqaW061639 for perforce@freebsd.org; Tue, 17 Apr 2007 10:38:52 GMT (envelope-from mharvan@FreeBSD.org) Date: Tue, 17 Apr 2007 10:38:52 GMT Message-Id: <200704171038.l3HAcqaW061639@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mharvan@FreeBSD.org using -f From: Matus Harvan To: Perforce Change Reviews Cc: Subject: PERFORCE change 118296 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: Tue, 17 Apr 2007 10:38:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=118296 Change 118296 by mharvan@mharvan_twoflower on 2007/04/17 10:38:18 Importing initial version of the tunneling daemon sources. Affected files ... .. //depot/projects/soc2007/mharvan-mtund/mtund.src/Makefile#1 add .. //depot/projects/soc2007/mharvan-mtund/mtund.src/README#1 add .. //depot/projects/soc2007/mharvan-mtund/mtund.src/plugin.h#1 add .. //depot/projects/soc2007/mharvan-mtund/mtund.src/plugin_tcp.c#1 add .. //depot/projects/soc2007/mharvan-mtund/mtund.src/plugin_udp.c#1 add .. //depot/projects/soc2007/mharvan-mtund/mtund.src/tun_dev.c#1 add .. //depot/projects/soc2007/mharvan-mtund/mtund.src/tun_dev.c.freebsd#1 add .. //depot/projects/soc2007/mharvan-mtund/mtund.src/tun_dev.c.linux#1 add .. //depot/projects/soc2007/mharvan-mtund/mtund.src/tun_dev.h#1 add .. //depot/projects/soc2007/mharvan-mtund/mtund.src/tunneld.c#1 add .. //depot/projects/soc2007/mharvan-mtund/mtund.src/tunneld.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Tue Apr 17 10:44:00 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 3847D16A409; Tue, 17 Apr 2007 10:44:00 +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 0E31116A401 for ; Tue, 17 Apr 2007 10:44:00 +0000 (UTC) (envelope-from mharvan@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id DA34413C46A for ; Tue, 17 Apr 2007 10:43:59 +0000 (UTC) (envelope-from mharvan@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 l3HAhxbZ062986 for ; Tue, 17 Apr 2007 10:43:59 GMT (envelope-from mharvan@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3HAhxeM062983 for perforce@freebsd.org; Tue, 17 Apr 2007 10:43:59 GMT (envelope-from mharvan@FreeBSD.org) Date: Tue, 17 Apr 2007 10:43:59 GMT Message-Id: <200704171043.l3HAhxeM062983@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mharvan@FreeBSD.org using -f From: Matus Harvan To: Perforce Change Reviews Cc: Subject: PERFORCE change 118297 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: Tue, 17 Apr 2007 10:44:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=118297 Change 118297 by mharvan@mharvan_twoflower on 2007/04/17 10:43:06 Imported SoC application and abstract. Affected files ... .. //depot/projects/soc2007/mharvan-mtund/soc.doc/abstract.txt#1 add .. //depot/projects/soc2007/mharvan-mtund/soc.doc/application.txt#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Tue Apr 17 14:01:11 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 B927216A407; Tue, 17 Apr 2007 14:01:10 +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 6BFBC16A401 for ; Tue, 17 Apr 2007 14:01:10 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 10B9013C46A for ; Tue, 17 Apr 2007 14:01:10 +0000 (UTC) (envelope-from gabor@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 l3HE193i015657 for ; Tue, 17 Apr 2007 14:01:09 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3HE19KA015641 for perforce@freebsd.org; Tue, 17 Apr 2007 14:01:09 GMT (envelope-from gabor@freebsd.org) Date: Tue, 17 Apr 2007 14:01:09 GMT Message-Id: <200704171401.l3HE19KA015641@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 118306 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: Tue, 17 Apr 2007 14:01:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=118306 Change 118306 by gabor@gabor_server on 2007/04/17 14:00:09 - Pull out general command variables from bsd.port.mk into bsd.commands.mk, while I think it makes bsd.port.mk cleaner and it is more suitable for the DESTDIR layout - Add a NOOP framework for DESTDIR, I'll do the necessary operations in the new if statement, but it is a NOOP for now Affected files ... .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.commands.mk#1 add .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#12 edit Differences ... ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#12 (text+ko) ==== @@ -1043,6 +1043,18 @@ # Most port authors should not need to understand anything after this point. # +.include "${PORTSDIR}/Mk/bsd.commands.mk" + +# +# DESTDIR section to start a chrooted process if incoked with DESTDIR set +# + +.if defined(DESTDIR) && !empty(DESTDIR) +.BEGIN: + ${ECHO_CMD} "===> DESTDIR support coming soon..."; \ + ${FALSE} +.else + # Look for ${WRKSRC}/.../*.orig files, and (re-)create # ${FILEDIR}/patch-* files from them. @@ -1072,77 +1084,6 @@ .endif .endif -AWK?= /usr/bin/awk -BASENAME?= /usr/bin/basename -BRANDELF?= /usr/bin/brandelf -BZCAT?= /usr/bin/bzcat -BZIP2_CMD?= /usr/bin/bzip2 -CAT?= /bin/cat -CHGRP?= /usr/bin/chgrp -CHMOD?= /bin/chmod -CHOWN?= /usr/sbin/chown -CHROOT?= /usr/sbin/chroot -COMM?= /usr/bin/comm -CP?= /bin/cp -CPIO?= /usr/bin/cpio -CUT?= /usr/bin/cut -DC?= /usr/bin/dc -DIALOG?= /usr/bin/dialog -DIFF?= /usr/bin/diff -DIRNAME?= /usr/bin/dirname -EGREP?= /usr/bin/egrep -EXPR?= /bin/expr -FALSE?= false # Shell builtin -FILE?= /usr/bin/file -FIND?= /usr/bin/find -FMT?= /usr/bin/fmt -GREP?= /usr/bin/grep -GUNZIP_CMD?= /usr/bin/gunzip -f -GZCAT?= /usr/bin/gzcat -GZIP?= -9 -GZIP_CMD?= /usr/bin/gzip -nf ${GZIP} -HEAD?= /usr/bin/head -ID?= /usr/bin/id -IDENT?= /usr/bin/ident -LDCONFIG?= /sbin/ldconfig -LN?= /bin/ln -LS?= /bin/ls -MKDIR?= /bin/mkdir -p -MKTEMP?= /usr/bin/mktemp -MV?= /bin/mv -OBJCOPY?= /usr/bin/objcopy -OBJDUMP?= /usr/bin/objdump -PASTE?= /usr/bin/paste -PAX?= /bin/pax -PRINTF?= /usr/bin/printf -REALPATH?= /bin/realpath -RM?= /bin/rm -RMDIR?= /bin/rmdir -SED?= /usr/bin/sed -SETENV?= /usr/bin/env -SH?= /bin/sh -SORT?= /usr/bin/sort -STRIP_CMD?= /usr/bin/strip -SU_CMD?= /usr/bin/su root -c -SYSCTL?= /sbin/sysctl -TAIL?= /usr/bin/tail -TEST?= test # Shell builtin -TR?= LANG=C /usr/bin/tr -TRUE?= true # Shell builtin -UNAME?= /usr/bin/uname -UNZIP_CMD?= ${LOCALBASE}/bin/unzip -WHICH?= /usr/bin/which -XARGS?= /usr/bin/xargs -YACC?= /usr/bin/yacc - -# ECHO is defined in /usr/share/mk/sys.mk, which can either be "echo", -# or "true" if the make flag -s is given. Use ECHO_CMD where you mean -# the echo command. -ECHO_CMD?= echo # Shell builtin - -# Used to print all the '===>' style prompts - override this to turn them off. -ECHO_MSG?= ${ECHO_CMD} - # Get the default maintainer MAINTAINER?= ports@FreeBSD.org @@ -5738,3 +5679,6 @@ .endif # End of post-makefile section. + +.endif +# End of the DESTDIR if statement From owner-p4-projects@FreeBSD.ORG Tue Apr 17 14:35:56 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 A9F7916A407; Tue, 17 Apr 2007 14:35:56 +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 669FF16A403 for ; Tue, 17 Apr 2007 14:35:56 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 3E6C613C4BF for ; Tue, 17 Apr 2007 14:35:56 +0000 (UTC) (envelope-from gonzo@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 l3HEZuHt022854 for ; Tue, 17 Apr 2007 14:35:56 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3HEZtO3022851 for perforce@freebsd.org; Tue, 17 Apr 2007 14:35:55 GMT (envelope-from gonzo@FreeBSD.org) Date: Tue, 17 Apr 2007 14:35:55 GMT Message-Id: <200704171435.l3HEZtO3022851@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 118309 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: Tue, 17 Apr 2007 14:35:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=118309 Change 118309 by gonzo@gonzo_wooster on 2007/04/17 14:35:05 o Move gd_qnan.h to appropriate location. Affected files ... .. //depot/projects/mips2/src/lib/libc/mips/gd_qnan.h#1 branch .. //depot/projects/mips2/src/lib/libc/mips/gdtoa/gd_qnan.h#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Tue Apr 17 18:09:51 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 D255E16A50A; Tue, 17 Apr 2007 18:09:50 +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 6D40F16A56A for ; Tue, 17 Apr 2007 18:09:50 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5D2DF13C469 for ; Tue, 17 Apr 2007 18:09:50 +0000 (UTC) (envelope-from gonzo@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 l3HI9ofd070133 for ; Tue, 17 Apr 2007 18:09:50 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3HI9oW5070130 for perforce@freebsd.org; Tue, 17 Apr 2007 18:09:50 GMT (envelope-from gonzo@FreeBSD.org) Date: Tue, 17 Apr 2007 18:09:50 GMT Message-Id: <200704171809.l3HI9oW5070130@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 118318 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: Tue, 17 Apr 2007 18:09:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=118318 Change 118318 by gonzo@gonzo_jeeves on 2007/04/17 18:09:08 o Use v1 as temporary register and do not mess with stack. Affected files ... .. //depot/projects/mips2/src/lib/libc/mips/sys/sbrk.S#5 edit Differences ... ==== //depot/projects/mips2/src/lib/libc/mips/sys/sbrk.S#5 (text+ko) ==== @@ -55,17 +55,13 @@ .cpload t9 .set reorder #endif - subu sp, sp, 4 - sw s0, 0(sp) - lw s0, _C_LABEL(__curbrk) + lw v1, _C_LABEL(__curbrk) li v0, SYS_break - addu a0, a0, s0 # compute current break + addu a0, a0, v1 # compute current break syscall bne a3, zero, 1f - move v0, s0 # return old val of curbrk from above + move v0, v1 # return old val of curbrk from above sw a0, _C_LABEL(__curbrk) # save current val of curbrk from above - lw s0, 0(sp) - addu sp, sp, 4 j ra 1: la t9, _C_LABEL(__cerror) From owner-p4-projects@FreeBSD.ORG Tue Apr 17 20:23:20 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 5CE3C16A404; Tue, 17 Apr 2007 20:23:20 +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 29BB116A40D for ; Tue, 17 Apr 2007 20:23:20 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id D528413C487 for ; Tue, 17 Apr 2007 20:23:19 +0000 (UTC) (envelope-from imp@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 l3HKNJNU001877 for ; Tue, 17 Apr 2007 20:23:19 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3HKN0Wc001838 for perforce@freebsd.org; Tue, 17 Apr 2007 20:23:00 GMT (envelope-from imp@freebsd.org) Date: Tue, 17 Apr 2007 20:23:00 GMT Message-Id: <200704172023.l3HKN0Wc001838@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 118323 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: Tue, 17 Apr 2007 20:23:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=118323 Change 118323 by imp@imp_paco-paco on 2007/04/17 20:22:54 IFC @118322 Affected files ... .. //depot/projects/arm/src/Makefile.inc1#25 integrate .. //depot/projects/arm/src/ObsoleteFiles.inc#18 integrate .. //depot/projects/arm/src/UPDATING#13 integrate .. //depot/projects/arm/src/cddl/Makefile#2 integrate .. //depot/projects/arm/src/cddl/Makefile.inc#2 integrate .. //depot/projects/arm/src/cddl/lib/Makefile#2 integrate .. //depot/projects/arm/src/cddl/lib/Makefile.inc#2 integrate .. //depot/projects/arm/src/cddl/lib/libavl/Makefile#2 integrate .. //depot/projects/arm/src/cddl/lib/libnvpair/Makefile#2 integrate .. //depot/projects/arm/src/cddl/lib/libumem/Makefile#2 integrate .. //depot/projects/arm/src/cddl/lib/libuutil/Makefile#2 integrate .. //depot/projects/arm/src/cddl/lib/libzfs/Makefile#2 integrate .. //depot/projects/arm/src/cddl/lib/libzpool/Makefile#2 integrate .. //depot/projects/arm/src/cddl/sbin/Makefile#2 integrate .. //depot/projects/arm/src/cddl/sbin/zfs/Makefile#2 integrate .. //depot/projects/arm/src/cddl/sbin/zpool/Makefile#2 integrate .. //depot/projects/arm/src/cddl/usr.bin/Makefile#2 integrate .. //depot/projects/arm/src/cddl/usr.bin/ztest/Makefile#2 integrate .. //depot/projects/arm/src/cddl/usr.sbin/Makefile#2 integrate .. //depot/projects/arm/src/cddl/usr.sbin/zdb/Makefile#2 integrate .. //depot/projects/arm/src/contrib/libreadline/FREEBSD-upgrade#3 integrate .. //depot/projects/arm/src/contrib/libreadline/display.c#3 integrate .. //depot/projects/arm/src/contrib/openbsm/HISTORY#5 integrate .. //depot/projects/arm/src/contrib/openbsm/README#3 integrate .. //depot/projects/arm/src/contrib/openbsm/TODO#3 integrate .. //depot/projects/arm/src/contrib/openbsm/VERSION#4 integrate .. //depot/projects/arm/src/contrib/openbsm/bin/audit/audit.8#2 integrate .. //depot/projects/arm/src/contrib/openbsm/bin/auditd/auditd.8#3 integrate .. //depot/projects/arm/src/contrib/openbsm/bin/auditd/auditd.c#5 integrate .. //depot/projects/arm/src/contrib/openbsm/bin/auditfilterd/auditfilterd.8#2 integrate .. //depot/projects/arm/src/contrib/openbsm/bin/auditfilterd/auditfilterd.c#3 integrate .. //depot/projects/arm/src/contrib/openbsm/bin/auditreduce/auditreduce.1#3 integrate .. //depot/projects/arm/src/contrib/openbsm/bin/praudit/praudit.1#2 integrate .. //depot/projects/arm/src/contrib/openbsm/bin/praudit/praudit.c#2 integrate .. //depot/projects/arm/src/contrib/openbsm/bsm/libbsm.h#4 integrate .. //depot/projects/arm/src/contrib/openbsm/compat/clock_gettime.h#1 branch .. //depot/projects/arm/src/contrib/openbsm/config/config.h#4 integrate .. //depot/projects/arm/src/contrib/openbsm/configure#5 integrate .. //depot/projects/arm/src/contrib/openbsm/configure.ac#5 integrate .. //depot/projects/arm/src/contrib/openbsm/etc/audit_event#4 integrate .. //depot/projects/arm/src/contrib/openbsm/libbsm/au_class.3#2 integrate .. //depot/projects/arm/src/contrib/openbsm/libbsm/au_control.3#3 integrate .. //depot/projects/arm/src/contrib/openbsm/libbsm/au_event.3#2 integrate .. //depot/projects/arm/src/contrib/openbsm/libbsm/au_free_token.3#2 integrate .. //depot/projects/arm/src/contrib/openbsm/libbsm/au_io.3#2 integrate .. //depot/projects/arm/src/contrib/openbsm/libbsm/au_mask.3#2 integrate .. //depot/projects/arm/src/contrib/openbsm/libbsm/au_open.3#3 integrate .. //depot/projects/arm/src/contrib/openbsm/libbsm/au_token.3#3 integrate .. //depot/projects/arm/src/contrib/openbsm/libbsm/au_user.3#2 integrate .. //depot/projects/arm/src/contrib/openbsm/libbsm/audit_submit.3#2 integrate .. //depot/projects/arm/src/contrib/openbsm/libbsm/bsm_io.c#4 integrate .. //depot/projects/arm/src/contrib/openbsm/libbsm/bsm_notify.c#2 integrate .. //depot/projects/arm/src/contrib/openbsm/libbsm/bsm_token.c#5 integrate .. //depot/projects/arm/src/contrib/openbsm/libbsm/bsm_wrappers.c#2 integrate .. //depot/projects/arm/src/contrib/openbsm/libbsm/libbsm.3#3 integrate .. //depot/projects/arm/src/contrib/openbsm/man/audit.2#2 integrate .. //depot/projects/arm/src/contrib/openbsm/man/audit.log.5#3 integrate .. //depot/projects/arm/src/contrib/openbsm/man/audit_class.5#2 integrate .. //depot/projects/arm/src/contrib/openbsm/man/audit_control.5#3 integrate .. //depot/projects/arm/src/contrib/openbsm/man/audit_event.5#2 integrate .. //depot/projects/arm/src/contrib/openbsm/man/audit_user.5#2 integrate .. //depot/projects/arm/src/contrib/openbsm/man/audit_warn.5#2 integrate .. //depot/projects/arm/src/contrib/openbsm/man/auditctl.2#2 integrate .. //depot/projects/arm/src/contrib/openbsm/man/auditon.2#3 integrate .. //depot/projects/arm/src/contrib/openbsm/man/getaudit.2#2 integrate .. //depot/projects/arm/src/contrib/openbsm/man/getauid.2#2 integrate .. //depot/projects/arm/src/contrib/openbsm/man/setaudit.2#2 integrate .. //depot/projects/arm/src/contrib/openbsm/man/setauid.2#2 integrate .. //depot/projects/arm/src/contrib/openbsm/test/bsm/generate.c#3 integrate .. //depot/projects/arm/src/contrib/openbsm/test/reference/arg32_record#2 integrate .. //depot/projects/arm/src/contrib/openbsm/test/reference/data_record#2 integrate .. //depot/projects/arm/src/contrib/openbsm/test/reference/file_record#2 integrate .. //depot/projects/arm/src/contrib/openbsm/test/reference/in_addr_record#2 integrate .. //depot/projects/arm/src/contrib/openbsm/test/reference/ip_record#2 integrate .. //depot/projects/arm/src/contrib/openbsm/test/reference/ipc_record#2 integrate .. //depot/projects/arm/src/contrib/openbsm/test/reference/iport_record#2 integrate .. //depot/projects/arm/src/contrib/openbsm/test/reference/opaque_record#2 integrate .. //depot/projects/arm/src/contrib/openbsm/test/reference/path_record#2 integrate .. //depot/projects/arm/src/contrib/openbsm/test/reference/process32_record#2 integrate .. //depot/projects/arm/src/contrib/openbsm/test/reference/process32ex_record#2 delete .. //depot/projects/arm/src/contrib/openbsm/test/reference/process32ex_record-IPv4#1 branch .. //depot/projects/arm/src/contrib/openbsm/test/reference/process32ex_record-IPv6#1 branch .. //depot/projects/arm/src/contrib/openbsm/test/reference/process32ex_token#2 delete .. //depot/projects/arm/src/contrib/openbsm/test/reference/process32ex_token-IPv4#1 branch .. //depot/projects/arm/src/contrib/openbsm/test/reference/process32ex_token-IPv6#1 branch .. //depot/projects/arm/src/contrib/openbsm/test/reference/process64_record#1 branch .. //depot/projects/arm/src/contrib/openbsm/test/reference/process64_token#1 branch .. //depot/projects/arm/src/contrib/openbsm/test/reference/process64ex_record-IPv4#1 branch .. //depot/projects/arm/src/contrib/openbsm/test/reference/process64ex_record-IPv6#1 branch .. //depot/projects/arm/src/contrib/openbsm/test/reference/process64ex_token-IPv4#1 branch .. //depot/projects/arm/src/contrib/openbsm/test/reference/process64ex_token-IPv6#1 branch .. //depot/projects/arm/src/contrib/openbsm/test/reference/return32_record#2 integrate .. //depot/projects/arm/src/contrib/openbsm/test/reference/seq_record#2 integrate .. //depot/projects/arm/src/contrib/openbsm/test/reference/subject32_record#2 integrate .. //depot/projects/arm/src/contrib/openbsm/test/reference/subject32ex_record#2 integrate .. //depot/projects/arm/src/contrib/openbsm/test/reference/subject32ex_token-IPv4#2 integrate .. //depot/projects/arm/src/contrib/openbsm/test/reference/subject32ex_token-IPv6#2 integrate .. //depot/projects/arm/src/contrib/openbsm/test/reference/text_record#2 integrate .. //depot/projects/arm/src/contrib/openbsm/test/reference/zonename_record#1 branch .. //depot/projects/arm/src/contrib/openbsm/test/reference/zonename_token#1 branch .. //depot/projects/arm/src/contrib/openbsm/tools/audump.c#3 integrate .. //depot/projects/arm/src/contrib/opensolaris/cmd/zdb/zdb.8#2 integrate .. //depot/projects/arm/src/contrib/opensolaris/cmd/zfs/zfs.8#2 integrate .. //depot/projects/arm/src/contrib/opensolaris/cmd/zfs/zfs_main.c#2 integrate .. //depot/projects/arm/src/contrib/opensolaris/cmd/zpool/zpool.8#2 integrate .. //depot/projects/arm/src/contrib/opensolaris/cmd/ztest/ztest.c#2 integrate .. //depot/projects/arm/src/contrib/opensolaris/lib/libzfs/common/libzfs.h#2 integrate .. //depot/projects/arm/src/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#2 integrate .. //depot/projects/arm/src/contrib/opensolaris/lib/libzpool/common/kernel.c#2 integrate .. //depot/projects/arm/src/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#2 integrate .. //depot/projects/arm/src/contrib/sendmail/FREEBSD-upgrade#3 integrate .. //depot/projects/arm/src/contrib/sendmail/KNOWNBUGS#2 integrate .. //depot/projects/arm/src/contrib/sendmail/PGPKEYS#2 integrate .. //depot/projects/arm/src/contrib/sendmail/RELEASE_NOTES#3 integrate .. //depot/projects/arm/src/contrib/sendmail/cf/README#2 integrate .. //depot/projects/arm/src/contrib/sendmail/cf/cf/knecht.mc#2 integrate .. //depot/projects/arm/src/contrib/sendmail/cf/cf/submit.cf#3 integrate .. //depot/projects/arm/src/contrib/sendmail/cf/feature/access_db.m4#2 integrate .. //depot/projects/arm/src/contrib/sendmail/cf/feature/badmx.m4#1 branch .. //depot/projects/arm/src/contrib/sendmail/cf/feature/block_bad_helo.m4#1 branch .. //depot/projects/arm/src/contrib/sendmail/cf/feature/dnsbl.m4#2 integrate .. //depot/projects/arm/src/contrib/sendmail/cf/feature/enhdnsbl.m4#2 integrate .. //depot/projects/arm/src/contrib/sendmail/cf/feature/require_rdns.m4#1 branch .. //depot/projects/arm/src/contrib/sendmail/cf/m4/proto.m4#2 integrate .. //depot/projects/arm/src/contrib/sendmail/cf/m4/version.m4#3 integrate .. //depot/projects/arm/src/contrib/sendmail/cf/mailer/smtp.m4#2 integrate .. //depot/projects/arm/src/contrib/sendmail/contrib/cidrexpand#3 integrate .. //depot/projects/arm/src/contrib/sendmail/contrib/qtool.pl#2 integrate .. //depot/projects/arm/src/contrib/sendmail/doc/op/op.me#2 integrate .. //depot/projects/arm/src/contrib/sendmail/editmap/Makefile.m4#2 integrate .. //depot/projects/arm/src/contrib/sendmail/include/libmilter/mfapi.h#2 integrate .. //depot/projects/arm/src/contrib/sendmail/include/libmilter/mfdef.h#2 integrate .. //depot/projects/arm/src/contrib/sendmail/include/libmilter/milter.h#2 integrate .. //depot/projects/arm/src/contrib/sendmail/include/sm/conf.h#2 integrate .. //depot/projects/arm/src/contrib/sendmail/include/sm/errstring.h#2 integrate .. //depot/projects/arm/src/contrib/sendmail/include/sm/heap.h#2 integrate .. //depot/projects/arm/src/contrib/sendmail/include/sm/ldap.h#2 integrate .. //depot/projects/arm/src/contrib/sendmail/include/sm/misc.h#1 branch .. //depot/projects/arm/src/contrib/sendmail/include/sm/os/sm_os_qnx.h#1 branch .. //depot/projects/arm/src/contrib/sendmail/include/sm/sendmail.h#1 branch .. //depot/projects/arm/src/contrib/sendmail/include/sm/tailq.h#1 branch .. //depot/projects/arm/src/contrib/sendmail/libmilter/Makefile#2 integrate .. //depot/projects/arm/src/contrib/sendmail/libmilter/Makefile.m4#2 integrate .. //depot/projects/arm/src/contrib/sendmail/libmilter/README#2 integrate .. //depot/projects/arm/src/contrib/sendmail/libmilter/comm.c#2 integrate .. //depot/projects/arm/src/contrib/sendmail/libmilter/docs/api.html#2 integrate .. //depot/projects/arm/src/contrib/sendmail/libmilter/docs/design.html#2 integrate .. //depot/projects/arm/src/contrib/sendmail/libmilter/docs/index.html#2 integrate .. //depot/projects/arm/src/contrib/sendmail/libmilter/docs/installation.html#2 integrate .. //depot/projects/arm/src/contrib/sendmail/libmilter/docs/other.html#2 integrate .. //depot/projects/arm/src/contrib/sendmail/libmilter/docs/overview.html#2 integrate .. //depot/projects/arm/src/contrib/sendmail/libmilter/docs/sample.html#2 integrate .. //depot/projects/arm/src/contrib/sendmail/libmilter/docs/smfi_addheader.html#2 integrate .. //depot/projects/arm/src/contrib/sendmail/libmilter/docs/smfi_addrcpt.html#2 integrate .. //depot/projects/arm/src/contrib/sendmail/libmilter/docs/smfi_addrcpt_par.html#1 branch .. //depot/projects/arm/src/contrib/sendmail/libmilter/docs/smfi_chgfrom.html#1 branch .. //depot/projects/arm/src/contrib/sendmail/libmilter/docs/smfi_chgheader.html#2 integrate .. //depot/projects/arm/src/contrib/sendmail/libmilter/docs/smfi_delrcpt.html#2 integrate .. //depot/projects/arm/src/contrib/sendmail/libmilter/docs/smfi_getpriv.html#2 integrate .. //depot/projects/arm/src/contrib/sendmail/libmilter/docs/smfi_getsymval.html#2 integrate .. //depot/projects/arm/src/contrib/sendmail/libmilter/docs/smfi_insheader.html#2 integrate .. //depot/projects/arm/src/contrib/sendmail/libmilter/docs/smfi_main.html#2 integrate .. //depot/projects/arm/src/contrib/sendmail/libmilter/docs/smfi_opensocket.html#2 integrate .. //depot/projects/arm/src/contrib/sendmail/libmilter/docs/smfi_progress.html#2 integrate .. //depot/projects/arm/src/contrib/sendmail/libmilter/docs/smfi_quarantine.html#2 integrate .. //depot/projects/arm/src/contrib/sendmail/libmilter/docs/smfi_register.html#2 integrate .. //depot/projects/arm/src/contrib/sendmail/libmilter/docs/smfi_replacebody.html#2 integrate .. //depot/projects/arm/src/contrib/sendmail/libmilter/docs/smfi_setbacklog.html#2 integrate .. //depot/projects/arm/src/contrib/sendmail/libmilter/docs/smfi_setconn.html#2 integrate .. //depot/projects/arm/src/contrib/sendmail/libmilter/docs/smfi_setdbg.html#2 integrate .. //depot/projects/arm/src/contrib/sendmail/libmilter/docs/smfi_setmlreply.html#2 integrate .. //depot/projects/arm/src/contrib/sendmail/libmilter/docs/smfi_setpriv.html#2 integrate .. //depot/projects/arm/src/contrib/sendmail/libmilter/docs/smfi_setreply.html#2 integrate .. //depot/projects/arm/src/contrib/sendmail/libmilter/docs/smfi_setsymlist.html#1 branch .. //depot/projects/arm/src/contrib/sendmail/libmilter/docs/smfi_settimeout.html#2 integrate .. //depot/projects/arm/src/contrib/sendmail/libmilter/docs/smfi_stop.html#2 integrate .. //depot/projects/arm/src/contrib/sendmail/libmilter/docs/smfi_version.html#1 branch .. //depot/projects/arm/src/contrib/sendmail/libmilter/docs/xxfi_abort.html#2 integrate .. //depot/projects/arm/src/contrib/sendmail/libmilter/docs/xxfi_body.html#2 integrate .. //depot/projects/arm/src/contrib/sendmail/libmilter/docs/xxfi_close.html#2 integrate .. //depot/projects/arm/src/contrib/sendmail/libmilter/docs/xxfi_connect.html#2 integrate .. //depot/projects/arm/src/contrib/sendmail/libmilter/docs/xxfi_data.html#1 branch .. //depot/projects/arm/src/contrib/sendmail/libmilter/docs/xxfi_envfrom.html#2 integrate .. //depot/projects/arm/src/contrib/sendmail/libmilter/docs/xxfi_envrcpt.html#2 integrate .. //depot/projects/arm/src/contrib/sendmail/libmilter/docs/xxfi_eoh.html#2 integrate .. //depot/projects/arm/src/contrib/sendmail/libmilter/docs/xxfi_eom.html#2 integrate .. //depot/projects/arm/src/contrib/sendmail/libmilter/docs/xxfi_header.html#2 integrate .. //depot/projects/arm/src/contrib/sendmail/libmilter/docs/xxfi_helo.html#2 integrate .. //depot/projects/arm/src/contrib/sendmail/libmilter/docs/xxfi_negotiate.html#1 branch .. //depot/projects/arm/src/contrib/sendmail/libmilter/docs/xxfi_unknown.html#1 branch .. //depot/projects/arm/src/contrib/sendmail/libmilter/engine.c#2 integrate .. //depot/projects/arm/src/contrib/sendmail/libmilter/example.c#1 branch .. //depot/projects/arm/src/contrib/sendmail/libmilter/handler.c#2 integrate .. //depot/projects/arm/src/contrib/sendmail/libmilter/libmilter.h#2 integrate .. //depot/projects/arm/src/contrib/sendmail/libmilter/listener.c#2 integrate .. //depot/projects/arm/src/contrib/sendmail/libmilter/main.c#2 integrate .. //depot/projects/arm/src/contrib/sendmail/libmilter/monitor.c#1 branch .. //depot/projects/arm/src/contrib/sendmail/libmilter/smfi.c#2 integrate .. //depot/projects/arm/src/contrib/sendmail/libmilter/worker.c#1 branch .. //depot/projects/arm/src/contrib/sendmail/libsm/Makefile#2 integrate .. //depot/projects/arm/src/contrib/sendmail/libsm/Makefile.m4#2 integrate .. //depot/projects/arm/src/contrib/sendmail/libsm/config.c#2 integrate .. //depot/projects/arm/src/contrib/sendmail/libsm/exc.c#2 integrate .. //depot/projects/arm/src/contrib/sendmail/libsm/exc.html#2 integrate .. //depot/projects/arm/src/contrib/sendmail/libsm/findfp.c#2 integrate .. //depot/projects/arm/src/contrib/sendmail/libsm/flags.c#2 integrate .. //depot/projects/arm/src/contrib/sendmail/libsm/ldap.c#2 integrate .. //depot/projects/arm/src/contrib/sendmail/libsm/local.h#2 integrate .. //depot/projects/arm/src/contrib/sendmail/libsm/memstat.c#2 integrate .. //depot/projects/arm/src/contrib/sendmail/libsm/snprintf.c#2 integrate .. //depot/projects/arm/src/contrib/sendmail/libsm/t-memstat.c#2 integrate .. //depot/projects/arm/src/contrib/sendmail/libsm/t-qic.c#1 branch .. //depot/projects/arm/src/contrib/sendmail/libsm/t-sem.c#2 integrate .. //depot/projects/arm/src/contrib/sendmail/libsm/util.c#1 branch .. //depot/projects/arm/src/contrib/sendmail/libsm/vfscanf.c#2 integrate .. //depot/projects/arm/src/contrib/sendmail/libsmdb/Makefile.m4#2 integrate .. //depot/projects/arm/src/contrib/sendmail/libsmutil/Makefile.m4#2 integrate .. //depot/projects/arm/src/contrib/sendmail/mail.local/Makefile.m4#2 integrate .. //depot/projects/arm/src/contrib/sendmail/mail.local/mail.local.c#2 integrate .. //depot/projects/arm/src/contrib/sendmail/mailstats/Makefile.m4#2 integrate .. //depot/projects/arm/src/contrib/sendmail/makemap/Makefile.m4#2 integrate .. //depot/projects/arm/src/contrib/sendmail/praliases/Makefile.m4#2 integrate .. //depot/projects/arm/src/contrib/sendmail/rmail/Makefile.m4#2 integrate .. //depot/projects/arm/src/contrib/sendmail/smrsh/Makefile.m4#2 integrate .. //depot/projects/arm/src/contrib/sendmail/src/Makefile#2 integrate .. //depot/projects/arm/src/contrib/sendmail/src/Makefile.m4#2 integrate .. //depot/projects/arm/src/contrib/sendmail/src/README#2 integrate .. //depot/projects/arm/src/contrib/sendmail/src/TRACEFLAGS#2 integrate .. //depot/projects/arm/src/contrib/sendmail/src/TUNING#2 integrate .. //depot/projects/arm/src/contrib/sendmail/src/alias.c#2 integrate .. //depot/projects/arm/src/contrib/sendmail/src/arpadate.c#2 integrate .. //depot/projects/arm/src/contrib/sendmail/src/collect.c#2 integrate .. //depot/projects/arm/src/contrib/sendmail/src/conf.c#2 integrate .. //depot/projects/arm/src/contrib/sendmail/src/conf.h#2 integrate .. //depot/projects/arm/src/contrib/sendmail/src/control.c#2 integrate .. //depot/projects/arm/src/contrib/sendmail/src/daemon.c#2 integrate .. //depot/projects/arm/src/contrib/sendmail/src/daemon.h#1 branch .. //depot/projects/arm/src/contrib/sendmail/src/deliver.c#2 integrate .. //depot/projects/arm/src/contrib/sendmail/src/domain.c#2 integrate .. //depot/projects/arm/src/contrib/sendmail/src/envelope.c#2 integrate .. //depot/projects/arm/src/contrib/sendmail/src/err.c#2 integrate .. //depot/projects/arm/src/contrib/sendmail/src/headers.c#2 integrate .. //depot/projects/arm/src/contrib/sendmail/src/helpfile#2 integrate .. //depot/projects/arm/src/contrib/sendmail/src/macro.c#2 integrate .. //depot/projects/arm/src/contrib/sendmail/src/mailq.1#2 integrate .. //depot/projects/arm/src/contrib/sendmail/src/main.c#3 integrate .. //depot/projects/arm/src/contrib/sendmail/src/map.c#2 integrate .. //depot/projects/arm/src/contrib/sendmail/src/map.h#1 branch .. //depot/projects/arm/src/contrib/sendmail/src/mci.c#2 integrate .. //depot/projects/arm/src/contrib/sendmail/src/milter.c#2 integrate .. //depot/projects/arm/src/contrib/sendmail/src/mime.c#2 integrate .. //depot/projects/arm/src/contrib/sendmail/src/parseaddr.c#2 integrate .. //depot/projects/arm/src/contrib/sendmail/src/queue.c#3 integrate .. //depot/projects/arm/src/contrib/sendmail/src/ratectrl.c#2 integrate .. //depot/projects/arm/src/contrib/sendmail/src/readcf.c#2 integrate .. //depot/projects/arm/src/contrib/sendmail/src/recipient.c#2 integrate .. //depot/projects/arm/src/contrib/sendmail/src/sasl.c#2 integrate .. //depot/projects/arm/src/contrib/sendmail/src/savemail.c#2 integrate .. //depot/projects/arm/src/contrib/sendmail/src/sendmail.h#2 integrate .. //depot/projects/arm/src/contrib/sendmail/src/sm_resolve.c#2 integrate .. //depot/projects/arm/src/contrib/sendmail/src/srvrsmtp.c#3 integrate .. //depot/projects/arm/src/contrib/sendmail/src/stab.c#2 integrate .. //depot/projects/arm/src/contrib/sendmail/src/stats.c#2 integrate .. //depot/projects/arm/src/contrib/sendmail/src/timers.c#2 integrate .. //depot/projects/arm/src/contrib/sendmail/src/tls.c#2 integrate .. //depot/projects/arm/src/contrib/sendmail/src/udb.c#2 integrate .. //depot/projects/arm/src/contrib/sendmail/src/usersmtp.c#2 integrate .. //depot/projects/arm/src/contrib/sendmail/src/util.c#2 integrate .. //depot/projects/arm/src/contrib/sendmail/src/version.c#3 integrate .. //depot/projects/arm/src/contrib/sendmail/test/Makefile#2 integrate .. //depot/projects/arm/src/contrib/sendmail/vacation/Makefile.m4#2 integrate .. //depot/projects/arm/src/contrib/sendmail/vacation/vacation.c#2 integrate .. //depot/projects/arm/src/contrib/top/commands.c#2 integrate .. //depot/projects/arm/src/contrib/top/machine.h#2 integrate .. //depot/projects/arm/src/contrib/top/top.X#2 integrate .. //depot/projects/arm/src/contrib/top/top.c#2 integrate .. //depot/projects/arm/src/contrib/top/top.h#2 integrate .. //depot/projects/arm/src/etc/defaults/rc.conf#14 integrate .. //depot/projects/arm/src/etc/mtree/BSD.root.dist#3 integrate .. //depot/projects/arm/src/etc/rc.d/FILESYSTEMS#2 integrate .. //depot/projects/arm/src/etc/rc.d/Makefile#7 integrate .. //depot/projects/arm/src/etc/rc.d/NETWORKING#2 integrate .. //depot/projects/arm/src/etc/rc.d/hostid#1 branch .. //depot/projects/arm/src/etc/rc.d/ipfilter#5 integrate .. //depot/projects/arm/src/etc/rc.d/ipsec#3 integrate .. //depot/projects/arm/src/etc/rc.d/kldxref#3 integrate .. //depot/projects/arm/src/etc/rc.d/mountcritremote#4 integrate .. //depot/projects/arm/src/etc/rc.d/mountd#3 integrate .. //depot/projects/arm/src/etc/rc.d/netoptions#2 integrate .. //depot/projects/arm/src/etc/rc.d/pf#4 integrate .. //depot/projects/arm/src/etc/rc.d/pflog#4 integrate .. //depot/projects/arm/src/etc/rc.d/pfsync#4 integrate .. //depot/projects/arm/src/etc/rc.d/zfs#2 integrate .. //depot/projects/arm/src/etc/services#2 integrate .. //depot/projects/arm/src/include/Makefile#9 integrate .. //depot/projects/arm/src/include/rpc/Makefile#2 integrate .. //depot/projects/arm/src/include/rpc/types.h#2 delete .. //depot/projects/arm/src/lib/libarchive/Makefile#11 integrate .. //depot/projects/arm/src/lib/libarchive/archive.h.in#12 integrate .. //depot/projects/arm/src/lib/libarchive/archive_entry.c#7 integrate .. //depot/projects/arm/src/lib/libarchive/archive_platform.h#5 integrate .. //depot/projects/arm/src/lib/libarchive/archive_read_extract.c#9 integrate .. //depot/projects/arm/src/lib/libarchive/archive_read_support_format_ar.c#2 integrate .. //depot/projects/arm/src/lib/libarchive/archive_read_support_format_cpio.c#7 integrate .. //depot/projects/arm/src/lib/libarchive/archive_read_support_format_tar.c#9 integrate .. //depot/projects/arm/src/lib/libarchive/archive_read_support_format_zip.c#5 integrate .. //depot/projects/arm/src/lib/libarchive/archive_write_disk.c#5 integrate .. //depot/projects/arm/src/lib/libarchive/archive_write_set_compression_none.c#7 integrate .. //depot/projects/arm/src/lib/libarchive/archive_write_set_format_ar.c#2 integrate .. //depot/projects/arm/src/lib/libarchive/archive_write_set_format_by_name.c#4 integrate .. //depot/projects/arm/src/lib/libarchive/archive_write_set_format_pax.c#7 integrate .. //depot/projects/arm/src/lib/libarchive/archive_write_set_format_ustar.c#8 integrate .. //depot/projects/arm/src/lib/libarchive/config_freebsd.h#3 integrate .. //depot/projects/arm/src/lib/libarchive/test/Makefile#3 integrate .. //depot/projects/arm/src/lib/libarchive/test/main.c#2 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_acl_basic.c#2 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_acl_pax.c#2 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_read_data_large.c#2 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_read_extract.c#2 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_read_format_ar.c#2 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_read_large.c#2 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_read_position.c#2 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_read_truncated.c#2 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_tar_filenames.c#1 branch .. //depot/projects/arm/src/lib/libarchive/test/test_write_disk_perms.c#3 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_write_disk_secure.c#2 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_write_format_ar.c#2 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_write_format_tar.c#2 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_write_open_memory.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/Symbol.map#4 integrate .. //depot/projects/arm/src/lib/libc/gen/sysconf.c#4 integrate .. //depot/projects/arm/src/lib/libc/gen/sysctl.3#3 integrate .. //depot/projects/arm/src/lib/libc/i386/Symbol.map#2 integrate .. //depot/projects/arm/src/lib/libc/stdlib/strtol.3#3 integrate .. //depot/projects/arm/src/lib/libc/sys/ptrace.2#4 integrate .. //depot/projects/arm/src/lib/libmilter/Makefile#2 integrate .. //depot/projects/arm/src/lib/libpmc/libpmc.c#2 integrate .. //depot/projects/arm/src/lib/libpmc/pmc.3#3 integrate .. //depot/projects/arm/src/lib/libsm/Makefile#2 integrate .. //depot/projects/arm/src/lib/ncurses/ncurses/Makefile#3 integrate .. //depot/projects/arm/src/libexec/rtld-elf/Makefile#3 integrate .. //depot/projects/arm/src/libexec/rtld-elf/Symbol.map#2 integrate .. //depot/projects/arm/src/libexec/rtld-elf/Versions.def#2 integrate .. //depot/projects/arm/src/release/Makefile.inc.docports#2 integrate .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#8 integrate .. //depot/projects/arm/src/sbin/atm/atmconfig/diag.c#2 integrate .. //depot/projects/arm/src/sbin/dhclient/dhclient-script#3 integrate .. //depot/projects/arm/src/sbin/ifconfig/Makefile#2 integrate .. //depot/projects/arm/src/sbin/ifconfig/ifconfig.8#13 integrate .. //depot/projects/arm/src/sbin/ifconfig/iflagg.c#1 branch .. //depot/projects/arm/src/sbin/ipfw/ipfw2.c#8 integrate .. //depot/projects/arm/src/sbin/mount/mount.c#7 integrate .. //depot/projects/arm/src/share/examples/cvsup/cvs-supfile#2 integrate .. //depot/projects/arm/src/share/examples/cvsup/stable-supfile#2 integrate .. //depot/projects/arm/src/share/examples/cvsup/standard-supfile#2 integrate .. //depot/projects/arm/src/share/man/man4/Makefile#10 integrate .. //depot/projects/arm/src/share/man/man4/lagg.4#1 branch .. //depot/projects/arm/src/share/man/man4/uftdi.4#3 integrate .. //depot/projects/arm/src/share/man/man5/rc.conf.5#11 integrate .. //depot/projects/arm/src/share/man/man9/hash.9#4 integrate .. //depot/projects/arm/src/share/misc/committers-ports.dot#3 integrate .. //depot/projects/arm/src/share/misc/committers-src.dot#3 integrate .. //depot/projects/arm/src/share/misc/organization.dot#1 branch .. //depot/projects/arm/src/sys/Makefile#12 integrate .. //depot/projects/arm/src/sys/amd64/amd64/pmap.c#31 integrate .. //depot/projects/arm/src/sys/amd64/conf/GENERIC#20 integrate .. //depot/projects/arm/src/sys/cam/cam_ccb.h#7 integrate .. //depot/projects/arm/src/sys/cam/cam_periph.c#8 integrate .. //depot/projects/arm/src/sys/cam/cam_periph.h#2 integrate .. //depot/projects/arm/src/sys/cam/cam_sim.c#3 integrate .. //depot/projects/arm/src/sys/cam/cam_sim.h#2 integrate .. //depot/projects/arm/src/sys/cam/cam_xpt.c#17 integrate .. //depot/projects/arm/src/sys/cam/cam_xpt.h#4 integrate .. //depot/projects/arm/src/sys/cam/cam_xpt_periph.h#3 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_cd.c#7 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_ch.c#4 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_da.c#17 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_low.c#4 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_pass.c#4 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_pt.c#3 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_sa.c#5 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_ses.c#4 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_sg.c#3 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_sg.h#2 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_targ_bh.c#4 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_target.c#6 integrate .. //depot/projects/arm/src/sys/compat/linprocfs/linprocfs.c#18 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_ioctl.h#5 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_socket.c#13 integrate .. //depot/projects/arm/src/sys/compat/opensolaris/kern/opensolaris_kmem.c#2 integrate .. //depot/projects/arm/src/sys/compat/opensolaris/kern/opensolaris_string.c#2 integrate .. //depot/projects/arm/src/sys/compat/opensolaris/sys/kmem.h#2 integrate .. //depot/projects/arm/src/sys/compat/opensolaris/sys/string.h#2 integrate .. //depot/projects/arm/src/sys/conf/NOTES#46 integrate .. //depot/projects/arm/src/sys/conf/files#68 integrate .. //depot/projects/arm/src/sys/conf/options#43 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/utmisc.c#4 integrate .. //depot/projects/arm/src/sys/contrib/opensolaris/common/atomic/amd64/atomic.S#2 integrate .. //depot/projects/arm/src/sys/contrib/opensolaris/common/atomic/i386/atomic.S#2 integrate .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/dnlc.c#2 integrate .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#2 integrate .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#2 integrate .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#2 integrate .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa.c#2 integrate .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#2 integrate .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#2 integrate .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#2 integrate .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#2 integrate .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#2 integrate .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#2 integrate .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#2 integrate .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap.c#2 integrate .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#2 integrate .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#2 integrate .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#2 integrate .. //depot/projects/arm/src/sys/contrib/pf/net/if_pfsync.c#9 integrate .. //depot/projects/arm/src/sys/dev/aac/aac_cam.c#6 integrate .. //depot/projects/arm/src/sys/dev/advansys/advansys.c#6 integrate .. //depot/projects/arm/src/sys/dev/advansys/adwcam.c#7 integrate .. //depot/projects/arm/src/sys/dev/aha/aha.c#5 integrate .. //depot/projects/arm/src/sys/dev/ahb/ahb.c#8 integrate .. //depot/projects/arm/src/sys/dev/aic/aic.c#4 integrate .. //depot/projects/arm/src/sys/dev/aic7xxx/aic7770.c#2 integrate .. //depot/projects/arm/src/sys/dev/aic7xxx/aic79xx.c#4 integrate .. //depot/projects/arm/src/sys/dev/aic7xxx/aic79xx.h#3 integrate .. //depot/projects/arm/src/sys/dev/aic7xxx/aic79xx_osm.c#7 integrate .. //depot/projects/arm/src/sys/dev/aic7xxx/aic79xx_osm.h#6 integrate .. //depot/projects/arm/src/sys/dev/aic7xxx/aic79xx_pci.c#4 integrate .. //depot/projects/arm/src/sys/dev/aic7xxx/aic7xxx.c#3 integrate .. //depot/projects/arm/src/sys/dev/aic7xxx/aic7xxx.h#2 integrate .. //depot/projects/arm/src/sys/dev/aic7xxx/aic7xxx_osm.c#7 integrate .. //depot/projects/arm/src/sys/dev/aic7xxx/aic7xxx_osm.h#6 integrate .. //depot/projects/arm/src/sys/dev/aic7xxx/aic7xxx_pci.c#3 integrate .. //depot/projects/arm/src/sys/dev/aic7xxx/aic_osm_lib.c#2 integrate .. //depot/projects/arm/src/sys/dev/aic7xxx/aic_osm_lib.h#2 integrate .. //depot/projects/arm/src/sys/dev/amd/amd.c#7 integrate .. //depot/projects/arm/src/sys/dev/amr/amr_cam.c#5 integrate .. //depot/projects/arm/src/sys/dev/arcmsr/arcmsr.c#11 integrate .. //depot/projects/arm/src/sys/dev/asr/asr.c#13 integrate .. //depot/projects/arm/src/sys/dev/ata/atapi-cam.c#7 integrate .. //depot/projects/arm/src/sys/dev/ath/ah_osdep.c#2 integrate .. //depot/projects/arm/src/sys/dev/buslogic/bt.c#6 integrate .. //depot/projects/arm/src/sys/dev/ciss/ciss.c#12 integrate .. //depot/projects/arm/src/sys/dev/cxgb/cxgb_main.c#3 integrate .. //depot/projects/arm/src/sys/dev/cxgb/cxgb_sge.c#4 integrate .. //depot/projects/arm/src/sys/dev/cxgb/sys/mvec.h#2 integrate .. //depot/projects/arm/src/sys/dev/cxgb/sys/uipc_mvec.c#3 integrate .. //depot/projects/arm/src/sys/dev/dpt/dpt_scsi.c#7 integrate .. //depot/projects/arm/src/sys/dev/esp/ncr53c9x.c#6 integrate .. //depot/projects/arm/src/sys/dev/ex/if_exvar.h#3 integrate .. //depot/projects/arm/src/sys/dev/firewire/fwdma.c#2 integrate .. //depot/projects/arm/src/sys/dev/firewire/sbp.c#6 integrate .. //depot/projects/arm/src/sys/dev/firewire/sbp_targ.c#3 integrate .. //depot/projects/arm/src/sys/dev/hptmv/entry.c#8 integrate .. //depot/projects/arm/src/sys/dev/iir/iir.c#6 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_freebsd.c#25 integrate .. //depot/projects/arm/src/sys/dev/mii/brgphy.c#17 integrate .. //depot/projects/arm/src/sys/dev/mii/miidevs#15 integrate .. //depot/projects/arm/src/sys/dev/mly/mly.c#7 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt_cam.c#36 integrate .. //depot/projects/arm/src/sys/dev/msk/if_msk.c#5 integrate .. //depot/projects/arm/src/sys/dev/ppbus/vpo.c#3 integrate .. //depot/projects/arm/src/sys/dev/rr232x/osm_bsd.c#3 integrate .. //depot/projects/arm/src/sys/dev/sym/sym_hipd.c#10 integrate .. //depot/projects/arm/src/sys/dev/trm/trm.c#8 integrate .. //depot/projects/arm/src/sys/dev/twa/tw_osl_cam.c#4 integrate .. //depot/projects/arm/src/sys/dev/usb/umass.c#15 integrate .. //depot/projects/arm/src/sys/dev/usb/usbdevs#28 integrate .. //depot/projects/arm/src/sys/dev/wds/wd7000.c#5 integrate .. //depot/projects/arm/src/sys/fs/procfs/procfs_dbregs.c#3 integrate .. //depot/projects/arm/src/sys/fs/procfs/procfs_fpregs.c#3 integrate .. //depot/projects/arm/src/sys/fs/procfs/procfs_map.c#3 integrate .. //depot/projects/arm/src/sys/fs/procfs/procfs_regs.c#3 integrate .. //depot/projects/arm/src/sys/fs/pseudofs/pseudofs.c#7 integrate .. //depot/projects/arm/src/sys/fs/pseudofs/pseudofs.h#6 integrate .. //depot/projects/arm/src/sys/fs/pseudofs/pseudofs_fileno.c#4 integrate .. //depot/projects/arm/src/sys/fs/pseudofs/pseudofs_internal.h#3 integrate .. //depot/projects/arm/src/sys/fs/pseudofs/pseudofs_vncache.c#7 integrate .. //depot/projects/arm/src/sys/fs/pseudofs/pseudofs_vnops.c#6 integrate .. //depot/projects/arm/src/sys/geom/vinum/geom_vinum.h#4 integrate .. //depot/projects/arm/src/sys/geom/vinum/geom_vinum_rm.c#5 integrate .. //depot/projects/arm/src/sys/geom/vinum/geom_vinum_share.c#2 integrate .. //depot/projects/arm/src/sys/geom/vinum/geom_vinum_subr.c#4 integrate .. //depot/projects/arm/src/sys/i386/conf/GENERIC#19 integrate .. //depot/projects/arm/src/sys/i386/i386/mp_machdep.c#15 integrate .. //depot/projects/arm/src/sys/i386/i386/pmap.c#31 integrate .. //depot/projects/arm/src/sys/i386/include/pmap.h#10 integrate .. //depot/projects/arm/src/sys/ia64/conf/GENERIC#13 integrate .. //depot/projects/arm/src/sys/isa/isa_common.c#5 integrate .. //depot/projects/arm/src/sys/kern/kern_jail.c#9 integrate .. //depot/projects/arm/src/sys/kern/subr_rman.c#13 integrate .. //depot/projects/arm/src/sys/kern/uipc_mbuf.c#18 integrate .. //depot/projects/arm/src/sys/kern/uipc_mqueue.c#13 integrate .. //depot/projects/arm/src/sys/kern/vfs_mount.c#28 integrate .. //depot/projects/arm/src/sys/kern/vfs_subr.c#33 integrate .. //depot/projects/arm/src/sys/libkern/index.c#2 integrate .. //depot/projects/arm/src/sys/libkern/rindex.c#2 integrate .. //depot/projects/arm/src/sys/modules/Makefile#40 integrate .. //depot/projects/arm/src/sys/modules/dpt/Makefile#2 integrate .. //depot/projects/arm/src/sys/modules/if_lagg/Makefile#1 branch .. //depot/projects/arm/src/sys/net/ieee8023ad_lacp.c#1 branch .. //depot/projects/arm/src/sys/net/ieee8023ad_lacp.h#1 branch .. //depot/projects/arm/src/sys/net/if.c#20 integrate .. //depot/projects/arm/src/sys/net/if_ethersubr.c#22 integrate .. //depot/projects/arm/src/sys/net/if_lagg.c#1 branch .. //depot/projects/arm/src/sys/net/if_lagg.h#1 branch .. //depot/projects/arm/src/sys/net/if_var.h#9 integrate .. //depot/projects/arm/src/sys/netinet/in_pcb.c#18 integrate .. //depot/projects/arm/src/sys/netinet/ip_fw2.c#29 integrate .. //depot/projects/arm/src/sys/netinet/sctp_constants.h#8 integrate .. //depot/projects/arm/src/sys/netinet/sctp_crc32.c#5 integrate .. //depot/projects/arm/src/sys/netinet/sctp_indata.c#10 integrate .. //depot/projects/arm/src/sys/netinet/sctp_input.c#10 integrate .. //depot/projects/arm/src/sys/netinet/sctp_output.c#10 integrate .. //depot/projects/arm/src/sys/netinet/sctp_pcb.c#10 integrate .. //depot/projects/arm/src/sys/netinet/sctp_peeloff.c#6 integrate .. //depot/projects/arm/src/sys/netinet/sctp_structs.h#10 integrate .. //depot/projects/arm/src/sys/netinet/sctp_timer.c#8 integrate .. //depot/projects/arm/src/sys/netinet/sctp_uio.h#9 integrate .. //depot/projects/arm/src/sys/netinet/sctp_usrreq.c#10 integrate .. //depot/projects/arm/src/sys/netinet/sctp_var.h#6 integrate .. //depot/projects/arm/src/sys/netinet/sctputil.c#10 integrate .. //depot/projects/arm/src/sys/netinet/sctputil.h#8 integrate .. //depot/projects/arm/src/sys/netinet/tcp_input.c#26 integrate .. //depot/projects/arm/src/sys/netinet/tcp_output.c#14 integrate .. //depot/projects/arm/src/sys/netinet/tcp_sack.c#12 integrate .. //depot/projects/arm/src/sys/netinet/tcp_subr.c#21 integrate .. //depot/projects/arm/src/sys/netinet/tcp_syncache.c#18 integrate .. //depot/projects/arm/src/sys/netinet/tcp_timer.c#13 integrate .. //depot/projects/arm/src/sys/netinet/tcp_timer.h#7 integrate .. //depot/projects/arm/src/sys/netinet/tcp_usrreq.c#16 integrate .. //depot/projects/arm/src/sys/netinet/tcp_var.h#15 integrate .. //depot/projects/arm/src/sys/netinet6/ipsec.c#10 integrate .. //depot/projects/arm/src/sys/netinet6/sctp6_usrreq.c#9 integrate .. //depot/projects/arm/src/sys/netipsec/ipsec_osdep.h#4 integrate .. //depot/projects/arm/src/sys/netnatm/natm.h#4 integrate .. //depot/projects/arm/src/sys/nfsserver/nfs_srvsock.c#10 integrate .. //depot/projects/arm/src/sys/pc98/conf/GENERIC#12 integrate .. //depot/projects/arm/src/sys/pci/if_vr.c#7 integrate .. //depot/projects/arm/src/sys/pci/if_vrreg.h#5 integrate .. //depot/projects/arm/src/sys/pci/ncr.c#7 integrate .. //depot/projects/arm/src/sys/powerpc/conf/GENERIC#15 integrate .. //depot/projects/arm/src/sys/rpc/types.h#1 branch .. //depot/projects/arm/src/sys/security/audit/audit.c#15 integrate .. //depot/projects/arm/src/sys/security/audit/audit.h#6 integrate .. //depot/projects/arm/src/sys/security/audit/audit_arg.c#10 integrate .. //depot/projects/arm/src/sys/security/audit/audit_bsm.c#10 integrate .. //depot/projects/arm/src/sys/security/audit/audit_bsm_token.c#9 integrate .. //depot/projects/arm/src/sys/security/audit/audit_private.h#9 integrate .. //depot/projects/arm/src/sys/security/audit/audit_syscalls.c#10 integrate .. //depot/projects/arm/src/sys/sparc64/conf/GENERIC#21 integrate .. //depot/projects/arm/src/sys/sun4v/conf/GENERIC#6 integrate .. //depot/projects/arm/src/sys/sys/eventhandler.h#5 integrate .. //depot/projects/arm/src/sys/sys/hash.h#2 integrate .. //depot/projects/arm/src/sys/sys/libkern.h#6 integrate .. //depot/projects/arm/src/sys/sys/mbuf.h#21 integrate .. //depot/projects/arm/src/sys/sys/mutex.h#13 integrate .. //depot/projects/arm/src/sys/sys/priv.h#4 integrate .. //depot/projects/arm/src/sys/sys/proc.h#23 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_snapshot.c#18 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_softdep.c#17 integrate .. //depot/projects/arm/src/sys/vm/phys_pager.c#4 integrate .. //depot/projects/arm/src/tools/regression/lib/libc/nss/Makefile#1 branch .. //depot/projects/arm/src/tools/regression/lib/libc/nss/README#1 branch .. //depot/projects/arm/src/tools/regression/lib/libc/nss/mach#1 branch .. //depot/projects/arm/src/tools/regression/lib/libc/nss/test-getaddr.c#1 branch .. //depot/projects/arm/src/tools/regression/lib/libc/nss/test-getaddr.t#1 branch .. //depot/projects/arm/src/tools/regression/lib/libc/nss/test-getgr.c#1 branch .. //depot/projects/arm/src/tools/regression/lib/libc/nss/test-getgr.t#1 branch .. //depot/projects/arm/src/tools/regression/lib/libc/nss/test-gethostby.c#1 branch .. //depot/projects/arm/src/tools/regression/lib/libc/nss/test-gethostby.t#1 branch .. //depot/projects/arm/src/tools/regression/lib/libc/nss/test-getproto.c#1 branch .. //depot/projects/arm/src/tools/regression/lib/libc/nss/test-getproto.t#1 branch .. //depot/projects/arm/src/tools/regression/lib/libc/nss/test-getpw.c#1 branch .. //depot/projects/arm/src/tools/regression/lib/libc/nss/test-getpw.t#1 branch .. //depot/projects/arm/src/tools/regression/lib/libc/nss/test-getrpc.c#1 branch .. //depot/projects/arm/src/tools/regression/lib/libc/nss/test-getrpc.t#1 branch .. //depot/projects/arm/src/tools/regression/lib/libc/nss/test-getserv.c#1 branch .. //depot/projects/arm/src/tools/regression/lib/libc/nss/test-getserv.t#1 branch .. //depot/projects/arm/src/tools/regression/lib/libc/nss/test-getusershell.c#1 branch .. //depot/projects/arm/src/tools/regression/lib/libc/nss/test-getusershell.t#1 branch .. //depot/projects/arm/src/tools/regression/lib/libc/nss/testutil.h#1 branch .. //depot/projects/arm/src/tools/regression/netinet/ipblock/Makefile#2 delete .. //depot/projects/arm/src/tools/regression/netinet/ipblock/ipblock.c#2 delete .. //depot/projects/arm/src/tools/regression/netinet/ipsockopt/ipsockopt.c#3 integrate .. //depot/projects/arm/src/tools/tools/net80211/wesside/wesside/Makefile#2 integrate .. //depot/projects/arm/src/tools/tools/net80211/wesside/wesside/aircrack-ptw-lib.c#1 branch .. //depot/projects/arm/src/tools/tools/net80211/wesside/wesside/aircrack-ptw-lib.h#1 branch .. //depot/projects/arm/src/tools/tools/net80211/wesside/wesside/wesside.c#2 integrate .. //depot/projects/arm/src/usr.bin/finger/extern.h#2 integrate .. //depot/projects/arm/src/usr.bin/finger/finger.1#2 integrate .. //depot/projects/arm/src/usr.bin/finger/finger.c#2 integrate .. //depot/projects/arm/src/usr.bin/finger/net.c#2 integrate .. //depot/projects/arm/src/usr.bin/gcore/elfcore.c#2 integrate .. //depot/projects/arm/src/usr.bin/kdump/kdump.c#4 integrate .. //depot/projects/arm/src/usr.bin/kdump/kdump_subr.h#3 integrate .. //depot/projects/arm/src/usr.bin/kdump/mksubr#4 integrate .. //depot/projects/arm/src/usr.bin/make/parse.c#3 integrate .. //depot/projects/arm/src/usr.bin/netstat/mcast.c#4 integrate .. //depot/projects/arm/src/usr.bin/tar/Makefile#4 integrate .. //depot/projects/arm/src/usr.bin/tar/bsdtar_platform.h#5 integrate .. //depot/projects/arm/src/usr.bin/tar/read.c#6 integrate .. //depot/projects/arm/src/usr.bin/tar/write.c#8 integrate .. //depot/projects/arm/src/usr.bin/top/machine.c#3 integrate .. //depot/projects/arm/src/usr.bin/touch/touch.1#2 integrate .. //depot/projects/arm/src/usr.bin/touch/touch.c#2 integrate .. //depot/projects/arm/src/usr.bin/truss/Makefile#2 integrate .. //depot/projects/arm/src/usr.bin/truss/amd64-fbsd.c#2 integrate .. //depot/projects/arm/src/usr.bin/truss/extern.h#2 integrate .. //depot/projects/arm/src/usr.bin/truss/i386-fbsd.c#3 integrate .. //depot/projects/arm/src/usr.bin/truss/i386-linux.c#2 integrate .. //depot/projects/arm/src/usr.bin/truss/ia64-fbsd.c#2 integrate .. //depot/projects/arm/src/usr.bin/truss/main.c#2 integrate .. //depot/projects/arm/src/usr.bin/truss/powerpc-fbsd.c#2 integrate .. //depot/projects/arm/src/usr.bin/truss/setup.c#2 integrate .. //depot/projects/arm/src/usr.bin/truss/sparc64-fbsd.c#2 integrate .. //depot/projects/arm/src/usr.bin/truss/syscall.h#2 integrate .. //depot/projects/arm/src/usr.bin/truss/syscalls.c#2 integrate .. //depot/projects/arm/src/usr.bin/truss/truss.1#4 integrate .. //depot/projects/arm/src/usr.bin/truss/truss.h#2 integrate .. //depot/projects/arm/src/usr.bin/uuidgen/Makefile#2 integrate .. //depot/projects/arm/src/usr.bin/whois/whois.c#3 integrate .. //depot/projects/arm/src/usr.sbin/adduser/adduser.conf.5#2 integrate .. //depot/projects/arm/src/usr.sbin/adduser/adduser.sh#3 integrate .. //depot/projects/arm/src/usr.sbin/bsnmpd/modules/snmp_bridge/snmp_bridge.3#3 integrate .. //depot/projects/arm/src/usr.sbin/ifmcstat/Makefile#3 integrate .. //depot/projects/arm/src/usr.sbin/ifmcstat/ifmcstat.8#3 integrate .. //depot/projects/arm/src/usr.sbin/ifmcstat/ifmcstat.c#3 integrate .. //depot/projects/arm/src/usr.sbin/mountd/mountd.c#6 integrate .. //depot/projects/arm/src/usr.sbin/rpc.lockd/lockd_lock.c#5 integrate .. //depot/projects/arm/src/usr.sbin/sendmail/Makefile#3 integrate Differences ... ==== //depot/projects/arm/src/Makefile.inc1#25 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.571 2007/04/06 02:13:29 pjd Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.572 2007/04/17 15:52:36 pjd Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -1016,11 +1016,11 @@ ${_lib_libgssapi} ${_lib_libipx} \ lib/libkiconv lib/libkvm lib/libmd \ lib/ncurses/ncurses lib/ncurses/ncursesw \ - lib/libopie lib/libpam \ + lib/libopie lib/libpam lib/libpthread \ lib/libradius lib/libsbuf lib/libtacplus lib/libutil \ ${_lib_libypclnt} lib/libz lib/msun \ ${_secure_lib_libcrypto} ${_secure_lib_libssh} \ - ${_secure_lib_libssl} lib/libthr + ${_secure_lib_libssl} _generic_libs= ${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib ==== //depot/projects/arm/src/ObsoleteFiles.inc#18 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.77 2007/03/28 07:49:57 delphij Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.79 2007/04/17 01:02:55 thompsa Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,10 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20070417: trunk(4) renamed to lagg(4) +OLD_FILES+=usr/include/net/if_trunk.h +# 20070409: uuidgen moved to /bin/ +OLD_FILES+=usr/bin/uuidgen # 20070328: bzip2 1.0.4 OLD_FILES+=usr/share/info/bzip2.info.gz # 20070303: libarchive 2.0 ==== //depot/projects/arm/src/UPDATING#13 (text+ko) ==== @@ -21,6 +21,15 @@ developers choose to disable these features on build machines to maximize performance. +20070417: + The new trunk(4) driver has been renamed to lagg(4) as it better + reflects its purpose. ifconfig will need to be recompiled. + +20070408: + sendmail(8) has been updated to version 8.14.1. Mail filters + (aka, milters) compiled against the libmilter included in the + base operating system should be recompiled. + 20070302: Firmwares for ipw(4) and iwi(4) are now included in the base tree. In order to use them one must agree to the respective LICENSE in @@ -758,4 +767,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.484 2007/04/03 10:04:54 brueffer Exp $ +$FreeBSD: src/UPDATING,v 1.486 2007/04/17 00:41:59 thompsa Exp $ ==== //depot/projects/arm/src/cddl/Makefile#2 (text+ko) ==== @@ -1,8 +1,5 @@ -# $FreeBSD: src/cddl/Makefile,v 1.1 2007/04/06 01:08:56 pjd Exp $ +# $FreeBSD: src/cddl/Makefile,v 1.2 2007/04/16 21:20:24 ru Exp $ -SUBDIR= lib -SUBDIR+=sbin -SUBDIR+=usr.bin -SUBDIR+=usr.sbin +SUBDIR= lib sbin usr.bin usr.sbin .include ==== //depot/projects/arm/src/cddl/Makefile.inc#2 (text+ko) ==== @@ -1,3 +1,3 @@ -# $FreeBSD: src/cddl/Makefile.inc,v 1.1 2007/04/06 01:08:56 pjd Exp $ +# $FreeBSD: src/cddl/Makefile.inc,v 1.2 2007/04/16 21:20:24 ru Exp $ -CFLAGS+=-D_SOLARIS_C_SOURCE +CFLAGS+= -D_SOLARIS_C_SOURCE ==== //depot/projects/arm/src/cddl/lib/Makefile#2 (text+ko) ==== @@ -1,18 +1,19 @@ -# $FreeBSD: src/cddl/lib/Makefile,v 1.2 2007/04/07 19:12:09 des Exp $ +# $FreeBSD: src/cddl/lib/Makefile,v 1.3 2007/04/16 21:20:24 ru Exp $ .include -SUBDIR= libavl -SUBDIR+=libnvpair -SUBDIR+=libumem -SUBDIR+=libuutil -.if ${MK_CDDL} != "no" -SUBDIR+=libzfs -SUBDIR+=${_libzpool} -.endif +SUBDIR= libavl \ + libnvpair \ + libumem \ + libuutil \ + ${_libzfs} \ + ${_libzpool} -.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" +.if ${MK_ZFS} != "no" +_libzfs= libzfs +.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" _libzpool= libzpool .endif +.endif .include ==== //depot/projects/arm/src/cddl/lib/Makefile.inc#2 (text+ko) ==== @@ -1,5 +1,6 @@ -# $FreeBSD: src/cddl/lib/Makefile.inc,v 1.1 2007/04/06 01:08:56 pjd Exp $ +# $FreeBSD: src/cddl/lib/Makefile.inc,v 1.2 2007/04/16 21:20:24 ru Exp $ SHLIBDIR?= /lib +SHLIB_MAJOR?= 1 .include "../Makefile.inc" ==== //depot/projects/arm/src/cddl/lib/libavl/Makefile#2 (text+ko) ==== @@ -1,13 +1,10 @@ -# $FreeBSD: src/cddl/lib/libavl/Makefile,v 1.1 2007/04/06 01:08:56 pjd Exp $ +# $FreeBSD: src/cddl/lib/libavl/Makefile,v 1.2 2007/04/16 21:20:24 ru Exp $ -.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/avl +.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/avl LIB= avl -SHLIB_MAJOR?=1 - SRCS= avl.c - -CFLAGS+=-I${.CURDIR}/../../../sys/compat/opensolaris -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common +CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common .include ==== //depot/projects/arm/src/cddl/lib/libnvpair/Makefile#2 (text+ko) ==== @@ -1,18 +1,17 @@ -# $FreeBSD: src/cddl/lib/libnvpair/Makefile,v 1.1 2007/04/06 01:08:56 pjd Exp $ +# $FreeBSD: src/cddl/lib/libnvpair/Makefile,v 1.2 2007/04/16 21:20:25 ru Exp $ -.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair -.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/nvpair +.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair +.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/nvpair LIB= nvpair -SHLIB_MAJOR?=1 -SRCS= libnvpair.c -SRCS+= nvpair_alloc_system.c -SRCS+= nvpair_alloc_fixed.c -SRCS+= nvpair.c +SRCS= libnvpair.c \ + nvpair_alloc_system.c \ + nvpair_alloc_fixed.c \ + nvpair.c -CFLAGS+=-I${.CURDIR}/../../../sys/compat/opensolaris -CFLAGS+=-I${.CURDIR}/../../../include -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common +CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris +CFLAGS+= -I${.CURDIR}/../../../include # XXX +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common .include ==== //depot/projects/arm/src/cddl/lib/libumem/Makefile#2 (text+ko) ==== @@ -1,12 +1,9 @@ -# $FreeBSD: src/cddl/lib/libumem/Makefile,v 1.1 2007/04/06 01:08:56 pjd Exp $ +# $FreeBSD: src/cddl/lib/libumem/Makefile,v 1.2 2007/04/16 21:20:25 ru Exp $ -.PATH: ${.CURDIR}/../../../compat/opensolaris/lib/libumem +.PATH: ${.CURDIR}/../../../compat/opensolaris/lib/libumem LIB= umem -SHLIB_MAJOR?=1 - SRCS= umem.c - -CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/lib/libumem +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem .include ==== //depot/projects/arm/src/cddl/lib/libuutil/Makefile#2 (text+ko) ==== @@ -1,27 +1,25 @@ -# $FreeBSD: src/cddl/lib/libuutil/Makefile,v 1.1 2007/04/06 01:08:57 pjd Exp $ +# $FreeBSD: src/cddl/lib/libuutil/Makefile,v 1.2 2007/04/16 21:20:25 ru Exp $ -.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common -.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/avl +.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common +.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/avl LIB= uutil -SHLIB_MAJOR?=1 +SRCS= avl.c \ + uu_alloc.c \ + uu_avl.c \ + uu_dprintf.c \ + uu_ident.c \ + uu_list.c \ + uu_misc.c \ + uu_open.c \ + uu_pname.c \ + uu_strtoint.c -SRCS= avl.c -SRCS+= uu_alloc.c -SRCS+= uu_avl.c -SRCS+= uu_dprintf.c -SRCS+= uu_ident.c -SRCS+= uu_list.c -SRCS+= uu_misc.c -SRCS+= uu_open.c -SRCS+= uu_pname.c -SRCS+= uu_strtoint.c - -CFLAGS+=-DNATIVE_BUILD -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common -CFLAGS+=-I${.CURDIR}/../../../sys/compat/opensolaris -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common -CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/include -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/head +CFLAGS+= -DNATIVE_BUILD +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common +CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head .include ==== //depot/projects/arm/src/cddl/lib/libzfs/Makefile#2 (text+ko) ==== @@ -1,49 +1,46 @@ -# $FreeBSD: src/cddl/lib/libzfs/Makefile,v 1.1 2007/04/06 01:08:57 pjd Exp $ +# $FreeBSD: src/cddl/lib/libzfs/Makefile,v 1.2 2007/04/16 21:20:25 ru Exp $ -.PATH: ${.CURDIR}/../../../compat/opensolaris/misc -.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs -.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs -.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common +.PATH: ${.CURDIR}/../../../compat/opensolaris/misc +.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs +.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs +.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common LIB= zfs -SHLIB_MAJOR?=1 - DPADD= ${LIBUTIL} LDADD= -lutil -SRCS= mnttab.c -SRCS+= mkdirp.c -SRCS+= zmount.c -SRCS+= fsshare.c -SRCS+= zone.c +SRCS= mnttab.c \ + mkdirp.c \ + zmount.c \ + fsshare.c \ + zone.c -SRCS+= zfs_namecheck.c -SRCS+= zfs_prop.c -SRCS+= libzfs_dataset.c -SRCS+= libzfs_util.c -SRCS+= libzfs_graph.c -SRCS+= libzfs_mount.c -SRCS+= libzfs_pool.c -SRCS+= libzfs_changelist.c -SRCS+= libzfs_config.c -SRCS+= libzfs_import.c -SRCS+= libzfs_status.c +SRCS+= zfs_namecheck.c \ + zfs_prop.c \ + libzfs_dataset.c \ + libzfs_util.c \ + libzfs_graph.c \ + libzfs_mount.c \ + libzfs_pool.c \ + libzfs_changelist.c \ + libzfs_config.c \ + libzfs_import.c \ + libzfs_status.c -CFLAGS+=-DZFS_NO_ACL -CFLAGS+=-I${.CURDIR}/../../../sbin/mount -CFLAGS+=-I${.CURDIR}/../../../cddl/lib/libumem -CFLAGS+=-I${.CURDIR}/../../../sys/compat/opensolaris -CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/include -CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/lib/libumem -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/head -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common -CFLAGS+=-I${.CURDIR}/../../../sys +CFLAGS+= -DZFS_NO_ACL +CFLAGS+= -I${.CURDIR}/../../../sbin/mount +CFLAGS+= -I${.CURDIR}/../../../cddl/lib/libumem +CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common .include ==== //depot/projects/arm/src/cddl/lib/libzpool/Makefile#2 (text+ko) ==== @@ -1,44 +1,43 @@ -# $FreeBSD: src/cddl/lib/libzpool/Makefile,v 1.2 2007/04/07 23:54:53 pjd Exp $ +# $FreeBSD: src/cddl/lib/libzpool/Makefile,v 1.4 2007/04/17 15:52:36 pjd Exp $ .include "${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/Makefile.files" # ZFS_COMMON_SRCS -.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs +.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs # ZFS_SHARED_SRCS >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Apr 18 03:30:26 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 DCE3E16A404; Wed, 18 Apr 2007 03:30:25 +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 9285B16A400; Wed, 18 Apr 2007 03:30:25 +0000 (UTC) (envelope-from zec@icir.org) Received: from xaqua.tel.fer.hr (xaqua.tel.fer.hr [161.53.19.25]) by mx1.freebsd.org (Postfix) with ESMTP id 20D1613C484; Wed, 18 Apr 2007 03:30:25 +0000 (UTC) (envelope-from zec@icir.org) Received: by xaqua.tel.fer.hr (Postfix, from userid 20006) id 171759B649; Wed, 18 Apr 2007 05:11:16 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.1.7 (2006-10-05) on xaqua.tel.fer.hr X-Spam-Level: X-Spam-Status: No, score=-4.4 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.7 Received: from [192.168.200.106] (zec2.tel.fer.hr [161.53.19.79]) by xaqua.tel.fer.hr (Postfix) with ESMTP id 406349B646; Wed, 18 Apr 2007 05:11:15 +0200 (CEST) From: Marko Zec To: Julian Elischer Date: Wed, 18 Apr 2007 05:10:54 +0200 User-Agent: KMail/1.9.1 References: <200704161051.l3GApuxA044256@repoman.freebsd.org> <4623EC51.4080407@elischer.org> In-Reply-To: <4623EC51.4080407@elischer.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200704180510.54729.zec@icir.org> Cc: Perforce Change Reviews , Marko Zec Subject: Re: PERFORCE change 118226 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: Wed, 18 Apr 2007 03:30:26 -0000 On Monday 16 April 2007 23:36, Julian Elischer wrote: > Marko Zec wrote: > > - pf can now be kldloaded, but is not virtualized (yet) > > I was thinking that the following might be an interesting > way to think about modules.. > > kldloading a module is 2 parts.. > 1/ loading it in to memeory > 2/ linking it in > > In the base vimage you do both, but in the others, > then you only can link in modules that are already loaded. > > i.e. each vimage is responsible for linking the modules that it > needs (?) > > loading a new module to memeory doesn't mean that the functionality > is automatically available for all existing vimages... > > child images do not inherrit all the linked modules of the parent.. > they need to link in those they need. Yup this looks neat but could become an implementation nightmare. For example in case of pf, to some "stack" instances we would have to expose the /dev/pf entry, while to those others that haven't been "locally-kldloaded" we shouldn't. Or consider the sysctl interface in say ipfw - we would have to implement additional logic for hiding the sysctl nodes to those stack instances that haven't "loaded" the ipfw module. But most importantly this would complicate traversing over stack instances in those code chunks that need to traverse through all stacks, many timers for example. Those would now need to maintain separate per-module lists of active (loaded) and inactive instances - a nightmare of its own. And finally we would have to take extra care about dependencies. I.e. which modules must be unconditionally loaded in all stacks (like INET and INET6), and which can be left unattached until later explicitly requested by the instance owner. But I see the drive for this, both in terms of conserving system resources, and in preventing shoot-in-the-foot scenarios, like kldloading ipfw and then instantly breaking IP communication in all existing stack instances if ipfw was not compiled with DEFAULT_TO_ACCEPT... So this idea needs more thought... Marko From owner-p4-projects@FreeBSD.ORG Wed Apr 18 10:20:03 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 27E2016A410; Wed, 18 Apr 2007 10:20:03 +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 8799516A403 for ; Wed, 18 Apr 2007 10:20:02 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 75F7513C4B8 for ; Wed, 18 Apr 2007 10:20:02 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3IAK2s9096809 for ; Wed, 18 Apr 2007 10:20:02 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3IAJrSr096773 for perforce@freebsd.org; Wed, 18 Apr 2007 10:19:53 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 18 Apr 2007 10:19:53 GMT Message-Id: <200704181019.l3IAJrSr096773@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 118350 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: Wed, 18 Apr 2007 10:20:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=118350 Change 118350 by rwatson@rwatson_zoo on 2007/04/18 10:19:42 Integrate TrustedBSD base branch from FreeBSD CVS: - trunk(4) renamed to lagg(4) - sendmail update to 8.14.1 - Sundry ZFS build and bug fixes - libreadonline update to 5.2p2 - OpenBSM update to 1.0 alpha 14 - top(1) jailid support - cam(4) MPSAFE, as well as several SCSI device drivers - pseudofs, procfs, linprocfs, linsysfs MPSAFE - PRIV_VFS_MOUNT_OWNER and vfs_suser changes - rman(9) debugging - many sctp(4) fixes - SUSER_ALLOWJAIL consistency improvements - ARG_TERMID_ADDR and extended address process audit state Affected files ... .. //depot/projects/trustedbsd/base/Makefile.inc1#84 integrate .. //depot/projects/trustedbsd/base/ObsoleteFiles.inc#22 integrate .. //depot/projects/trustedbsd/base/UPDATING#78 integrate .. //depot/projects/trustedbsd/base/cddl/Makefile#2 integrate .. //depot/projects/trustedbsd/base/cddl/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/base/cddl/lib/Makefile#2 integrate .. //depot/projects/trustedbsd/base/cddl/lib/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/base/cddl/lib/libavl/Makefile#2 integrate .. //depot/projects/trustedbsd/base/cddl/lib/libnvpair/Makefile#2 integrate .. //depot/projects/trustedbsd/base/cddl/lib/libumem/Makefile#2 integrate .. //depot/projects/trustedbsd/base/cddl/lib/libuutil/Makefile#2 integrate .. //depot/projects/trustedbsd/base/cddl/lib/libzfs/Makefile#2 integrate .. //depot/projects/trustedbsd/base/cddl/lib/libzpool/Makefile#3 integrate .. //depot/projects/trustedbsd/base/cddl/sbin/Makefile#2 integrate .. //depot/projects/trustedbsd/base/cddl/sbin/zfs/Makefile#2 integrate .. //depot/projects/trustedbsd/base/cddl/sbin/zpool/Makefile#2 integrate .. //depot/projects/trustedbsd/base/cddl/usr.bin/Makefile#2 integrate .. //depot/projects/trustedbsd/base/cddl/usr.bin/ztest/Makefile#2 integrate .. //depot/projects/trustedbsd/base/cddl/usr.sbin/Makefile#2 integrate .. //depot/projects/trustedbsd/base/cddl/usr.sbin/zdb/Makefile#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/FREEBSD-upgrade#7 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/display.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/HISTORY#7 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/README#6 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/TODO#5 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/VERSION#6 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/audit/audit.8#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/auditd/auditd.8#3 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/auditd/auditd.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/auditfilterd/auditfilterd.8#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/auditfilterd/auditfilterd.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/auditreduce/auditreduce.1#3 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/praudit/praudit.1#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/praudit/praudit.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/bsm/libbsm.h#8 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/compat/clock_gettime.h#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/config/config.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/configure#7 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/configure.ac#7 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/etc/audit_event#6 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/au_class.3#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/au_control.3#3 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/au_event.3#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/au_free_token.3#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/au_io.3#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/au_mask.3#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/au_open.3#3 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/au_token.3#4 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/au_user.3#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/audit_submit.3#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/bsm_io.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/bsm_notify.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/bsm_token.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/bsm_wrappers.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/libbsm.3#4 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/man/audit.2#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/man/audit.log.5#4 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/man/audit_class.5#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/man/audit_control.5#3 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/man/audit_event.5#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/man/audit_user.5#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/man/audit_warn.5#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/man/auditctl.2#3 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/man/auditon.2#3 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/man/getaudit.2#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/man/getauid.2#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/man/setaudit.2#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/man/setauid.2#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/test/bsm/generate.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/arg32_record#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/data_record#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/file_record#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/in_addr_record#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/ip_record#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/ipc_record#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/iport_record#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/opaque_record#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/path_record#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/process32_record#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/process32ex_record#2 delete .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/process32ex_record-IPv4#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/process32ex_record-IPv6#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/process32ex_token#2 delete .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/process32ex_token-IPv4#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/process32ex_token-IPv6#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/process64_record#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/process64_token#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/process64ex_record-IPv4#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/process64ex_record-IPv6#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/process64ex_token-IPv4#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/process64ex_token-IPv6#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/return32_record#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/seq_record#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/subject32_record#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/subject32ex_record#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/subject32ex_token-IPv4#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/subject32ex_token-IPv6#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/text_record#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/zonename_record#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/zonename_token#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/tools/audump.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/opensolaris/cmd/zdb/zdb.8#2 integrate .. //depot/projects/trustedbsd/base/contrib/opensolaris/cmd/zfs/zfs.8#2 integrate .. //depot/projects/trustedbsd/base/contrib/opensolaris/cmd/zfs/zfs_main.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/opensolaris/cmd/zpool/zpool.8#2 integrate .. //depot/projects/trustedbsd/base/contrib/opensolaris/cmd/ztest/ztest.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/opensolaris/lib/libzfs/common/libzfs.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/opensolaris/lib/libzpool/common/kernel.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/top/commands.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/top/machine.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/top/top.X#9 integrate .. //depot/projects/trustedbsd/base/contrib/top/top.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/top/top.h#3 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/hostid#2 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/mountd#12 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/zfs#2 integrate .. //depot/projects/trustedbsd/base/etc/services#15 integrate .. //depot/projects/trustedbsd/base/include/Makefile#60 integrate .. //depot/projects/trustedbsd/base/include/rpc/Makefile#3 integrate .. //depot/projects/trustedbsd/base/include/rpc/types.h#3 delete .. //depot/projects/trustedbsd/base/lib/libarchive/Makefile#25 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive.h.in#16 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_entry.c#20 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_platform.h#16 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_extract.c#19 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_ar.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_cpio.c#16 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_tar.c#21 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_zip.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_disk.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_compression_none.c#10 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_format_ar.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_format_by_name.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_format_pax.c#21 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_format_ustar.c#12 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/config_freebsd.h#3 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/Makefile#2 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/main.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_acl_basic.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_acl_pax.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_read_data_large.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_read_extract.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_read_format_ar.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_read_large.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_read_position.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_read_truncated.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_tar_filenames.c#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_write_disk_perms.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_write_disk_secure.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_write_format_ar.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_write_format_tar.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_write_open_memory.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/sysconf.c#11 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/ptrace.2#12 integrate .. //depot/projects/trustedbsd/base/lib/libpmc/libpmc.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libpmc/pmc.3#9 integrate .. //depot/projects/trustedbsd/base/lib/ncurses/ncurses/Makefile#3 integrate .. //depot/projects/trustedbsd/base/release/Makefile.inc.docports#14 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/article.sgml#6 integrate .. //depot/projects/trustedbsd/base/sbin/atm/atmconfig/diag.c#6 integrate .. //depot/projects/trustedbsd/base/sbin/dhclient/dhclient-script#7 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/Makefile#13 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifconfig.8#48 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/iflagg.c#1 branch .. //depot/projects/trustedbsd/base/sbin/ifconfig/iftrunk.c#2 delete .. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw2.c#46 integrate .. //depot/projects/trustedbsd/base/sbin/mount/mount.c#29 integrate .. //depot/projects/trustedbsd/base/share/examples/cvsup/cvs-supfile#9 integrate .. //depot/projects/trustedbsd/base/share/examples/cvsup/stable-supfile#7 integrate .. //depot/projects/trustedbsd/base/share/examples/cvsup/standard-supfile#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/Makefile#75 integrate .. //depot/projects/trustedbsd/base/share/man/man4/lagg.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/trunk.4#2 delete .. //depot/projects/trustedbsd/base/share/man/man4/uftdi.4#7 integrate .. //depot/projects/trustedbsd/base/share/misc/committers-ports.dot#3 integrate .. //depot/projects/trustedbsd/base/share/misc/committers-src.dot#3 integrate .. //depot/projects/trustedbsd/base/share/misc/organization.dot#1 branch .. //depot/projects/trustedbsd/base/sys/Makefile#16 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/busdma_machdep.c#18 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/pmap.c#39 integrate .. //depot/projects/trustedbsd/base/sys/cam/cam_ccb.h#12 integrate .. //depot/projects/trustedbsd/base/sys/cam/cam_periph.c#22 integrate .. //depot/projects/trustedbsd/base/sys/cam/cam_periph.h#6 integrate .. //depot/projects/trustedbsd/base/sys/cam/cam_sim.c#6 integrate .. //depot/projects/trustedbsd/base/sys/cam/cam_sim.h#3 integrate .. //depot/projects/trustedbsd/base/sys/cam/cam_xpt.c#31 integrate .. //depot/projects/trustedbsd/base/sys/cam/cam_xpt.h#5 integrate .. //depot/projects/trustedbsd/base/sys/cam/cam_xpt_periph.h#4 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_cd.c#31 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_ch.c#14 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_da.c#62 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_low.c#15 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_pass.c#13 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_pt.c#12 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_sa.c#20 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_ses.c#13 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_sg.c#3 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_targ_bh.c#10 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_target.c#21 integrate .. //depot/projects/trustedbsd/base/sys/compat/linprocfs/linprocfs.c#41 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_socket.c#27 integrate .. //depot/projects/trustedbsd/base/sys/compat/opensolaris/kern/opensolaris_vfs.c#2 integrate .. //depot/projects/trustedbsd/base/sys/conf/NOTES#85 integrate .. //depot/projects/trustedbsd/base/sys/conf/files#114 integrate .. //depot/projects/trustedbsd/base/sys/conf/options#81 integrate .. //depot/projects/trustedbsd/base/sys/contrib/opensolaris/common/atomic/amd64/atomic.S#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/opensolaris/common/atomic/i386/atomic.S#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/opensolaris/uts/common/fs/dnlc.c#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/opensolaris/uts/common/fs/zfs/spa.c#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/pf/net/if_pfsync.c#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/aac/aac_cam.c#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/advansys/advansys.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/advansys/adwcam.c#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/aha/aha.c#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/ahb/ahb.c#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic/aic.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic7770.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic79xx.c#21 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic79xx.h#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic79xx_osm.c#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic79xx_osm.h#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic79xx_pci.c#22 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic7xxx.c#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic7xxx.h#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic7xxx_osm.c#21 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic7xxx_osm.h#22 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic7xxx_pci.c#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic_osm_lib.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic_osm_lib.h#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/amd/amd.c#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/amr/amr_cam.c#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/arcmsr/arcmsr.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/asr/asr.c#33 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/atapi-cam.c#28 integrate .. //depot/projects/trustedbsd/base/sys/dev/buslogic/bt.c#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/ciss/ciss.c#39 integrate .. //depot/projects/trustedbsd/base/sys/dev/cxgb/cxgb_main.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/cxgb/cxgb_sge.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/cxgb/sys/mvec.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/cxgb/sys/uipc_mvec.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/dpt/dpt_scsi.c#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/esp/ncr53c9x.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/ex/if_exvar.h#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/fwdma.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/sbp.c#35 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/sbp_targ.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/hptmv/entry.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/iicbus/icee.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/iir/iir.c#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_freebsd.c#37 integrate .. //depot/projects/trustedbsd/base/sys/dev/mly/mly.c#22 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_cam.c#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/ppbus/vpo.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/re/if_re.c#31 integrate .. //depot/projects/trustedbsd/base/sys/dev/rr232x/osm_bsd.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/sym/sym_hipd.c#27 integrate .. //depot/projects/trustedbsd/base/sys/dev/trm/trm.c#23 integrate .. //depot/projects/trustedbsd/base/sys/dev/twa/tw_osl_cam.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/umass.c#50 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usbdevs#62 integrate .. //depot/projects/trustedbsd/base/sys/dev/wds/wd7000.c#10 integrate .. //depot/projects/trustedbsd/base/sys/fs/procfs/procfs_dbregs.c#14 integrate .. //depot/projects/trustedbsd/base/sys/fs/procfs/procfs_fpregs.c#14 integrate .. //depot/projects/trustedbsd/base/sys/fs/procfs/procfs_map.c#11 integrate .. //depot/projects/trustedbsd/base/sys/fs/procfs/procfs_regs.c#14 integrate .. //depot/projects/trustedbsd/base/sys/fs/pseudofs/pseudofs.c#16 integrate .. //depot/projects/trustedbsd/base/sys/fs/pseudofs/pseudofs.h#19 integrate .. //depot/projects/trustedbsd/base/sys/fs/pseudofs/pseudofs_fileno.c#7 integrate .. //depot/projects/trustedbsd/base/sys/fs/pseudofs/pseudofs_internal.h#3 integrate .. //depot/projects/trustedbsd/base/sys/fs/pseudofs/pseudofs_vncache.c#22 integrate .. //depot/projects/trustedbsd/base/sys/fs/pseudofs/pseudofs_vnops.c#30 integrate .. //depot/projects/trustedbsd/base/sys/geom/vinum/geom_vinum.h#7 integrate .. //depot/projects/trustedbsd/base/sys/geom/vinum/geom_vinum_rm.c#7 integrate .. //depot/projects/trustedbsd/base/sys/geom/vinum/geom_vinum_share.c#4 integrate .. //depot/projects/trustedbsd/base/sys/geom/vinum/geom_vinum_subr.c#7 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/busdma_machdep.c#30 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/mp_machdep.c#55 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/pmap.c#74 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/pmap.h#27 integrate .. //depot/projects/trustedbsd/base/sys/isa/isa_common.c#16 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_jail.c#29 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_rman.c#27 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_mbuf.c#40 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_mqueue.c#9 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_mount.c#59 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_subr.c#87 integrate .. //depot/projects/trustedbsd/base/sys/modules/Makefile#87 integrate .. //depot/projects/trustedbsd/base/sys/modules/if_lagg/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/if_trunk/Makefile#2 delete .. //depot/projects/trustedbsd/base/sys/net/ieee8023ad_lacp.c#2 integrate .. //depot/projects/trustedbsd/base/sys/net/ieee8023ad_lacp.h#2 integrate .. //depot/projects/trustedbsd/base/sys/net/if.c#54 integrate .. //depot/projects/trustedbsd/base/sys/net/if_ethersubr.c#55 integrate .. //depot/projects/trustedbsd/base/sys/net/if_lagg.c#1 branch .. //depot/projects/trustedbsd/base/sys/net/if_lagg.h#1 branch .. //depot/projects/trustedbsd/base/sys/net/if_trunk.c#2 delete .. //depot/projects/trustedbsd/base/sys/net/if_trunk.h#2 delete .. //depot/projects/trustedbsd/base/sys/net/if_var.h#43 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_fw2.c#59 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_constants.h#6 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_crc32.c#4 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_indata.c#6 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_input.c#6 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_output.c#6 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_pcb.c#6 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_peeloff.c#6 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_structs.h#6 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_timer.c#6 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_uio.h#6 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_usrreq.c#6 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_var.h#6 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctputil.c#6 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctputil.h#6 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_input.c#73 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_syncache.c#47 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/ipsec.c#25 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/sctp6_usrreq.c#6 integrate .. //depot/projects/trustedbsd/base/sys/netnatm/natm.h#8 integrate .. //depot/projects/trustedbsd/base/sys/nfsserver/nfs_srvsock.c#24 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_rlreg.h#27 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_vr.c#38 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_vrreg.h#15 integrate .. //depot/projects/trustedbsd/base/sys/pci/ncr.c#21 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit.c#16 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit.h#6 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_arg.c#9 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_bsm.c#12 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_bsm_token.c#9 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_private.h#9 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_syscalls.c#10 integrate .. //depot/projects/trustedbsd/base/sys/sys/eventhandler.h#15 integrate .. //depot/projects/trustedbsd/base/sys/sys/mbuf.h#55 integrate .. //depot/projects/trustedbsd/base/sys/sys/mount.h#46 integrate .. //depot/projects/trustedbsd/base/sys/sys/priv.h#5 integrate .. //depot/projects/trustedbsd/base/sys/sys/proc.h#82 integrate .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/nss/Makefile#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/nss/README#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/nss/mach#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/nss/test-getaddr.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/nss/test-getaddr.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/nss/test-getgr.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/nss/test-getgr.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/nss/test-gethostby.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/nss/test-gethostby.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/nss/test-getproto.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/nss/test-getproto.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/nss/test-getpw.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/nss/test-getpw.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/nss/test-getrpc.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/nss/test-getrpc.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/nss/test-getserv.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/nss/test-getserv.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/nss/test-getusershell.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/nss/test-getusershell.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/nss/testutil.h#1 branch .. //depot/projects/trustedbsd/base/tools/regression/netinet/ipblock/Makefile#2 delete .. //depot/projects/trustedbsd/base/tools/regression/netinet/ipblock/ipblock.c#2 delete .. //depot/projects/trustedbsd/base/usr.bin/finger/extern.h#8 integrate .. //depot/projects/trustedbsd/base/usr.bin/finger/finger.1#9 integrate .. //depot/projects/trustedbsd/base/usr.bin/finger/finger.c#12 integrate .. //depot/projects/trustedbsd/base/usr.bin/finger/net.c#8 integrate .. //depot/projects/trustedbsd/base/usr.bin/make/parse.c#26 integrate .. //depot/projects/trustedbsd/base/usr.bin/tar/Makefile#13 integrate .. //depot/projects/trustedbsd/base/usr.bin/tar/bsdtar_platform.h#16 integrate .. //depot/projects/trustedbsd/base/usr.bin/tar/read.c#14 integrate .. //depot/projects/trustedbsd/base/usr.bin/top/machine.c#14 integrate .. //depot/projects/trustedbsd/base/usr.bin/whois/whois.c#18 integrate .. //depot/projects/trustedbsd/base/usr.sbin/adduser/adduser.conf.5#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/adduser/adduser.sh#14 integrate .. //depot/projects/trustedbsd/base/usr.sbin/bsnmpd/modules/snmp_bridge/snmp_bridge.3#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/mountd/mountd.c#21 integrate .. //depot/projects/trustedbsd/base/usr.sbin/rpc.lockd/lockd_lock.c#14 integrate Differences ... ==== //depot/projects/trustedbsd/base/Makefile.inc1#84 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.571 2007/04/06 02:13:29 pjd Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.572 2007/04/17 15:52:36 pjd Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -1016,11 +1016,11 @@ ${_lib_libgssapi} ${_lib_libipx} \ lib/libkiconv lib/libkvm lib/libmd \ lib/ncurses/ncurses lib/ncurses/ncursesw \ - lib/libopie lib/libpam \ + lib/libopie lib/libpam lib/libpthread \ lib/libradius lib/libsbuf lib/libtacplus lib/libutil \ ${_lib_libypclnt} lib/libz lib/msun \ ${_secure_lib_libcrypto} ${_secure_lib_libssh} \ - ${_secure_lib_libssl} lib/libthr + ${_secure_lib_libssl} _generic_libs= ${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib ==== //depot/projects/trustedbsd/base/ObsoleteFiles.inc#22 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.78 2007/04/09 19:16:48 pjd Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.79 2007/04/17 01:02:55 thompsa Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,8 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20070417: trunk(4) renamed to lagg(4) +OLD_FILES+=usr/include/net/if_trunk.h # 20070409: uuidgen moved to /bin/ OLD_FILES+=usr/bin/uuidgen # 20070328: bzip2 1.0.4 ==== //depot/projects/trustedbsd/base/UPDATING#78 (text+ko) ==== @@ -21,6 +21,15 @@ developers choose to disable these features on build machines to maximize performance. +20070417: + The new trunk(4) driver has been renamed to lagg(4) as it better + reflects its purpose. ifconfig will need to be recompiled. + +20070408: + sendmail(8) has been updated to version 8.14.1. Mail filters + (aka, milters) compiled against the libmilter included in the + base operating system should be recompiled. + 20070302: Firmwares for ipw(4) and iwi(4) are now included in the base tree. In order to use them one must agree to the respective LICENSE in @@ -758,4 +767,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.484 2007/04/03 10:04:54 brueffer Exp $ +$FreeBSD: src/UPDATING,v 1.486 2007/04/17 00:41:59 thompsa Exp $ ==== //depot/projects/trustedbsd/base/cddl/Makefile#2 (text+ko) ==== @@ -1,8 +1,5 @@ -# $FreeBSD: src/cddl/Makefile,v 1.1 2007/04/06 01:08:56 pjd Exp $ +# $FreeBSD: src/cddl/Makefile,v 1.2 2007/04/16 21:20:24 ru Exp $ -SUBDIR= lib -SUBDIR+=sbin -SUBDIR+=usr.bin -SUBDIR+=usr.sbin +SUBDIR= lib sbin usr.bin usr.sbin .include ==== //depot/projects/trustedbsd/base/cddl/Makefile.inc#2 (text+ko) ==== @@ -1,3 +1,3 @@ -# $FreeBSD: src/cddl/Makefile.inc,v 1.1 2007/04/06 01:08:56 pjd Exp $ +# $FreeBSD: src/cddl/Makefile.inc,v 1.2 2007/04/16 21:20:24 ru Exp $ -CFLAGS+=-D_SOLARIS_C_SOURCE +CFLAGS+= -D_SOLARIS_C_SOURCE ==== //depot/projects/trustedbsd/base/cddl/lib/Makefile#2 (text+ko) ==== @@ -1,18 +1,19 @@ -# $FreeBSD: src/cddl/lib/Makefile,v 1.2 2007/04/07 19:12:09 des Exp $ +# $FreeBSD: src/cddl/lib/Makefile,v 1.3 2007/04/16 21:20:24 ru Exp $ .include -SUBDIR= libavl -SUBDIR+=libnvpair -SUBDIR+=libumem -SUBDIR+=libuutil -.if ${MK_CDDL} != "no" -SUBDIR+=libzfs -SUBDIR+=${_libzpool} -.endif +SUBDIR= libavl \ + libnvpair \ + libumem \ + libuutil \ + ${_libzfs} \ + ${_libzpool} -.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" +.if ${MK_ZFS} != "no" +_libzfs= libzfs +.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" _libzpool= libzpool .endif +.endif .include ==== //depot/projects/trustedbsd/base/cddl/lib/Makefile.inc#2 (text+ko) ==== @@ -1,5 +1,6 @@ -# $FreeBSD: src/cddl/lib/Makefile.inc,v 1.1 2007/04/06 01:08:56 pjd Exp $ +# $FreeBSD: src/cddl/lib/Makefile.inc,v 1.2 2007/04/16 21:20:24 ru Exp $ SHLIBDIR?= /lib +SHLIB_MAJOR?= 1 .include "../Makefile.inc" ==== //depot/projects/trustedbsd/base/cddl/lib/libavl/Makefile#2 (text+ko) ==== @@ -1,13 +1,10 @@ -# $FreeBSD: src/cddl/lib/libavl/Makefile,v 1.1 2007/04/06 01:08:56 pjd Exp $ +# $FreeBSD: src/cddl/lib/libavl/Makefile,v 1.2 2007/04/16 21:20:24 ru Exp $ -.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/avl +.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/avl LIB= avl -SHLIB_MAJOR?=1 - SRCS= avl.c - -CFLAGS+=-I${.CURDIR}/../../../sys/compat/opensolaris -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common +CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common .include ==== //depot/projects/trustedbsd/base/cddl/lib/libnvpair/Makefile#2 (text+ko) ==== @@ -1,18 +1,17 @@ -# $FreeBSD: src/cddl/lib/libnvpair/Makefile,v 1.1 2007/04/06 01:08:56 pjd Exp $ +# $FreeBSD: src/cddl/lib/libnvpair/Makefile,v 1.2 2007/04/16 21:20:25 ru Exp $ -.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair -.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/nvpair +.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair +.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/nvpair LIB= nvpair -SHLIB_MAJOR?=1 -SRCS= libnvpair.c -SRCS+= nvpair_alloc_system.c -SRCS+= nvpair_alloc_fixed.c -SRCS+= nvpair.c +SRCS= libnvpair.c \ + nvpair_alloc_system.c \ + nvpair_alloc_fixed.c \ + nvpair.c -CFLAGS+=-I${.CURDIR}/../../../sys/compat/opensolaris -CFLAGS+=-I${.CURDIR}/../../../include -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common +CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris +CFLAGS+= -I${.CURDIR}/../../../include # XXX +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common .include ==== //depot/projects/trustedbsd/base/cddl/lib/libumem/Makefile#2 (text+ko) ==== @@ -1,12 +1,9 @@ -# $FreeBSD: src/cddl/lib/libumem/Makefile,v 1.1 2007/04/06 01:08:56 pjd Exp $ +# $FreeBSD: src/cddl/lib/libumem/Makefile,v 1.2 2007/04/16 21:20:25 ru Exp $ -.PATH: ${.CURDIR}/../../../compat/opensolaris/lib/libumem +.PATH: ${.CURDIR}/../../../compat/opensolaris/lib/libumem LIB= umem -SHLIB_MAJOR?=1 - SRCS= umem.c - -CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/lib/libumem +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem .include ==== //depot/projects/trustedbsd/base/cddl/lib/libuutil/Makefile#2 (text+ko) ==== @@ -1,27 +1,25 @@ -# $FreeBSD: src/cddl/lib/libuutil/Makefile,v 1.1 2007/04/06 01:08:57 pjd Exp $ +# $FreeBSD: src/cddl/lib/libuutil/Makefile,v 1.2 2007/04/16 21:20:25 ru Exp $ -.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common -.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/avl +.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common +.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/avl LIB= uutil -SHLIB_MAJOR?=1 +SRCS= avl.c \ + uu_alloc.c \ + uu_avl.c \ + uu_dprintf.c \ + uu_ident.c \ + uu_list.c \ + uu_misc.c \ + uu_open.c \ + uu_pname.c \ + uu_strtoint.c -SRCS= avl.c -SRCS+= uu_alloc.c -SRCS+= uu_avl.c -SRCS+= uu_dprintf.c -SRCS+= uu_ident.c -SRCS+= uu_list.c -SRCS+= uu_misc.c -SRCS+= uu_open.c -SRCS+= uu_pname.c -SRCS+= uu_strtoint.c - -CFLAGS+=-DNATIVE_BUILD -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common -CFLAGS+=-I${.CURDIR}/../../../sys/compat/opensolaris -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common -CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/include -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/head +CFLAGS+= -DNATIVE_BUILD +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common +CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head .include ==== //depot/projects/trustedbsd/base/cddl/lib/libzfs/Makefile#2 (text+ko) ==== @@ -1,49 +1,46 @@ -# $FreeBSD: src/cddl/lib/libzfs/Makefile,v 1.1 2007/04/06 01:08:57 pjd Exp $ +# $FreeBSD: src/cddl/lib/libzfs/Makefile,v 1.2 2007/04/16 21:20:25 ru Exp $ -.PATH: ${.CURDIR}/../../../compat/opensolaris/misc -.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs -.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs -.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common +.PATH: ${.CURDIR}/../../../compat/opensolaris/misc +.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs +.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs +.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common LIB= zfs -SHLIB_MAJOR?=1 - DPADD= ${LIBUTIL} LDADD= -lutil -SRCS= mnttab.c -SRCS+= mkdirp.c -SRCS+= zmount.c -SRCS+= fsshare.c -SRCS+= zone.c +SRCS= mnttab.c \ + mkdirp.c \ + zmount.c \ + fsshare.c \ + zone.c -SRCS+= zfs_namecheck.c -SRCS+= zfs_prop.c -SRCS+= libzfs_dataset.c -SRCS+= libzfs_util.c -SRCS+= libzfs_graph.c -SRCS+= libzfs_mount.c -SRCS+= libzfs_pool.c -SRCS+= libzfs_changelist.c -SRCS+= libzfs_config.c -SRCS+= libzfs_import.c -SRCS+= libzfs_status.c +SRCS+= zfs_namecheck.c \ + zfs_prop.c \ + libzfs_dataset.c \ + libzfs_util.c \ + libzfs_graph.c \ + libzfs_mount.c \ + libzfs_pool.c \ + libzfs_changelist.c \ + libzfs_config.c \ + libzfs_import.c \ + libzfs_status.c -CFLAGS+=-DZFS_NO_ACL -CFLAGS+=-I${.CURDIR}/../../../sbin/mount -CFLAGS+=-I${.CURDIR}/../../../cddl/lib/libumem -CFLAGS+=-I${.CURDIR}/../../../sys/compat/opensolaris -CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/include -CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/lib/libumem -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/head -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common -CFLAGS+=-I${.CURDIR}/../../../sys +CFLAGS+= -DZFS_NO_ACL +CFLAGS+= -I${.CURDIR}/../../../sbin/mount +CFLAGS+= -I${.CURDIR}/../../../cddl/lib/libumem +CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common .include ==== //depot/projects/trustedbsd/base/cddl/lib/libzpool/Makefile#3 (text+ko) ==== @@ -1,44 +1,43 @@ -# $FreeBSD: src/cddl/lib/libzpool/Makefile,v 1.2 2007/04/07 23:54:53 pjd Exp $ +# $FreeBSD: src/cddl/lib/libzpool/Makefile,v 1.4 2007/04/17 15:52:36 pjd Exp $ .include "${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/Makefile.files" # ZFS_COMMON_SRCS -.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs +.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs # ZFS_SHARED_SRCS -.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs +.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs # KERNEL_SRCS -.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common +.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common # LIST_SRCS -.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/os +.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/os # ATOMIC_SRCS -.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/atomic/${MACHINE_ARCH} +.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/atomic/${MACHINE_ARCH} -LIB= zpool -SHLIB_MAJOR?=1 +LIB= zpool -ZFS_COMMON_SRCS= ${ZFS_COMMON_OBJS:C/.o$/.c/} vdev_file.c -ZFS_SHARED_SRCS= ${ZFS_SHARED_OBJS:C/.o$/.c/} -KERNEL_SRCS= kernel.c taskq.c util.c -LIST_SRCS= list.c -ATOMIC_SRCS= atomic.S +ZFS_COMMON_SRCS= ${ZFS_COMMON_OBJS:C/.o$/.c/} vdev_file.c +ZFS_SHARED_SRCS= ${ZFS_SHARED_OBJS:C/.o$/.c/} +KERNEL_SRCS= kernel.c taskq.c util.c +LIST_SRCS= list.c +ATOMIC_SRCS= atomic.S -SRCS= ${ZFS_COMMON_SRCS} ${ZFS_SHARED_SRCS} ${KERNEL_SRCS} ${LIST_SRCS} ${ATOMIC_SRCS} +SRCS= ${ZFS_COMMON_SRCS} ${ZFS_SHARED_SRCS} \ + ${KERNEL_SRCS} ${LIST_SRCS} ${ATOMIC_SRCS} -CFLAGS+=-I${.CURDIR}/../../../sys/compat/opensolaris -CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/include -CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/lib/libumem -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/head -CFLAGS+=-I${.CURDIR}/../../../cddl/lib/libumem -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair -CFLAGS+=-I${.CURDIR}/../../../sys +CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head +CFLAGS+= -I${.CURDIR}/../../../cddl/lib/libumem +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair -DPADD= ${LIBTHR} ${LIBZ} -LDADD= -lthr -lz +DPADD= ${LIBPTHREAD} ${LIBZ} +LDADD= -lpthread -lz # atomic.S doesn't like profiling. NO_PROFILE= ==== //depot/projects/trustedbsd/base/cddl/sbin/Makefile#2 (text+ko) ==== @@ -1,11 +1,12 @@ -# $FreeBSD: src/cddl/sbin/Makefile,v 1.1 2007/04/06 01:08:57 pjd Exp $ +# $FreeBSD: src/cddl/sbin/Makefile,v 1.2 2007/04/16 21:20:25 ru Exp $ .include -SUBDIR= +SUBDIR= ${_zfs} ${_zpool} + .if ${MK_ZFS} != "no" -SUBDIR+=zfs -SUBDIR+=zpool +_zfs= zfs +_zpool= zpool .endif .include ==== //depot/projects/trustedbsd/base/cddl/sbin/zfs/Makefile#2 (text+ko) ==== @@ -1,25 +1,23 @@ -# $FreeBSD: src/cddl/sbin/zfs/Makefile,v 1.1 2007/04/06 01:08:57 pjd Exp $ +# $FreeBSD: src/cddl/sbin/zfs/Makefile,v 1.2 2007/04/16 21:20:26 ru Exp $ -.PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zfs +.PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zfs PROG= zfs MAN= zfs.8 -SRCS= zfs_main.c -SRCS+= zfs_iter.c +SRCS= zfs_main.c zfs_iter.c -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common -CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/include -CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/lib/libumem -CFLAGS+=-I${.CURDIR}/../../../sys/compat/opensolaris -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/head -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libumem/common -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys -CFLAGS+=-I${.CURDIR}/../../../sys +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem +CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libumem/common +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBZFS} LDADD= -lgeom -lm -lnvpair -luutil -lzfs ==== //depot/projects/trustedbsd/base/cddl/sbin/zpool/Makefile#2 (text+ko) ==== @@ -1,27 +1,23 @@ -# $FreeBSD: src/cddl/sbin/zpool/Makefile,v 1.1 2007/04/06 01:08:57 pjd Exp $ +# $FreeBSD: src/cddl/sbin/zpool/Makefile,v 1.2 2007/04/16 21:20:26 ru Exp $ -.PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zpool +.PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zpool PROG= zpool MAN= zpool.8 -SRCS= zpool_main.c -SRCS+= zpool_vdev.c -SRCS+= zpool_iter.c -SRCS+= zpool_util.c +SRCS= zpool_main.c zpool_vdev.c zpool_iter.c zpool_util.c -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common -CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/include -CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/lib/libumem -CFLAGS+=-I${.CURDIR}/../../../sys/compat/opensolaris -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/head -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libumem/common -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys -CFLAGS+=-I${.CURDIR}/../../../sys +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem +CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libumem/common +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBZFS} LDADD= -lavl -lgeom -lm -lnvpair -luutil -lzfs ==== //depot/projects/trustedbsd/base/cddl/usr.bin/Makefile#2 (text+ko) ==== @@ -1,13 +1,13 @@ -# $FreeBSD: src/cddl/usr.bin/Makefile,v 1.2 2007/04/07 19:12:09 des Exp $ +# $FreeBSD: src/cddl/usr.bin/Makefile,v 1.3 2007/04/16 21:20:26 ru Exp $ .include -.if ${MK_ZFS} != "no" SUBDIR= ${_ztest} -.endif -.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" +.if ${MK_ZFS} != "no" +.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" _ztest= ztest .endif +.endif .include ==== //depot/projects/trustedbsd/base/cddl/usr.bin/ztest/Makefile#2 (text+ko) ==== @@ -1,23 +1,21 @@ -# $FreeBSD: src/cddl/usr.bin/ztest/Makefile,v 1.1 2007/04/06 01:08:58 pjd Exp $ +# $FreeBSD: src/cddl/usr.bin/ztest/Makefile,v 1.3 2007/04/17 15:52:37 pjd Exp $ -.PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/ztest +.PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/ztest PROG= ztest +NO_MAN= -CFLAGS+=-I${.CURDIR}/../../../sys/compat/opensolaris -CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/include -CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/lib/libumem -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/head -CFLAGS+=-I${.CURDIR}/../../lib/libumem -CFLAGS+=-I${.CURDIR}/../../../sys +CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head +CFLAGS+= -I${.CURDIR}/../../lib/libumem -DPADD= ${LIBAVL} ${LIBM} ${LIBNVPAIR} ${LIBTHR} ${LIBUMEM} ${LIBZPOOL} -LDADD= -lavl -lm -lnvpair -lthr -lumem -lzpool - -NO_MAN= +DPADD= ${LIBAVL} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} ${LIBZPOOL} +LDADD= -lavl -lm -lnvpair -lpthread -lumem -lzpool .include >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Apr 18 10:46:42 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 6F61816A404; Wed, 18 Apr 2007 10:46:42 +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 E0D4716A403 for ; Wed, 18 Apr 2007 10:46:41 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id CFA2813C44C for ; Wed, 18 Apr 2007 10:46:41 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3IAkfkU004771 for ; Wed, 18 Apr 2007 10:46:41 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3IAkZ3B004766 for perforce@freebsd.org; Wed, 18 Apr 2007 10:46:35 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 18 Apr 2007 10:46:35 GMT Message-Id: <200704181046.l3IAkZ3B004766@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 118351 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: Wed, 18 Apr 2007 10:46:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=118351 Change 118351 by rwatson@rwatson_zoo on 2007/04/18 10:46:30 Integrate TrustedBSD audit3 branch from TrustedBSD base branch. Affected files ... .. //depot/projects/trustedbsd/audit3/Makefile.inc1#19 integrate .. //depot/projects/trustedbsd/audit3/ObsoleteFiles.inc#14 integrate .. //depot/projects/trustedbsd/audit3/UPDATING#19 integrate .. //depot/projects/trustedbsd/audit3/cddl/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/cddl/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/audit3/cddl/lib/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/cddl/lib/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/audit3/cddl/lib/libavl/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/cddl/lib/libnvpair/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/cddl/lib/libumem/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/cddl/lib/libuutil/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/cddl/lib/libzfs/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/cddl/lib/libzpool/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/cddl/sbin/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/cddl/sbin/zfs/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/cddl/sbin/zpool/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/cddl/usr.bin/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/cddl/usr.bin/ztest/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/cddl/usr.sbin/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/cddl/usr.sbin/zdb/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/FREEBSD-upgrade#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/display.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#19 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/README#19 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/TODO#14 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/VERSION#17 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/audit.8#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.8#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.c#19 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditfilterd/auditfilterd.8#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditfilterd/auditfilterd.c#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/auditreduce.1#11 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/praudit/praudit.1#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/praudit/praudit.c#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/libbsm.h#22 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/compat/clock_gettime.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/config/config.h#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/configure#17 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/configure.ac#18 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_event#20 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_class.3#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_control.3#9 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_event.3#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_free_token.3#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_io.3#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_mask.3#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_open.3#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_token.3#12 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_user.3#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/audit_submit.3#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#23 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_notify.c#13 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#25 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_wrappers.c#15 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/libbsm.3#14 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit.2#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit.log.5#12 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit_class.5#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit_control.5#12 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit_event.5#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit_user.5#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit_warn.5#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/auditctl.2#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/auditon.2#10 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/getaudit.2#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/getauid.2#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/setaudit.2#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/setauid.2#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/bsm/generate.c#9 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/arg32_record#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/data_record#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/file_record#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/in_addr_record#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/ip_record#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/ipc_record#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/iport_record#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/opaque_record#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/path_record#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/process32_record#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/process32ex_record-IPv4#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/process32ex_record-IPv6#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/process32ex_token-IPv4#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/process32ex_token-IPv6#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/process64_record#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/process64_token#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/process64ex_record-IPv4#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/process64ex_record-IPv6#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/process64ex_token-IPv4#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/process64ex_token-IPv6#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/return32_record#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/seq_record#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/subject32_record#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/subject32ex_record#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/subject32ex_token-IPv4#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/subject32ex_token-IPv6#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/text_record#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/zonename_record#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/zonename_token#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/audump.c#11 integrate .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/cmd/zdb/zdb.8#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/cmd/zfs/zfs.8#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/cmd/zfs/zfs_main.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/cmd/zpool/zpool.8#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/cmd/ztest/ztest.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/lib/libzfs/common/libzfs.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/lib/libzpool/common/kernel.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/top/commands.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/top/machine.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/top/top.X#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/top/top.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/top/top.h#3 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/hostid#2 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/mountd#5 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/zfs#2 integrate .. //depot/projects/trustedbsd/audit3/etc/services#4 integrate .. //depot/projects/trustedbsd/audit3/include/Makefile#14 integrate .. //depot/projects/trustedbsd/audit3/include/rpc/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/include/rpc/types.h#2 delete .. //depot/projects/trustedbsd/audit3/lib/libarchive/Makefile#11 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive.h.in#11 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_entry.c#10 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_platform.h#9 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_read_extract.c#10 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_read_support_format_ar.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_read_support_format_cpio.c#11 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_read_support_format_tar.c#13 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_read_support_format_zip.c#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_write_disk.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_write_set_compression_none.c#7 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_write_set_format_ar.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_write_set_format_by_name.c#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_write_set_format_pax.c#11 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_write_set_format_ustar.c#8 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/config_freebsd.h#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/test/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/test/main.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/test/test_acl_basic.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/test/test_acl_pax.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/test/test_read_data_large.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/test/test_read_extract.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/test/test_read_format_ar.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/test/test_read_large.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/test/test_read_position.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/test/test_read_truncated.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/test/test_tar_filenames.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libarchive/test/test_write_disk_perms.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/test/test_write_disk_secure.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/test/test_write_format_ar.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/test/test_write_format_tar.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/test/test_write_open_memory.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/gen/sysconf.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/ptrace.2#7 integrate .. //depot/projects/trustedbsd/audit3/lib/libpmc/libpmc.c#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libpmc/pmc.3#7 integrate .. //depot/projects/trustedbsd/audit3/lib/ncurses/ncurses/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/release/Makefile.inc.docports#3 integrate .. //depot/projects/trustedbsd/audit3/release/doc/en_US.ISO8859-1/relnotes/article.sgml#4 integrate .. //depot/projects/trustedbsd/audit3/sbin/atm/atmconfig/diag.c#4 integrate .. //depot/projects/trustedbsd/audit3/sbin/dhclient/dhclient-script#5 integrate .. //depot/projects/trustedbsd/audit3/sbin/ifconfig/Makefile#7 integrate .. //depot/projects/trustedbsd/audit3/sbin/ifconfig/ifconfig.8#18 integrate .. //depot/projects/trustedbsd/audit3/sbin/ifconfig/iflagg.c#1 branch .. //depot/projects/trustedbsd/audit3/sbin/ifconfig/iftrunk.c#2 delete .. //depot/projects/trustedbsd/audit3/sbin/ipfw/ipfw2.c#15 integrate .. //depot/projects/trustedbsd/audit3/sbin/mount/mount.c#12 integrate .. //depot/projects/trustedbsd/audit3/share/examples/cvsup/cvs-supfile#3 integrate .. //depot/projects/trustedbsd/audit3/share/examples/cvsup/stable-supfile#5 integrate .. //depot/projects/trustedbsd/audit3/share/examples/cvsup/standard-supfile#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/Makefile#18 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/lagg.4#1 branch .. //depot/projects/trustedbsd/audit3/share/man/man4/trunk.4#2 delete .. //depot/projects/trustedbsd/audit3/share/man/man4/uftdi.4#6 integrate .. //depot/projects/trustedbsd/audit3/share/misc/committers-ports.dot#3 integrate .. //depot/projects/trustedbsd/audit3/share/misc/committers-src.dot#3 integrate .. //depot/projects/trustedbsd/audit3/share/misc/organization.dot#1 branch .. //depot/projects/trustedbsd/audit3/sys/Makefile#11 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/busdma_machdep.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/pmap.c#16 integrate .. //depot/projects/trustedbsd/audit3/sys/cam/cam_ccb.h#9 integrate .. //depot/projects/trustedbsd/audit3/sys/cam/cam_periph.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/cam/cam_periph.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/cam/cam_sim.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/cam/cam_sim.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/cam/cam_xpt.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/cam/cam_xpt.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/cam/cam_xpt_periph.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/cam/scsi/scsi_cd.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/cam/scsi/scsi_ch.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/cam/scsi/scsi_da.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/cam/scsi/scsi_low.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/cam/scsi/scsi_pass.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/cam/scsi/scsi_pt.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/cam/scsi/scsi_sa.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/cam/scsi/scsi_ses.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/cam/scsi/scsi_sg.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/cam/scsi/scsi_targ_bh.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/cam/scsi/scsi_target.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/linprocfs/linprocfs.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/linux/linux_socket.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/opensolaris/kern/opensolaris_vfs.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/NOTES#21 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/files#30 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/options#18 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/opensolaris/common/atomic/amd64/atomic.S#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/opensolaris/common/atomic/i386/atomic.S#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/opensolaris/uts/common/fs/dnlc.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/opensolaris/uts/common/fs/zfs/spa.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/pf/net/if_pfsync.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/aac/aac_cam.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/advansys/advansys.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/advansys/adwcam.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/aha/aha.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ahb/ahb.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/aic/aic.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/aic7xxx/aic7770.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/aic7xxx/aic79xx.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/aic7xxx/aic79xx.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/aic7xxx/aic79xx_osm.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/aic7xxx/aic79xx_osm.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/aic7xxx/aic79xx_pci.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/aic7xxx/aic7xxx.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/aic7xxx/aic7xxx.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/aic7xxx/aic7xxx_osm.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/aic7xxx/aic7xxx_osm.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/aic7xxx/aic7xxx_pci.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/aic7xxx/aic_osm_lib.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/aic7xxx/aic_osm_lib.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/amd/amd.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/amr/amr_cam.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/arcmsr/arcmsr.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/asr/asr.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/atapi-cam.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/buslogic/bt.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ciss/ciss.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/cxgb_main.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/cxgb_sge.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/sys/mvec.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/sys/uipc_mvec.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/dpt/dpt_scsi.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/esp/ncr53c9x.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ex/if_exvar.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/firewire/fwdma.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/firewire/sbp.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/firewire/sbp_targ.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/hptmv/entry.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/iicbus/icee.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/iir/iir.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/isp_freebsd.c#16 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mly/mly.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpt_cam.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ppbus/vpo.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/re/if_re.c#15 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/rr232x/osm_bsd.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sym/sym_hipd.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/trm/trm.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/twa/tw_osl_cam.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/umass.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/usbdevs#18 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/wds/wd7000.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/procfs/procfs_dbregs.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/procfs/procfs_fpregs.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/procfs/procfs_map.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/procfs/procfs_regs.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/pseudofs/pseudofs.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/pseudofs/pseudofs.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/pseudofs/pseudofs_fileno.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/pseudofs/pseudofs_internal.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/pseudofs/pseudofs_vncache.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/pseudofs/pseudofs_vnops.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/vinum/geom_vinum.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/vinum/geom_vinum_rm.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/vinum/geom_vinum_share.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/vinum/geom_vinum_subr.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/busdma_machdep.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/mp_machdep.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/pmap.c#17 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/include/pmap.h#10 integrate .. //depot/projects/trustedbsd/audit3/sys/isa/isa_common.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_jail.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/subr_rman.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/uipc_mbuf.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/uipc_mqueue.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_mount.c#24 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_subr.c#19 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/Makefile#19 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/if_lagg/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/sys/modules/if_trunk/Makefile#2 delete .. //depot/projects/trustedbsd/audit3/sys/net/ieee8023ad_lacp.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/net/ieee8023ad_lacp.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if.c#18 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_ethersubr.c#14 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_lagg.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/net/if_lagg.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/net/if_trunk.c#2 delete .. //depot/projects/trustedbsd/audit3/sys/net/if_trunk.h#2 delete .. //depot/projects/trustedbsd/audit3/sys/net/if_var.h#13 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/ip_fw2.c#19 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_constants.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_crc32.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_indata.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_input.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_output.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_pcb.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_peeloff.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_structs.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_timer.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_uio.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_usrreq.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_var.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctputil.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctputil.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_input.c#17 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_syncache.c#15 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet6/ipsec.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet6/sctp6_usrreq.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/netnatm/natm.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/nfsserver/nfs_srvsock.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/if_rlreg.h#12 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/if_vr.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/if_vrreg.h#8 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/ncr.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#42 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.h#22 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_arg.c#27 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm.c#27 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#33 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_private.h#38 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_syscalls.c#33 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/eventhandler.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/mbuf.h#14 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/mount.h#14 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/priv.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/proc.h#21 integrate .. //depot/projects/trustedbsd/audit3/tools/regression/lib/libc/nss/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/lib/libc/nss/README#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/lib/libc/nss/mach#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/lib/libc/nss/test-getaddr.c#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/lib/libc/nss/test-getaddr.t#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/lib/libc/nss/test-getgr.c#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/lib/libc/nss/test-getgr.t#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/lib/libc/nss/test-gethostby.c#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/lib/libc/nss/test-gethostby.t#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/lib/libc/nss/test-getproto.c#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/lib/libc/nss/test-getproto.t#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/lib/libc/nss/test-getpw.c#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/lib/libc/nss/test-getpw.t#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/lib/libc/nss/test-getrpc.c#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/lib/libc/nss/test-getrpc.t#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/lib/libc/nss/test-getserv.c#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/lib/libc/nss/test-getserv.t#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/lib/libc/nss/test-getusershell.c#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/lib/libc/nss/test-getusershell.t#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/lib/libc/nss/testutil.h#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/netinet/ipblock/Makefile#2 delete .. //depot/projects/trustedbsd/audit3/tools/regression/netinet/ipblock/ipblock.c#2 delete .. //depot/projects/trustedbsd/audit3/usr.bin/finger/extern.h#3 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/finger/finger.1#4 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/finger/finger.c#4 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/finger/net.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/make/parse.c#7 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/tar/Makefile#6 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/tar/bsdtar_platform.h#8 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/tar/read.c#7 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/top/machine.c#7 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/whois/whois.c#6 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/adduser/adduser.conf.5#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/adduser/adduser.sh#6 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/bsnmpd/modules/snmp_bridge/snmp_bridge.3#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/mountd/mountd.c#12 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/rpc.lockd/lockd_lock.c#7 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/Makefile.inc1#19 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.571 2007/04/06 02:13:29 pjd Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.572 2007/04/17 15:52:36 pjd Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -1016,11 +1016,11 @@ ${_lib_libgssapi} ${_lib_libipx} \ lib/libkiconv lib/libkvm lib/libmd \ lib/ncurses/ncurses lib/ncurses/ncursesw \ - lib/libopie lib/libpam \ + lib/libopie lib/libpam lib/libpthread \ lib/libradius lib/libsbuf lib/libtacplus lib/libutil \ ${_lib_libypclnt} lib/libz lib/msun \ ${_secure_lib_libcrypto} ${_secure_lib_libssh} \ - ${_secure_lib_libssl} lib/libthr + ${_secure_lib_libssl} _generic_libs= ${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib ==== //depot/projects/trustedbsd/audit3/ObsoleteFiles.inc#14 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.78 2007/04/09 19:16:48 pjd Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.79 2007/04/17 01:02:55 thompsa Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,8 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20070417: trunk(4) renamed to lagg(4) +OLD_FILES+=usr/include/net/if_trunk.h # 20070409: uuidgen moved to /bin/ OLD_FILES+=usr/bin/uuidgen # 20070328: bzip2 1.0.4 ==== //depot/projects/trustedbsd/audit3/UPDATING#19 (text+ko) ==== @@ -21,6 +21,15 @@ developers choose to disable these features on build machines to maximize performance. +20070417: + The new trunk(4) driver has been renamed to lagg(4) as it better + reflects its purpose. ifconfig will need to be recompiled. + +20070408: + sendmail(8) has been updated to version 8.14.1. Mail filters + (aka, milters) compiled against the libmilter included in the + base operating system should be recompiled. + 20070302: Firmwares for ipw(4) and iwi(4) are now included in the base tree. In order to use them one must agree to the respective LICENSE in @@ -758,4 +767,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.484 2007/04/03 10:04:54 brueffer Exp $ +$FreeBSD: src/UPDATING,v 1.486 2007/04/17 00:41:59 thompsa Exp $ ==== //depot/projects/trustedbsd/audit3/cddl/Makefile#2 (text+ko) ==== @@ -1,8 +1,5 @@ -# $FreeBSD: src/cddl/Makefile,v 1.1 2007/04/06 01:08:56 pjd Exp $ +# $FreeBSD: src/cddl/Makefile,v 1.2 2007/04/16 21:20:24 ru Exp $ -SUBDIR= lib -SUBDIR+=sbin -SUBDIR+=usr.bin -SUBDIR+=usr.sbin +SUBDIR= lib sbin usr.bin usr.sbin .include ==== //depot/projects/trustedbsd/audit3/cddl/Makefile.inc#2 (text+ko) ==== @@ -1,3 +1,3 @@ -# $FreeBSD: src/cddl/Makefile.inc,v 1.1 2007/04/06 01:08:56 pjd Exp $ +# $FreeBSD: src/cddl/Makefile.inc,v 1.2 2007/04/16 21:20:24 ru Exp $ -CFLAGS+=-D_SOLARIS_C_SOURCE +CFLAGS+= -D_SOLARIS_C_SOURCE ==== //depot/projects/trustedbsd/audit3/cddl/lib/Makefile#2 (text+ko) ==== @@ -1,18 +1,19 @@ -# $FreeBSD: src/cddl/lib/Makefile,v 1.2 2007/04/07 19:12:09 des Exp $ +# $FreeBSD: src/cddl/lib/Makefile,v 1.3 2007/04/16 21:20:24 ru Exp $ .include -SUBDIR= libavl -SUBDIR+=libnvpair -SUBDIR+=libumem -SUBDIR+=libuutil -.if ${MK_CDDL} != "no" -SUBDIR+=libzfs -SUBDIR+=${_libzpool} -.endif +SUBDIR= libavl \ + libnvpair \ + libumem \ + libuutil \ + ${_libzfs} \ + ${_libzpool} -.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" +.if ${MK_ZFS} != "no" +_libzfs= libzfs +.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" _libzpool= libzpool .endif +.endif .include ==== //depot/projects/trustedbsd/audit3/cddl/lib/Makefile.inc#2 (text+ko) ==== @@ -1,5 +1,6 @@ -# $FreeBSD: src/cddl/lib/Makefile.inc,v 1.1 2007/04/06 01:08:56 pjd Exp $ +# $FreeBSD: src/cddl/lib/Makefile.inc,v 1.2 2007/04/16 21:20:24 ru Exp $ SHLIBDIR?= /lib +SHLIB_MAJOR?= 1 .include "../Makefile.inc" ==== //depot/projects/trustedbsd/audit3/cddl/lib/libavl/Makefile#2 (text+ko) ==== @@ -1,13 +1,10 @@ -# $FreeBSD: src/cddl/lib/libavl/Makefile,v 1.1 2007/04/06 01:08:56 pjd Exp $ +# $FreeBSD: src/cddl/lib/libavl/Makefile,v 1.2 2007/04/16 21:20:24 ru Exp $ -.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/avl +.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/avl LIB= avl -SHLIB_MAJOR?=1 - SRCS= avl.c - -CFLAGS+=-I${.CURDIR}/../../../sys/compat/opensolaris -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common +CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common .include ==== //depot/projects/trustedbsd/audit3/cddl/lib/libnvpair/Makefile#2 (text+ko) ==== @@ -1,18 +1,17 @@ -# $FreeBSD: src/cddl/lib/libnvpair/Makefile,v 1.1 2007/04/06 01:08:56 pjd Exp $ +# $FreeBSD: src/cddl/lib/libnvpair/Makefile,v 1.2 2007/04/16 21:20:25 ru Exp $ -.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair -.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/nvpair +.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair +.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/nvpair LIB= nvpair -SHLIB_MAJOR?=1 -SRCS= libnvpair.c -SRCS+= nvpair_alloc_system.c -SRCS+= nvpair_alloc_fixed.c -SRCS+= nvpair.c +SRCS= libnvpair.c \ + nvpair_alloc_system.c \ + nvpair_alloc_fixed.c \ + nvpair.c -CFLAGS+=-I${.CURDIR}/../../../sys/compat/opensolaris -CFLAGS+=-I${.CURDIR}/../../../include -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common +CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris +CFLAGS+= -I${.CURDIR}/../../../include # XXX +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common .include ==== //depot/projects/trustedbsd/audit3/cddl/lib/libumem/Makefile#2 (text+ko) ==== @@ -1,12 +1,9 @@ -# $FreeBSD: src/cddl/lib/libumem/Makefile,v 1.1 2007/04/06 01:08:56 pjd Exp $ +# $FreeBSD: src/cddl/lib/libumem/Makefile,v 1.2 2007/04/16 21:20:25 ru Exp $ -.PATH: ${.CURDIR}/../../../compat/opensolaris/lib/libumem +.PATH: ${.CURDIR}/../../../compat/opensolaris/lib/libumem LIB= umem -SHLIB_MAJOR?=1 - SRCS= umem.c - -CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/lib/libumem +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem .include ==== //depot/projects/trustedbsd/audit3/cddl/lib/libuutil/Makefile#2 (text+ko) ==== @@ -1,27 +1,25 @@ -# $FreeBSD: src/cddl/lib/libuutil/Makefile,v 1.1 2007/04/06 01:08:57 pjd Exp $ +# $FreeBSD: src/cddl/lib/libuutil/Makefile,v 1.2 2007/04/16 21:20:25 ru Exp $ -.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common -.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/avl +.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common +.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/avl LIB= uutil -SHLIB_MAJOR?=1 +SRCS= avl.c \ + uu_alloc.c \ + uu_avl.c \ + uu_dprintf.c \ + uu_ident.c \ + uu_list.c \ + uu_misc.c \ + uu_open.c \ + uu_pname.c \ + uu_strtoint.c -SRCS= avl.c -SRCS+= uu_alloc.c -SRCS+= uu_avl.c -SRCS+= uu_dprintf.c -SRCS+= uu_ident.c -SRCS+= uu_list.c -SRCS+= uu_misc.c -SRCS+= uu_open.c -SRCS+= uu_pname.c -SRCS+= uu_strtoint.c - -CFLAGS+=-DNATIVE_BUILD -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common -CFLAGS+=-I${.CURDIR}/../../../sys/compat/opensolaris -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common -CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/include -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/head +CFLAGS+= -DNATIVE_BUILD +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common +CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head .include ==== //depot/projects/trustedbsd/audit3/cddl/lib/libzfs/Makefile#2 (text+ko) ==== @@ -1,49 +1,46 @@ -# $FreeBSD: src/cddl/lib/libzfs/Makefile,v 1.1 2007/04/06 01:08:57 pjd Exp $ +# $FreeBSD: src/cddl/lib/libzfs/Makefile,v 1.2 2007/04/16 21:20:25 ru Exp $ -.PATH: ${.CURDIR}/../../../compat/opensolaris/misc -.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs -.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs -.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common +.PATH: ${.CURDIR}/../../../compat/opensolaris/misc +.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs +.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs +.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common LIB= zfs -SHLIB_MAJOR?=1 - DPADD= ${LIBUTIL} LDADD= -lutil -SRCS= mnttab.c -SRCS+= mkdirp.c -SRCS+= zmount.c -SRCS+= fsshare.c -SRCS+= zone.c +SRCS= mnttab.c \ + mkdirp.c \ + zmount.c \ + fsshare.c \ + zone.c -SRCS+= zfs_namecheck.c -SRCS+= zfs_prop.c -SRCS+= libzfs_dataset.c -SRCS+= libzfs_util.c -SRCS+= libzfs_graph.c -SRCS+= libzfs_mount.c -SRCS+= libzfs_pool.c -SRCS+= libzfs_changelist.c -SRCS+= libzfs_config.c -SRCS+= libzfs_import.c -SRCS+= libzfs_status.c +SRCS+= zfs_namecheck.c \ + zfs_prop.c \ + libzfs_dataset.c \ + libzfs_util.c \ + libzfs_graph.c \ + libzfs_mount.c \ + libzfs_pool.c \ + libzfs_changelist.c \ + libzfs_config.c \ + libzfs_import.c \ + libzfs_status.c -CFLAGS+=-DZFS_NO_ACL -CFLAGS+=-I${.CURDIR}/../../../sbin/mount -CFLAGS+=-I${.CURDIR}/../../../cddl/lib/libumem -CFLAGS+=-I${.CURDIR}/../../../sys/compat/opensolaris -CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/include -CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/lib/libumem -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/head -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common -CFLAGS+=-I${.CURDIR}/../../../sys +CFLAGS+= -DZFS_NO_ACL +CFLAGS+= -I${.CURDIR}/../../../sbin/mount +CFLAGS+= -I${.CURDIR}/../../../cddl/lib/libumem +CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common .include ==== //depot/projects/trustedbsd/audit3/cddl/lib/libzpool/Makefile#3 (text+ko) ==== @@ -1,44 +1,43 @@ -# $FreeBSD: src/cddl/lib/libzpool/Makefile,v 1.2 2007/04/07 23:54:53 pjd Exp $ +# $FreeBSD: src/cddl/lib/libzpool/Makefile,v 1.4 2007/04/17 15:52:36 pjd Exp $ .include "${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/Makefile.files" # ZFS_COMMON_SRCS -.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs +.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs # ZFS_SHARED_SRCS -.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs +.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs # KERNEL_SRCS -.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common +.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common # LIST_SRCS -.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/os +.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/os # ATOMIC_SRCS -.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/atomic/${MACHINE_ARCH} +.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/atomic/${MACHINE_ARCH} -LIB= zpool -SHLIB_MAJOR?=1 +LIB= zpool -ZFS_COMMON_SRCS= ${ZFS_COMMON_OBJS:C/.o$/.c/} vdev_file.c -ZFS_SHARED_SRCS= ${ZFS_SHARED_OBJS:C/.o$/.c/} -KERNEL_SRCS= kernel.c taskq.c util.c -LIST_SRCS= list.c -ATOMIC_SRCS= atomic.S +ZFS_COMMON_SRCS= ${ZFS_COMMON_OBJS:C/.o$/.c/} vdev_file.c +ZFS_SHARED_SRCS= ${ZFS_SHARED_OBJS:C/.o$/.c/} +KERNEL_SRCS= kernel.c taskq.c util.c +LIST_SRCS= list.c +ATOMIC_SRCS= atomic.S -SRCS= ${ZFS_COMMON_SRCS} ${ZFS_SHARED_SRCS} ${KERNEL_SRCS} ${LIST_SRCS} ${ATOMIC_SRCS} +SRCS= ${ZFS_COMMON_SRCS} ${ZFS_SHARED_SRCS} \ + ${KERNEL_SRCS} ${LIST_SRCS} ${ATOMIC_SRCS} -CFLAGS+=-I${.CURDIR}/../../../sys/compat/opensolaris -CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/include -CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/lib/libumem -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/head -CFLAGS+=-I${.CURDIR}/../../../cddl/lib/libumem -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair -CFLAGS+=-I${.CURDIR}/../../../sys +CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head +CFLAGS+= -I${.CURDIR}/../../../cddl/lib/libumem +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair -DPADD= ${LIBTHR} ${LIBZ} -LDADD= -lthr -lz +DPADD= ${LIBPTHREAD} ${LIBZ} +LDADD= -lpthread -lz # atomic.S doesn't like profiling. NO_PROFILE= ==== //depot/projects/trustedbsd/audit3/cddl/sbin/Makefile#2 (text+ko) ==== @@ -1,11 +1,12 @@ -# $FreeBSD: src/cddl/sbin/Makefile,v 1.1 2007/04/06 01:08:57 pjd Exp $ +# $FreeBSD: src/cddl/sbin/Makefile,v 1.2 2007/04/16 21:20:25 ru Exp $ .include -SUBDIR= +SUBDIR= ${_zfs} ${_zpool} + .if ${MK_ZFS} != "no" -SUBDIR+=zfs -SUBDIR+=zpool +_zfs= zfs +_zpool= zpool .endif .include ==== //depot/projects/trustedbsd/audit3/cddl/sbin/zfs/Makefile#2 (text+ko) ==== @@ -1,25 +1,23 @@ -# $FreeBSD: src/cddl/sbin/zfs/Makefile,v 1.1 2007/04/06 01:08:57 pjd Exp $ +# $FreeBSD: src/cddl/sbin/zfs/Makefile,v 1.2 2007/04/16 21:20:26 ru Exp $ -.PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zfs +.PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zfs PROG= zfs MAN= zfs.8 -SRCS= zfs_main.c -SRCS+= zfs_iter.c +SRCS= zfs_main.c zfs_iter.c -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common -CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/include -CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/lib/libumem -CFLAGS+=-I${.CURDIR}/../../../sys/compat/opensolaris -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/head -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libumem/common -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys -CFLAGS+=-I${.CURDIR}/../../../sys +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem +CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libumem/common +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBZFS} LDADD= -lgeom -lm -lnvpair -luutil -lzfs ==== //depot/projects/trustedbsd/audit3/cddl/sbin/zpool/Makefile#2 (text+ko) ==== @@ -1,27 +1,23 @@ -# $FreeBSD: src/cddl/sbin/zpool/Makefile,v 1.1 2007/04/06 01:08:57 pjd Exp $ +# $FreeBSD: src/cddl/sbin/zpool/Makefile,v 1.2 2007/04/16 21:20:26 ru Exp $ -.PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zpool +.PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zpool PROG= zpool MAN= zpool.8 -SRCS= zpool_main.c -SRCS+= zpool_vdev.c -SRCS+= zpool_iter.c -SRCS+= zpool_util.c +SRCS= zpool_main.c zpool_vdev.c zpool_iter.c zpool_util.c -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common -CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/include -CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/lib/libumem -CFLAGS+=-I${.CURDIR}/../../../sys/compat/opensolaris -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/head -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libumem/common -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys -CFLAGS+=-I${.CURDIR}/../../../sys +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem +CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libumem/common +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBZFS} LDADD= -lavl -lgeom -lm -lnvpair -luutil -lzfs ==== //depot/projects/trustedbsd/audit3/cddl/usr.bin/Makefile#2 (text+ko) ==== @@ -1,13 +1,13 @@ -# $FreeBSD: src/cddl/usr.bin/Makefile,v 1.2 2007/04/07 19:12:09 des Exp $ +# $FreeBSD: src/cddl/usr.bin/Makefile,v 1.3 2007/04/16 21:20:26 ru Exp $ .include -.if ${MK_ZFS} != "no" SUBDIR= ${_ztest} -.endif -.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" +.if ${MK_ZFS} != "no" +.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" _ztest= ztest .endif +.endif .include ==== //depot/projects/trustedbsd/audit3/cddl/usr.bin/ztest/Makefile#2 (text+ko) ==== @@ -1,23 +1,21 @@ -# $FreeBSD: src/cddl/usr.bin/ztest/Makefile,v 1.1 2007/04/06 01:08:58 pjd Exp $ +# $FreeBSD: src/cddl/usr.bin/ztest/Makefile,v 1.3 2007/04/17 15:52:37 pjd Exp $ -.PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/ztest +.PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/ztest PROG= ztest +NO_MAN= -CFLAGS+=-I${.CURDIR}/../../../sys/compat/opensolaris -CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/include -CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/lib/libumem -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/head -CFLAGS+=-I${.CURDIR}/../../lib/libumem -CFLAGS+=-I${.CURDIR}/../../../sys +CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head +CFLAGS+= -I${.CURDIR}/../../lib/libumem -DPADD= ${LIBAVL} ${LIBM} ${LIBNVPAIR} ${LIBTHR} ${LIBUMEM} ${LIBZPOOL} -LDADD= -lavl -lm -lnvpair -lthr -lumem -lzpool - -NO_MAN= +DPADD= ${LIBAVL} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} ${LIBZPOOL} +LDADD= -lavl -lm -lnvpair -lpthread -lumem -lzpool .include ==== //depot/projects/trustedbsd/audit3/cddl/usr.sbin/Makefile#2 (text+ko) ==== @@ -1,14 +1,13 @@ -# $FreeBSD: src/cddl/usr.sbin/Makefile,v 1.2 2007/04/07 19:12:09 des Exp $ +# $FreeBSD: src/cddl/usr.sbin/Makefile,v 1.3 2007/04/16 21:20:26 ru Exp $ .include -SUBDIR= +SUBDIR= ${_zdb} + .if ${MK_ZFS} != "no" -SUBDIR+=${_zdb} +.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" +_zdb= zdb >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Apr 18 11:01:29 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 D816C16A409; Wed, 18 Apr 2007 11:01:28 +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 ABB3B16A402 for ; Wed, 18 Apr 2007 11:01:28 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 9D07C13C45E for ; Wed, 18 Apr 2007 11:01:28 +0000 (UTC) (envelope-from gonzo@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 l3IB1SLd010250 for ; Wed, 18 Apr 2007 11:01:28 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3IB1SlE010247 for perforce@freebsd.org; Wed, 18 Apr 2007 11:01:28 GMT (envelope-from gonzo@FreeBSD.org) Date: Wed, 18 Apr 2007 11:01:28 GMT Message-Id: <200704181101.l3IB1SlE010247@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 118353 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: Wed, 18 Apr 2007 11:01:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=118353 Change 118353 by gonzo@gonzo_jeeves on 2007/04/18 11:00:39 o gt_pci_intr should by fiter interrupt. Affected files ... .. //depot/projects/mips2/src/sys/mips/mips4k/malta/gt_pci.c#6 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips4k/malta/gt_pci.c#6 (text+ko) ==== @@ -137,7 +137,7 @@ (sc->sc_elcr >> 8) & 0xff); } -static void +static int gt_pci_intr(void *v) { struct gt_pci_softc *sc = v; @@ -151,7 +151,7 @@ irq = bus_space_read_1(sc->sc_pciio, sc->sc_ioh_icu1, PIC_OCW3); if ((irq & OCW3_POLL_PENDING) == 0) { - return; + return FILTER_HANDLED; } irq = OCW3_POLL_IRQ(irq); @@ -196,6 +196,8 @@ bus_space_write_1(sc->sc_pciio, sc->sc_ioh_icu1, PIC_OCW2, OCW2_SELECT | OCW2_EOI | OCW2_SL | OCW2_ILS(irq)); } + + return FILTER_HANDLED; } static int @@ -351,7 +353,7 @@ } if ((bus_setup_intr(dev, sc->sc_irq, INTR_TYPE_MISC, - NULL, gt_pci_intr, sc, &sc->sc_ih))) { + gt_pci_intr, NULL, sc, &sc->sc_ih))) { device_printf(dev, "WARNING: unable to register interrupt handler\n"); return ENXIO; From owner-p4-projects@FreeBSD.ORG Wed Apr 18 11:02:30 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 7D04316A408; Wed, 18 Apr 2007 11:02:30 +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 58BC816A402 for ; Wed, 18 Apr 2007 11:02:30 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 4A63F13C4AD for ; Wed, 18 Apr 2007 11:02:30 +0000 (UTC) (envelope-from gonzo@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 l3IB2UdP010488 for ; Wed, 18 Apr 2007 11:02:30 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3IB2UeO010485 for perforce@freebsd.org; Wed, 18 Apr 2007 11:02:30 GMT (envelope-from gonzo@FreeBSD.org) Date: Wed, 18 Apr 2007 11:02:30 GMT Message-Id: <200704181102.l3IB2UeO010485@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 118354 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: Wed, 18 Apr 2007 11:02:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=118354 Change 118354 by gonzo@gonzo_jeeves on 2007/04/18 11:02:28 o Rollback latest change and add comment why this is the right thing (tm). Affected files ... .. //depot/projects/mips2/src/lib/libc/mips/sys/sbrk.S#6 edit Differences ... ==== //depot/projects/mips2/src/lib/libc/mips/sys/sbrk.S#6 (text+ko) ==== @@ -55,15 +55,29 @@ .cpload t9 .set reorder #endif - lw v1, _C_LABEL(__curbrk) + addu sp, sp, -4 + sw s0, 0(sp) # Preserve s0 value in stack + # it should be the same on return + # We can't use v1 as temporary + # register since syscall uses it + # to return 64-bit values + lw s0, _C_LABEL(__curbrk) li v0, SYS_break - addu a0, a0, v1 # compute current break + addu a0, a0, s0 # compute current break + syscall + bne a3, zero, 1f - move v0, v1 # return old val of curbrk from above + nop + move v0, s0 # return old val of curbrk from above + lw s0, 0(sp) + addu sp, sp, 4 sw a0, _C_LABEL(__curbrk) # save current val of curbrk from above j ra + 1: + lw s0, 0(sp) + addu sp, sp, 4 la t9, _C_LABEL(__cerror) jr t9 END(__sys_sbrk) From owner-p4-projects@FreeBSD.ORG Wed Apr 18 11:12:45 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 0A03516A403; Wed, 18 Apr 2007 11:12:45 +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 CF22016A408 for ; Wed, 18 Apr 2007 11:12:44 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id BE4C613C4AE for ; Wed, 18 Apr 2007 11:12:44 +0000 (UTC) (envelope-from gonzo@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 l3IBCiuq013328 for ; Wed, 18 Apr 2007 11:12:44 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3IBChvn013325 for perforce@freebsd.org; Wed, 18 Apr 2007 11:12:43 GMT (envelope-from gonzo@FreeBSD.org) Date: Wed, 18 Apr 2007 11:12:43 GMT Message-Id: <200704181112.l3IBChvn013325@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 118356 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: Wed, 18 Apr 2007 11:12:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=118356 Change 118356 by gonzo@gonzo_jeeves on 2007/04/18 11:12:02 o Organize things for _setjmp/setjmp/sigsetjmp calls family: - two magic numbers for _setjmp and setjmp - sigsetjmp calls either _setjmp or setjmp - siglongjmp calls either _longjmp or setjmp taking into account respective magic number. Affected files ... .. //depot/projects/mips2/src/lib/libc/mips/gen/_setjmp.S#4 edit .. //depot/projects/mips2/src/lib/libc/mips/gen/setjmp.S#3 edit .. //depot/projects/mips2/src/lib/libc/mips/gen/sigsetjmp.S#3 edit .. //depot/projects/mips2/src/sys/mips/include/asm.h#11 edit .. //depot/projects/mips2/src/sys/mips/include/setjmp.h#4 edit Differences ... ==== //depot/projects/mips2/src/lib/libc/mips/gen/_setjmp.S#4 (text+ko) ==== @@ -44,8 +44,6 @@ .abicalls #endif -#define SOFTFLOAT /* XXX */ - /* * C library -- _setjmp, _longjmp * @@ -57,94 +55,55 @@ * The previous signal state is NOT restored. */ - .set noreorder LEAF(_setjmp) #ifdef __ABICALLS__ - #.set noreorder + .set noreorder .cpload t9 - #.set reorder + .cprestore 16 #endif + li v0, _JB_MAGIC__SETJMP + sw v0, (_JB_MAGIC * SZREG)(a0) + sw ra, (_JB_REG_RA * SZREG)(a0) + sw s0, (_JB_REG_S0 * SZREG)(a0) + sw s1, (_JB_REG_S1 * SZREG)(a0) + sw s2, (_JB_REG_S2 * SZREG)(a0) + sw s3, (_JB_REG_S3 * SZREG)(a0) + sw s4, (_JB_REG_S4 * SZREG)(a0) + sw s5, (_JB_REG_S5 * SZREG)(a0) + sw s6, (_JB_REG_S6 * SZREG)(a0) + sw s7, (_JB_REG_S7 * SZREG)(a0) + sw sp, (_JB_REG_SP * SZREG)(a0) + sw s8, (_JB_REG_S8 * SZREG)(a0) - .set push - li v0, 0xACEDBADE - sw v0, (a0) - sw ra, (1 * SZREG)(a0) - sw s0, (2 * SZREG)(a0) - sw s1, (3 * SZREG)(a0) - sw s2, (4 * SZREG)(a0) - sw s3, (5 * SZREG)(a0) - sw s4, (6 * SZREG)(a0) - sw s5, (7 * SZREG)(a0) - sw s6, (8 * SZREG)(a0) - sw s7, (9 * SZREG)(a0) - sw sp, (10 * SZREG)(a0) - sw s8, (11 * SZREG)(a0) -#ifndef SOFTFLOAT - cfc1 v0, $31 # too bad cant check if FP used - swc1 $f20, (20 * 4 + _OFFSETOF_SC_FPREGS)(a0) - swc1 $f21, (21 * 4 + _OFFSETOF_SC_FPREGS)(a0) - swc1 $f22, (22 * 4 + _OFFSETOF_SC_FPREGS)(a0) - swc1 $f23, (23 * 4 + _OFFSETOF_SC_FPREGS)(a0) - swc1 $f24, (24 * 4 + _OFFSETOF_SC_FPREGS)(a0) - swc1 $f25, (25 * 4 + _OFFSETOF_SC_FPREGS)(a0) - swc1 $f26, (26 * 4 + _OFFSETOF_SC_FPREGS)(a0) - swc1 $f27, (27 * 4 + _OFFSETOF_SC_FPREGS)(a0) - swc1 $f28, (28 * 4 + _OFFSETOF_SC_FPREGS)(a0) - swc1 $f29, (29 * 4 + _OFFSETOF_SC_FPREGS)(a0) - swc1 $f30, (30 * 4 + _OFFSETOF_SC_FPREGS)(a0) - swc1 $f31, (31 * 4 + _OFFSETOF_SC_FPREGS)(a0) - sw v0, (32 * 4 + _OFFSETOF_SC_FPREGS)(a0) -#endif - .set pop j ra move v0, zero END(_setjmp) LEAF(_longjmp) #ifdef __ABICALLS__ - .set noreorder + .set noreorder .cpload t9 - .set reorder - subu sp, sp, 32 .cprestore 16 - .set noreorder #endif - .set push - lw v0, (a0) # get magic number - lw ra, (1 * SZREG)(a0) - li t0, 0xACEDBADE + lw v0, (_JB_MAGIC * SZREG)(a0) + lw ra, (_JB_REG_RA * SZREG)(a0) + li t0, _JB_MAGIC__SETJMP bne v0, t0, botch # jump if error - addu sp, sp, 32 # does not matter, sanity - lw s0, (2 * SZREG)(a0) - lw s1, (3 * SZREG)(a0) - lw s2, (4 * SZREG)(a0) - lw s3, (5 * SZREG)(a0) - lw s4, (6 * SZREG)(a0) - lw s5, (7 * SZREG)(a0) - lw s6, (8 * SZREG)(a0) - lw s7, (9 * SZREG)(a0) - lw sp, (10 * SZREG)(a0) - lw s8, (11 * SZREG)(a0) -#ifndef SOFTFLOAT - lw v0, (32 * 4 + _OFFSETOF_SC_FPREGS)(a0) # get fpu status - ctc1 v0, $31 - lwc1 $f20, (20 * 4 + _OFFSETOF_SC_FPREGS)(a0) - lwc1 $f21, (21 * 4 + _OFFSETOF_SC_FPREGS)(a0) - lwc1 $f22, (22 * 4 + _OFFSETOF_SC_FPREGS)(a0) - lwc1 $f23, (23 * 4 + _OFFSETOF_SC_FPREGS)(a0) - lwc1 $f24, (24 * 4 + _OFFSETOF_SC_FPREGS)(a0) - lwc1 $f25, (25 * 4 + _OFFSETOF_SC_FPREGS)(a0) - lwc1 $f26, (26 * 4 + _OFFSETOF_SC_FPREGS)(a0) - lwc1 $f27, (27 * 4 + _OFFSETOF_SC_FPREGS)(a0) - lwc1 $f28, (28 * 4 + _OFFSETOF_SC_FPREGS)(a0) - lwc1 $f29, (29 * 4 + _OFFSETOF_SC_FPREGS)(a0) - lwc1 $f30, (30 * 4 + _OFFSETOF_SC_FPREGS)(a0) - lwc1 $f31, (31 * 4 + _OFFSETOF_SC_FPREGS)(a0) -#endif + lw s0, (_JB_REG_S0 * SZREG)(a0) + lw s1, (_JB_REG_S1 * SZREG)(a0) + lw s2, (_JB_REG_S2 * SZREG)(a0) + lw s3, (_JB_REG_S3 * SZREG)(a0) + lw s4, (_JB_REG_S4 * SZREG)(a0) + lw s5, (_JB_REG_S5 * SZREG)(a0) + lw s6, (_JB_REG_S6 * SZREG)(a0) + lw s7, (_JB_REG_S7 * SZREG)(a0) + lw sp, (_JB_REG_SP * SZREG)(a0) + lw s8, (_JB_REG_S8 * SZREG)(a0) + j ra move v0, a1 - .set pop + botch: jal _C_LABEL(longjmperror) nop ==== //depot/projects/mips2/src/lib/libc/mips/gen/setjmp.S#3 (text+ko) ==== @@ -55,82 +55,105 @@ * and a struct sigcontext, see */ -#define SETJMP_FRAME_SIZE (CALLFRAME_SIZ + 12) +#define SETJMP_FRAME_SIZE (CALLFRAME_SIZ + SZREG) + NESTED(setjmp, SETJMP_FRAME_SIZE, ra) .mask 0x80000000, (CALLFRAME_RA - CALLFRAME_SIZ) + .set noreorder #ifdef __ABICALLS__ - .set noreorder .cpload t9 - .set reorder #endif subu sp, sp, SETJMP_FRAME_SIZE # allocate stack frame #ifdef __ABICALLS__ .cprestore 16 #endif sw ra, CALLFRAME_RA(sp) # save RA - sw a0, SETJMP_FRAME_SIZE(sp) # squirrel away sc + sw a0, CALLFRAME_SIZ(sp) # store env /* Get the signal mask. */ - addu a2, a0, _OFFSETOF_SC_MASK # &sc.sc_mask - move a1, zero - # XXXMIPS: jal _C_LABEL(__sigprocmask14) # get current signal mask - move a0, zero # (in delay slot) - - /* Get the signal stack. */ - move a0, zero - addu a1, sp, CALLFRAME_SIZ # pointer to struct sigaltstack - # XXXMIPS: jal _C_LABEL(__sigaltstack14) + addu a2, a0, _JB_SIGMASK * SZREG # &oenv + li a0, 1 # SIG_SETBLOCK + move a1, zero # &env == 0 + la t9, _C_LABEL(sigprocmask) # get current signal mask + jal t9 nop - lw v1, CALLFRAME_SIZ+8(sp) # get old ss_onstack - lw a0, SETJMP_FRAME_SIZE(sp) # restore sc pointer - and v1, v1, 1 # extract onstack flag - sw v1, 0(a0) # save it in sc_onstack + lw a0, CALLFRAME_SIZ(sp) # restore env pointer lw ra, CALLFRAME_RA(sp) # restore RA addu sp, sp, SETJMP_FRAME_SIZE # pop stack frame - blt v0, zero, botch # check for sigaltstack() error + li v0, _JB_MAGIC_SETJMP + sw v0, (_JB_MAGIC * SZREG)(a0) + sw ra, (_JB_REG_RA * SZREG)(a0) + sw s0, (_JB_REG_S0 * SZREG)(a0) + sw s1, (_JB_REG_S1 * SZREG)(a0) + sw s2, (_JB_REG_S2 * SZREG)(a0) + sw s3, (_JB_REG_S3 * SZREG)(a0) + sw s4, (_JB_REG_S4 * SZREG)(a0) + sw s5, (_JB_REG_S5 * SZREG)(a0) + sw s6, (_JB_REG_S6 * SZREG)(a0) + sw s7, (_JB_REG_S7 * SZREG)(a0) + sw sp, (_JB_REG_SP * SZREG)(a0) + sw s8, (_JB_REG_S8 * SZREG)(a0) - REG_PROLOGUE - REG_S ra, (2 * 4)(a0) # sc_pc = return address - REG_LI v0, 0xACEDBADE # sigcontext magic number - REG_S v0, (_OFFSETOF_SC_REGS + ZERO * SZREG)(a0) # saved in sc_regs[0] - REG_S s0, (_OFFSETOF_SC_REGS + S0 * SZREG)(a0) - REG_S s1, (_OFFSETOF_SC_REGS + S1 * SZREG)(a0) - REG_S s2, (_OFFSETOF_SC_REGS + S2 * SZREG)(a0) - REG_S s3, (_OFFSETOF_SC_REGS + S3 * SZREG)(a0) - REG_S s4, (_OFFSETOF_SC_REGS + S4 * SZREG)(a0) - REG_S s5, (_OFFSETOF_SC_REGS + S5 * SZREG)(a0) - REG_S s6, (_OFFSETOF_SC_REGS + S6 * SZREG)(a0) - REG_S s7, (_OFFSETOF_SC_REGS + S7 * SZREG)(a0) - REG_S gp, (_OFFSETOF_SC_REGS + GP * SZREG)(a0) - REG_S sp, (_OFFSETOF_SC_REGS + SP * SZREG)(a0) - REG_S s8, (_OFFSETOF_SC_REGS + S8 * SZREG)(a0) - li v0, 1 # be nice if we could tell - sw v0, (_OFFSETOF_SC_REGS + 34 * SZREG)(a0) # sc_fpused = 1 - cfc1 v0, $31 - swc1 $f20, (20 * 4 + _OFFSETOF_SC_FPREGS)(a0) - swc1 $f21, (21 * 4 + _OFFSETOF_SC_FPREGS)(a0) - swc1 $f22, (22 * 4 + _OFFSETOF_SC_FPREGS)(a0) - swc1 $f23, (23 * 4 + _OFFSETOF_SC_FPREGS)(a0) - swc1 $f24, (24 * 4 + _OFFSETOF_SC_FPREGS)(a0) - swc1 $f25, (25 * 4 + _OFFSETOF_SC_FPREGS)(a0) - swc1 $f26, (26 * 4 + _OFFSETOF_SC_FPREGS)(a0) - swc1 $f27, (27 * 4 + _OFFSETOF_SC_FPREGS)(a0) - swc1 $f28, (28 * 4 + _OFFSETOF_SC_FPREGS)(a0) - swc1 $f29, (29 * 4 + _OFFSETOF_SC_FPREGS)(a0) - swc1 $f30, (30 * 4 + _OFFSETOF_SC_FPREGS)(a0) - swc1 $f31, (31 * 4 + _OFFSETOF_SC_FPREGS)(a0) - sw v0, (32 * 4 + _OFFSETOF_SC_FPREGS)(a0) move v0, zero j ra - REG_EPILOGUE +END(setjmp) + +#define LONGJMP_FRAME_SIZE CALLFRAME_RA + SZREG * 2 + +NESTED(longjmp, LONGJMP_FRAME_SIZE, ra) + .mask 0x80000000, (CALLFRAME_RA - CALLFRAME_SIZ) + .set noreorder +#ifdef __ABICALLS__ + .cpload t9 +#endif + subu sp, sp, LONGJMP_FRAME_SIZE # allocate stack frame +#ifdef __ABICALLS__ + .cprestore 16 +#endif + sw ra, CALLFRAME_RA(sp) # save RA + lw v0, (_JB_MAGIC * SZREG)(a0) + li t0, _JB_MAGIC_SETJMP + bne v0, t0, botch # jump if error + nop + + sw a0, CALLFRAME_SIZ(sp) # save env + sw a1, (CALLFRAME_SIZ + SZREG)(sp) # save return value + + # set sigmask + addu a1, a0, _JB_SIGMASK * SZREG # &set + move a2, zero # &oset == NULL + li a0, 3 # SIG_SETMASK + la t9,_C_LABEL(sigprocmask) # set current signal mask + jal t9 + nop + + lw a0, CALLFRAME_SIZ(sp) # restore env + lw a1, (CALLFRAME_SIZ + SZREG)(sp) # restore return value + + lw ra, (_JB_REG_RA * SZREG)(a0) + lw s0, (_JB_REG_S0 * SZREG)(a0) + lw s1, (_JB_REG_S1 * SZREG)(a0) + lw s2, (_JB_REG_S2 * SZREG)(a0) + lw s3, (_JB_REG_S3 * SZREG)(a0) + lw s4, (_JB_REG_S4 * SZREG)(a0) + lw s5, (_JB_REG_S5 * SZREG)(a0) + lw s6, (_JB_REG_S6 * SZREG)(a0) + lw s7, (_JB_REG_S7 * SZREG)(a0) + lw sp, (_JB_REG_SP * SZREG)(a0) + lw s8, (_JB_REG_S8 * SZREG)(a0) + move v0, a1 + j ra + nop + botch: - jal _C_LABEL(abort) -END(setjmp) + la t9, _C_LABEL(longjmperror) + jal t9 + nop -WEAK_ALIAS(longjmp, __longjmp) -LEAF(__longjmp) - j ra -END(__longjmp) + la t9, _C_LABEL(abort) + jal t9 + nop +END(longjmp) ==== //depot/projects/mips2/src/lib/libc/mips/gen/sigsetjmp.S#3 (text+ko) ==== @@ -62,9 +62,7 @@ .cpload t9 .set reorder #endif - WEAK_ALIAS(__sigsetjmp, sigsetjmp) - # XXXMIPS: sw a1, (_JBLEN*4)(a0) # save "savemask" - # XXXMIPS: bne a1, 0x0, 1f # do saving of signal mask? + bne a1, 0x0, 1f # do saving of signal mask? la t9, _setjmp jr t9 @@ -78,11 +76,11 @@ .cpload t9 .set reorder #endif - WEAK_ALIAS(__siglongjmp, siglongjmp) - # XXXMIPS: lw t0, (_JBLEN * 4)(a0) # get "savemask" - # XXXMIPS: bne t0, 0x0, 1f # restore signal mask? + lw t0, (_JB_MAGIC * SZREG)(a0) + li t1, _JB_MAGIC__SETJMP + bne t0, t1, 1f # setjmp or _setjmp magic? la t9, _longjmp jr t9 -1: la t9, __longjmp +1: la t9, longjmp jr t9 END(siglongjmp) ==== //depot/projects/mips2/src/sys/mips/include/asm.h#11 (text+ko) ==== @@ -331,4 +331,52 @@ .stabs __STRING(_/**/sym),1,0,0,0 #endif /* __STDC__ */ +/* + * Description of the setjmp buffer + * + * word 0 magic number (dependant on creator) + * 1 RA + * 2 S0 + * 3 S1 + * 4 S2 + * 5 S3 + * 6 S4 + * 7 S5 + * 8 S6 + * 9 S7 + * 10 SP + * 11 S8 + * 12 signal mask (dependant on magic) + * 13 (con't) + * 14 (con't) + * 15 (con't) + * + * The magic number number identifies the jmp_buf and + * how the buffer was created as well as providing + * a sanity check + * + */ + +#define _JB_MAGIC__SETJMP 0xBADFACED +#define _JB_MAGIC_SETJMP 0xFACEDBAD + +/* Valid for all jmp_buf's */ + +#define _JB_MAGIC 0 +#define _JB_REG_RA 1 +#define _JB_REG_S0 2 +#define _JB_REG_S1 3 +#define _JB_REG_S2 4 +#define _JB_REG_S3 5 +#define _JB_REG_S4 6 +#define _JB_REG_S5 7 +#define _JB_REG_S6 8 +#define _JB_REG_S7 9 +#define _JB_REG_SP 10 +#define _JB_REG_S8 11 + +/* Only valid with the _JB_MAGIC_SETJMP magic */ + +#define _JB_SIGMASK 12 + #endif /* !_MACHINE_ASM_H_ */ ==== //depot/projects/mips2/src/sys/mips/include/setjmp.h#4 (text+ko) ==== @@ -37,7 +37,7 @@ #include -#define _JBLEN 12 /* Size of the jmp_buf on MIPS. */ +#define _JBLEN 16 /* Size of the jmp_buf on MIPS. */ /* * jmp_buf and sigjmp_buf are encapsulated in different structs to force From owner-p4-projects@FreeBSD.ORG Wed Apr 18 11:14:47 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 B375616A40A; Wed, 18 Apr 2007 11:14:47 +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 7251816A406 for ; Wed, 18 Apr 2007 11:14:47 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 642FD13C469 for ; Wed, 18 Apr 2007 11:14:47 +0000 (UTC) (envelope-from gonzo@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 l3IBElKw013727 for ; Wed, 18 Apr 2007 11:14:47 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3IBElPS013724 for perforce@freebsd.org; Wed, 18 Apr 2007 11:14:47 GMT (envelope-from gonzo@FreeBSD.org) Date: Wed, 18 Apr 2007 11:14:47 GMT Message-Id: <200704181114.l3IBElPS013724@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 118357 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: Wed, 18 Apr 2007 11:14:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=118357 Change 118357 by gonzo@gonzo_jeeves on 2007/04/18 11:14:28 o Leave only REENTRANT version and call __error instead of __errno. Affected files ... .. //depot/projects/mips2/src/lib/libc/mips/sys/cerror.S#3 edit .. //depot/projects/mips2/src/lib/libc/mips/sys/ptrace.S#2 edit Differences ... ==== //depot/projects/mips2/src/lib/libc/mips/sys/cerror.S#3 (text+ko) ==== @@ -39,8 +39,15 @@ ASMSTR("$NetBSD: cerror.S,v 1.13 2003/08/07 16:42:17 agc Exp $") #endif /* LIBC_SCCS and not lint */ -#ifdef _REENTRANT - .globl _C_LABEL(__errno) + + /* + * The __error() function is thread aware. For non-threaded + * programs and the initial threaded in threaded programs, + * it returns a pointer to the global errno variable. + */ + .globl _C_LABEL(__error) + .type _C_LABEL(__error),%function + LEAF(__cerror) .frame sp, CALLFRAME_SIZ, ra PIC_PROLOGUE(__cerror, t9) @@ -49,7 +56,7 @@ sw ra, CALLFRAME_RA(sp) sw v0, 12(sp) # save errno value - la t9, _C_LABEL(__errno) # locate address of errno + la t9, _C_LABEL(__error) # locate address of errno jalr t9 lw t0, 12(sp) @@ -60,16 +67,3 @@ li v1, -1 j ra END(__cerror) -#else - .globl _C_LABEL(errno) -LEAF(__cerror) - .set noreorder -#ifdef __ABICALLS__ - .cpload t9 -#endif - sw v0, _C_LABEL(errno) - li v0, -1 - j ra - li v1, -1 -END(__cerror) -#endif /* _REENTRANT */ ==== //depot/projects/mips2/src/lib/libc/mips/sys/ptrace.S#2 (text+ko) ==== @@ -45,7 +45,9 @@ .cpload t9 .set reorder #endif - sw zero, _C_LABEL(errno) + la t9, _C_LABEL(__error) # locate address of errno + jalr t9 + sw zero, 0(v0) li v0, SYS_ptrace syscall bne a3, zero, 1f From owner-p4-projects@FreeBSD.ORG Wed Apr 18 13:45:55 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 7CA3A16A401; Wed, 18 Apr 2007 13:45:55 +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 2D2AC16A403 for ; Wed, 18 Apr 2007 13:45:55 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 1D62613C458 for ; Wed, 18 Apr 2007 13:45:55 +0000 (UTC) (envelope-from gonzo@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 l3IDjsud057660 for ; Wed, 18 Apr 2007 13:45:55 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3IDjs8n057650 for perforce@freebsd.org; Wed, 18 Apr 2007 13:45:54 GMT (envelope-from gonzo@FreeBSD.org) Date: Wed, 18 Apr 2007 13:45:54 GMT Message-Id: <200704181345.l3IDjs8n057650@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 118360 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: Wed, 18 Apr 2007 13:45:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=118360 Change 118360 by gonzo@gonzo_jeeves on 2007/04/18 13:45:08 o Implement fubyte, fusword, fuswintr, susword, suswintr. Affected files ... .. //depot/projects/mips2/src/sys/mips/mips/support.S#12 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips/support.S#12 (text+ko) ==== @@ -145,10 +145,15 @@ * int susword(void *addr, int shortword) */ ENTRY(susword) - break - li v0, -1 - jr ra - nop + lw t2, pcpup + lw v1, PC_CURPCB(t2) + la v0, _C_LABEL(fswberr) + blt a0, zero, _C_LABEL(fswberr) + sw v0, PCB_ONFAULT(v1) + sh a1, 0(a0) # store short word + sw zero, PCB_ONFAULT(v1) + j ra + move v0, zero END(susword) /* @@ -156,10 +161,15 @@ * int suswintr(void *addr, int shortword) */ ENTRY(suswintr) - break - li v0, -1 - jr ra - nop + lw t2, pcpup + lw v1, PC_CURPCB(t2) + la v0, _C_LABEL(fswintrberr) + blt a0, zero, _C_LABEL(fswintrberr) + sw v0, PCB_ONFAULT(v1) + sh a1, 0(a0) # store short word + sw zero, PCB_ONFAULT(v1) + j ra + move v0, zero END(suswintr) /* @@ -193,7 +203,6 @@ sw zero, PCB_ONFAULT(v1) j ra move v0, zero - END(suword32) /* @@ -217,9 +226,14 @@ * int fubyte(const void *addr) */ ENTRY(fubyte) - break - li v0, -1 - jr ra + lw t2, pcpup + lw v1, PC_CURPCB(t2) + la a1, _C_LABEL(fswberr) + blt a0, zero, _C_LABEL(fswberr) + sw a1, PCB_ONFAULT(v1) + lb v0, 0(a0) # fetch byte + sw zero, PCB_ONFAULT(v1) + j ra nop END(fubyte) @@ -228,10 +242,14 @@ * int fusword(const void *addr) */ ENTRY(fusword) - break - li v0, -1 - jr ra - nop + lw t2, pcpup + lw v1, PC_CURPCB(t2) + la v0, _C_LABEL(fswberr) + blt a0, zero, _C_LABEL(fswberr) + sw v0, PCB_ONFAULT(v1) + lhu v0, 0(a0) # fetch short word + j ra + sw zero, PCB_ONFAULT(v1) END(fusword) /* @@ -239,10 +257,14 @@ * int fuswintr(const void *addr) */ ENTRY(fuswintr) - break - li v0, -1 - jr ra - nop + lw t2, pcpup + lw v1, PC_CURPCB(t2) + la v0, _C_LABEL(fswintrberr) + blt a0, zero, _C_LABEL(fswintrberr) + sw v0, PCB_ONFAULT(v1) + lhu v0, 0(a0) # fetch short word + j ra + sw zero, PCB_ONFAULT(v1) END(fuswintr) /* @@ -255,7 +277,7 @@ la v0, _C_LABEL(fswberr) blt a0, zero, _C_LABEL(fswberr) sw v0, PCB_ONFAULT(v1) - lw v0, 0(a0) # store byte + lw v0, 0(a0) # fetch word j ra sw zero, PCB_ONFAULT(v1) END(fuword) @@ -263,12 +285,17 @@ /* * fuword32(9) * int fuword32(const void *addr) + * XXXMIPS: MIPS32 implementation only. */ ENTRY(fuword32) - break - li v0, -1 - jr ra - nop + lw t2, pcpup + lw v1, PC_CURPCB(t2) + la v0, _C_LABEL(fswberr) + blt a0, zero, _C_LABEL(fswberr) + sw v0, PCB_ONFAULT(v1) + lw v0, 0(a0) # fetch word + j ra + sw zero, PCB_ONFAULT(v1) END(fuword32) /* From owner-p4-projects@FreeBSD.ORG Wed Apr 18 20:28:13 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 3255816A404; Wed, 18 Apr 2007 20:28:13 +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 DAFC516A402 for ; Wed, 18 Apr 2007 20:28:12 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C964D13C483 for ; Wed, 18 Apr 2007 20:28:12 +0000 (UTC) (envelope-from marcel@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 l3IKSCYh049962 for ; Wed, 18 Apr 2007 20:28:12 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3IKOL74048781 for perforce@freebsd.org; Wed, 18 Apr 2007 20:24:21 GMT (envelope-from marcel@freebsd.org) Date: Wed, 18 Apr 2007 20:24:21 GMT Message-Id: <200704182024.l3IKOL74048781@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 118380 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: Wed, 18 Apr 2007 20:28:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=118380 Change 118380 by marcel@marcel_xcllnt on 2007/04/18 20:19:47 IFC @118368 Affected files ... .. //depot/projects/tty/COPYRIGHT#5 integrate .. //depot/projects/tty/MAINTAINERS#24 integrate .. //depot/projects/tty/Makefile#21 integrate .. //depot/projects/tty/Makefile.inc1#32 integrate .. //depot/projects/tty/ObsoleteFiles.inc#10 integrate .. //depot/projects/tty/UPDATING#33 integrate .. //depot/projects/tty/bin/cat/cat.1#4 integrate .. //depot/projects/tty/bin/chmod/chmod.1#5 integrate .. //depot/projects/tty/bin/cp/cp.1#9 integrate .. //depot/projects/tty/bin/cp/cp.c#9 integrate .. //depot/projects/tty/bin/csh/config.h#7 integrate .. //depot/projects/tty/bin/csh/config_p.h#3 integrate .. //depot/projects/tty/bin/df/df.1#7 integrate .. //depot/projects/tty/bin/df/df.c#9 integrate .. //depot/projects/tty/bin/domainname/domainname.1#5 integrate .. //depot/projects/tty/bin/expr/expr.1#4 integrate .. //depot/projects/tty/bin/expr/expr.y#3 integrate .. //depot/projects/tty/bin/hostname/hostname.1#6 integrate .. //depot/projects/tty/bin/hostname/hostname.c#5 integrate .. //depot/projects/tty/bin/kill/kill.1#5 integrate .. //depot/projects/tty/bin/ls/ls.1#16 integrate .. //depot/projects/tty/bin/ls/print.c#9 integrate .. //depot/projects/tty/bin/mkdir/mkdir.1#5 integrate .. //depot/projects/tty/bin/mkdir/mkdir.c#6 integrate .. //depot/projects/tty/bin/pax/cpio.c#4 integrate .. //depot/projects/tty/bin/pax/tar.c#5 integrate .. //depot/projects/tty/bin/rcp/rcp.1#6 integrate .. //depot/projects/tty/bin/rm/rm.1#9 integrate .. //depot/projects/tty/bin/rm/rm.c#8 integrate .. //depot/projects/tty/bin/rmdir/rmdir.1#6 integrate .. //depot/projects/tty/bin/setfacl/setfacl.c#6 integrate .. //depot/projects/tty/bin/sh/exec.c#8 integrate .. //depot/projects/tty/bin/sh/expand.c#9 integrate .. //depot/projects/tty/bin/sh/parser.c#7 integrate .. //depot/projects/tty/bin/sh/parser.h#3 integrate .. //depot/projects/tty/bin/test/test.1#6 integrate .. //depot/projects/tty/cddl/Makefile#1 branch .. //depot/projects/tty/cddl/Makefile.inc#1 branch .. //depot/projects/tty/cddl/lib/Makefile#1 branch .. //depot/projects/tty/cddl/lib/Makefile.inc#1 branch .. //depot/projects/tty/cddl/lib/libavl/Makefile#1 branch .. //depot/projects/tty/cddl/lib/libnvpair/Makefile#1 branch .. //depot/projects/tty/cddl/lib/libumem/Makefile#1 branch .. //depot/projects/tty/cddl/lib/libuutil/Makefile#1 branch .. //depot/projects/tty/cddl/lib/libzfs/Makefile#1 branch .. //depot/projects/tty/cddl/lib/libzpool/Makefile#1 branch .. //depot/projects/tty/cddl/sbin/Makefile#1 branch .. //depot/projects/tty/cddl/sbin/Makefile.inc#1 branch .. //depot/projects/tty/cddl/sbin/zfs/Makefile#1 branch .. //depot/projects/tty/cddl/sbin/zpool/Makefile#1 branch .. //depot/projects/tty/cddl/usr.bin/Makefile#1 branch .. //depot/projects/tty/cddl/usr.bin/Makefile.inc#1 branch .. //depot/projects/tty/cddl/usr.bin/ztest/Makefile#1 branch .. //depot/projects/tty/cddl/usr.sbin/Makefile#1 branch .. //depot/projects/tty/cddl/usr.sbin/Makefile.inc#1 branch .. //depot/projects/tty/cddl/usr.sbin/zdb/Makefile#1 branch .. //depot/projects/tty/compat/opensolaris/include/devid.h#1 branch .. //depot/projects/tty/compat/opensolaris/include/fsshare.h#1 branch .. //depot/projects/tty/compat/opensolaris/include/libintl.h#1 branch .. //depot/projects/tty/compat/opensolaris/include/mnttab.h#1 branch .. //depot/projects/tty/compat/opensolaris/include/priv.h#1 branch .. //depot/projects/tty/compat/opensolaris/include/solaris.h#1 branch .. //depot/projects/tty/compat/opensolaris/include/zone.h#1 branch .. //depot/projects/tty/compat/opensolaris/lib/libumem/umem.c#1 branch .. //depot/projects/tty/compat/opensolaris/lib/libumem/umem.h#1 branch .. //depot/projects/tty/compat/opensolaris/misc/fsshare.c#1 branch .. //depot/projects/tty/compat/opensolaris/misc/mkdirp.c#1 branch .. //depot/projects/tty/compat/opensolaris/misc/mnttab.c#1 branch .. //depot/projects/tty/compat/opensolaris/misc/zmount.c#1 branch .. //depot/projects/tty/compat/opensolaris/misc/zone.c#1 branch .. //depot/projects/tty/contrib/amd/hlfsd/hlfsd.h#4 integrate .. //depot/projects/tty/contrib/bind9/CHANGES#6 integrate .. //depot/projects/tty/contrib/bind9/COPYRIGHT#3 integrate .. //depot/projects/tty/contrib/bind9/FAQ#4 integrate .. //depot/projects/tty/contrib/bind9/FAQ.xml#2 integrate .. //depot/projects/tty/contrib/bind9/Makefile.in#2 integrate .. //depot/projects/tty/contrib/bind9/README#4 integrate .. //depot/projects/tty/contrib/bind9/bin/check/named-checkconf.8#3 integrate .. //depot/projects/tty/contrib/bind9/bin/check/named-checkconf.c#3 integrate .. //depot/projects/tty/contrib/bind9/bin/check/named-checkconf.html#3 integrate .. //depot/projects/tty/contrib/bind9/bin/check/named-checkzone.8#3 integrate .. //depot/projects/tty/contrib/bind9/bin/check/named-checkzone.docbook#3 integrate .. //depot/projects/tty/contrib/bind9/bin/check/named-checkzone.html#3 integrate .. //depot/projects/tty/contrib/bind9/bin/dig/dig.1#3 integrate .. //depot/projects/tty/contrib/bind9/bin/dig/dig.c#4 integrate .. //depot/projects/tty/contrib/bind9/bin/dig/dig.html#3 integrate .. //depot/projects/tty/contrib/bind9/bin/dig/dighost.c#4 integrate .. //depot/projects/tty/contrib/bind9/bin/dig/host.1#3 integrate .. //depot/projects/tty/contrib/bind9/bin/dig/host.c#4 integrate .. //depot/projects/tty/contrib/bind9/bin/dig/host.html#3 integrate .. //depot/projects/tty/contrib/bind9/bin/dig/include/dig/dig.h#4 integrate .. //depot/projects/tty/contrib/bind9/bin/dig/nslookup.1#3 integrate .. //depot/projects/tty/contrib/bind9/bin/dig/nslookup.c#4 integrate .. //depot/projects/tty/contrib/bind9/bin/dig/nslookup.docbook#3 integrate .. //depot/projects/tty/contrib/bind9/bin/dig/nslookup.html#3 integrate .. //depot/projects/tty/contrib/bind9/bin/dnssec/dnssec-keygen.8#3 integrate .. //depot/projects/tty/contrib/bind9/bin/dnssec/dnssec-keygen.html#3 integrate .. //depot/projects/tty/contrib/bind9/bin/dnssec/dnssec-signzone.8#3 integrate .. //depot/projects/tty/contrib/bind9/bin/dnssec/dnssec-signzone.c#4 integrate .. //depot/projects/tty/contrib/bind9/bin/dnssec/dnssec-signzone.html#3 integrate .. //depot/projects/tty/contrib/bind9/bin/named/aclconf.c#3 integrate .. //depot/projects/tty/contrib/bind9/bin/named/client.c#4 integrate .. //depot/projects/tty/contrib/bind9/bin/named/config.c#3 integrate .. //depot/projects/tty/contrib/bind9/bin/named/controlconf.c#2 integrate .. //depot/projects/tty/contrib/bind9/bin/named/include/named/aclconf.h#2 integrate .. //depot/projects/tty/contrib/bind9/bin/named/include/named/client.h#3 integrate .. //depot/projects/tty/contrib/bind9/bin/named/include/named/config.h#2 integrate .. //depot/projects/tty/contrib/bind9/bin/named/include/named/control.h#4 integrate .. //depot/projects/tty/contrib/bind9/bin/named/include/named/globals.h#2 integrate .. //depot/projects/tty/contrib/bind9/bin/named/include/named/logconf.h#2 integrate .. //depot/projects/tty/contrib/bind9/bin/named/include/named/lwresd.h#2 integrate .. //depot/projects/tty/contrib/bind9/bin/named/include/named/server.h#2 integrate .. //depot/projects/tty/contrib/bind9/bin/named/include/named/sortlist.h#2 integrate .. //depot/projects/tty/contrib/bind9/bin/named/include/named/tkeyconf.h#2 integrate .. //depot/projects/tty/contrib/bind9/bin/named/include/named/tsigconf.h#2 integrate .. //depot/projects/tty/contrib/bind9/bin/named/include/named/zoneconf.h#2 integrate .. //depot/projects/tty/contrib/bind9/bin/named/interfacemgr.c#2 integrate .. //depot/projects/tty/contrib/bind9/bin/named/logconf.c#2 integrate .. //depot/projects/tty/contrib/bind9/bin/named/lwdgabn.c#2 integrate .. //depot/projects/tty/contrib/bind9/bin/named/lwdgrbn.c#2 integrate .. //depot/projects/tty/contrib/bind9/bin/named/lwresd.8#3 integrate .. //depot/projects/tty/contrib/bind9/bin/named/lwresd.c#2 integrate .. //depot/projects/tty/contrib/bind9/bin/named/lwresd.html#3 integrate .. //depot/projects/tty/contrib/bind9/bin/named/main.c#4 integrate .. //depot/projects/tty/contrib/bind9/bin/named/named.8#3 integrate .. //depot/projects/tty/contrib/bind9/bin/named/named.conf.5#4 integrate .. //depot/projects/tty/contrib/bind9/bin/named/named.conf.docbook#4 integrate .. //depot/projects/tty/contrib/bind9/bin/named/named.conf.html#4 integrate .. //depot/projects/tty/contrib/bind9/bin/named/named.docbook#3 integrate .. //depot/projects/tty/contrib/bind9/bin/named/named.html#3 integrate .. //depot/projects/tty/contrib/bind9/bin/named/query.c#4 integrate .. //depot/projects/tty/contrib/bind9/bin/named/server.c#4 integrate .. //depot/projects/tty/contrib/bind9/bin/named/sortlist.c#2 integrate .. //depot/projects/tty/contrib/bind9/bin/named/tkeyconf.c#2 integrate .. //depot/projects/tty/contrib/bind9/bin/named/tsigconf.c#2 integrate .. //depot/projects/tty/contrib/bind9/bin/named/unix/os.c#4 integrate .. //depot/projects/tty/contrib/bind9/bin/named/update.c#4 integrate .. //depot/projects/tty/contrib/bind9/bin/named/zoneconf.c#3 integrate .. //depot/projects/tty/contrib/bind9/bin/nsupdate/nsupdate.8#3 integrate .. //depot/projects/tty/contrib/bind9/bin/nsupdate/nsupdate.c#4 integrate .. //depot/projects/tty/contrib/bind9/bin/nsupdate/nsupdate.html#3 integrate .. //depot/projects/tty/contrib/bind9/bin/rndc/rndc-confgen.8#3 integrate .. //depot/projects/tty/contrib/bind9/bin/rndc/rndc-confgen.html#3 integrate .. //depot/projects/tty/contrib/bind9/bin/rndc/rndc.8#3 integrate .. //depot/projects/tty/contrib/bind9/bin/rndc/rndc.c#5 integrate .. //depot/projects/tty/contrib/bind9/bin/rndc/rndc.conf.5#3 integrate .. //depot/projects/tty/contrib/bind9/bin/rndc/rndc.conf.html#3 integrate .. //depot/projects/tty/contrib/bind9/bin/rndc/rndc.html#3 integrate .. //depot/projects/tty/contrib/bind9/config.threads.in#2 integrate .. //depot/projects/tty/contrib/bind9/configure.in#4 integrate .. //depot/projects/tty/contrib/bind9/doc/arm/Bv9ARM-book.xml#4 integrate .. //depot/projects/tty/contrib/bind9/doc/arm/Bv9ARM.ch01.html#3 integrate .. //depot/projects/tty/contrib/bind9/doc/arm/Bv9ARM.ch02.html#3 integrate .. //depot/projects/tty/contrib/bind9/doc/arm/Bv9ARM.ch03.html#4 integrate .. //depot/projects/tty/contrib/bind9/doc/arm/Bv9ARM.ch04.html#4 integrate .. //depot/projects/tty/contrib/bind9/doc/arm/Bv9ARM.ch05.html#4 integrate .. //depot/projects/tty/contrib/bind9/doc/arm/Bv9ARM.ch06.html#4 integrate .. //depot/projects/tty/contrib/bind9/doc/arm/Bv9ARM.ch07.html#4 integrate .. //depot/projects/tty/contrib/bind9/doc/arm/Bv9ARM.ch08.html#4 integrate .. //depot/projects/tty/contrib/bind9/doc/arm/Bv9ARM.ch09.html#4 integrate .. //depot/projects/tty/contrib/bind9/doc/arm/Bv9ARM.html#4 integrate .. //depot/projects/tty/contrib/bind9/doc/arm/Bv9ARM.pdf#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/Makefile.in#4 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/api#4 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/config.h.in#4 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/configure#4 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/configure.in#4 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/dst/dst_api.c#4 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/dst/hmac_link.c#3 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/include/arpa/nameser_compat.h#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/include/isc/list.h#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/include/netdb.h#3 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/inet/inet_cidr_ntop.c#3 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/inet/inet_net_ntop.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/irs/dns.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/irs/dns_ho.c#3 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/irs/gai_strerror.c#3 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/irs/gen_ho.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/irs/getaddrinfo.c#3 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/irs/gethostent.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/irs/getnameinfo.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/irs/getprotoent_r.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/irs/getservent_r.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/irs/irp.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/irs/irp_nw.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/irs/irpmarshall.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/irs/irs_data.c#3 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/irs/lcl_ho.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/irs/lcl_pr.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/isc/ev_connects.c#3 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/isc/eventlib.c#4 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/isc/eventlib_p.h#4 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/isc/heap.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/isc/hex.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/isc/memcluster.c#4 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/nameser/ns_sign.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/nameser/ns_verify.c#3 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/port_after.h.in#4 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/port_before.h.in#3 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/resolv/mtctxres.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/resolv/res_init.c#3 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/resolv/res_send.c#3 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/resolv/res_sendsigned.c#3 integrate .. //depot/projects/tty/contrib/bind9/lib/bind9/api#4 integrate .. //depot/projects/tty/contrib/bind9/lib/bind9/check.c#4 integrate .. //depot/projects/tty/contrib/bind9/lib/bind9/include/bind9/check.h#2 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/Makefile.in#3 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/acl.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/adb.c#4 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/api#4 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/cache.c#3 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/compress.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/dispatch.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/dnssec.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/dst_api.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/gen.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/include/dns/acl.h#2 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/include/dns/cache.h#2 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/include/dns/compress.h#2 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/include/dns/keytable.h#2 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/include/dns/message.h#2 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/include/dns/name.h#3 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/include/dns/peer.h#2 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/include/dns/rdataset.h#3 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/include/dns/resolver.h#2 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/include/dns/types.h#2 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/include/dns/validator.h#3 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/include/dns/xfrin.h#2 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/include/dns/zone.h#3 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/keytable.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/lookup.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/masterdump.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/message.c#3 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/name.c#3 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/openssl_link.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/openssldh_link.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/openssldsa_link.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/opensslrsa_link.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/peer.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/portlist.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/rbtdb.c#3 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/rdata.c#4 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/rdata/generic/dlv_32769.c#1 branch .. //depot/projects/tty/contrib/bind9/lib/dns/rdata/generic/dlv_32769.h#1 branch .. //depot/projects/tty/contrib/bind9/lib/dns/rdata/generic/dlv_65323.c#2 delete .. //depot/projects/tty/contrib/bind9/lib/dns/rdata/generic/dlv_65323.h#2 delete .. //depot/projects/tty/contrib/bind9/lib/dns/rdataset.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/request.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/resolver.c#6 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/tcpmsg.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/tkey.c#3 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/tsig.c#3 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/validator.c#4 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/xfrin.c#4 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/zone.c#4 integrate .. //depot/projects/tty/contrib/bind9/lib/isc/api#4 integrate .. //depot/projects/tty/contrib/bind9/lib/isc/hash.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/isc/heap.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/isc/hmacmd5.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/isc/include/isc/heap.h#2 integrate .. //depot/projects/tty/contrib/bind9/lib/isc/include/isc/list.h#2 integrate .. //depot/projects/tty/contrib/bind9/lib/isc/include/isc/sockaddr.h#3 integrate .. //depot/projects/tty/contrib/bind9/lib/isc/include/isc/symtab.h#2 integrate .. //depot/projects/tty/contrib/bind9/lib/isc/lex.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/isc/log.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/isc/netscope.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/isc/nothreads/condition.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/isc/nothreads/mutex.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/isc/print.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/isc/sockaddr.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/isc/taskpool.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/isc/timer.c#3 integrate .. //depot/projects/tty/contrib/bind9/lib/isc/unix/entropy.c#3 integrate .. //depot/projects/tty/contrib/bind9/lib/isc/unix/fsaccess.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#4 integrate .. //depot/projects/tty/contrib/bind9/lib/isc/unix/ipv6.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/isc/unix/socket.c#4 integrate .. //depot/projects/tty/contrib/bind9/lib/isccc/api#2 integrate .. //depot/projects/tty/contrib/bind9/lib/isccfg/include/isccfg/cfg.h#2 integrate .. //depot/projects/tty/contrib/bind9/lib/isccfg/include/isccfg/grammar.h#3 integrate .. //depot/projects/tty/contrib/bind9/lib/isccfg/namedconf.c#4 integrate .. //depot/projects/tty/contrib/bind9/lib/isccfg/parser.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/api#4 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/gai_strerror.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/getaddrinfo.c#3 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/lwconfig.c#3 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres.3#3 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres.html#3 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_buffer.3#3 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_buffer.html#3 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_config.3#3 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_config.html#3 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_context.3#3 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_context.html#3 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_gabn.3#3 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_gabn.html#3 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_gai_strerror.3#3 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html#3 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.3#3 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html#3 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_gethostent.3#3 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_gethostent.html#3 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_getipnode.3#3 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_getipnode.html#3 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_getnameinfo.3#3 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html#3 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.3#3 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html#3 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_gnba.3#3 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_gnba.html#3 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_hstrerror.3#3 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_hstrerror.html#3 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_inetntop.3#3 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_inetntop.html#3 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_noop.3#3 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_noop.html#3 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_packet.3#3 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_packet.html#3 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_resutil.3#3 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_resutil.html#3 integrate .. //depot/projects/tty/contrib/bind9/libtool.m4#3 integrate .. //depot/projects/tty/contrib/bind9/ltmain.sh#3 integrate .. //depot/projects/tty/contrib/bind9/make/rules.in#3 integrate .. //depot/projects/tty/contrib/bind9/version#6 integrate .. //depot/projects/tty/contrib/binutils/gas/as.h#3 integrate .. //depot/projects/tty/contrib/binutils/gas/tc.h#3 integrate .. //depot/projects/tty/contrib/bsnmp/snmp_mibII/mibII.c#10 integrate .. //depot/projects/tty/contrib/bsnmp/snmpd/action.c#4 integrate .. //depot/projects/tty/contrib/bsnmp/snmpd/tree.def#4 integrate .. //depot/projects/tty/contrib/bzip2/CHANGES#3 integrate .. //depot/projects/tty/contrib/bzip2/FREEBSD-upgrade#3 integrate .. //depot/projects/tty/contrib/bzip2/LICENSE#3 integrate .. //depot/projects/tty/contrib/bzip2/Makefile#3 integrate .. //depot/projects/tty/contrib/bzip2/Makefile-libbz2_so#3 integrate .. //depot/projects/tty/contrib/bzip2/README#3 integrate .. //depot/projects/tty/contrib/bzip2/README.COMPILATION.PROBLEMS#3 integrate .. //depot/projects/tty/contrib/bzip2/Y2K_INFO#2 delete .. //depot/projects/tty/contrib/bzip2/blocksort.c#3 integrate .. //depot/projects/tty/contrib/bzip2/bzip2.1#3 integrate .. //depot/projects/tty/contrib/bzip2/bzip2.c#4 integrate .. //depot/projects/tty/contrib/bzip2/bzip2recover.c#3 integrate .. //depot/projects/tty/contrib/bzip2/bzlib.c#4 integrate .. //depot/projects/tty/contrib/bzip2/bzlib.h#3 integrate .. //depot/projects/tty/contrib/bzip2/bzlib_private.h#3 integrate .. //depot/projects/tty/contrib/bzip2/compress.c#3 integrate .. //depot/projects/tty/contrib/bzip2/crctable.c#3 integrate .. //depot/projects/tty/contrib/bzip2/decompress.c#3 integrate .. //depot/projects/tty/contrib/bzip2/dlltest.c#2 integrate .. //depot/projects/tty/contrib/bzip2/huffman.c#3 integrate .. //depot/projects/tty/contrib/bzip2/manual.texi#2 delete .. //depot/projects/tty/contrib/bzip2/randtable.c#3 integrate .. //depot/projects/tty/contrib/bzip2/sample1.bz2.uu#3 integrate .. //depot/projects/tty/contrib/bzip2/sample1.ref.gz.uu#3 integrate .. //depot/projects/tty/contrib/bzip2/sample2.bz2.uu#3 integrate .. //depot/projects/tty/contrib/bzip2/sample2.ref.gz.uu#3 integrate .. //depot/projects/tty/contrib/bzip2/sample3.bz2.uu#3 integrate .. //depot/projects/tty/contrib/bzip2/sample3.ref.gz.uu#3 integrate .. //depot/projects/tty/contrib/bzip2/spewG.c#2 integrate .. //depot/projects/tty/contrib/bzip2/unzcrash.c#2 integrate .. //depot/projects/tty/contrib/bzip2/words0#2 integrate .. //depot/projects/tty/contrib/bzip2/words2#2 integrate .. //depot/projects/tty/contrib/bzip2/words3#2 integrate .. //depot/projects/tty/contrib/cvs/src/log.c#4 integrate .. //depot/projects/tty/contrib/gcc/function.c#8 integrate .. //depot/projects/tty/contrib/gdtoa/README#3 integrate .. //depot/projects/tty/contrib/gdtoa/arithchk.c#2 integrate .. //depot/projects/tty/contrib/gdtoa/dmisc.c#2 integrate .. //depot/projects/tty/contrib/gdtoa/dtoa.c#2 integrate .. //depot/projects/tty/contrib/gdtoa/g_Qfmt.c#2 integrate .. //depot/projects/tty/contrib/gdtoa/g__fmt.c#3 integrate .. //depot/projects/tty/contrib/gdtoa/g_ddfmt.c#2 integrate .. //depot/projects/tty/contrib/gdtoa/g_dfmt.c#2 integrate .. //depot/projects/tty/contrib/gdtoa/g_ffmt.c#2 integrate .. //depot/projects/tty/contrib/gdtoa/g_xLfmt.c#2 integrate .. //depot/projects/tty/contrib/gdtoa/g_xfmt.c#2 integrate .. //depot/projects/tty/contrib/gdtoa/gdtoa.c#2 integrate .. //depot/projects/tty/contrib/gdtoa/gdtoa.h#2 integrate .. //depot/projects/tty/contrib/gdtoa/gdtoaimp.h#5 integrate .. //depot/projects/tty/contrib/gdtoa/gethex.c#4 integrate .. //depot/projects/tty/contrib/gdtoa/gmisc.c#2 integrate .. //depot/projects/tty/contrib/gdtoa/hd_init.c#2 integrate .. //depot/projects/tty/contrib/gdtoa/hexnan.c#2 integrate .. //depot/projects/tty/contrib/gdtoa/makefile#2 integrate .. //depot/projects/tty/contrib/gdtoa/misc.c#2 integrate .. //depot/projects/tty/contrib/gdtoa/qnan.c#1 branch .. //depot/projects/tty/contrib/gdtoa/smisc.c#2 integrate .. //depot/projects/tty/contrib/gdtoa/strtoIQ.c#2 integrate .. //depot/projects/tty/contrib/gdtoa/strtoId.c#2 integrate .. //depot/projects/tty/contrib/gdtoa/strtoIdd.c#2 integrate .. //depot/projects/tty/contrib/gdtoa/strtoIf.c#2 integrate .. //depot/projects/tty/contrib/gdtoa/strtoIg.c#2 integrate .. //depot/projects/tty/contrib/gdtoa/strtoIx.c#2 integrate .. //depot/projects/tty/contrib/gdtoa/strtoIxL.c#2 integrate .. //depot/projects/tty/contrib/gdtoa/strtod.c#4 integrate .. //depot/projects/tty/contrib/gdtoa/strtodI.c#2 integrate .. //depot/projects/tty/contrib/gdtoa/strtodg.c#3 integrate .. //depot/projects/tty/contrib/gdtoa/strtodnrp.c#1 branch .. //depot/projects/tty/contrib/gdtoa/strtof.c#2 integrate .. //depot/projects/tty/contrib/gdtoa/strtopQ.c#2 integrate .. //depot/projects/tty/contrib/gdtoa/strtopd.c#2 integrate .. //depot/projects/tty/contrib/gdtoa/strtopdd.c#2 integrate .. //depot/projects/tty/contrib/gdtoa/strtopf.c#2 integrate .. //depot/projects/tty/contrib/gdtoa/strtopx.c#2 integrate .. //depot/projects/tty/contrib/gdtoa/strtopxL.c#2 integrate .. //depot/projects/tty/contrib/gdtoa/strtorQ.c#2 integrate .. //depot/projects/tty/contrib/gdtoa/strtord.c#2 integrate .. //depot/projects/tty/contrib/gdtoa/strtordd.c#2 integrate .. //depot/projects/tty/contrib/gdtoa/strtorf.c#2 integrate .. //depot/projects/tty/contrib/gdtoa/strtorx.c#2 integrate .. //depot/projects/tty/contrib/gdtoa/strtorxL.c#2 integrate .. //depot/projects/tty/contrib/gdtoa/sum.c#2 integrate .. //depot/projects/tty/contrib/gdtoa/test/Qtest.c#2 integrate .. //depot/projects/tty/contrib/gdtoa/test/dItest.c#2 integrate .. //depot/projects/tty/contrib/gdtoa/test/ddtest.c#2 integrate .. //depot/projects/tty/contrib/gdtoa/test/dt.c#2 integrate .. //depot/projects/tty/contrib/gdtoa/test/dtest.c#2 integrate .. //depot/projects/tty/contrib/gdtoa/test/dtst.out#2 integrate .. //depot/projects/tty/contrib/gdtoa/test/ftest.c#2 integrate .. //depot/projects/tty/contrib/gdtoa/test/getround.c#2 integrate .. //depot/projects/tty/contrib/gdtoa/test/makefile#2 integrate .. //depot/projects/tty/contrib/gdtoa/test/strtodt.c#2 integrate .. //depot/projects/tty/contrib/gdtoa/test/x.ou0#2 integrate .. //depot/projects/tty/contrib/gdtoa/test/x.ou1#2 integrate .. //depot/projects/tty/contrib/gdtoa/test/xL.ou1#2 integrate .. //depot/projects/tty/contrib/gdtoa/test/xLtest.c#2 integrate .. //depot/projects/tty/contrib/gdtoa/test/xsum0.out#2 integrate .. //depot/projects/tty/contrib/gdtoa/test/xtest.c#2 integrate .. //depot/projects/tty/contrib/gdtoa/ulp.c#2 integrate .. //depot/projects/tty/contrib/gdtoa/xsum0.out#4 integrate .. //depot/projects/tty/contrib/groff/tmac/doc-common#11 integrate .. //depot/projects/tty/contrib/groff/tmac/doc-syms#8 integrate .. //depot/projects/tty/contrib/groff/tmac/groff_mdoc.man#9 integrate .. //depot/projects/tty/contrib/libbegemot/rpoll.c#3 integrate .. //depot/projects/tty/contrib/libbegemot/rpoll.h#2 integrate .. //depot/projects/tty/contrib/libbegemot/rpoll.man#3 integrate .. //depot/projects/tty/contrib/libpcap/pcap-bpf.c#9 integrate .. //depot/projects/tty/contrib/libreadline/CHANGELOG#5 integrate .. //depot/projects/tty/contrib/libreadline/CHANGES#5 integrate .. //depot/projects/tty/contrib/libreadline/FREEBSD-upgrade#6 integrate .. //depot/projects/tty/contrib/libreadline/INSTALL#5 integrate .. //depot/projects/tty/contrib/libreadline/NEWS#3 integrate .. //depot/projects/tty/contrib/libreadline/README#5 integrate .. //depot/projects/tty/contrib/libreadline/aclocal.m4#5 integrate .. //depot/projects/tty/contrib/libreadline/bind.c#6 integrate .. //depot/projects/tty/contrib/libreadline/callback.c#5 integrate .. //depot/projects/tty/contrib/libreadline/complete.c#6 integrate .. //depot/projects/tty/contrib/libreadline/config.h.in#5 integrate .. //depot/projects/tty/contrib/libreadline/configure#5 integrate .. //depot/projects/tty/contrib/libreadline/configure.in#5 integrate .. //depot/projects/tty/contrib/libreadline/display.c#6 integrate .. //depot/projects/tty/contrib/libreadline/doc/history.texi#2 integrate .. //depot/projects/tty/contrib/libreadline/doc/hstech.texi#2 integrate .. //depot/projects/tty/contrib/libreadline/doc/hsuser.texi#2 integrate .. //depot/projects/tty/contrib/libreadline/doc/readline.3#6 integrate .. //depot/projects/tty/contrib/libreadline/doc/rlman.texi#2 integrate .. //depot/projects/tty/contrib/libreadline/doc/rltech.texi#3 integrate .. //depot/projects/tty/contrib/libreadline/doc/rluser.texi#3 integrate .. //depot/projects/tty/contrib/libreadline/doc/rluserman.texi#3 integrate .. //depot/projects/tty/contrib/libreadline/doc/version.texi#3 integrate .. //depot/projects/tty/contrib/libreadline/examples/excallback.c#2 integrate .. //depot/projects/tty/contrib/libreadline/examples/rlfe/Makefile.in#2 integrate .. //depot/projects/tty/contrib/libreadline/histexpand.c#5 integrate .. //depot/projects/tty/contrib/libreadline/histfile.c#4 integrate .. //depot/projects/tty/contrib/libreadline/history.c#5 integrate .. //depot/projects/tty/contrib/libreadline/input.c#5 integrate .. //depot/projects/tty/contrib/libreadline/isearch.c#4 integrate .. //depot/projects/tty/contrib/libreadline/kill.c#4 integrate .. //depot/projects/tty/contrib/libreadline/macro.c#4 integrate .. //depot/projects/tty/contrib/libreadline/misc.c#4 integrate .. //depot/projects/tty/contrib/libreadline/readline.c#6 integrate .. //depot/projects/tty/contrib/libreadline/readline.h#6 integrate .. //depot/projects/tty/contrib/libreadline/rlconf.h#5 integrate .. //depot/projects/tty/contrib/libreadline/rlmbutil.h#4 integrate .. //depot/projects/tty/contrib/libreadline/rlprivate.h#5 integrate .. //depot/projects/tty/contrib/libreadline/rltty.c#5 integrate .. //depot/projects/tty/contrib/libreadline/search.c#5 integrate .. //depot/projects/tty/contrib/libreadline/signals.c#5 integrate .. //depot/projects/tty/contrib/libreadline/support/shlib-install#5 integrate .. //depot/projects/tty/contrib/libreadline/support/shobj-conf#5 integrate .. //depot/projects/tty/contrib/libreadline/terminal.c#6 integrate .. //depot/projects/tty/contrib/libreadline/text.c#4 integrate .. //depot/projects/tty/contrib/libreadline/tilde.c#4 integrate .. //depot/projects/tty/contrib/libreadline/undo.c#4 integrate .. //depot/projects/tty/contrib/libreadline/vi_mode.c#6 integrate .. //depot/projects/tty/contrib/ncurses/ANNOUNCE#2 integrate .. //depot/projects/tty/contrib/ncurses/AUTHORS#1 branch .. //depot/projects/tty/contrib/ncurses/FREEBSD-Xlist#1 branch .. //depot/projects/tty/contrib/ncurses/FREEBSD-upgrade#1 branch .. //depot/projects/tty/contrib/ncurses/INSTALL#2 integrate .. //depot/projects/tty/contrib/ncurses/MANIFEST#2 integrate .. //depot/projects/tty/contrib/ncurses/Makefile.glibc#2 delete .. //depot/projects/tty/contrib/ncurses/Makefile.in#2 integrate .. //depot/projects/tty/contrib/ncurses/Makefile.os2#2 integrate .. //depot/projects/tty/contrib/ncurses/NEWS#2 integrate .. //depot/projects/tty/contrib/ncurses/README#2 integrate .. //depot/projects/tty/contrib/ncurses/README.emx#2 integrate .. //depot/projects/tty/contrib/ncurses/README.glibc#2 delete .. //depot/projects/tty/contrib/ncurses/TO-DO#2 integrate .. //depot/projects/tty/contrib/ncurses/aclocal.m4#2 integrate .. //depot/projects/tty/contrib/ncurses/announce.html.in#2 integrate .. //depot/projects/tty/contrib/ncurses/c++/Makefile.in#2 delete .. //depot/projects/tty/contrib/ncurses/c++/NEWS#2 delete .. //depot/projects/tty/contrib/ncurses/c++/PROBLEMS#2 delete .. //depot/projects/tty/contrib/ncurses/c++/README-first#2 delete .. //depot/projects/tty/contrib/ncurses/c++/cursesapp.cc#2 delete .. //depot/projects/tty/contrib/ncurses/c++/cursesapp.h#2 delete .. //depot/projects/tty/contrib/ncurses/c++/cursesf.cc#2 delete .. //depot/projects/tty/contrib/ncurses/c++/cursesf.h#2 delete .. //depot/projects/tty/contrib/ncurses/c++/cursesm.cc#2 delete .. //depot/projects/tty/contrib/ncurses/c++/cursesm.h#2 delete .. //depot/projects/tty/contrib/ncurses/c++/cursesmain.cc#2 delete .. //depot/projects/tty/contrib/ncurses/c++/cursesp.cc#2 delete .. //depot/projects/tty/contrib/ncurses/c++/cursesp.h#2 delete .. //depot/projects/tty/contrib/ncurses/c++/cursespad.cc#2 delete .. //depot/projects/tty/contrib/ncurses/c++/cursesw.cc#2 delete .. //depot/projects/tty/contrib/ncurses/c++/cursesw.h#2 delete .. //depot/projects/tty/contrib/ncurses/c++/cursslk.cc#2 delete .. //depot/projects/tty/contrib/ncurses/c++/cursslk.h#2 delete .. //depot/projects/tty/contrib/ncurses/c++/demo.cc#2 delete .. //depot/projects/tty/contrib/ncurses/c++/edit_cfg.sh#2 delete .. //depot/projects/tty/contrib/ncurses/c++/etip.h.in#2 delete .. //depot/projects/tty/contrib/ncurses/c++/headers#2 delete .. //depot/projects/tty/contrib/ncurses/c++/internal.h#2 delete .. //depot/projects/tty/contrib/ncurses/c++/modules#2 delete .. //depot/projects/tty/contrib/ncurses/config.guess#2 integrate .. //depot/projects/tty/contrib/ncurses/config.sub#2 integrate .. //depot/projects/tty/contrib/ncurses/configure#2 integrate .. //depot/projects/tty/contrib/ncurses/configure.in#2 integrate .. //depot/projects/tty/contrib/ncurses/convert_configure.pl#2 integrate .. //depot/projects/tty/contrib/ncurses/dist.mk#2 integrate .. //depot/projects/tty/contrib/ncurses/doc/hackguide.doc#2 integrate .. //depot/projects/tty/contrib/ncurses/doc/html/NCURSES-Programming-HOWTO.html#1 branch .. //depot/projects/tty/contrib/ncurses/doc/html/announce.html#2 integrate .. //depot/projects/tty/contrib/ncurses/doc/html/hackguide.html#2 integrate .. //depot/projects/tty/contrib/ncurses/doc/html/ncurses-intro.html#2 integrate .. //depot/projects/tty/contrib/ncurses/doc/ncurses-intro.doc#2 integrate .. //depot/projects/tty/contrib/ncurses/form/Makefile.in#2 integrate .. //depot/projects/tty/contrib/ncurses/form/READ.ME#2 integrate .. //depot/projects/tty/contrib/ncurses/form/f_trace.c#1 branch .. //depot/projects/tty/contrib/ncurses/form/fld_arg.c#2 integrate .. //depot/projects/tty/contrib/ncurses/form/fld_attr.c#2 integrate .. //depot/projects/tty/contrib/ncurses/form/fld_current.c#2 integrate .. //depot/projects/tty/contrib/ncurses/form/fld_def.c#2 integrate .. //depot/projects/tty/contrib/ncurses/form/fld_dup.c#2 integrate .. //depot/projects/tty/contrib/ncurses/form/fld_ftchoice.c#2 integrate .. //depot/projects/tty/contrib/ncurses/form/fld_ftlink.c#2 integrate .. //depot/projects/tty/contrib/ncurses/form/fld_info.c#2 integrate .. //depot/projects/tty/contrib/ncurses/form/fld_just.c#2 integrate .. //depot/projects/tty/contrib/ncurses/form/fld_link.c#2 integrate .. //depot/projects/tty/contrib/ncurses/form/fld_max.c#2 integrate .. //depot/projects/tty/contrib/ncurses/form/fld_move.c#2 integrate .. //depot/projects/tty/contrib/ncurses/form/fld_newftyp.c#2 integrate .. //depot/projects/tty/contrib/ncurses/form/fld_opts.c#2 integrate .. //depot/projects/tty/contrib/ncurses/form/fld_pad.c#2 integrate .. //depot/projects/tty/contrib/ncurses/form/fld_page.c#2 integrate .. //depot/projects/tty/contrib/ncurses/form/fld_stat.c#2 integrate .. //depot/projects/tty/contrib/ncurses/form/fld_type.c#2 integrate .. //depot/projects/tty/contrib/ncurses/form/fld_user.c#2 integrate .. //depot/projects/tty/contrib/ncurses/form/form.h#2 integrate .. //depot/projects/tty/contrib/ncurses/form/form.priv.h#2 integrate .. //depot/projects/tty/contrib/ncurses/form/frm_cursor.c#2 integrate .. //depot/projects/tty/contrib/ncurses/form/frm_data.c#2 integrate .. //depot/projects/tty/contrib/ncurses/form/frm_def.c#2 integrate .. //depot/projects/tty/contrib/ncurses/form/frm_driver.c#2 integrate .. //depot/projects/tty/contrib/ncurses/form/frm_hook.c#2 integrate .. //depot/projects/tty/contrib/ncurses/form/frm_opts.c#2 integrate .. //depot/projects/tty/contrib/ncurses/form/frm_page.c#2 integrate .. //depot/projects/tty/contrib/ncurses/form/frm_post.c#2 integrate .. //depot/projects/tty/contrib/ncurses/form/frm_req_name.c#2 integrate .. //depot/projects/tty/contrib/ncurses/form/frm_scale.c#2 integrate .. //depot/projects/tty/contrib/ncurses/form/frm_sub.c#2 integrate .. //depot/projects/tty/contrib/ncurses/form/frm_user.c#2 integrate .. //depot/projects/tty/contrib/ncurses/form/frm_win.c#2 integrate .. //depot/projects/tty/contrib/ncurses/form/fty_alnum.c#2 integrate .. //depot/projects/tty/contrib/ncurses/form/fty_alpha.c#2 integrate .. //depot/projects/tty/contrib/ncurses/form/fty_enum.c#2 integrate .. //depot/projects/tty/contrib/ncurses/form/fty_int.c#2 integrate .. //depot/projects/tty/contrib/ncurses/form/fty_ipv4.c#2 integrate .. //depot/projects/tty/contrib/ncurses/form/fty_num.c#2 integrate .. //depot/projects/tty/contrib/ncurses/form/fty_regex.c#2 integrate .. //depot/projects/tty/contrib/ncurses/form/llib-lform#2 integrate .. //depot/projects/tty/contrib/ncurses/form/llib-lformw#1 branch .. //depot/projects/tty/contrib/ncurses/form/modules#2 integrate .. //depot/projects/tty/contrib/ncurses/include/Caps#2 integrate .. //depot/projects/tty/contrib/ncurses/include/Caps.aix4#2 integrate .. //depot/projects/tty/contrib/ncurses/include/Caps.hpux11#1 branch .. //depot/projects/tty/contrib/ncurses/include/Caps.keys#2 integrate .. //depot/projects/tty/contrib/ncurses/include/Caps.osf1r5#2 integrate .. //depot/projects/tty/contrib/ncurses/include/Caps.uwin#2 integrate .. //depot/projects/tty/contrib/ncurses/include/MKhashsize.sh#2 integrate .. //depot/projects/tty/contrib/ncurses/include/MKkey_defs.sh#2 integrate .. //depot/projects/tty/contrib/ncurses/include/MKncurses_def.sh#2 integrate .. //depot/projects/tty/contrib/ncurses/include/MKparametrized.sh#2 integrate .. //depot/projects/tty/contrib/ncurses/include/MKterm.h.awk.in#2 integrate .. //depot/projects/tty/contrib/ncurses/include/curses.h.in#2 integrate .. //depot/projects/tty/contrib/ncurses/include/curses.tail#2 integrate .. //depot/projects/tty/contrib/ncurses/include/curses.wide#2 integrate .. //depot/projects/tty/contrib/ncurses/include/hashed_db.h#1 branch .. //depot/projects/tty/contrib/ncurses/include/nc_alloc.h#2 integrate .. //depot/projects/tty/contrib/ncurses/include/nc_tparm.h#1 branch .. //depot/projects/tty/contrib/ncurses/include/ncurses_cfg.hin#2 integrate .. //depot/projects/tty/contrib/ncurses/include/ncurses_defs#2 integrate .. //depot/projects/tty/contrib/ncurses/include/ncurses_dll.h#2 integrate .. //depot/projects/tty/contrib/ncurses/include/term_entry.h#2 integrate .. //depot/projects/tty/contrib/ncurses/include/tic.h#2 integrate .. //depot/projects/tty/contrib/ncurses/install-sh#2 integrate .. //depot/projects/tty/contrib/ncurses/man/MKterminfo.sh#2 integrate .. //depot/projects/tty/contrib/ncurses/man/Makefile.in#2 integrate .. //depot/projects/tty/contrib/ncurses/man/captoinfo.1m#2 integrate .. //depot/projects/tty/contrib/ncurses/man/clear.1#2 integrate .. //depot/projects/tty/contrib/ncurses/man/curs_add_wch.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/curs_add_wchstr.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/curs_addch.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/curs_addchstr.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/curs_addstr.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/curs_addwstr.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/curs_attr.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/curs_beep.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/curs_bkgd.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/curs_bkgrnd.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/curs_border.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/curs_border_set.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/curs_clear.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/curs_color.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/curs_delch.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/curs_deleteln.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/curs_extend.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/curs_get_wch.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/curs_get_wstr.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/curs_getcchar.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/curs_getch.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/curs_getstr.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/curs_getyx.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/curs_in_wch.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/curs_in_wchstr.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/curs_inch.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/curs_inchstr.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/curs_initscr.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/curs_inopts.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/curs_ins_wch.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/curs_ins_wstr.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/curs_insch.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/curs_insstr.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/curs_instr.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/curs_inwstr.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/curs_kernel.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/curs_mouse.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/curs_move.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/curs_outopts.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/curs_overlay.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/curs_pad.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/curs_print.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/curs_printw.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/curs_refresh.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/curs_scanw.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/curs_scr_dump.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/curs_scroll.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/curs_slk.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/curs_termattrs.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/curs_termcap.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/curs_terminfo.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/curs_touch.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/curs_trace.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/curs_util.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/curs_window.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/default_colors.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/define_key.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/form.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/form_cursor.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/form_data.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/form_driver.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/form_field.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/form_field_attributes.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/form_field_buffer.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/form_field_info.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/form_field_just.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/form_field_new.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/form_field_opts.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/form_field_userptr.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/form_field_validation.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/form_fieldtype.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/form_hook.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/form_new.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/form_new_page.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/form_opts.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/form_page.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/form_post.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/form_requestname.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/form_userptr.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/form_win.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/infocmp.1m#2 integrate .. //depot/projects/tty/contrib/ncurses/man/infotocap.1m#2 integrate .. //depot/projects/tty/contrib/ncurses/man/key_defined.3x#1 branch .. //depot/projects/tty/contrib/ncurses/man/keybound.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/keyok.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/legacy_coding.3x#1 branch .. //depot/projects/tty/contrib/ncurses/man/make_sed.sh#2 integrate .. //depot/projects/tty/contrib/ncurses/man/man_db.renames#2 integrate .. //depot/projects/tty/contrib/ncurses/man/manlinks.sed#2 integrate .. //depot/projects/tty/contrib/ncurses/man/menu.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/menu_attributes.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/menu_cursor.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/menu_driver.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/menu_format.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/menu_hook.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/menu_items.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/menu_mark.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/menu_new.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/menu_opts.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/menu_pattern.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/menu_post.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/menu_requestname.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/menu_spacing.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/menu_userptr.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/menu_win.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/mitem_current.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/mitem_name.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/mitem_new.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/mitem_opts.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/mitem_userptr.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/mitem_value.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/ncurses.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/panel.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/resizeterm.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/man/term.5#2 integrate .. //depot/projects/tty/contrib/ncurses/man/term.7#2 integrate .. //depot/projects/tty/contrib/ncurses/man/terminfo.head#2 integrate .. //depot/projects/tty/contrib/ncurses/man/terminfo.tail#2 integrate .. //depot/projects/tty/contrib/ncurses/man/tic.1m#2 integrate .. //depot/projects/tty/contrib/ncurses/man/toe.1m#2 integrate .. //depot/projects/tty/contrib/ncurses/man/tput.1#2 integrate .. //depot/projects/tty/contrib/ncurses/man/tset.1#2 integrate .. //depot/projects/tty/contrib/ncurses/man/wresize.3x#2 integrate .. //depot/projects/tty/contrib/ncurses/menu/Makefile.in#2 integrate .. //depot/projects/tty/contrib/ncurses/menu/READ.ME#2 integrate .. //depot/projects/tty/contrib/ncurses/menu/eti.h#2 integrate .. //depot/projects/tty/contrib/ncurses/menu/llib-lmenu#2 integrate .. //depot/projects/tty/contrib/ncurses/menu/llib-lmenuw#1 branch .. //depot/projects/tty/contrib/ncurses/menu/m_attribs.c#2 integrate .. //depot/projects/tty/contrib/ncurses/menu/m_cursor.c#2 integrate .. //depot/projects/tty/contrib/ncurses/menu/m_driver.c#2 integrate .. //depot/projects/tty/contrib/ncurses/menu/m_format.c#2 integrate .. //depot/projects/tty/contrib/ncurses/menu/m_global.c#2 integrate .. //depot/projects/tty/contrib/ncurses/menu/m_hook.c#2 integrate .. //depot/projects/tty/contrib/ncurses/menu/m_item_cur.c#2 integrate .. //depot/projects/tty/contrib/ncurses/menu/m_item_nam.c#2 integrate .. //depot/projects/tty/contrib/ncurses/menu/m_item_new.c#2 integrate .. //depot/projects/tty/contrib/ncurses/menu/m_item_opt.c#2 integrate .. //depot/projects/tty/contrib/ncurses/menu/m_item_top.c#2 integrate .. //depot/projects/tty/contrib/ncurses/menu/m_item_use.c#2 integrate .. //depot/projects/tty/contrib/ncurses/menu/m_item_val.c#2 integrate .. //depot/projects/tty/contrib/ncurses/menu/m_item_vis.c#2 integrate .. //depot/projects/tty/contrib/ncurses/menu/m_items.c#2 integrate .. //depot/projects/tty/contrib/ncurses/menu/m_new.c#2 integrate .. //depot/projects/tty/contrib/ncurses/menu/m_opts.c#2 integrate .. //depot/projects/tty/contrib/ncurses/menu/m_pad.c#2 integrate .. //depot/projects/tty/contrib/ncurses/menu/m_pattern.c#2 integrate .. //depot/projects/tty/contrib/ncurses/menu/m_post.c#2 integrate .. //depot/projects/tty/contrib/ncurses/menu/m_req_name.c#2 integrate .. //depot/projects/tty/contrib/ncurses/menu/m_scale.c#2 integrate .. //depot/projects/tty/contrib/ncurses/menu/m_spacing.c#2 integrate .. //depot/projects/tty/contrib/ncurses/menu/m_sub.c#2 integrate .. //depot/projects/tty/contrib/ncurses/menu/m_trace.c#1 branch .. //depot/projects/tty/contrib/ncurses/menu/m_userptr.c#2 integrate .. //depot/projects/tty/contrib/ncurses/menu/m_win.c#2 integrate .. //depot/projects/tty/contrib/ncurses/menu/menu.h#2 integrate .. //depot/projects/tty/contrib/ncurses/menu/menu.priv.h#2 integrate .. //depot/projects/tty/contrib/ncurses/menu/mf_common.h#2 integrate .. //depot/projects/tty/contrib/ncurses/menu/modules#2 integrate .. //depot/projects/tty/contrib/ncurses/misc/Makefile.in#2 integrate .. //depot/projects/tty/contrib/ncurses/misc/chkdef.cmd#2 integrate .. //depot/projects/tty/contrib/ncurses/misc/cleantic.cmd#2 integrate .. //depot/projects/tty/contrib/ncurses/misc/cmpdef.cmd#2 integrate .. //depot/projects/tty/contrib/ncurses/misc/csort#1 branch .. //depot/projects/tty/contrib/ncurses/misc/emx.src#2 integrate .. //depot/projects/tty/contrib/ncurses/misc/gen_edit.sh#1 branch .. //depot/projects/tty/contrib/ncurses/misc/indent.pro#2 delete .. //depot/projects/tty/contrib/ncurses/misc/jpf-indent#1 branch .. //depot/projects/tty/contrib/ncurses/misc/makedef.cmd#2 integrate .. //depot/projects/tty/contrib/ncurses/misc/ncu-indent#1 branch .. //depot/projects/tty/contrib/ncurses/misc/ncurses-config.in#1 branch .. //depot/projects/tty/contrib/ncurses/misc/run_tic.in#2 integrate .. //depot/projects/tty/contrib/ncurses/misc/shlib#2 integrate .. //depot/projects/tty/contrib/ncurses/misc/terminfo.src#2 integrate .. //depot/projects/tty/contrib/ncurses/mk-0th.awk#2 integrate .. //depot/projects/tty/contrib/ncurses/mk-1st.awk#2 integrate .. //depot/projects/tty/contrib/ncurses/mk-2nd.awk#2 integrate .. //depot/projects/tty/contrib/ncurses/mkinstalldirs#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/Makefile.in#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/README#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/README.IZ#1 branch .. //depot/projects/tty/contrib/ncurses/ncurses/SigAction.h#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/base/MKkeyname.awk#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/base/MKlib_gen.sh#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/base/MKunctrl.awk#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/base/README#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/base/define_key.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/base/key_defined.c#1 branch .. //depot/projects/tty/contrib/ncurses/ncurses/base/keybound.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/base/keyok.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/base/legacy_coding.c#1 branch .. //depot/projects/tty/contrib/ncurses/ncurses/base/lib_addch.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/base/lib_addstr.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/base/lib_beep.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/base/lib_bkgd.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/base/lib_box.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/base/lib_chgat.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/base/lib_clrbot.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/base/lib_color.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/base/lib_colorset.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/base/lib_dft_fgbg.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/base/lib_erase.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/base/lib_freeall.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/base/lib_getch.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/base/lib_getstr.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/base/lib_hline.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/base/lib_initscr.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/base/lib_insch.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/base/lib_insdel.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/base/lib_insnstr.c#1 branch .. //depot/projects/tty/contrib/ncurses/ncurses/base/lib_insstr.c#2 delete .. //depot/projects/tty/contrib/ncurses/ncurses/base/lib_instr.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/base/lib_mouse.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/base/lib_move.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/base/lib_mvwin.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/base/lib_newterm.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/base/lib_newwin.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/base/lib_overlay.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/base/lib_pad.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/base/lib_printw.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/base/lib_redrawln.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/base/lib_refresh.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/base/lib_restart.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/base/lib_screen.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/base/lib_scroll.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/base/lib_set_term.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/base/lib_slk.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/base/lib_slkatr_set.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/base/lib_slkatrof.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/base/lib_slkatron.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/base/lib_slkatrset.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/base/lib_slkattr.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/base/lib_slkclear.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/base/lib_slkcolor.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/base/lib_slklab.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/base/lib_slkrefr.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/base/lib_slkset.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/base/lib_ungetch.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/base/lib_vline.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/base/lib_wattroff.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/base/lib_wattron.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/base/lib_window.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/base/resizeterm.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/base/safe_sprintf.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/base/sigaction.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/base/tries.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/base/version.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/base/vsscanf.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/base/wresize.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/curses.priv.h#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/llib-lncurses#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/llib-lncursesw#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/modules#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/tinfo/MKcaptab.awk#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/tinfo/MKfallback.sh#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/tinfo/MKkeys_list.sh#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/tinfo/MKnames.awk#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/tinfo/README#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/tinfo/access.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/tinfo/add_tries.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/tinfo/alloc_entry.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/tinfo/alloc_ttype.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/tinfo/captoinfo.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/tinfo/comp_error.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/tinfo/comp_expand.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/tinfo/comp_hash.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/tinfo/comp_parse.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/tinfo/comp_scan.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/tinfo/db_iterator.c#1 branch .. //depot/projects/tty/contrib/ncurses/ncurses/tinfo/doalloc.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/tinfo/free_ttype.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/tinfo/hashed_db.c#1 branch .. //depot/projects/tty/contrib/ncurses/ncurses/tinfo/home_terminfo.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/tinfo/init_keytry.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/tinfo/lib_acs.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/tinfo/lib_cur_term.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/tinfo/lib_data.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/tinfo/lib_has_cap.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/tinfo/lib_kernel.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/tinfo/lib_napms.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/tinfo/lib_options.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/tinfo/lib_print.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/tinfo/lib_raw.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/tinfo/lib_setup.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/tinfo/lib_termcap.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/tinfo/lib_termname.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/tinfo/lib_tgoto.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/tinfo/lib_ti.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/tinfo/lib_tparm.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/tinfo/lib_tputs.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/tinfo/lib_ttyflags.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/tinfo/make_keys.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/tinfo/name_match.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/tinfo/parse_entry.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/tinfo/read_entry.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/tinfo/read_termcap.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/tinfo/setbuf.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/tinfo/strings.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/tinfo/trim_sgr0.c#1 branch .. //depot/projects/tty/contrib/ncurses/ncurses/tinfo/write_entry.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/trace/README#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/trace/lib_trace.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/trace/lib_traceatr.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/trace/lib_tracebits.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/trace/lib_tracechr.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/trace/lib_tracedmp.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/trace/lib_tracemse.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/trace/trace_buf.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/trace/varargs.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/trace/visbuf.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/tty/MKexpanded.sh#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/tty/hashmap.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/tty/lib_mvcur.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/tty/lib_tstp.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/tty/lib_twait.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/tty/lib_vidattr.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/tty/tty_display.h#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/tty/tty_update.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/widechar/charable.c#1 branch .. //depot/projects/tty/contrib/ncurses/ncurses/widechar/lib_add_wch.c#1 branch .. //depot/projects/tty/contrib/ncurses/ncurses/widechar/lib_box_set.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/widechar/lib_cchar.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/widechar/lib_get_wch.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/widechar/lib_get_wstr.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/widechar/lib_in_wch.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/widechar/lib_in_wchnstr.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/widechar/lib_ins_nwstr.c#2 delete .. //depot/projects/tty/contrib/ncurses/ncurses/widechar/lib_ins_wch.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/widechar/lib_inwstr.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/widechar/lib_pecho_wchar.c#1 branch .. //depot/projects/tty/contrib/ncurses/ncurses/widechar/lib_slk_wset.c#1 branch .. //depot/projects/tty/contrib/ncurses/ncurses/widechar/lib_unget_wch.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/widechar/lib_vid_attr.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/widechar/lib_wacs.c#2 integrate .. //depot/projects/tty/contrib/ncurses/ncurses/widechar/lib_wunctrl.c#2 integrate .. //depot/projects/tty/contrib/ncurses/panel/Makefile.in#2 integrate .. //depot/projects/tty/contrib/ncurses/panel/llib-lpanel#2 integrate .. //depot/projects/tty/contrib/ncurses/panel/llib-lpanelw#1 branch .. //depot/projects/tty/contrib/ncurses/panel/p_above.c#2 integrate .. //depot/projects/tty/contrib/ncurses/panel/p_below.c#2 integrate .. //depot/projects/tty/contrib/ncurses/panel/p_bottom.c#2 integrate .. //depot/projects/tty/contrib/ncurses/panel/p_delete.c#2 integrate .. //depot/projects/tty/contrib/ncurses/panel/p_hidden.c#2 integrate .. //depot/projects/tty/contrib/ncurses/panel/p_hide.c#2 integrate .. //depot/projects/tty/contrib/ncurses/panel/p_move.c#2 integrate .. //depot/projects/tty/contrib/ncurses/panel/p_new.c#2 integrate .. //depot/projects/tty/contrib/ncurses/panel/p_replace.c#2 integrate .. //depot/projects/tty/contrib/ncurses/panel/p_show.c#2 integrate .. //depot/projects/tty/contrib/ncurses/panel/p_top.c#2 integrate .. //depot/projects/tty/contrib/ncurses/panel/p_update.c#2 integrate .. //depot/projects/tty/contrib/ncurses/panel/p_user.c#2 integrate .. //depot/projects/tty/contrib/ncurses/panel/p_win.c#2 integrate .. //depot/projects/tty/contrib/ncurses/panel/panel.c#2 integrate .. //depot/projects/tty/contrib/ncurses/panel/panel.h#2 integrate .. //depot/projects/tty/contrib/ncurses/panel/panel.priv.h#2 integrate .. //depot/projects/tty/contrib/ncurses/progs/MKtermsort.sh#2 integrate .. //depot/projects/tty/contrib/ncurses/progs/Makefile.in#2 integrate .. //depot/projects/tty/contrib/ncurses/progs/capconvert#2 integrate .. //depot/projects/tty/contrib/ncurses/progs/clear.c#2 integrate .. //depot/projects/tty/contrib/ncurses/progs/clear.sh#2 integrate .. //depot/projects/tty/contrib/ncurses/progs/dump_entry.c#2 integrate .. //depot/projects/tty/contrib/ncurses/progs/dump_entry.h#2 integrate .. //depot/projects/tty/contrib/ncurses/progs/infocmp.c#2 integrate .. //depot/projects/tty/contrib/ncurses/progs/modules#2 integrate .. //depot/projects/tty/contrib/ncurses/progs/progs.priv.h#2 integrate .. //depot/projects/tty/contrib/ncurses/progs/tic.c#2 integrate .. //depot/projects/tty/contrib/ncurses/progs/toe.c#2 integrate .. //depot/projects/tty/contrib/ncurses/progs/tput.c#2 integrate .. //depot/projects/tty/contrib/ncurses/progs/tset.c#2 integrate .. //depot/projects/tty/contrib/ncurses/tack/COPYING#2 integrate .. //depot/projects/tty/contrib/ncurses/tack/HISTORY#2 integrate .. //depot/projects/tty/contrib/ncurses/tack/Makefile.in#2 integrate .. //depot/projects/tty/contrib/ncurses/tack/ansi.c#2 integrate .. //depot/projects/tty/contrib/ncurses/tack/charset.c#2 integrate .. //depot/projects/tty/contrib/ncurses/tack/color.c#2 integrate .. //depot/projects/tty/contrib/ncurses/tack/control.c#2 integrate .. //depot/projects/tty/contrib/ncurses/tack/crum.c#2 integrate .. //depot/projects/tty/contrib/ncurses/tack/edit.c#2 integrate .. //depot/projects/tty/contrib/ncurses/tack/fun.c#2 integrate .. //depot/projects/tty/contrib/ncurses/tack/init.c#2 integrate .. //depot/projects/tty/contrib/ncurses/tack/menu.c#2 integrate .. //depot/projects/tty/contrib/ncurses/tack/modes.c#2 integrate .. //depot/projects/tty/contrib/ncurses/tack/modules#2 integrate .. //depot/projects/tty/contrib/ncurses/tack/output.c#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Apr 18 20:35:27 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 F084916A403; Wed, 18 Apr 2007 20:35:26 +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 7D6B016A400 for ; Wed, 18 Apr 2007 20:35:26 +0000 (UTC) (envelope-from jkim@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6BCBF13C484 for ; Wed, 18 Apr 2007 20:35:26 +0000 (UTC) (envelope-from jkim@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 l3IKZQGf051671 for ; Wed, 18 Apr 2007 20:35:26 GMT (envelope-from jkim@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3IKZMgm051659 for perforce@freebsd.org; Wed, 18 Apr 2007 20:35:22 GMT (envelope-from jkim@freebsd.org) Date: Wed, 18 Apr 2007 20:35:22 GMT Message-Id: <200704182035.l3IKZMgm051659@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jkim@freebsd.org using -f From: Jung-uk Kim To: Perforce Change Reviews Cc: Subject: PERFORCE change 118381 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: Wed, 18 Apr 2007 20:35:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=118381 Change 118381 by jkim@jkim_hammer on 2007/04/18 20:34:35 IFC @118379 Affected files ... .. //depot/projects/linuxolator/src/sys/Makefile#5 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/busdma_machdep.c#4 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/pmap.c#8 integrate .. //depot/projects/linuxolator/src/sys/amd64/conf/GENERIC#10 integrate .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_dummy.c#13 integrate .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#49 integrate .. //depot/projects/linuxolator/src/sys/boot/forth/loader.conf#6 integrate .. //depot/projects/linuxolator/src/sys/cam/cam_ccb.h#4 integrate .. //depot/projects/linuxolator/src/sys/cam/cam_periph.c#4 integrate .. //depot/projects/linuxolator/src/sys/cam/cam_periph.h#2 integrate .. //depot/projects/linuxolator/src/sys/cam/cam_sim.c#2 integrate .. //depot/projects/linuxolator/src/sys/cam/cam_sim.h#2 integrate .. //depot/projects/linuxolator/src/sys/cam/cam_xpt.c#9 integrate .. //depot/projects/linuxolator/src/sys/cam/cam_xpt.h#4 integrate .. //depot/projects/linuxolator/src/sys/cam/cam_xpt_periph.h#2 integrate .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_cd.c#3 integrate .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_ch.c#3 integrate .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_da.c#10 integrate .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_low.c#3 integrate .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_pass.c#3 integrate .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_pt.c#3 integrate .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_sa.c#3 integrate .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_ses.c#3 integrate .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_sg.c#2 edit .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_sg.h#2 edit .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_targ_bh.c#3 integrate .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_target.c#4 integrate .. //depot/projects/linuxolator/src/sys/compat/linprocfs/linprocfs.c#17 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_ioctl.h#4 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_socket.c#15 integrate .. //depot/projects/linuxolator/src/sys/compat/opensolaris/kern/opensolaris_kmem.c#2 integrate .. //depot/projects/linuxolator/src/sys/compat/opensolaris/kern/opensolaris_kobj.c#2 integrate .. //depot/projects/linuxolator/src/sys/compat/opensolaris/kern/opensolaris_misc.c#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/kern/opensolaris_string.c#2 integrate .. //depot/projects/linuxolator/src/sys/compat/opensolaris/kern/opensolaris_vfs.c#2 integrate .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/kmem.h#2 integrate .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/kobj.h#2 integrate .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/lock.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/misc.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/mutex.h#2 integrate .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/rwlock.h#2 integrate .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/string.h#2 integrate .. //depot/projects/linuxolator/src/sys/conf/NOTES#24 integrate .. //depot/projects/linuxolator/src/sys/conf/files#27 integrate .. //depot/projects/linuxolator/src/sys/conf/files.ia64#3 integrate .. //depot/projects/linuxolator/src/sys/conf/options#23 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/utmisc.c#3 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/common/atomic/amd64/atomic.S#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/common/atomic/i386/atomic.S#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/dnlc.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#3 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/fs/zfs.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/pf/net/if_pfsync.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/aac/aac_cam.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/advansys/advansys.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/advansys/adwcam.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/aha/aha.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/ahb/ahb.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/aic/aic.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/aic7xxx/aic7770.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/aic7xxx/aic79xx.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/aic7xxx/aic79xx.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/aic7xxx/aic79xx_osm.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/aic7xxx/aic79xx_osm.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/aic7xxx/aic79xx_pci.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/aic7xxx/aic7xxx.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/aic7xxx/aic7xxx.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/aic7xxx/aic7xxx_osm.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/aic7xxx/aic7xxx_osm.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/aic7xxx/aic7xxx_pci.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/aic7xxx/aic_osm_lib.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/aic7xxx/aic_osm_lib.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/amd/amd.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/amr/amr_cam.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/arcmsr/arcmsr.c#8 integrate .. //depot/projects/linuxolator/src/sys/dev/asr/asr.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/ata-all.h#6 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/ata-chipset.c#14 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/ata-dma.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/atapi-cam.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/ath/ah_osdep.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/buslogic/bt.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/ciss/ciss.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/cxgb/cxgb_adapter.h#4 integrate .. //depot/projects/linuxolator/src/sys/dev/cxgb/cxgb_lro.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/cxgb/cxgb_main.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/cxgb/cxgb_osdep.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/cxgb/cxgb_sge.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/cxgb/sys/mvec.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/cxgb/sys/uipc_mvec.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/dpt/dpt_scsi.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/esp/ncr53c9x.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/ex/if_exvar.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/firewire/fwdma.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/firewire/sbp.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/firewire/sbp_targ.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/hptmv/entry.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/iicbus/icee.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/iir/iir.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/isp/isp_freebsd.c#12 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/brgphy.c#12 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/miidevs#8 integrate .. //depot/projects/linuxolator/src/sys/dev/mly/mly.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/mpt/mpt_cam.c#15 integrate .. //depot/projects/linuxolator/src/sys/dev/msk/if_msk.c#8 integrate .. //depot/projects/linuxolator/src/sys/dev/ppbus/vpo.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/re/if_re.c#12 integrate .. //depot/projects/linuxolator/src/sys/dev/rr232x/osm_bsd.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/isa/ad1816.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/isa/ess.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/isa/mss.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/isa/sb16.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/isa/sb8.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/als4000.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/atiixp.c#7 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/au88x0.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/aureal.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/cmi.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/cs4281.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/csapcm.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/ds1.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/emu10k1.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/emu10kx-pcm.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/es137x.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/fm801.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/hda/hdac.c#18 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/ich.c#7 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/maestro3.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/solo.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/t4dwave.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/via8233.c#7 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/via82c686.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/vibes.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/buffer.c#7 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/buffer.h#5 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/sound.h#6 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/sbus/cs4231.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/sym/sym_hipd.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/trm/trm.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/twa/tw_osl_cam.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/umass.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/usbdevs#12 integrate .. //depot/projects/linuxolator/src/sys/dev/wds/wd7000.c#4 integrate .. //depot/projects/linuxolator/src/sys/fs/procfs/procfs_dbregs.c#2 integrate .. //depot/projects/linuxolator/src/sys/fs/procfs/procfs_fpregs.c#2 integrate .. //depot/projects/linuxolator/src/sys/fs/procfs/procfs_map.c#2 integrate .. //depot/projects/linuxolator/src/sys/fs/procfs/procfs_regs.c#2 integrate .. //depot/projects/linuxolator/src/sys/fs/pseudofs/pseudofs.c#4 integrate .. //depot/projects/linuxolator/src/sys/fs/pseudofs/pseudofs.h#4 integrate .. //depot/projects/linuxolator/src/sys/fs/pseudofs/pseudofs_fileno.c#2 integrate .. //depot/projects/linuxolator/src/sys/fs/pseudofs/pseudofs_internal.h#2 integrate .. //depot/projects/linuxolator/src/sys/fs/pseudofs/pseudofs_vncache.c#4 integrate .. //depot/projects/linuxolator/src/sys/fs/pseudofs/pseudofs_vnops.c#2 integrate .. //depot/projects/linuxolator/src/sys/geom/eli/g_eli.c#8 integrate .. //depot/projects/linuxolator/src/sys/geom/vinum/geom_vinum.h#2 integrate .. //depot/projects/linuxolator/src/sys/geom/vinum/geom_vinum_rm.c#2 integrate .. //depot/projects/linuxolator/src/sys/geom/vinum/geom_vinum_share.c#2 integrate .. //depot/projects/linuxolator/src/sys/geom/vinum/geom_vinum_subr.c#2 integrate .. //depot/projects/linuxolator/src/sys/i386/conf/GENERIC#8 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/busdma_machdep.c#5 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/identcpu.c#7 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/mp_machdep.c#8 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/pmap.c#12 integrate .. //depot/projects/linuxolator/src/sys/i386/include/pmap.h#6 integrate .. //depot/projects/linuxolator/src/sys/ia64/conf/GENERIC#6 integrate .. //depot/projects/linuxolator/src/sys/isa/isa_common.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_jail.c#11 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_mib.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/subr_rman.c#5 integrate .. //depot/projects/linuxolator/src/sys/kern/uipc_mbuf.c#7 integrate .. //depot/projects/linuxolator/src/sys/kern/uipc_mqueue.c#8 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_mount.c#14 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_subr.c#12 integrate .. //depot/projects/linuxolator/src/sys/libkern/index.c#2 integrate .. //depot/projects/linuxolator/src/sys/libkern/rindex.c#2 integrate .. //depot/projects/linuxolator/src/sys/modules/Makefile#14 integrate .. //depot/projects/linuxolator/src/sys/modules/cxgb/Makefile#3 integrate .. //depot/projects/linuxolator/src/sys/modules/dpt/Makefile#2 integrate .. //depot/projects/linuxolator/src/sys/modules/if_lagg/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/modules/libalias/libalias/Makefile#2 integrate .. //depot/projects/linuxolator/src/sys/modules/zfs/Makefile#3 integrate .. //depot/projects/linuxolator/src/sys/net/ieee8023ad_lacp.c#1 branch .. //depot/projects/linuxolator/src/sys/net/ieee8023ad_lacp.h#1 branch .. //depot/projects/linuxolator/src/sys/net/if.c#7 integrate .. //depot/projects/linuxolator/src/sys/net/if_ethersubr.c#8 integrate .. //depot/projects/linuxolator/src/sys/net/if_lagg.c#1 branch .. //depot/projects/linuxolator/src/sys/net/if_lagg.h#1 branch .. //depot/projects/linuxolator/src/sys/net/if_var.h#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/in_pcb.c#7 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_fw2.c#14 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_constants.h#10 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_crc32.c#4 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_indata.c#12 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_input.c#12 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_output.c#12 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_pcb.c#12 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_peeloff.c#6 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_structs.h#11 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_timer.c#9 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_uio.h#9 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_usrreq.c#12 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_var.h#8 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctputil.c#12 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctputil.h#9 integrate .. //depot/projects/linuxolator/src/sys/netinet/tcp_input.c#15 integrate .. //depot/projects/linuxolator/src/sys/netinet/tcp_output.c#10 integrate .. //depot/projects/linuxolator/src/sys/netinet/tcp_sack.c#4 integrate .. //depot/projects/linuxolator/src/sys/netinet/tcp_subr.c#10 integrate .. //depot/projects/linuxolator/src/sys/netinet/tcp_syncache.c#8 integrate .. //depot/projects/linuxolator/src/sys/netinet/tcp_timer.c#5 integrate .. //depot/projects/linuxolator/src/sys/netinet/tcp_timer.h#4 integrate .. //depot/projects/linuxolator/src/sys/netinet/tcp_usrreq.c#9 integrate .. //depot/projects/linuxolator/src/sys/netinet/tcp_var.h#7 integrate .. //depot/projects/linuxolator/src/sys/netinet6/ipsec.c#4 integrate .. //depot/projects/linuxolator/src/sys/netinet6/sctp6_usrreq.c#12 integrate .. //depot/projects/linuxolator/src/sys/netipsec/ipsec_osdep.h#3 integrate .. //depot/projects/linuxolator/src/sys/netnatm/natm.h#3 integrate .. //depot/projects/linuxolator/src/sys/nfsserver/nfs_srvsock.c#4 integrate .. //depot/projects/linuxolator/src/sys/pc98/conf/GENERIC#7 integrate .. //depot/projects/linuxolator/src/sys/pci/if_rlreg.h#4 integrate .. //depot/projects/linuxolator/src/sys/pci/if_vr.c#4 integrate .. //depot/projects/linuxolator/src/sys/pci/if_vrreg.h#3 integrate .. //depot/projects/linuxolator/src/sys/pci/ncr.c#4 integrate .. //depot/projects/linuxolator/src/sys/powerpc/conf/GENERIC#8 integrate .. //depot/projects/linuxolator/src/sys/rpc/types.h#1 branch .. //depot/projects/linuxolator/src/sys/security/audit/audit.c#7 integrate .. //depot/projects/linuxolator/src/sys/security/audit/audit.h#2 integrate .. //depot/projects/linuxolator/src/sys/security/audit/audit_arg.c#6 integrate .. //depot/projects/linuxolator/src/sys/security/audit/audit_bsm.c#5 integrate .. //depot/projects/linuxolator/src/sys/security/audit/audit_bsm_token.c#4 integrate .. //depot/projects/linuxolator/src/sys/security/audit/audit_private.h#4 integrate .. //depot/projects/linuxolator/src/sys/security/audit/audit_syscalls.c#9 integrate .. //depot/projects/linuxolator/src/sys/sparc64/conf/GENERIC#7 integrate .. //depot/projects/linuxolator/src/sys/sun4v/conf/GENERIC#8 integrate .. //depot/projects/linuxolator/src/sys/sys/eventhandler.h#5 integrate .. //depot/projects/linuxolator/src/sys/sys/hash.h#2 integrate .. //depot/projects/linuxolator/src/sys/sys/kernel.h#4 integrate .. //depot/projects/linuxolator/src/sys/sys/libkern.h#3 integrate .. //depot/projects/linuxolator/src/sys/sys/mbuf.h#10 integrate .. //depot/projects/linuxolator/src/sys/sys/mount.h#11 integrate .. //depot/projects/linuxolator/src/sys/sys/mutex.h#10 integrate .. //depot/projects/linuxolator/src/sys/sys/param.h#15 integrate .. //depot/projects/linuxolator/src/sys/sys/priv.h#8 integrate .. //depot/projects/linuxolator/src/sys/sys/proc.h#15 integrate .. //depot/projects/linuxolator/src/sys/sys/sysctl.h#3 integrate .. //depot/projects/linuxolator/src/sys/sys/systm.h#13 integrate .. //depot/projects/linuxolator/src/sys/ufs/ffs/ffs_snapshot.c#6 integrate .. //depot/projects/linuxolator/src/sys/ufs/ffs/ffs_softdep.c#10 integrate .. //depot/projects/linuxolator/src/sys/vm/phys_pager.c#4 integrate Differences ... ==== //depot/projects/linuxolator/src/sys/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/Makefile,v 1.41 2007/03/24 22:21:01 maxim Exp $ +# $FreeBSD: src/sys/Makefile,v 1.42 2007/04/14 16:29:15 maxim Exp $ .include @@ -8,10 +8,10 @@ .endif # Directories to include in cscope name file and TAGS. -CSCOPEDIRS= cam coda compat conf contrib crypto ddb dev fs geom gnu i4b \ - isa kern libkern modules net net80211 netatalk netatm \ +CSCOPEDIRS= bsm cam coda compat conf contrib crypto ddb dev fs geom gnu \ + i4b isa kern libkern modules net net80211 netatalk netatm \ netgraph netinet netinet6 netipx netkey netnatm netncp \ - netsmb nfs nfsclient nfs4client rpc pccard pci sys \ + netsmb nfs nfsclient nfs4client rpc pccard pci security sys \ ufs vm ${ARCHDIR} ARCHDIR ?= ${MACHINE} ==== //depot/projects/linuxolator/src/sys/amd64/amd64/busdma_machdep.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.79 2007/03/06 18:28:42 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.80 2007/04/17 21:05:34 jhb Exp $"); #include #include @@ -48,6 +48,7 @@ #include #include #include +#include #define MAX_BPAGES 8192 @@ -522,6 +523,9 @@ } else if ((uintptr_t)*vaddr & (dmat->alignment - 1)) { printf("bus_dmamem_alloc failed to align memory properly.\n"); } + if (flags & BUS_DMA_NOCACHE) + pmap_change_attr((vm_offset_t)*vaddr, dmat->maxsize, + PAT_UNCACHEABLE); CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d", __func__, dmat, dmat->flags, ENOMEM); return (0); @@ -540,6 +544,7 @@ */ if (map != NULL) panic("bus_dmamem_free: Invalid map freed\n"); + pmap_change_attr((vm_offset_t)vaddr, dmat->maxsize, PAT_WRITE_BACK); if ((dmat->maxsize <= PAGE_SIZE) && (dmat->alignment < dmat->maxsize) && dmat->lowaddr >= ptoa((vm_paddr_t)Maxmem)) ==== //depot/projects/linuxolator/src/sys/amd64/amd64/pmap.c#8 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.581 2007/03/10 20:26:43 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.582 2007/04/13 16:07:29 alc Exp $"); /* * Manages physical address maps. @@ -3261,7 +3261,7 @@ pd_entry_t *pde; pt_entry_t *pte; - base = va & PG_FRAME; + base = trunc_page(va); offset = va & PAGE_MASK; size = roundup(offset + size, PAGE_SIZE); ==== //depot/projects/linuxolator/src/sys/amd64/conf/GENERIC#10 (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/linuxolator/src/sys/amd64/linux32/linux32_dummy.c#13 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_dummy.c,v 1.8 2007/03/29 02:11:46 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_dummy.c,v 1.9 2007/04/18 18:08:12 jkim Exp $"); #include #include @@ -63,7 +63,6 @@ DUMMY(mincore); DUMMY(fadvise64); DUMMY(ptrace); -DUMMY(settimeofday); DUMMY(lookup_dcookie); DUMMY(epoll_create); DUMMY(epoll_ctl); ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#49 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.39 2007/03/30 17:27:13 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.42 2007/04/18 20:12:05 jkim Exp $"); #include #include @@ -252,7 +252,7 @@ if (iovcnt > UIO_MAXIOV) return (EINVAL); iovlen = iovcnt * sizeof(struct iovec); - uio = malloc(iovlen + sizeof *uio, M_IOV, M_WAITOK); + uio = malloc(iovlen + sizeof(*uio), M_IOV, M_WAITOK); iov = (struct iovec *)(uio + 1); for (i = 0; i < iovcnt; i++) { error = copyin(&iovp[i], &iov32, sizeof(struct iovec32)); @@ -526,7 +526,9 @@ td2 = FIRST_THREAD_IN_PROC(p2); - /* make it run */ + /* + * Make this runnable after we are finished with it. + */ mtx_lock_spin(&sched_lock); TD_SET_CAN_RUN(td2); sched_add(td2, SRQ_BORING); @@ -572,8 +574,8 @@ /* * XXX: In Linux, sharing of fs info (chroot/cwd/umask) * and open files is independant. In FreeBSD, its in one - * structure but in reality it does not make any problems - * because both of these flags are set at once usually. + * structure but in reality it does not cause any problems + * because both of these flags are usually set together. */ if (!(args->flags & (LINUX_CLONE_FILES | LINUX_CLONE_FS))) ff |= RFFDG; @@ -660,15 +662,15 @@ if (args->flags & LINUX_CLONE_SETTLS) { struct user_segment_descriptor sd; struct l_user_desc info; - int a[2]; + int a[2]; - error = copyin((void *)td->td_frame->tf_rsi, &info, + error = copyin((void *)td->td_frame->tf_rsi, &info, sizeof(struct l_user_desc)); if (error) { printf(LMSG("copyin failed!")); } else { /* We might copy out the entry_number as GUGS32_SEL. */ - info.entry_number = GUGS32_SEL; + info.entry_number = GUGS32_SEL; error = copyout(&info, (void *)td->td_frame->tf_rsi, sizeof(struct l_user_desc)); if (error) @@ -871,7 +873,7 @@ * * Our mmap with MAP_STACK takes addr as the maximum * downsize limit on BOS, and as len the max size of - * the region. It them maps the top SGROWSIZ bytes, + * the region. It then maps the top SGROWSIZ bytes, * and auto grows the region down, up to the limit * in addr. * @@ -1167,17 +1169,44 @@ microtime(&atv); atv32.tv_sec = atv.tv_sec; atv32.tv_usec = atv.tv_usec; - error = copyout(&atv32, uap->tp, sizeof (atv32)); + error = copyout(&atv32, uap->tp, sizeof(atv32)); } if (error == 0 && uap->tzp != NULL) { rtz.tz_minuteswest = tz_minuteswest; rtz.tz_dsttime = tz_dsttime; - error = copyout(&rtz, uap->tzp, sizeof (rtz)); + error = copyout(&rtz, uap->tzp, sizeof(rtz)); } return (error); } int +linux_settimeofday(struct thread *td, struct linux_settimeofday_args *uap) +{ + l_timeval atv32; + struct timeval atv, *tvp; + struct timezone atz, *tzp; + int error; + + if (uap->tp) { + error = copyin(uap->tp, &atv32, sizeof(atv32)); + if (error) + return (error); + atv.tv_sec = atv32.tv_sec; + atv.tv_usec = atv32.tv_usec; + tvp = &atv; + } else + tvp = NULL; + if (uap->tzp) { + error = copyin(uap->tzp, &atz, sizeof(atz)); + if (error) + return (error); + tzp = &atz; + } else + tzp = NULL; + return (kern_settimeofday(td, tvp, tzp)); +} + +int linux_getrusage(struct thread *td, struct linux_getrusage_args *uap) { struct l_rusage s32; @@ -1242,7 +1271,7 @@ #ifdef DEBUG if (ldebug(set_thread_area)) - printf(ARGS(set_thread_area, "%i, %x, %x, %i, %i, %i, " + printf(ARGS(set_thread_area, "%i, %x, %x, %i, %i, %i, " "%i, %i, %i"), info.entry_number, info.base_addr, info.limit, info.seg_32bit, info.contents, info.read_exec_only, info.limit_in_pages, @@ -1261,9 +1290,10 @@ * The tls_array[] is used only in [gs]et_thread_area() syscalls and * for loading the GDT descriptors. We use just one GDT descriptor * for TLS, so we will load just one. - * XXX: This doesnt work when user-space process tries to use more + * + * XXX: This doesn't work when a user space process tries to use more * than one TLS segment. Comment in the Linux source says wine might - * do that. + * do this. */ /* @@ -1284,8 +1314,9 @@ /* * We have to copy out the GDT entry we use. - * XXX: What if userspace program does not check return value and - * tries to use 6, 7 or 8? + * + * XXX: What if a user space program does not check the return value + * and tries to use 6, 7 or 8? */ error = copyout(&info, args->desc, sizeof(struct l_user_desc)); if (error) ==== //depot/projects/linuxolator/src/sys/boot/forth/loader.conf#6 (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/linuxolator/src/sys/cam/cam_ccb.h#4 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam_ccb.h,v 1.34 2006/12/03 07:19:28 mjacob Exp $ + * $FreeBSD: src/sys/cam/cam_ccb.h,v 1.35 2007/04/15 08:49:09 scottl Exp $ */ #ifndef _CAM_CAM_CCB_H @@ -242,8 +242,7 @@ typedef union { void *ptr; u_long field; - u_int8_t bytes[sizeof(void *) > sizeof(u_long) - ? sizeof(void *) : sizeof(u_long)]; + u_int8_t bytes[sizeof(uintptr_t)]; } ccb_priv_entry; typedef union { @@ -274,8 +273,12 @@ ccb_ppriv_area periph_priv; ccb_spriv_area sim_priv; u_int32_t timeout; /* Timeout value */ + + /* + * Deprecated, only for use by non-MPSAFE SIMs. All others must + * allocate and initialize their own callout storage. + */ struct callout_handle timeout_ch; - /* Callout handle used for timeouts */ }; /* Get Device Information CCB */ ==== //depot/projects/linuxolator/src/sys/cam/cam_periph.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.64 2006/12/05 07:45:27 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.66 2007/04/16 19:42:23 scottl Exp $"); #include #include @@ -51,6 +51,7 @@ #include #include #include +#include #include #include @@ -122,6 +123,7 @@ ac_callback_t *ac_callback, ac_code code, void *arg) { struct periph_driver **p_drv; + struct cam_sim *sim; struct cam_periph *periph; struct cam_periph *cur_periph; path_id_t path_id; @@ -163,11 +165,14 @@ init_level++; + xpt_lock_buses(); for (p_drv = periph_drivers; *p_drv != NULL; p_drv++) { if (strcmp((*p_drv)->driver_name, name) == 0) break; } - + xpt_unlock_buses(); + + sim = xpt_path_sim(path); path_id = xpt_path_path_id(path); target_id = xpt_path_target_id(path); lun_id = xpt_path_lun_id(path); @@ -181,6 +186,7 @@ periph->unit_number = camperiphunit(*p_drv, path_id, target_id, lun_id); periph->immediate_priority = CAM_PRIORITY_NONE; periph->refcount = 0; + periph->sim = sim; SLIST_INIT(&periph->ccb_list); status = xpt_create_path(&path, periph, path_id, target_id, lun_id); if (status != CAM_REQ_CMP) @@ -276,14 +282,13 @@ cam_status cam_periph_acquire(struct cam_periph *periph) { - int s; if (periph == NULL) return(CAM_REQ_CMP_ERR); - s = splsoftcam(); + xpt_lock_buses(); periph->refcount++; - splx(s); + xpt_unlock_buses(); return(CAM_REQ_CMP); } @@ -291,18 +296,66 @@ void cam_periph_release(struct cam_periph *periph) { - int s; if (periph == NULL) return; - s = splsoftcam(); + xpt_lock_buses(); if ((--periph->refcount == 0) && (periph->flags & CAM_PERIPH_INVALID)) { camperiphfree(periph); } - splx(s); + xpt_unlock_buses(); + +} + +int +cam_periph_hold(struct cam_periph *periph, int priority) +{ + struct mtx *mtx; + int error; + + mtx_assert(periph->sim->mtx, MA_OWNED); + + /* + * Increment the reference count on the peripheral + * while we wait for our lock attempt to succeed + * to ensure the peripheral doesn't disappear out + * from user us while we sleep. + */ + + if (cam_periph_acquire(periph) != CAM_REQ_CMP) + return (ENXIO); + + mtx = periph->sim->mtx; + if (mtx == &Giant) + mtx = NULL; + + while ((periph->flags & CAM_PERIPH_LOCKED) != 0) { + periph->flags |= CAM_PERIPH_LOCK_WANTED; + if ((error = msleep(periph, mtx, priority, "caplck", 0)) != 0) { + cam_periph_release(periph); + return (error); + } + } + + periph->flags |= CAM_PERIPH_LOCKED; + return (0); +} + +void +cam_periph_unhold(struct cam_periph *periph) +{ + + mtx_assert(periph->sim->mtx, MA_OWNED); + + periph->flags &= ~CAM_PERIPH_LOCKED; + if ((periph->flags & CAM_PERIPH_LOCK_WANTED) != 0) { + periph->flags &= ~CAM_PERIPH_LOCK_WANTED; + wakeup(periph); + } + cam_periph_release(periph); } /* @@ -424,9 +477,7 @@ void cam_periph_invalidate(struct cam_periph *periph) { - int s; - s = splsoftcam(); /* * We only call this routine the first time a peripheral is * invalidated. The oninvalidate() routine is always called at @@ -439,17 +490,17 @@ periph->flags |= CAM_PERIPH_INVALID; periph->flags &= ~CAM_PERIPH_NEW_DEV_FOUND; + xpt_lock_buses(); if (periph->refcount == 0) camperiphfree(periph); else if (periph->refcount < 0) printf("cam_invalidate_periph: refcount < 0!!\n"); - splx(s); + xpt_unlock_buses(); } static void camperiphfree(struct cam_periph *periph) { - int s; struct periph_driver **p_drv; for (p_drv = periph_drivers; *p_drv != NULL; p_drv++) { @@ -460,15 +511,13 @@ printf("camperiphfree: attempt to free non-existant periph\n"); return; } - - if (periph->periph_dtor != NULL) - periph->periph_dtor(periph); - - s = splsoftcam(); + TAILQ_REMOVE(&(*p_drv)->units, periph, unit_links); (*p_drv)->generation++; - splx(s); + xpt_unlock_buses(); + if (periph->periph_dtor != NULL) + periph->periph_dtor(periph); xpt_remove_periph(periph); if (periph->flags & CAM_PERIPH_NEW_DEV_FOUND) { @@ -497,35 +546,17 @@ } xpt_free_path(periph->path); free(periph, M_CAMPERIPH); + xpt_lock_buses(); } /* * Wait interruptibly for an exclusive lock. */ -int -cam_periph_lock(struct cam_periph *periph, int priority) +void +cam_periph_lock(struct cam_periph *periph) { - int error; - /* - * Increment the reference count on the peripheral - * while we wait for our lock attempt to succeed - * to ensure the peripheral doesn't disappear out - * from under us while we sleep. - */ - if (cam_periph_acquire(periph) != CAM_REQ_CMP) - return(ENXIO); - - while ((periph->flags & CAM_PERIPH_LOCKED) != 0) { - periph->flags |= CAM_PERIPH_LOCK_WANTED; - if ((error = tsleep(periph, priority, "caplck", 0)) != 0) { - cam_periph_release(periph); - return error; - } - } - - periph->flags |= CAM_PERIPH_LOCKED; - return 0; + mtx_lock(periph->sim->mtx); } /* @@ -534,13 +565,8 @@ void cam_periph_unlock(struct cam_periph *periph) { - periph->flags &= ~CAM_PERIPH_LOCKED; - if ((periph->flags & CAM_PERIPH_LOCK_WANTED) != 0) { - periph->flags &= ~CAM_PERIPH_LOCK_WANTED; - wakeup(periph); - } - cam_periph_release(periph); + mtx_unlock(periph->sim->mtx); } /* @@ -752,12 +778,11 @@ cam_periph_getccb(struct cam_periph *periph, u_int32_t priority) { struct ccb_hdr *ccb_h; - int s; + struct mtx *mtx; + mtx_assert(periph->sim->mtx, MA_OWNED); CAM_DEBUG(periph->path, CAM_DEBUG_TRACE, ("entering cdgetccb\n")); - s = splsoftcam(); - while (SLIST_FIRST(&periph->ccb_list) == NULL) { if (periph->immediate_priority > priority) periph->immediate_priority = priority; @@ -765,24 +790,35 @@ if ((SLIST_FIRST(&periph->ccb_list) != NULL) && (SLIST_FIRST(&periph->ccb_list)->pinfo.priority == priority)) break; - tsleep(&periph->ccb_list, PRIBIO, "cgticb", 0); + mtx_assert(periph->sim->mtx, MA_OWNED); + if (periph->sim->mtx == &Giant) + mtx = NULL; + else + mtx = periph->sim->mtx; + msleep(&periph->ccb_list, mtx, PRIBIO, "cgticb", 0); } ccb_h = SLIST_FIRST(&periph->ccb_list); SLIST_REMOVE_HEAD(&periph->ccb_list, periph_links.sle); - splx(s); return ((union ccb *)ccb_h); } void cam_periph_ccbwait(union ccb *ccb) { + struct mtx *mtx; + struct cam_sim *sim; int s; s = splsoftcam(); + sim = xpt_path_sim(ccb->ccb_h.path); + if (sim->mtx == &Giant) + mtx = NULL; + else + mtx = sim->mtx; if ((ccb->ccb_h.pinfo.index != CAM_UNQUEUED_INDEX) || ((ccb->ccb_h.status & CAM_STATUS_MASK) == CAM_REQ_INPROG)) - tsleep(&ccb->ccb_h.cbfcnp, PRIBIO, "cbwait", 0); + msleep(&ccb->ccb_h.cbfcnp, mtx, PRIBIO, "cbwait", 0); splx(s); } @@ -857,10 +893,13 @@ cam_flags camflags, u_int32_t sense_flags, struct devstat *ds) { + struct cam_sim *sim; int error; error = 0; - + sim = xpt_path_sim(ccb->ccb_h.path); + mtx_assert(sim->mtx, MA_OWNED); + /* * If the user has supplied a stats structure, and if we understand * this particular type of ccb, record the transaction start. ==== //depot/projects/linuxolator/src/sys/cam/cam_periph.h#2 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam_periph.h,v 1.16 2005/01/05 22:34:34 imp Exp $ + * $FreeBSD: src/sys/cam/cam_periph.h,v 1.17 2007/04/15 08:49:09 scottl Exp $ */ #ifndef _CAM_CAM_PERIPH_H @@ -104,6 +104,7 @@ char *periph_name; struct cam_path *path; /* Compiled path to device */ void *softc; + struct cam_sim *sim; u_int32_t unit_number; cam_periph_type type; u_int32_t flags; @@ -113,6 +114,7 @@ #define CAM_PERIPH_INVALID 0x08 #define CAM_PERIPH_NEW_DEV_FOUND 0x10 #define CAM_PERIPH_RECOVERY_INPROG 0x20 +#define CAM_PERIPH_POLLED 0x40 u_int32_t immediate_priority; u_int32_t refcount; SLIST_HEAD(, ccb_hdr) ccb_list; /* For "immediate" requests */ @@ -136,10 +138,12 @@ char *name, cam_periph_type type, struct cam_path *, ac_callback_t *, ac_code, void *arg); struct cam_periph *cam_periph_find(struct cam_path *path, char *name); -int cam_periph_lock(struct cam_periph *periph, int priority); +void cam_periph_lock(struct cam_periph *periph); void cam_periph_unlock(struct cam_periph *periph); cam_status cam_periph_acquire(struct cam_periph *periph); void cam_periph_release(struct cam_periph *periph); +int cam_periph_hold(struct cam_periph *periph, int priority); +void cam_periph_unhold(struct cam_periph *periph); void cam_periph_invalidate(struct cam_periph *periph); int cam_periph_mapmem(union ccb *ccb, struct cam_periph_map_info *mapinfo); ==== //depot/projects/linuxolator/src/sys/cam/cam_sim.c#2 (text+ko) ==== @@ -27,12 +27,14 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_sim.c,v 1.9 2005/07/01 15:21:29 avatar Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_sim.c,v 1.10 2007/04/15 08:49:09 scottl Exp $"); #include #include #include #include +#include +#include #include #include @@ -58,39 +60,42 @@ struct cam_sim * cam_sim_alloc(sim_action_func sim_action, sim_poll_func sim_poll, const char *sim_name, void *softc, u_int32_t unit, - int max_dev_transactions, + struct mtx *mtx, int max_dev_transactions, int max_tagged_dev_transactions, struct cam_devq *queue) { struct cam_sim *sim; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Apr 18 23:40:36 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 B635916A404; Wed, 18 Apr 2007 23:40:35 +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 5698B16A400 for ; Wed, 18 Apr 2007 23:40:35 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 449B413C448 for ; Wed, 18 Apr 2007 23:40:35 +0000 (UTC) (envelope-from kmacy@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 l3INeZmE092192 for ; Wed, 18 Apr 2007 23:40:35 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3INeLJQ092176 for perforce@freebsd.org; Wed, 18 Apr 2007 23:40:21 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 18 Apr 2007 23:40:21 GMT Message-Id: <200704182340.l3INeLJQ092176@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 118384 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: Wed, 18 Apr 2007 23:40:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=118384 Change 118384 by kmacy@kmacy_vt-x:opentoe_init on 2007/04/18 23:39:23 IFC latest cxgb updates to HEAD Affected files ... .. //depot/projects/opentoe/MAINTAINERS#2 integrate .. //depot/projects/opentoe/Makefile.inc1#2 integrate .. //depot/projects/opentoe/ObsoleteFiles.inc#4 integrate .. //depot/projects/opentoe/UPDATING#3 integrate .. //depot/projects/opentoe/bin/df/df.c#2 integrate .. //depot/projects/opentoe/cddl/Makefile#1 branch .. //depot/projects/opentoe/cddl/Makefile.inc#1 branch .. //depot/projects/opentoe/cddl/lib/Makefile#1 branch .. //depot/projects/opentoe/cddl/lib/Makefile.inc#1 branch .. //depot/projects/opentoe/cddl/lib/libavl/Makefile#1 branch .. //depot/projects/opentoe/cddl/lib/libnvpair/Makefile#1 branch .. //depot/projects/opentoe/cddl/lib/libumem/Makefile#1 branch .. //depot/projects/opentoe/cddl/lib/libuutil/Makefile#1 branch .. //depot/projects/opentoe/cddl/lib/libzfs/Makefile#1 branch .. //depot/projects/opentoe/cddl/lib/libzpool/Makefile#1 branch .. //depot/projects/opentoe/cddl/sbin/Makefile#1 branch .. //depot/projects/opentoe/cddl/sbin/Makefile.inc#1 branch .. //depot/projects/opentoe/cddl/sbin/zfs/Makefile#1 branch .. //depot/projects/opentoe/cddl/sbin/zpool/Makefile#1 branch .. //depot/projects/opentoe/cddl/usr.bin/Makefile#1 branch .. //depot/projects/opentoe/cddl/usr.bin/Makefile.inc#1 branch .. //depot/projects/opentoe/cddl/usr.bin/ztest/Makefile#1 branch .. //depot/projects/opentoe/cddl/usr.sbin/Makefile#1 branch .. //depot/projects/opentoe/cddl/usr.sbin/Makefile.inc#1 branch .. //depot/projects/opentoe/cddl/usr.sbin/zdb/Makefile#1 branch .. //depot/projects/opentoe/compat/opensolaris/include/devid.h#1 branch .. //depot/projects/opentoe/compat/opensolaris/include/fsshare.h#1 branch .. //depot/projects/opentoe/compat/opensolaris/include/libintl.h#1 branch .. //depot/projects/opentoe/compat/opensolaris/include/mnttab.h#1 branch .. //depot/projects/opentoe/compat/opensolaris/include/priv.h#1 branch .. //depot/projects/opentoe/compat/opensolaris/include/solaris.h#1 branch .. //depot/projects/opentoe/compat/opensolaris/include/zone.h#1 branch .. //depot/projects/opentoe/compat/opensolaris/lib/libumem/umem.c#1 branch .. //depot/projects/opentoe/compat/opensolaris/lib/libumem/umem.h#1 branch .. //depot/projects/opentoe/compat/opensolaris/misc/fsshare.c#1 branch .. //depot/projects/opentoe/compat/opensolaris/misc/mkdirp.c#1 branch .. //depot/projects/opentoe/compat/opensolaris/misc/mnttab.c#1 branch .. //depot/projects/opentoe/compat/opensolaris/misc/zmount.c#1 branch .. //depot/projects/opentoe/compat/opensolaris/misc/zone.c#1 branch .. //depot/projects/opentoe/contrib/amd/hlfsd/hlfsd.h#2 integrate .. //depot/projects/opentoe/contrib/binutils/gas/as.h#2 integrate .. //depot/projects/opentoe/contrib/binutils/gas/tc.h#2 integrate .. //depot/projects/opentoe/contrib/libreadline/FREEBSD-upgrade#2 integrate .. //depot/projects/opentoe/contrib/libreadline/display.c#2 integrate .. //depot/projects/opentoe/contrib/openbsm/HISTORY#2 integrate .. //depot/projects/opentoe/contrib/openbsm/README#2 integrate .. //depot/projects/opentoe/contrib/openbsm/TODO#2 integrate .. //depot/projects/opentoe/contrib/openbsm/VERSION#2 integrate .. //depot/projects/opentoe/contrib/openbsm/bin/audit/audit.8#2 integrate .. //depot/projects/opentoe/contrib/openbsm/bin/auditd/auditd.8#2 integrate .. //depot/projects/opentoe/contrib/openbsm/bin/auditd/auditd.c#2 integrate .. //depot/projects/opentoe/contrib/openbsm/bin/auditfilterd/auditfilterd.8#2 integrate .. //depot/projects/opentoe/contrib/openbsm/bin/auditfilterd/auditfilterd.c#2 integrate .. //depot/projects/opentoe/contrib/openbsm/bin/auditreduce/auditreduce.1#2 integrate .. //depot/projects/opentoe/contrib/openbsm/bin/praudit/praudit.1#2 integrate .. //depot/projects/opentoe/contrib/openbsm/bin/praudit/praudit.c#2 integrate .. //depot/projects/opentoe/contrib/openbsm/bsm/libbsm.h#2 integrate .. //depot/projects/opentoe/contrib/openbsm/compat/clock_gettime.h#1 branch .. //depot/projects/opentoe/contrib/openbsm/config/config.h#2 integrate .. //depot/projects/opentoe/contrib/openbsm/configure#2 integrate .. //depot/projects/opentoe/contrib/openbsm/configure.ac#2 integrate .. //depot/projects/opentoe/contrib/openbsm/etc/audit_event#2 integrate .. //depot/projects/opentoe/contrib/openbsm/libbsm/au_class.3#2 integrate .. //depot/projects/opentoe/contrib/openbsm/libbsm/au_control.3#2 integrate .. //depot/projects/opentoe/contrib/openbsm/libbsm/au_event.3#2 integrate .. //depot/projects/opentoe/contrib/openbsm/libbsm/au_free_token.3#2 integrate .. //depot/projects/opentoe/contrib/openbsm/libbsm/au_io.3#2 integrate .. //depot/projects/opentoe/contrib/openbsm/libbsm/au_mask.3#2 integrate .. //depot/projects/opentoe/contrib/openbsm/libbsm/au_open.3#2 integrate .. //depot/projects/opentoe/contrib/openbsm/libbsm/au_token.3#2 integrate .. //depot/projects/opentoe/contrib/openbsm/libbsm/au_user.3#2 integrate .. //depot/projects/opentoe/contrib/openbsm/libbsm/audit_submit.3#2 integrate .. //depot/projects/opentoe/contrib/openbsm/libbsm/bsm_io.c#2 integrate .. //depot/projects/opentoe/contrib/openbsm/libbsm/bsm_notify.c#2 integrate .. //depot/projects/opentoe/contrib/openbsm/libbsm/bsm_token.c#2 integrate .. //depot/projects/opentoe/contrib/openbsm/libbsm/bsm_wrappers.c#2 integrate .. //depot/projects/opentoe/contrib/openbsm/libbsm/libbsm.3#2 integrate .. //depot/projects/opentoe/contrib/openbsm/man/audit.2#2 integrate .. //depot/projects/opentoe/contrib/openbsm/man/audit.log.5#2 integrate .. //depot/projects/opentoe/contrib/openbsm/man/audit_class.5#2 integrate .. //depot/projects/opentoe/contrib/openbsm/man/audit_control.5#2 integrate .. //depot/projects/opentoe/contrib/openbsm/man/audit_event.5#2 integrate .. //depot/projects/opentoe/contrib/openbsm/man/audit_user.5#2 integrate .. //depot/projects/opentoe/contrib/openbsm/man/audit_warn.5#2 integrate .. //depot/projects/opentoe/contrib/openbsm/man/auditctl.2#2 integrate .. //depot/projects/opentoe/contrib/openbsm/man/auditon.2#2 integrate .. //depot/projects/opentoe/contrib/openbsm/man/getaudit.2#2 integrate .. //depot/projects/opentoe/contrib/openbsm/man/getauid.2#2 integrate .. //depot/projects/opentoe/contrib/openbsm/man/setaudit.2#2 integrate .. //depot/projects/opentoe/contrib/openbsm/man/setauid.2#2 integrate .. //depot/projects/opentoe/contrib/openbsm/test/bsm/generate.c#2 integrate .. //depot/projects/opentoe/contrib/openbsm/test/reference/arg32_record#2 integrate .. //depot/projects/opentoe/contrib/openbsm/test/reference/data_record#2 integrate .. //depot/projects/opentoe/contrib/openbsm/test/reference/file_record#2 integrate .. //depot/projects/opentoe/contrib/openbsm/test/reference/in_addr_record#2 integrate .. //depot/projects/opentoe/contrib/openbsm/test/reference/ip_record#2 integrate .. //depot/projects/opentoe/contrib/openbsm/test/reference/ipc_record#2 integrate .. //depot/projects/opentoe/contrib/openbsm/test/reference/iport_record#2 integrate .. //depot/projects/opentoe/contrib/openbsm/test/reference/opaque_record#2 integrate .. //depot/projects/opentoe/contrib/openbsm/test/reference/path_record#2 integrate .. //depot/projects/opentoe/contrib/openbsm/test/reference/process32_record#2 integrate .. //depot/projects/opentoe/contrib/openbsm/test/reference/process32ex_record#2 delete .. //depot/projects/opentoe/contrib/openbsm/test/reference/process32ex_record-IPv4#1 branch .. //depot/projects/opentoe/contrib/openbsm/test/reference/process32ex_record-IPv6#1 branch .. //depot/projects/opentoe/contrib/openbsm/test/reference/process32ex_token#2 delete .. //depot/projects/opentoe/contrib/openbsm/test/reference/process32ex_token-IPv4#1 branch .. //depot/projects/opentoe/contrib/openbsm/test/reference/process32ex_token-IPv6#1 branch .. //depot/projects/opentoe/contrib/openbsm/test/reference/process64_record#1 branch .. //depot/projects/opentoe/contrib/openbsm/test/reference/process64_token#1 branch .. //depot/projects/opentoe/contrib/openbsm/test/reference/process64ex_record-IPv4#1 branch .. //depot/projects/opentoe/contrib/openbsm/test/reference/process64ex_record-IPv6#1 branch .. //depot/projects/opentoe/contrib/openbsm/test/reference/process64ex_token-IPv4#1 branch .. //depot/projects/opentoe/contrib/openbsm/test/reference/process64ex_token-IPv6#1 branch .. //depot/projects/opentoe/contrib/openbsm/test/reference/return32_record#2 integrate .. //depot/projects/opentoe/contrib/openbsm/test/reference/seq_record#2 integrate .. //depot/projects/opentoe/contrib/openbsm/test/reference/subject32_record#2 integrate .. //depot/projects/opentoe/contrib/openbsm/test/reference/subject32ex_record#2 integrate .. //depot/projects/opentoe/contrib/openbsm/test/reference/subject32ex_token-IPv4#2 integrate .. //depot/projects/opentoe/contrib/openbsm/test/reference/subject32ex_token-IPv6#2 integrate .. //depot/projects/opentoe/contrib/openbsm/test/reference/text_record#2 integrate .. //depot/projects/opentoe/contrib/openbsm/test/reference/zonename_record#1 branch .. //depot/projects/opentoe/contrib/openbsm/test/reference/zonename_token#1 branch .. //depot/projects/opentoe/contrib/openbsm/tools/audump.c#2 integrate .. //depot/projects/opentoe/contrib/openpam/lib/openpam_readline.c#2 integrate .. //depot/projects/opentoe/contrib/opensolaris/cmd/zdb/zdb.8#1 branch .. //depot/projects/opentoe/contrib/opensolaris/cmd/zdb/zdb.c#1 branch .. //depot/projects/opentoe/contrib/opensolaris/cmd/zdb/zdb_il.c#1 branch .. //depot/projects/opentoe/contrib/opensolaris/cmd/zfs/zfs.8#1 branch .. //depot/projects/opentoe/contrib/opensolaris/cmd/zfs/zfs_iter.c#1 branch .. //depot/projects/opentoe/contrib/opensolaris/cmd/zfs/zfs_iter.h#1 branch .. //depot/projects/opentoe/contrib/opensolaris/cmd/zfs/zfs_main.c#1 branch .. //depot/projects/opentoe/contrib/opensolaris/cmd/zfs/zfs_util.h#1 branch .. //depot/projects/opentoe/contrib/opensolaris/cmd/zpool/zpool.8#1 branch .. //depot/projects/opentoe/contrib/opensolaris/cmd/zpool/zpool_iter.c#1 branch .. //depot/projects/opentoe/contrib/opensolaris/cmd/zpool/zpool_main.c#1 branch .. //depot/projects/opentoe/contrib/opensolaris/cmd/zpool/zpool_util.c#1 branch .. //depot/projects/opentoe/contrib/opensolaris/cmd/zpool/zpool_util.h#1 branch .. //depot/projects/opentoe/contrib/opensolaris/cmd/zpool/zpool_vdev.c#1 branch .. //depot/projects/opentoe/contrib/opensolaris/cmd/ztest/ztest.c#1 branch .. //depot/projects/opentoe/contrib/opensolaris/head/assert.h#1 branch .. //depot/projects/opentoe/contrib/opensolaris/head/atomic.h#1 branch .. //depot/projects/opentoe/contrib/opensolaris/head/libintl.h#1 branch .. //depot/projects/opentoe/contrib/opensolaris/head/stdio_ext.h#1 branch .. //depot/projects/opentoe/contrib/opensolaris/head/synch.h#1 branch .. //depot/projects/opentoe/contrib/opensolaris/head/thread.h#1 branch .. //depot/projects/opentoe/contrib/opensolaris/lib/libnvpair/libnvpair.c#1 branch .. //depot/projects/opentoe/contrib/opensolaris/lib/libnvpair/libnvpair.h#1 branch .. //depot/projects/opentoe/contrib/opensolaris/lib/libnvpair/nvpair_alloc_system.c#1 branch .. //depot/projects/opentoe/contrib/opensolaris/lib/libuutil/common/libuutil.h#1 branch .. //depot/projects/opentoe/contrib/opensolaris/lib/libuutil/common/libuutil_common.h#1 branch .. //depot/projects/opentoe/contrib/opensolaris/lib/libuutil/common/libuutil_impl.h#1 branch .. //depot/projects/opentoe/contrib/opensolaris/lib/libuutil/common/uu_alloc.c#1 branch .. //depot/projects/opentoe/contrib/opensolaris/lib/libuutil/common/uu_avl.c#1 branch .. //depot/projects/opentoe/contrib/opensolaris/lib/libuutil/common/uu_dprintf.c#1 branch .. //depot/projects/opentoe/contrib/opensolaris/lib/libuutil/common/uu_ident.c#1 branch .. //depot/projects/opentoe/contrib/opensolaris/lib/libuutil/common/uu_list.c#1 branch .. //depot/projects/opentoe/contrib/opensolaris/lib/libuutil/common/uu_misc.c#1 branch .. //depot/projects/opentoe/contrib/opensolaris/lib/libuutil/common/uu_open.c#1 branch .. //depot/projects/opentoe/contrib/opensolaris/lib/libuutil/common/uu_pname.c#1 branch .. //depot/projects/opentoe/contrib/opensolaris/lib/libuutil/common/uu_strtoint.c#1 branch .. //depot/projects/opentoe/contrib/opensolaris/lib/libzfs/common/libzfs.h#1 branch .. //depot/projects/opentoe/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#1 branch .. //depot/projects/opentoe/contrib/opensolaris/lib/libzfs/common/libzfs_config.c#1 branch .. //depot/projects/opentoe/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#1 branch .. //depot/projects/opentoe/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c#1 branch .. //depot/projects/opentoe/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#1 branch .. //depot/projects/opentoe/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#1 branch .. //depot/projects/opentoe/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#1 branch .. //depot/projects/opentoe/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#1 branch .. //depot/projects/opentoe/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#1 branch .. //depot/projects/opentoe/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#1 branch .. //depot/projects/opentoe/contrib/opensolaris/lib/libzpool/common/kernel.c#1 branch .. //depot/projects/opentoe/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#1 branch .. //depot/projects/opentoe/contrib/opensolaris/lib/libzpool/common/taskq.c#1 branch .. //depot/projects/opentoe/contrib/opensolaris/lib/libzpool/common/util.c#1 branch .. //depot/projects/opentoe/contrib/sendmail/FREEBSD-upgrade#2 integrate .. //depot/projects/opentoe/contrib/sendmail/KNOWNBUGS#2 integrate .. //depot/projects/opentoe/contrib/sendmail/PGPKEYS#2 integrate .. //depot/projects/opentoe/contrib/sendmail/RELEASE_NOTES#2 integrate .. //depot/projects/opentoe/contrib/sendmail/cf/README#2 integrate .. //depot/projects/opentoe/contrib/sendmail/cf/cf/knecht.mc#2 integrate .. //depot/projects/opentoe/contrib/sendmail/cf/cf/submit.cf#2 integrate .. //depot/projects/opentoe/contrib/sendmail/cf/feature/access_db.m4#2 integrate .. //depot/projects/opentoe/contrib/sendmail/cf/feature/badmx.m4#1 branch .. //depot/projects/opentoe/contrib/sendmail/cf/feature/block_bad_helo.m4#1 branch .. //depot/projects/opentoe/contrib/sendmail/cf/feature/dnsbl.m4#2 integrate .. //depot/projects/opentoe/contrib/sendmail/cf/feature/enhdnsbl.m4#2 integrate .. //depot/projects/opentoe/contrib/sendmail/cf/feature/require_rdns.m4#1 branch .. //depot/projects/opentoe/contrib/sendmail/cf/m4/proto.m4#2 integrate .. //depot/projects/opentoe/contrib/sendmail/cf/m4/version.m4#2 integrate .. //depot/projects/opentoe/contrib/sendmail/cf/mailer/smtp.m4#2 integrate .. //depot/projects/opentoe/contrib/sendmail/contrib/cidrexpand#2 integrate .. //depot/projects/opentoe/contrib/sendmail/contrib/qtool.pl#2 integrate .. //depot/projects/opentoe/contrib/sendmail/doc/op/op.me#2 integrate .. //depot/projects/opentoe/contrib/sendmail/editmap/Makefile.m4#2 integrate .. //depot/projects/opentoe/contrib/sendmail/include/libmilter/mfapi.h#2 integrate .. //depot/projects/opentoe/contrib/sendmail/include/libmilter/mfdef.h#2 integrate .. //depot/projects/opentoe/contrib/sendmail/include/libmilter/milter.h#2 integrate .. //depot/projects/opentoe/contrib/sendmail/include/sm/conf.h#2 integrate .. //depot/projects/opentoe/contrib/sendmail/include/sm/errstring.h#2 integrate .. //depot/projects/opentoe/contrib/sendmail/include/sm/heap.h#2 integrate .. //depot/projects/opentoe/contrib/sendmail/include/sm/ldap.h#2 integrate .. //depot/projects/opentoe/contrib/sendmail/include/sm/misc.h#1 branch .. //depot/projects/opentoe/contrib/sendmail/include/sm/os/sm_os_qnx.h#1 branch .. //depot/projects/opentoe/contrib/sendmail/include/sm/sendmail.h#1 branch .. //depot/projects/opentoe/contrib/sendmail/include/sm/tailq.h#1 branch .. //depot/projects/opentoe/contrib/sendmail/libmilter/Makefile#2 integrate .. //depot/projects/opentoe/contrib/sendmail/libmilter/Makefile.m4#2 integrate .. //depot/projects/opentoe/contrib/sendmail/libmilter/README#2 integrate .. //depot/projects/opentoe/contrib/sendmail/libmilter/comm.c#2 integrate .. //depot/projects/opentoe/contrib/sendmail/libmilter/docs/api.html#2 integrate .. //depot/projects/opentoe/contrib/sendmail/libmilter/docs/design.html#2 integrate .. //depot/projects/opentoe/contrib/sendmail/libmilter/docs/index.html#2 integrate .. //depot/projects/opentoe/contrib/sendmail/libmilter/docs/installation.html#2 integrate .. //depot/projects/opentoe/contrib/sendmail/libmilter/docs/other.html#2 integrate .. //depot/projects/opentoe/contrib/sendmail/libmilter/docs/overview.html#2 integrate .. //depot/projects/opentoe/contrib/sendmail/libmilter/docs/sample.html#2 integrate .. //depot/projects/opentoe/contrib/sendmail/libmilter/docs/smfi_addheader.html#2 integrate .. //depot/projects/opentoe/contrib/sendmail/libmilter/docs/smfi_addrcpt.html#2 integrate .. //depot/projects/opentoe/contrib/sendmail/libmilter/docs/smfi_addrcpt_par.html#1 branch .. //depot/projects/opentoe/contrib/sendmail/libmilter/docs/smfi_chgfrom.html#1 branch .. //depot/projects/opentoe/contrib/sendmail/libmilter/docs/smfi_chgheader.html#2 integrate .. //depot/projects/opentoe/contrib/sendmail/libmilter/docs/smfi_delrcpt.html#2 integrate .. //depot/projects/opentoe/contrib/sendmail/libmilter/docs/smfi_getpriv.html#2 integrate .. //depot/projects/opentoe/contrib/sendmail/libmilter/docs/smfi_getsymval.html#2 integrate .. //depot/projects/opentoe/contrib/sendmail/libmilter/docs/smfi_insheader.html#2 integrate .. //depot/projects/opentoe/contrib/sendmail/libmilter/docs/smfi_main.html#2 integrate .. //depot/projects/opentoe/contrib/sendmail/libmilter/docs/smfi_opensocket.html#2 integrate .. //depot/projects/opentoe/contrib/sendmail/libmilter/docs/smfi_progress.html#2 integrate .. //depot/projects/opentoe/contrib/sendmail/libmilter/docs/smfi_quarantine.html#2 integrate .. //depot/projects/opentoe/contrib/sendmail/libmilter/docs/smfi_register.html#2 integrate .. //depot/projects/opentoe/contrib/sendmail/libmilter/docs/smfi_replacebody.html#2 integrate .. //depot/projects/opentoe/contrib/sendmail/libmilter/docs/smfi_setbacklog.html#2 integrate .. //depot/projects/opentoe/contrib/sendmail/libmilter/docs/smfi_setconn.html#2 integrate .. //depot/projects/opentoe/contrib/sendmail/libmilter/docs/smfi_setdbg.html#2 integrate .. //depot/projects/opentoe/contrib/sendmail/libmilter/docs/smfi_setmlreply.html#2 integrate .. //depot/projects/opentoe/contrib/sendmail/libmilter/docs/smfi_setpriv.html#2 integrate .. //depot/projects/opentoe/contrib/sendmail/libmilter/docs/smfi_setreply.html#2 integrate .. //depot/projects/opentoe/contrib/sendmail/libmilter/docs/smfi_setsymlist.html#1 branch .. //depot/projects/opentoe/contrib/sendmail/libmilter/docs/smfi_settimeout.html#2 integrate .. //depot/projects/opentoe/contrib/sendmail/libmilter/docs/smfi_stop.html#2 integrate .. //depot/projects/opentoe/contrib/sendmail/libmilter/docs/smfi_version.html#1 branch .. //depot/projects/opentoe/contrib/sendmail/libmilter/docs/xxfi_abort.html#2 integrate .. //depot/projects/opentoe/contrib/sendmail/libmilter/docs/xxfi_body.html#2 integrate .. //depot/projects/opentoe/contrib/sendmail/libmilter/docs/xxfi_close.html#2 integrate .. //depot/projects/opentoe/contrib/sendmail/libmilter/docs/xxfi_connect.html#2 integrate .. //depot/projects/opentoe/contrib/sendmail/libmilter/docs/xxfi_data.html#1 branch .. //depot/projects/opentoe/contrib/sendmail/libmilter/docs/xxfi_envfrom.html#2 integrate .. //depot/projects/opentoe/contrib/sendmail/libmilter/docs/xxfi_envrcpt.html#2 integrate .. //depot/projects/opentoe/contrib/sendmail/libmilter/docs/xxfi_eoh.html#2 integrate .. //depot/projects/opentoe/contrib/sendmail/libmilter/docs/xxfi_eom.html#2 integrate .. //depot/projects/opentoe/contrib/sendmail/libmilter/docs/xxfi_header.html#2 integrate .. //depot/projects/opentoe/contrib/sendmail/libmilter/docs/xxfi_helo.html#2 integrate .. //depot/projects/opentoe/contrib/sendmail/libmilter/docs/xxfi_negotiate.html#1 branch .. //depot/projects/opentoe/contrib/sendmail/libmilter/docs/xxfi_unknown.html#1 branch .. //depot/projects/opentoe/contrib/sendmail/libmilter/engine.c#2 integrate .. //depot/projects/opentoe/contrib/sendmail/libmilter/example.c#1 branch .. //depot/projects/opentoe/contrib/sendmail/libmilter/handler.c#2 integrate .. //depot/projects/opentoe/contrib/sendmail/libmilter/libmilter.h#2 integrate .. //depot/projects/opentoe/contrib/sendmail/libmilter/listener.c#2 integrate .. //depot/projects/opentoe/contrib/sendmail/libmilter/main.c#2 integrate .. //depot/projects/opentoe/contrib/sendmail/libmilter/monitor.c#1 branch .. //depot/projects/opentoe/contrib/sendmail/libmilter/smfi.c#2 integrate .. //depot/projects/opentoe/contrib/sendmail/libmilter/worker.c#1 branch .. //depot/projects/opentoe/contrib/sendmail/libsm/Makefile#2 integrate .. //depot/projects/opentoe/contrib/sendmail/libsm/Makefile.m4#2 integrate .. //depot/projects/opentoe/contrib/sendmail/libsm/config.c#2 integrate .. //depot/projects/opentoe/contrib/sendmail/libsm/exc.c#2 integrate .. //depot/projects/opentoe/contrib/sendmail/libsm/exc.html#2 integrate .. //depot/projects/opentoe/contrib/sendmail/libsm/findfp.c#2 integrate .. //depot/projects/opentoe/contrib/sendmail/libsm/flags.c#2 integrate .. //depot/projects/opentoe/contrib/sendmail/libsm/ldap.c#2 integrate .. //depot/projects/opentoe/contrib/sendmail/libsm/local.h#2 integrate .. //depot/projects/opentoe/contrib/sendmail/libsm/memstat.c#2 integrate .. //depot/projects/opentoe/contrib/sendmail/libsm/snprintf.c#2 integrate .. //depot/projects/opentoe/contrib/sendmail/libsm/t-memstat.c#2 integrate .. //depot/projects/opentoe/contrib/sendmail/libsm/t-qic.c#1 branch .. //depot/projects/opentoe/contrib/sendmail/libsm/t-sem.c#2 integrate .. //depot/projects/opentoe/contrib/sendmail/libsm/util.c#1 branch .. //depot/projects/opentoe/contrib/sendmail/libsm/vfscanf.c#2 integrate .. //depot/projects/opentoe/contrib/sendmail/libsmdb/Makefile.m4#2 integrate .. //depot/projects/opentoe/contrib/sendmail/libsmutil/Makefile.m4#2 integrate .. //depot/projects/opentoe/contrib/sendmail/mail.local/Makefile.m4#2 integrate .. //depot/projects/opentoe/contrib/sendmail/mail.local/mail.local.c#2 integrate .. //depot/projects/opentoe/contrib/sendmail/mailstats/Makefile.m4#2 integrate .. //depot/projects/opentoe/contrib/sendmail/makemap/Makefile.m4#2 integrate .. //depot/projects/opentoe/contrib/sendmail/praliases/Makefile.m4#2 integrate .. //depot/projects/opentoe/contrib/sendmail/rmail/Makefile.m4#2 integrate .. //depot/projects/opentoe/contrib/sendmail/smrsh/Makefile.m4#2 integrate .. //depot/projects/opentoe/contrib/sendmail/src/Makefile#2 integrate .. //depot/projects/opentoe/contrib/sendmail/src/Makefile.m4#2 integrate .. //depot/projects/opentoe/contrib/sendmail/src/README#2 integrate .. //depot/projects/opentoe/contrib/sendmail/src/TRACEFLAGS#2 integrate .. //depot/projects/opentoe/contrib/sendmail/src/TUNING#2 integrate .. //depot/projects/opentoe/contrib/sendmail/src/alias.c#2 integrate .. //depot/projects/opentoe/contrib/sendmail/src/arpadate.c#2 integrate .. //depot/projects/opentoe/contrib/sendmail/src/collect.c#2 integrate .. //depot/projects/opentoe/contrib/sendmail/src/conf.c#2 integrate .. //depot/projects/opentoe/contrib/sendmail/src/conf.h#2 integrate .. //depot/projects/opentoe/contrib/sendmail/src/control.c#2 integrate .. //depot/projects/opentoe/contrib/sendmail/src/daemon.c#2 integrate .. //depot/projects/opentoe/contrib/sendmail/src/daemon.h#1 branch .. //depot/projects/opentoe/contrib/sendmail/src/deliver.c#2 integrate .. //depot/projects/opentoe/contrib/sendmail/src/domain.c#2 integrate .. //depot/projects/opentoe/contrib/sendmail/src/envelope.c#2 integrate .. //depot/projects/opentoe/contrib/sendmail/src/err.c#2 integrate .. //depot/projects/opentoe/contrib/sendmail/src/headers.c#2 integrate .. //depot/projects/opentoe/contrib/sendmail/src/helpfile#2 integrate .. //depot/projects/opentoe/contrib/sendmail/src/macro.c#2 integrate .. //depot/projects/opentoe/contrib/sendmail/src/mailq.1#2 integrate .. //depot/projects/opentoe/contrib/sendmail/src/main.c#2 integrate .. //depot/projects/opentoe/contrib/sendmail/src/map.c#2 integrate .. //depot/projects/opentoe/contrib/sendmail/src/map.h#1 branch .. //depot/projects/opentoe/contrib/sendmail/src/mci.c#2 integrate .. //depot/projects/opentoe/contrib/sendmail/src/milter.c#2 integrate .. //depot/projects/opentoe/contrib/sendmail/src/mime.c#2 integrate .. //depot/projects/opentoe/contrib/sendmail/src/parseaddr.c#2 integrate .. //depot/projects/opentoe/contrib/sendmail/src/queue.c#2 integrate .. //depot/projects/opentoe/contrib/sendmail/src/ratectrl.c#2 integrate .. //depot/projects/opentoe/contrib/sendmail/src/readcf.c#2 integrate .. //depot/projects/opentoe/contrib/sendmail/src/recipient.c#2 integrate .. //depot/projects/opentoe/contrib/sendmail/src/sasl.c#2 integrate .. //depot/projects/opentoe/contrib/sendmail/src/savemail.c#2 integrate .. //depot/projects/opentoe/contrib/sendmail/src/sendmail.h#2 integrate .. //depot/projects/opentoe/contrib/sendmail/src/sm_resolve.c#2 integrate .. //depot/projects/opentoe/contrib/sendmail/src/srvrsmtp.c#2 integrate .. //depot/projects/opentoe/contrib/sendmail/src/stab.c#2 integrate .. //depot/projects/opentoe/contrib/sendmail/src/stats.c#2 integrate .. //depot/projects/opentoe/contrib/sendmail/src/timers.c#2 integrate .. //depot/projects/opentoe/contrib/sendmail/src/tls.c#2 integrate .. //depot/projects/opentoe/contrib/sendmail/src/udb.c#2 integrate .. //depot/projects/opentoe/contrib/sendmail/src/usersmtp.c#2 integrate .. //depot/projects/opentoe/contrib/sendmail/src/util.c#2 integrate .. //depot/projects/opentoe/contrib/sendmail/src/version.c#2 integrate .. //depot/projects/opentoe/contrib/sendmail/test/Makefile#2 integrate .. //depot/projects/opentoe/contrib/sendmail/vacation/Makefile.m4#2 integrate .. //depot/projects/opentoe/contrib/sendmail/vacation/vacation.c#2 integrate .. //depot/projects/opentoe/contrib/tcpdump/print-stp.c#2 integrate .. //depot/projects/opentoe/contrib/tcsh/sh.lex.c#2 integrate .. //depot/projects/opentoe/contrib/top/commands.c#2 integrate .. //depot/projects/opentoe/contrib/top/machine.h#2 integrate .. //depot/projects/opentoe/contrib/top/top.X#2 integrate .. //depot/projects/opentoe/contrib/top/top.c#2 integrate .. //depot/projects/opentoe/contrib/top/top.h#2 integrate .. //depot/projects/opentoe/etc/defaults/periodic.conf#2 integrate .. //depot/projects/opentoe/etc/defaults/rc.conf#4 integrate .. //depot/projects/opentoe/etc/devd.conf#2 integrate .. //depot/projects/opentoe/etc/mtree/BSD.root.dist#2 integrate .. //depot/projects/opentoe/etc/periodic/daily/404.status-zfs#1 branch .. //depot/projects/opentoe/etc/periodic/daily/Makefile#2 integrate .. //depot/projects/opentoe/etc/rc.d/FILESYSTEMS#2 integrate .. //depot/projects/opentoe/etc/rc.d/Makefile#3 integrate .. //depot/projects/opentoe/etc/rc.d/NETWORKING#2 integrate .. //depot/projects/opentoe/etc/rc.d/hostid#1 branch .. //depot/projects/opentoe/etc/rc.d/ipfilter#3 integrate .. //depot/projects/opentoe/etc/rc.d/ipsec#3 integrate .. //depot/projects/opentoe/etc/rc.d/kldxref#3 integrate .. //depot/projects/opentoe/etc/rc.d/mountcritremote#3 integrate .. //depot/projects/opentoe/etc/rc.d/mountd#2 integrate .. //depot/projects/opentoe/etc/rc.d/netoptions#2 integrate .. //depot/projects/opentoe/etc/rc.d/nfslocking#3 integrate .. //depot/projects/opentoe/etc/rc.d/pf#3 integrate .. //depot/projects/opentoe/etc/rc.d/pflog#3 integrate .. //depot/projects/opentoe/etc/rc.d/pfsync#3 integrate .. //depot/projects/opentoe/etc/rc.d/zfs#1 branch .. //depot/projects/opentoe/etc/rc.firewall#3 integrate .. //depot/projects/opentoe/etc/services#2 integrate .. //depot/projects/opentoe/include/Makefile#2 integrate .. //depot/projects/opentoe/include/rpc/Makefile#2 integrate .. //depot/projects/opentoe/include/rpc/types.h#2 delete .. //depot/projects/opentoe/include/stdio.h#2 integrate .. //depot/projects/opentoe/lib/libarchive/Makefile#3 integrate .. //depot/projects/opentoe/lib/libarchive/archive.h.in#3 integrate .. //depot/projects/opentoe/lib/libarchive/archive_entry.c#2 integrate .. //depot/projects/opentoe/lib/libarchive/archive_platform.h#2 integrate .. //depot/projects/opentoe/lib/libarchive/archive_read.3#2 integrate .. //depot/projects/opentoe/lib/libarchive/archive_read.c#3 integrate .. //depot/projects/opentoe/lib/libarchive/archive_read_data_into_buffer.c#2 delete .. //depot/projects/opentoe/lib/libarchive/archive_read_extract.c#2 integrate .. //depot/projects/opentoe/lib/libarchive/archive_read_support_compression_bzip2.c#3 integrate .. //depot/projects/opentoe/lib/libarchive/archive_read_support_compression_compress.c#2 integrate .. //depot/projects/opentoe/lib/libarchive/archive_read_support_compression_gzip.c#2 integrate .. //depot/projects/opentoe/lib/libarchive/archive_read_support_compression_none.c#2 integrate .. //depot/projects/opentoe/lib/libarchive/archive_read_support_format_all.c#2 integrate .. //depot/projects/opentoe/lib/libarchive/archive_read_support_format_ar.c#2 integrate .. //depot/projects/opentoe/lib/libarchive/archive_read_support_format_cpio.c#2 integrate .. //depot/projects/opentoe/lib/libarchive/archive_read_support_format_tar.c#3 integrate .. //depot/projects/opentoe/lib/libarchive/archive_read_support_format_zip.c#2 integrate .. //depot/projects/opentoe/lib/libarchive/archive_write_disk.c#4 integrate .. //depot/projects/opentoe/lib/libarchive/archive_write_set_compression_none.c#3 integrate .. //depot/projects/opentoe/lib/libarchive/archive_write_set_format_ar.c#2 integrate .. //depot/projects/opentoe/lib/libarchive/archive_write_set_format_by_name.c#2 integrate .. //depot/projects/opentoe/lib/libarchive/archive_write_set_format_pax.c#2 integrate .. //depot/projects/opentoe/lib/libarchive/archive_write_set_format_ustar.c#3 integrate .. //depot/projects/opentoe/lib/libarchive/config_freebsd.h#2 integrate .. //depot/projects/opentoe/lib/libarchive/libarchive-formats.5#3 integrate .. //depot/projects/opentoe/lib/libarchive/test/Makefile#2 integrate .. //depot/projects/opentoe/lib/libarchive/test/main.c#2 integrate .. //depot/projects/opentoe/lib/libarchive/test/test_acl_basic.c#2 integrate .. //depot/projects/opentoe/lib/libarchive/test/test_acl_pax.c#2 integrate .. //depot/projects/opentoe/lib/libarchive/test/test_read_data_large.c#2 integrate .. //depot/projects/opentoe/lib/libarchive/test/test_read_extract.c#2 integrate .. //depot/projects/opentoe/lib/libarchive/test/test_read_format_ar.c#2 integrate .. //depot/projects/opentoe/lib/libarchive/test/test_read_large.c#2 integrate .. //depot/projects/opentoe/lib/libarchive/test/test_read_position.c#2 integrate .. //depot/projects/opentoe/lib/libarchive/test/test_read_truncated.c#2 integrate .. //depot/projects/opentoe/lib/libarchive/test/test_tar_filenames.c#1 branch .. //depot/projects/opentoe/lib/libarchive/test/test_write_disk_perms.c#3 integrate .. //depot/projects/opentoe/lib/libarchive/test/test_write_disk_secure.c#2 integrate .. //depot/projects/opentoe/lib/libarchive/test/test_write_format_ar.c#2 integrate .. //depot/projects/opentoe/lib/libarchive/test/test_write_format_tar.c#2 integrate .. //depot/projects/opentoe/lib/libarchive/test/test_write_open_memory.c#2 integrate .. //depot/projects/opentoe/lib/libatm/cache_key.c#2 integrate .. //depot/projects/opentoe/lib/libc/amd64/stdlib/Makefile.inc#1 branch .. //depot/projects/opentoe/lib/libc/amd64/stdlib/div.S#1 branch .. //depot/projects/opentoe/lib/libc/amd64/stdlib/ldiv.S#1 branch .. //depot/projects/opentoe/lib/libc/amd64/stdlib/lldiv.S#1 branch .. //depot/projects/opentoe/lib/libc/gen/Symbol.map#2 integrate .. //depot/projects/opentoe/lib/libc/gen/dlfcn.c#2 integrate .. //depot/projects/opentoe/lib/libc/gen/getvfsbyname.3#2 integrate .. //depot/projects/opentoe/lib/libc/gen/sysconf.c#2 integrate .. //depot/projects/opentoe/lib/libc/gen/sysctl.3#2 integrate .. //depot/projects/opentoe/lib/libc/i386/Symbol.map#2 integrate .. //depot/projects/opentoe/lib/libc/resolv/Symbol.map#2 integrate .. //depot/projects/opentoe/lib/libc/resolv/res_debug.c#2 integrate .. //depot/projects/opentoe/lib/libc/stdlib/strtol.3#2 integrate .. //depot/projects/opentoe/lib/libc/sys/lseek.2#2 integrate .. //depot/projects/opentoe/lib/libc/sys/pathconf.2#2 integrate .. //depot/projects/opentoe/lib/libc/sys/ptrace.2#2 integrate .. //depot/projects/opentoe/lib/libc/uuid/uuid_compare.c#2 integrate .. //depot/projects/opentoe/lib/libcrypt/crypt.3#2 integrate .. //depot/projects/opentoe/lib/libgssapi/gss_accept_sec_context.c#2 integrate .. //depot/projects/opentoe/lib/libgssapi/gss_add_cred.c#2 integrate .. //depot/projects/opentoe/lib/libgssapi/gss_add_oid_set_member.c#2 integrate .. //depot/projects/opentoe/lib/libgssapi/gss_canonicalize_name.c#2 integrate .. //depot/projects/opentoe/lib/libgssapi/gss_display_name.c#2 integrate .. //depot/projects/opentoe/lib/libgssapi/gss_duplicate_name.c#2 integrate .. //depot/projects/opentoe/lib/libgssapi/gss_export_sec_context.c#2 integrate .. //depot/projects/opentoe/lib/libgssapi/gss_import_name.c#2 integrate .. //depot/projects/opentoe/lib/libgssapi/gss_init_sec_context.c#2 integrate .. //depot/projects/opentoe/lib/libgssapi/gss_inquire_cred.c#2 integrate .. //depot/projects/opentoe/lib/libgssapi/gss_names.c#2 integrate .. //depot/projects/opentoe/lib/libgssapi/gss_utils.c#2 integrate .. //depot/projects/opentoe/lib/libmilter/Makefile#2 integrate .. //depot/projects/opentoe/lib/libpmc/libpmc.c#2 integrate .. //depot/projects/opentoe/lib/libpmc/pmc.3#3 integrate .. //depot/projects/opentoe/lib/libradius/radlib.c#2 integrate .. //depot/projects/opentoe/lib/libsm/Makefile#2 integrate .. //depot/projects/opentoe/lib/libstand/environment.c#2 integrate .. //depot/projects/opentoe/lib/libthr/thread/thr_info.c#2 integrate .. //depot/projects/opentoe/lib/ncurses/ncurses/Makefile#2 integrate .. //depot/projects/opentoe/libexec/rtld-elf/Makefile#2 integrate .. //depot/projects/opentoe/libexec/rtld-elf/Symbol.map#1 branch .. //depot/projects/opentoe/libexec/rtld-elf/Versions.def#1 branch .. //depot/projects/opentoe/libexec/rtld-elf/i386/Symbol.map#1 branch .. //depot/projects/opentoe/libexec/rtld-elf/map_object.c#2 integrate .. //depot/projects/opentoe/libexec/rtld-elf/rtld.c#2 integrate .. //depot/projects/opentoe/libexec/rtld-elf/rtld.h#2 integrate .. //depot/projects/opentoe/libexec/rtld-elf/rtld_lock.c#2 integrate .. //depot/projects/opentoe/release/Makefile.inc.docports#2 integrate .. //depot/projects/opentoe/release/doc/en_US.ISO8859-1/relnotes/article.sgml#3 integrate .. //depot/projects/opentoe/sbin/atm/atmconfig/diag.c#2 integrate .. //depot/projects/opentoe/sbin/dhclient/dhclient-script#2 integrate .. //depot/projects/opentoe/sbin/dump/traverse.c#2 integrate .. //depot/projects/opentoe/sbin/gbde/test.sh#2 integrate .. //depot/projects/opentoe/sbin/ggate/ggatec/Makefile#2 integrate .. //depot/projects/opentoe/sbin/ggate/shared/ggate.c#2 integrate .. //depot/projects/opentoe/sbin/ifconfig/Makefile#2 integrate .. //depot/projects/opentoe/sbin/ifconfig/ifconfig.8#3 integrate .. //depot/projects/opentoe/sbin/ifconfig/iflagg.c#1 branch .. //depot/projects/opentoe/sbin/ipfw/ipfw2.c#2 integrate .. //depot/projects/opentoe/sbin/mount/mount.c#2 integrate .. //depot/projects/opentoe/share/examples/cvsup/cvs-supfile#2 integrate .. //depot/projects/opentoe/share/examples/cvsup/stable-supfile#2 integrate .. //depot/projects/opentoe/share/examples/cvsup/standard-supfile#2 integrate .. //depot/projects/opentoe/share/man/man4/Makefile#3 integrate .. //depot/projects/opentoe/share/man/man4/lagg.4#1 branch .. //depot/projects/opentoe/share/man/man4/mpt.4#2 integrate .. //depot/projects/opentoe/share/man/man4/nfe.4#2 integrate .. //depot/projects/opentoe/share/man/man4/pci.4#2 integrate .. //depot/projects/opentoe/share/man/man4/polling.4#2 integrate .. //depot/projects/opentoe/share/man/man4/tcp.4#2 integrate .. //depot/projects/opentoe/share/man/man4/uftdi.4#2 integrate .. //depot/projects/opentoe/share/man/man5/rc.conf.5#2 integrate .. //depot/projects/opentoe/share/man/man5/src.conf.5#2 integrate .. //depot/projects/opentoe/share/man/man7/hier.7#3 integrate .. //depot/projects/opentoe/share/man/man9/VFS_SET.9#2 integrate .. //depot/projects/opentoe/share/man/man9/hash.9#2 integrate .. //depot/projects/opentoe/share/misc/committers-ports.dot#3 integrate .. //depot/projects/opentoe/share/misc/committers-src.dot#3 integrate .. //depot/projects/opentoe/share/misc/organization.dot#1 branch .. //depot/projects/opentoe/share/mk/Makefile#2 integrate .. //depot/projects/opentoe/share/mk/bsd.lib.mk#2 integrate .. //depot/projects/opentoe/share/mk/bsd.libnames.mk#2 integrate .. //depot/projects/opentoe/share/mk/bsd.own.mk#2 integrate .. //depot/projects/opentoe/share/mk/bsd.symver.mk#1 branch .. //depot/projects/opentoe/sys/Makefile#3 integrate .. //depot/projects/opentoe/sys/amd64/amd64/busdma_machdep.c#2 integrate .. //depot/projects/opentoe/sys/amd64/amd64/pmap.c#2 integrate .. //depot/projects/opentoe/sys/amd64/conf/GENERIC#3 integrate .. //depot/projects/opentoe/sys/boot/forth/loader.conf#2 integrate .. //depot/projects/opentoe/sys/boot/pc98/boot0.5/Makefile#2 integrate .. //depot/projects/opentoe/sys/boot/pc98/boot0.5/boot0.5.s#2 integrate .. //depot/projects/opentoe/sys/boot/pc98/boot0.5/ldscript#1 branch .. //depot/projects/opentoe/sys/boot/pc98/boot0.5/putssjis.s#1 branch .. //depot/projects/opentoe/sys/boot/pc98/boot0.5/selector.s#2 integrate .. //depot/projects/opentoe/sys/boot/pc98/boot0.5/start.s#2 integrate .. //depot/projects/opentoe/sys/boot/pc98/boot2/boot.c#2 integrate .. //depot/projects/opentoe/sys/cam/cam_ccb.h#2 integrate .. //depot/projects/opentoe/sys/cam/cam_periph.c#2 integrate .. //depot/projects/opentoe/sys/cam/cam_periph.h#2 integrate .. //depot/projects/opentoe/sys/cam/cam_sim.c#2 integrate .. //depot/projects/opentoe/sys/cam/cam_sim.h#2 integrate .. //depot/projects/opentoe/sys/cam/cam_xpt.c#2 integrate .. //depot/projects/opentoe/sys/cam/cam_xpt.h#2 integrate .. //depot/projects/opentoe/sys/cam/cam_xpt_periph.h#2 integrate .. //depot/projects/opentoe/sys/cam/scsi/scsi_cd.c#2 integrate .. //depot/projects/opentoe/sys/cam/scsi/scsi_ch.c#2 integrate .. //depot/projects/opentoe/sys/cam/scsi/scsi_da.c#2 integrate .. //depot/projects/opentoe/sys/cam/scsi/scsi_low.c#2 integrate .. //depot/projects/opentoe/sys/cam/scsi/scsi_pass.c#2 integrate .. //depot/projects/opentoe/sys/cam/scsi/scsi_pt.c#2 integrate .. //depot/projects/opentoe/sys/cam/scsi/scsi_sa.c#2 integrate .. //depot/projects/opentoe/sys/cam/scsi/scsi_ses.c#2 integrate .. //depot/projects/opentoe/sys/cam/scsi/scsi_sg.c#1 branch .. //depot/projects/opentoe/sys/cam/scsi/scsi_sg.h#1 branch .. //depot/projects/opentoe/sys/cam/scsi/scsi_targ_bh.c#2 integrate .. //depot/projects/opentoe/sys/cam/scsi/scsi_target.c#2 integrate .. //depot/projects/opentoe/sys/compat/linprocfs/linprocfs.c#3 integrate .. //depot/projects/opentoe/sys/compat/linux/linux_file.c#3 integrate .. //depot/projects/opentoe/sys/compat/linux/linux_ioctl.c#2 integrate .. //depot/projects/opentoe/sys/compat/linux/linux_ioctl.h#2 integrate .. //depot/projects/opentoe/sys/compat/linux/linux_socket.c#2 integrate .. //depot/projects/opentoe/sys/compat/ndis/kern_ndis.c#2 integrate .. //depot/projects/opentoe/sys/compat/ndis/ndis_var.h#2 integrate .. //depot/projects/opentoe/sys/compat/ndis/subr_ndis.c#2 integrate .. //depot/projects/opentoe/sys/compat/ndis/subr_pe.c#2 integrate .. //depot/projects/opentoe/sys/compat/opensolaris/kern/opensolaris_kmem.c#1 branch .. //depot/projects/opentoe/sys/compat/opensolaris/kern/opensolaris_kobj.c#1 branch .. //depot/projects/opentoe/sys/compat/opensolaris/kern/opensolaris_kstat.c#1 branch .. //depot/projects/opentoe/sys/compat/opensolaris/kern/opensolaris_misc.c#1 branch .. //depot/projects/opentoe/sys/compat/opensolaris/kern/opensolaris_policy.c#1 branch .. //depot/projects/opentoe/sys/compat/opensolaris/kern/opensolaris_string.c#1 branch .. //depot/projects/opentoe/sys/compat/opensolaris/kern/opensolaris_vfs.c#1 branch .. //depot/projects/opentoe/sys/compat/opensolaris/kern/opensolaris_zone.c#1 branch .. //depot/projects/opentoe/sys/compat/opensolaris/machine/endian.h#1 branch .. //depot/projects/opentoe/sys/compat/opensolaris/rpc/xdr.h#1 branch .. //depot/projects/opentoe/sys/compat/opensolaris/sys/acl.h#1 branch .. //depot/projects/opentoe/sys/compat/opensolaris/sys/byteorder.h#1 branch .. //depot/projects/opentoe/sys/compat/opensolaris/sys/callb.h#1 branch .. //depot/projects/opentoe/sys/compat/opensolaris/sys/cmn_err.h#1 branch .. //depot/projects/opentoe/sys/compat/opensolaris/sys/cred.h#1 branch .. //depot/projects/opentoe/sys/compat/opensolaris/sys/debug.h#1 branch .. //depot/projects/opentoe/sys/compat/opensolaris/sys/dirent.h#1 branch .. //depot/projects/opentoe/sys/compat/opensolaris/sys/dkio.h#1 branch .. //depot/projects/opentoe/sys/compat/opensolaris/sys/kcondvar.h#1 branch .. //depot/projects/opentoe/sys/compat/opensolaris/sys/kmem.h#1 branch .. //depot/projects/opentoe/sys/compat/opensolaris/sys/kobj.h#1 branch .. //depot/projects/opentoe/sys/compat/opensolaris/sys/kstat.h#1 branch .. //depot/projects/opentoe/sys/compat/opensolaris/sys/lock.h#1 branch .. //depot/projects/opentoe/sys/compat/opensolaris/sys/misc.h#1 branch .. //depot/projects/opentoe/sys/compat/opensolaris/sys/mntent.h#1 branch .. //depot/projects/opentoe/sys/compat/opensolaris/sys/mnttab.h#1 branch .. //depot/projects/opentoe/sys/compat/opensolaris/sys/mount.h#1 branch .. //depot/projects/opentoe/sys/compat/opensolaris/sys/mutex.h#1 branch .. //depot/projects/opentoe/sys/compat/opensolaris/sys/policy.h#1 branch .. //depot/projects/opentoe/sys/compat/opensolaris/sys/proc.h#1 branch .. //depot/projects/opentoe/sys/compat/opensolaris/sys/random.h#1 branch .. //depot/projects/opentoe/sys/compat/opensolaris/sys/rwlock.h#1 branch .. //depot/projects/opentoe/sys/compat/opensolaris/sys/sdt.h#1 branch .. //depot/projects/opentoe/sys/compat/opensolaris/sys/string.h#1 branch .. //depot/projects/opentoe/sys/compat/opensolaris/sys/sysmacros.h#1 branch .. //depot/projects/opentoe/sys/compat/opensolaris/sys/systm.h#1 branch .. //depot/projects/opentoe/sys/compat/opensolaris/sys/taskq.h#1 branch .. //depot/projects/opentoe/sys/compat/opensolaris/sys/taskq_impl.h#1 branch .. //depot/projects/opentoe/sys/compat/opensolaris/sys/time.h#1 branch .. //depot/projects/opentoe/sys/compat/opensolaris/sys/types.h#1 branch .. //depot/projects/opentoe/sys/compat/opensolaris/sys/uio.h#1 branch .. //depot/projects/opentoe/sys/compat/opensolaris/sys/varargs.h#1 branch .. //depot/projects/opentoe/sys/compat/opensolaris/sys/vfs.h#1 branch .. //depot/projects/opentoe/sys/compat/opensolaris/sys/vnode.h#1 branch .. //depot/projects/opentoe/sys/compat/opensolaris/sys/zone.h#1 branch .. //depot/projects/opentoe/sys/compat/svr4/svr4_filio.c#2 integrate .. //depot/projects/opentoe/sys/conf/NOTES#4 integrate .. //depot/projects/opentoe/sys/conf/files#3 integrate .. //depot/projects/opentoe/sys/conf/files.amd64#2 integrate .. //depot/projects/opentoe/sys/conf/files.i386#2 integrate .. //depot/projects/opentoe/sys/conf/files.ia64#2 integrate .. //depot/projects/opentoe/sys/conf/files.pc98#2 integrate .. //depot/projects/opentoe/sys/conf/files.powerpc#2 integrate .. //depot/projects/opentoe/sys/conf/options#5 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/utmisc.c#3 integrate .. //depot/projects/opentoe/sys/contrib/opensolaris/common/acl/acl_common.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/common/acl/acl_common.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/common/atomic/amd64/atomic.S#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/common/atomic/i386/atomic.S#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/common/avl/avl.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/common/nvpair/nvpair.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/common/zfs/zfs_namecheck.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/common/zfs/zfs_namecheck.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/common/zfs/zfs_prop.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/common/zfs/zfs_prop.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/Makefile.files#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/dnlc.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/gfs.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/bplist.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/dmu.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/dnode.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/gzip.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/lzjb.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/refcount.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/sha256.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/spa.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/space_map.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_file.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_rlock.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/txg.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/uberblock.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/unique.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/zap.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/zfs.conf#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/zil.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/os/callb.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/os/list.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/os/nvpair_alloc_system.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/os/taskq.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/rpc/xdr.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/rpc/xdr.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/rpc/xdr_array.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/rpc/xdr_mem.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/sys/asm_linkage.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/sys/atomic.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/sys/avl.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/sys/avl_impl.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/sys/bitmap.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/sys/byteorder.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/sys/callb.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/sys/ccompile.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/sys/compress.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/sys/cred.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/sys/debug.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/sys/dkio.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/sys/dklabel.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/sys/dnlc.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/sys/errorq.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/sys/feature_tests.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/sys/fm/protocol.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/sys/fm/util.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/sys/fs/zfs.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/sys/gfs.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/sys/isa_defs.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/sys/list.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/sys/list_impl.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/sys/note.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/sys/nvpair.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/sys/nvpair_impl.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/sys/processor.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/sys/procset.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/sys/sdt.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/sys/synch.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/sys/sysevent.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/sys/sysmacros.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/sys/vfs.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/sys/vmem.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/sys/zmod.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/zmod/adler32.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/zmod/crc32.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/zmod/crc32.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/zmod/deflate.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/zmod/deflate.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/zmod/inffast.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/zmod/inffast.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/zmod/inffixed.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/zmod/inflate.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/zmod/inflate.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/zmod/inftrees.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/zmod/inftrees.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/zmod/trees.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/zmod/zconf.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/zmod/zlib.h#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/zmod/zmod.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/zmod/zmod_subr.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/zmod/zutil.c#1 branch .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/zmod/zutil.h#1 branch .. //depot/projects/opentoe/sys/contrib/pf/net/if_pfsync.c#3 integrate .. //depot/projects/opentoe/sys/dev/aac/aac_cam.c#2 integrate .. //depot/projects/opentoe/sys/dev/advansys/advansys.c#2 integrate .. //depot/projects/opentoe/sys/dev/advansys/adwcam.c#2 integrate .. //depot/projects/opentoe/sys/dev/aha/aha.c#2 integrate .. //depot/projects/opentoe/sys/dev/ahb/ahb.c#3 integrate .. //depot/projects/opentoe/sys/dev/aic/aic.c#2 integrate .. //depot/projects/opentoe/sys/dev/aic7xxx/aic7770.c#2 integrate .. //depot/projects/opentoe/sys/dev/aic7xxx/aic79xx.c#2 integrate .. //depot/projects/opentoe/sys/dev/aic7xxx/aic79xx.h#2 integrate .. //depot/projects/opentoe/sys/dev/aic7xxx/aic79xx_osm.c#2 integrate .. //depot/projects/opentoe/sys/dev/aic7xxx/aic79xx_osm.h#2 integrate .. //depot/projects/opentoe/sys/dev/aic7xxx/aic79xx_pci.c#2 integrate .. //depot/projects/opentoe/sys/dev/aic7xxx/aic7xxx.c#2 integrate .. //depot/projects/opentoe/sys/dev/aic7xxx/aic7xxx.h#2 integrate .. //depot/projects/opentoe/sys/dev/aic7xxx/aic7xxx_osm.c#2 integrate .. //depot/projects/opentoe/sys/dev/aic7xxx/aic7xxx_osm.h#2 integrate .. //depot/projects/opentoe/sys/dev/aic7xxx/aic7xxx_pci.c#2 integrate .. //depot/projects/opentoe/sys/dev/aic7xxx/aic_osm_lib.c#2 integrate .. //depot/projects/opentoe/sys/dev/aic7xxx/aic_osm_lib.h#2 integrate .. //depot/projects/opentoe/sys/dev/amd/amd.c#2 integrate .. //depot/projects/opentoe/sys/dev/amr/amr_cam.c#2 integrate .. //depot/projects/opentoe/sys/dev/arcmsr/arcmsr.c#3 integrate .. //depot/projects/opentoe/sys/dev/asr/asr.c#2 integrate .. //depot/projects/opentoe/sys/dev/ata/ata-all.h#2 integrate .. //depot/projects/opentoe/sys/dev/ata/ata-chipset.c#2 integrate .. //depot/projects/opentoe/sys/dev/ata/ata-dma.c#2 integrate .. //depot/projects/opentoe/sys/dev/ata/ata-lowlevel.c#2 integrate .. //depot/projects/opentoe/sys/dev/ata/ata_if.m#2 integrate .. //depot/projects/opentoe/sys/dev/ata/atapi-cam.c#2 integrate .. //depot/projects/opentoe/sys/dev/ath/ah_osdep.c#2 integrate .. //depot/projects/opentoe/sys/dev/buslogic/bt.c#2 integrate .. //depot/projects/opentoe/sys/dev/ciss/ciss.c#2 integrate .. //depot/projects/opentoe/sys/dev/cxgb/cxgb_adapter.h#6 integrate .. //depot/projects/opentoe/sys/dev/cxgb/cxgb_lro.c#3 integrate .. //depot/projects/opentoe/sys/dev/cxgb/cxgb_main.c#4 integrate .. //depot/projects/opentoe/sys/dev/cxgb/cxgb_osdep.h#5 integrate .. //depot/projects/opentoe/sys/dev/cxgb/cxgb_sge.c#5 edit .. //depot/projects/opentoe/sys/dev/cxgb/sys/mvec.h#1 add .. //depot/projects/opentoe/sys/dev/cxgb/sys/uipc_mvec.c#1 add .. //depot/projects/opentoe/sys/dev/dpt/dpt_scsi.c#2 integrate .. //depot/projects/opentoe/sys/dev/esp/ncr53c9x.c#2 integrate .. //depot/projects/opentoe/sys/dev/ex/if_exvar.h#2 integrate .. //depot/projects/opentoe/sys/dev/firewire/fwdma.c#2 integrate .. //depot/projects/opentoe/sys/dev/firewire/sbp.c#2 integrate .. //depot/projects/opentoe/sys/dev/firewire/sbp_targ.c#2 integrate .. //depot/projects/opentoe/sys/dev/hptmv/entry.c#2 integrate .. //depot/projects/opentoe/sys/dev/if_ndis/if_ndis_pccard.c#2 integrate .. //depot/projects/opentoe/sys/dev/iicbus/icee.c#2 integrate .. //depot/projects/opentoe/sys/dev/iir/iir.c#2 integrate .. //depot/projects/opentoe/sys/dev/isp/isp_freebsd.c#3 integrate .. //depot/projects/opentoe/sys/dev/mii/brgphy.c#3 integrate .. //depot/projects/opentoe/sys/dev/mii/miidevs#2 integrate .. //depot/projects/opentoe/sys/dev/mly/mly.c#2 integrate .. //depot/projects/opentoe/sys/dev/mpt/mpt_cam.c#2 integrate .. //depot/projects/opentoe/sys/dev/msk/if_msk.c#2 integrate .. //depot/projects/opentoe/sys/dev/ppbus/vpo.c#2 integrate .. //depot/projects/opentoe/sys/dev/re/if_re.c#3 integrate .. //depot/projects/opentoe/sys/dev/rr232x/osm_bsd.c#2 integrate .. //depot/projects/opentoe/sys/dev/sound/pci/cmi.c#2 integrate .. //depot/projects/opentoe/sys/dev/streams/streams.c#2 integrate .. //depot/projects/opentoe/sys/dev/sym/sym_hipd.c#2 integrate .. //depot/projects/opentoe/sys/dev/trm/trm.c#2 integrate .. //depot/projects/opentoe/sys/dev/twa/tw_osl_cam.c#2 integrate .. //depot/projects/opentoe/sys/dev/uart/uart_bus_pci.c#2 integrate .. //depot/projects/opentoe/sys/dev/usb/umass.c#2 integrate .. //depot/projects/opentoe/sys/dev/usb/usbdevs#3 integrate .. //depot/projects/opentoe/sys/dev/wds/wd7000.c#2 integrate .. //depot/projects/opentoe/sys/fs/devfs/devfs_vnops.c#3 integrate .. //depot/projects/opentoe/sys/fs/fdescfs/fdesc_vfsops.c#2 integrate .. //depot/projects/opentoe/sys/fs/fdescfs/fdesc_vnops.c#2 integrate .. //depot/projects/opentoe/sys/fs/fifofs/fifo_vnops.c#2 integrate .. //depot/projects/opentoe/sys/fs/procfs/procfs_dbregs.c#2 integrate .. //depot/projects/opentoe/sys/fs/procfs/procfs_fpregs.c#2 integrate .. //depot/projects/opentoe/sys/fs/procfs/procfs_map.c#2 integrate .. //depot/projects/opentoe/sys/fs/procfs/procfs_regs.c#2 integrate .. //depot/projects/opentoe/sys/fs/pseudofs/pseudofs.c#2 integrate .. //depot/projects/opentoe/sys/fs/pseudofs/pseudofs.h#2 integrate .. //depot/projects/opentoe/sys/fs/pseudofs/pseudofs_fileno.c#2 integrate .. //depot/projects/opentoe/sys/fs/pseudofs/pseudofs_internal.h#2 integrate .. //depot/projects/opentoe/sys/fs/pseudofs/pseudofs_vncache.c#2 integrate .. //depot/projects/opentoe/sys/fs/pseudofs/pseudofs_vnops.c#2 integrate .. //depot/projects/opentoe/sys/fs/unionfs/union_subr.c#2 integrate .. //depot/projects/opentoe/sys/geom/eli/g_eli.c#3 integrate .. //depot/projects/opentoe/sys/geom/journal/g_journal.c#3 integrate .. //depot/projects/opentoe/sys/geom/uzip/g_uzip.c#2 integrate .. //depot/projects/opentoe/sys/geom/vinum/geom_vinum.h#2 integrate .. //depot/projects/opentoe/sys/geom/vinum/geom_vinum_rm.c#2 integrate .. //depot/projects/opentoe/sys/geom/vinum/geom_vinum_share.c#2 integrate .. //depot/projects/opentoe/sys/geom/vinum/geom_vinum_subr.c#2 integrate .. //depot/projects/opentoe/sys/i386/conf/GENERIC#2 edit .. //depot/projects/opentoe/sys/i386/i386/busdma_machdep.c#2 integrate .. //depot/projects/opentoe/sys/i386/i386/identcpu.c#4 integrate .. //depot/projects/opentoe/sys/i386/i386/initcpu.c#2 integrate .. //depot/projects/opentoe/sys/i386/i386/minidump_machdep.c#2 integrate .. //depot/projects/opentoe/sys/i386/i386/mp_machdep.c#2 integrate .. //depot/projects/opentoe/sys/i386/i386/pmap.c#3 integrate .. //depot/projects/opentoe/sys/i386/i386/trap.c#3 integrate .. //depot/projects/opentoe/sys/i386/include/pmap.h#2 integrate .. //depot/projects/opentoe/sys/i386/include/specialreg.h#3 integrate .. //depot/projects/opentoe/sys/i386/include/vmparam.h#2 integrate .. //depot/projects/opentoe/sys/ia64/conf/GENERIC#2 integrate .. //depot/projects/opentoe/sys/isa/isa_common.c#2 integrate .. //depot/projects/opentoe/sys/kern/kern_descrip.c#2 integrate .. //depot/projects/opentoe/sys/kern/kern_event.c#2 integrate .. //depot/projects/opentoe/sys/kern/kern_fork.c#2 integrate .. //depot/projects/opentoe/sys/kern/kern_jail.c#2 integrate .. //depot/projects/opentoe/sys/kern/kern_mbuf.c#4 integrate .. //depot/projects/opentoe/sys/kern/kern_mib.c#2 integrate .. //depot/projects/opentoe/sys/kern/kern_subr.c#2 edit .. //depot/projects/opentoe/sys/kern/kern_sx.c#4 integrate .. //depot/projects/opentoe/sys/kern/subr_rman.c#2 integrate .. //depot/projects/opentoe/sys/kern/subr_witness.c#4 integrate .. //depot/projects/opentoe/sys/kern/sys_generic.c#2 integrate .. //depot/projects/opentoe/sys/kern/uipc_mbuf.c#3 edit .. //depot/projects/opentoe/sys/kern/uipc_mqueue.c#2 integrate .. //depot/projects/opentoe/sys/kern/uipc_socket.c#3 edit .. //depot/projects/opentoe/sys/kern/uipc_syscalls.c#3 integrate .. //depot/projects/opentoe/sys/kern/uipc_usrreq.c#2 integrate .. //depot/projects/opentoe/sys/kern/vfs_cache.c#2 integrate .. //depot/projects/opentoe/sys/kern/vfs_lookup.c#3 integrate .. //depot/projects/opentoe/sys/kern/vfs_mount.c#4 integrate .. //depot/projects/opentoe/sys/kern/vfs_subr.c#4 integrate .. //depot/projects/opentoe/sys/kern/vfs_syscalls.c#4 integrate .. //depot/projects/opentoe/sys/libkern/index.c#2 integrate .. //depot/projects/opentoe/sys/libkern/memset.c#1 branch .. //depot/projects/opentoe/sys/libkern/rindex.c#2 integrate .. //depot/projects/opentoe/sys/modules/Makefile#3 integrate .. //depot/projects/opentoe/sys/modules/cam/Makefile#2 integrate .. //depot/projects/opentoe/sys/modules/cxgb/Makefile#3 integrate .. //depot/projects/opentoe/sys/modules/dpt/Makefile#2 integrate .. //depot/projects/opentoe/sys/modules/if_lagg/Makefile#1 branch .. //depot/projects/opentoe/sys/modules/libalias/libalias/Makefile#2 integrate .. //depot/projects/opentoe/sys/modules/zfs/Makefile#1 branch .. //depot/projects/opentoe/sys/net/ieee8023ad_lacp.c#1 branch .. //depot/projects/opentoe/sys/net/ieee8023ad_lacp.h#1 branch .. //depot/projects/opentoe/sys/net/if.c#4 integrate .. //depot/projects/opentoe/sys/net/if_ethersubr.c#4 edit .. //depot/projects/opentoe/sys/net/if_lagg.c#1 branch .. //depot/projects/opentoe/sys/net/if_lagg.h#1 branch .. //depot/projects/opentoe/sys/net/if_var.h#3 integrate .. //depot/projects/opentoe/sys/netinet/in_pcb.c#2 integrate .. //depot/projects/opentoe/sys/netinet/in_pcb.h#3 integrate .. //depot/projects/opentoe/sys/netinet/ip_fw2.c#3 integrate .. //depot/projects/opentoe/sys/netinet/ip_input.c#4 edit .. //depot/projects/opentoe/sys/netinet/ip_var.h#2 integrate .. //depot/projects/opentoe/sys/netinet/libalias/alias_db.c#2 integrate .. //depot/projects/opentoe/sys/netinet/libalias/alias_skinny.c#2 integrate .. //depot/projects/opentoe/sys/netinet/sctp_constants.h#4 integrate .. //depot/projects/opentoe/sys/netinet/sctp_crc32.c#2 integrate .. //depot/projects/opentoe/sys/netinet/sctp_indata.c#5 integrate .. //depot/projects/opentoe/sys/netinet/sctp_input.c#5 integrate .. //depot/projects/opentoe/sys/netinet/sctp_output.c#5 integrate .. //depot/projects/opentoe/sys/netinet/sctp_pcb.c#5 integrate .. //depot/projects/opentoe/sys/netinet/sctp_peeloff.c#2 integrate .. //depot/projects/opentoe/sys/netinet/sctp_structs.h#4 integrate .. //depot/projects/opentoe/sys/netinet/sctp_timer.c#4 integrate .. //depot/projects/opentoe/sys/netinet/sctp_uio.h#4 integrate .. //depot/projects/opentoe/sys/netinet/sctp_usrreq.c#5 integrate .. //depot/projects/opentoe/sys/netinet/sctp_var.h#3 integrate .. //depot/projects/opentoe/sys/netinet/sctputil.c#5 integrate .. //depot/projects/opentoe/sys/netinet/sctputil.h#3 integrate .. //depot/projects/opentoe/sys/netinet/tcp_input.c#4 integrate .. //depot/projects/opentoe/sys/netinet/tcp_output.c#4 integrate .. //depot/projects/opentoe/sys/netinet/tcp_sack.c#4 integrate .. //depot/projects/opentoe/sys/netinet/tcp_subr.c#4 integrate .. //depot/projects/opentoe/sys/netinet/tcp_syncache.c#2 integrate .. //depot/projects/opentoe/sys/netinet/tcp_timer.c#4 integrate .. //depot/projects/opentoe/sys/netinet/tcp_timer.h#2 integrate .. //depot/projects/opentoe/sys/netinet/tcp_usrreq.c#3 integrate .. //depot/projects/opentoe/sys/netinet/tcp_var.h#3 integrate .. //depot/projects/opentoe/sys/netinet6/ipsec.c#2 integrate .. //depot/projects/opentoe/sys/netinet6/sctp6_usrreq.c#5 integrate .. //depot/projects/opentoe/sys/netipsec/ipsec_osdep.h#2 integrate .. //depot/projects/opentoe/sys/netnatm/natm.h#2 integrate .. //depot/projects/opentoe/sys/netsmb/smb_dev.c#2 integrate .. //depot/projects/opentoe/sys/nfsserver/nfs_srvsock.c#2 integrate .. //depot/projects/opentoe/sys/opencrypto/cryptodev.c#3 integrate .. //depot/projects/opentoe/sys/pc98/conf/GENERIC#2 integrate .. //depot/projects/opentoe/sys/pci/if_rlreg.h#2 integrate .. //depot/projects/opentoe/sys/pci/if_vr.c#2 integrate .. //depot/projects/opentoe/sys/pci/if_vrreg.h#2 integrate .. //depot/projects/opentoe/sys/pci/ncr.c#2 integrate .. //depot/projects/opentoe/sys/powerpc/conf/GENERIC#3 integrate .. //depot/projects/opentoe/sys/rpc/types.h#1 branch .. //depot/projects/opentoe/sys/security/audit/audit.c#2 integrate .. //depot/projects/opentoe/sys/security/audit/audit.h#2 integrate .. //depot/projects/opentoe/sys/security/audit/audit_arg.c#2 integrate .. //depot/projects/opentoe/sys/security/audit/audit_bsm.c#2 integrate .. //depot/projects/opentoe/sys/security/audit/audit_bsm_klib.c#2 integrate .. //depot/projects/opentoe/sys/security/audit/audit_bsm_token.c#2 integrate .. //depot/projects/opentoe/sys/security/audit/audit_private.h#2 integrate .. //depot/projects/opentoe/sys/security/audit/audit_syscalls.c#2 integrate .. //depot/projects/opentoe/sys/sparc64/conf/GENERIC#2 integrate .. //depot/projects/opentoe/sys/sun4v/conf/GENERIC#2 integrate .. //depot/projects/opentoe/sys/sun4v/include/smp.h#2 integrate .. //depot/projects/opentoe/sys/sys/eventhandler.h#3 integrate .. //depot/projects/opentoe/sys/sys/filedesc.h#2 integrate .. //depot/projects/opentoe/sys/sys/filio.h#2 integrate .. //depot/projects/opentoe/sys/sys/hash.h#2 integrate .. //depot/projects/opentoe/sys/sys/jail.h#2 integrate .. //depot/projects/opentoe/sys/sys/kernel.h#2 integrate .. //depot/projects/opentoe/sys/sys/libkern.h#2 integrate .. //depot/projects/opentoe/sys/sys/mbuf.h#5 edit .. //depot/projects/opentoe/sys/sys/mount.h#4 integrate .. //depot/projects/opentoe/sys/sys/mutex.h#4 integrate .. //depot/projects/opentoe/sys/sys/param.h#4 integrate .. //depot/projects/opentoe/sys/sys/priv.h#2 integrate .. //depot/projects/opentoe/sys/sys/proc.h#3 integrate .. //depot/projects/opentoe/sys/sys/socketvar.h#3 edit .. //depot/projects/opentoe/sys/sys/sysctl.h#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Apr 19 00:00:03 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 EBA0F16A403; Thu, 19 Apr 2007 00:00:02 +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 A266F16A401 for ; Thu, 19 Apr 2007 00:00:02 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8764A13C46C for ; Thu, 19 Apr 2007 00:00:02 +0000 (UTC) (envelope-from kmacy@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 l3J002Lq095141 for ; Thu, 19 Apr 2007 00:00:02 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3J002Id095138 for perforce@freebsd.org; Thu, 19 Apr 2007 00:00:02 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 19 Apr 2007 00:00:02 GMT Message-Id: <200704190000.l3J002Id095138@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 118386 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: Thu, 19 Apr 2007 00:00:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=118386 Change 118386 by kmacy@kmacy_vt-x:opentoe_init on 2007/04/18 23:59:44 IFC Affected files ... .. //depot/projects/opentoe/sys/amd64/linux32/linux32_dummy.c#3 integrate .. //depot/projects/opentoe/sys/amd64/linux32/linux32_machdep.c#3 integrate .. //depot/projects/opentoe/sys/dev/sound/isa/ad1816.c#2 integrate .. //depot/projects/opentoe/sys/dev/sound/isa/ess.c#2 integrate .. //depot/projects/opentoe/sys/dev/sound/isa/mss.c#2 integrate .. //depot/projects/opentoe/sys/dev/sound/isa/sb16.c#2 integrate .. //depot/projects/opentoe/sys/dev/sound/isa/sb8.c#2 integrate .. //depot/projects/opentoe/sys/dev/sound/pci/als4000.c#2 integrate .. //depot/projects/opentoe/sys/dev/sound/pci/atiixp.c#3 integrate .. //depot/projects/opentoe/sys/dev/sound/pci/au88x0.c#2 integrate .. //depot/projects/opentoe/sys/dev/sound/pci/aureal.c#2 integrate .. //depot/projects/opentoe/sys/dev/sound/pci/cs4281.c#2 integrate .. //depot/projects/opentoe/sys/dev/sound/pci/csapcm.c#2 integrate .. //depot/projects/opentoe/sys/dev/sound/pci/ds1.c#2 integrate .. //depot/projects/opentoe/sys/dev/sound/pci/emu10k1.c#2 integrate .. //depot/projects/opentoe/sys/dev/sound/pci/emu10kx-pcm.c#2 integrate .. //depot/projects/opentoe/sys/dev/sound/pci/es137x.c#2 integrate .. //depot/projects/opentoe/sys/dev/sound/pci/fm801.c#2 integrate .. //depot/projects/opentoe/sys/dev/sound/pci/hda/hdac.c#4 integrate .. //depot/projects/opentoe/sys/dev/sound/pci/ich.c#3 integrate .. //depot/projects/opentoe/sys/dev/sound/pci/maestro3.c#2 integrate .. //depot/projects/opentoe/sys/dev/sound/pci/solo.c#2 integrate .. //depot/projects/opentoe/sys/dev/sound/pci/t4dwave.c#2 integrate .. //depot/projects/opentoe/sys/dev/sound/pci/via8233.c#3 integrate .. //depot/projects/opentoe/sys/dev/sound/pci/via82c686.c#3 integrate .. //depot/projects/opentoe/sys/dev/sound/pci/vibes.c#2 integrate .. //depot/projects/opentoe/sys/dev/sound/pcm/buffer.c#3 integrate .. //depot/projects/opentoe/sys/dev/sound/pcm/buffer.h#2 integrate .. //depot/projects/opentoe/sys/dev/sound/pcm/sound.h#2 integrate .. //depot/projects/opentoe/sys/dev/sound/sbus/cs4231.c#2 integrate Differences ... ==== //depot/projects/opentoe/sys/amd64/linux32/linux32_dummy.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_dummy.c,v 1.8 2007/03/29 02:11:46 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_dummy.c,v 1.9 2007/04/18 18:08:12 jkim Exp $"); #include #include @@ -64,7 +64,6 @@ DUMMY(mincore); DUMMY(fadvise64); DUMMY(ptrace); -DUMMY(settimeofday); DUMMY(lookup_dcookie); DUMMY(epoll_create); DUMMY(epoll_ctl); ==== //depot/projects/opentoe/sys/amd64/linux32/linux32_machdep.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.39 2007/03/30 17:27:13 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.42 2007/04/18 20:12:05 jkim Exp $"); #include #include @@ -252,7 +252,7 @@ if (iovcnt > UIO_MAXIOV) return (EINVAL); iovlen = iovcnt * sizeof(struct iovec); - uio = malloc(iovlen + sizeof *uio, M_IOV, M_WAITOK); + uio = malloc(iovlen + sizeof(*uio), M_IOV, M_WAITOK); iov = (struct iovec *)(uio + 1); for (i = 0; i < iovcnt; i++) { error = copyin(&iovp[i], &iov32, sizeof(struct iovec32)); @@ -526,7 +526,9 @@ td2 = FIRST_THREAD_IN_PROC(p2); - /* make it run */ + /* + * Make this runnable after we are finished with it. + */ mtx_lock_spin(&sched_lock); TD_SET_CAN_RUN(td2); sched_add(td2, SRQ_BORING); @@ -572,8 +574,8 @@ /* * XXX: In Linux, sharing of fs info (chroot/cwd/umask) * and open files is independant. In FreeBSD, its in one - * structure but in reality it does not make any problems - * because both of these flags are set at once usually. + * structure but in reality it does not cause any problems + * because both of these flags are usually set together. */ if (!(args->flags & (LINUX_CLONE_FILES | LINUX_CLONE_FS))) ff |= RFFDG; @@ -660,15 +662,15 @@ if (args->flags & LINUX_CLONE_SETTLS) { struct user_segment_descriptor sd; struct l_user_desc info; - int a[2]; + int a[2]; - error = copyin((void *)td->td_frame->tf_rsi, &info, + error = copyin((void *)td->td_frame->tf_rsi, &info, sizeof(struct l_user_desc)); if (error) { printf(LMSG("copyin failed!")); } else { /* We might copy out the entry_number as GUGS32_SEL. */ - info.entry_number = GUGS32_SEL; + info.entry_number = GUGS32_SEL; error = copyout(&info, (void *)td->td_frame->tf_rsi, sizeof(struct l_user_desc)); if (error) @@ -871,7 +873,7 @@ * * Our mmap with MAP_STACK takes addr as the maximum * downsize limit on BOS, and as len the max size of - * the region. It them maps the top SGROWSIZ bytes, + * the region. It then maps the top SGROWSIZ bytes, * and auto grows the region down, up to the limit * in addr. * @@ -1167,17 +1169,44 @@ microtime(&atv); atv32.tv_sec = atv.tv_sec; atv32.tv_usec = atv.tv_usec; - error = copyout(&atv32, uap->tp, sizeof (atv32)); + error = copyout(&atv32, uap->tp, sizeof(atv32)); } if (error == 0 && uap->tzp != NULL) { rtz.tz_minuteswest = tz_minuteswest; rtz.tz_dsttime = tz_dsttime; - error = copyout(&rtz, uap->tzp, sizeof (rtz)); + error = copyout(&rtz, uap->tzp, sizeof(rtz)); } return (error); } int +linux_settimeofday(struct thread *td, struct linux_settimeofday_args *uap) +{ + l_timeval atv32; + struct timeval atv, *tvp; + struct timezone atz, *tzp; + int error; + + if (uap->tp) { + error = copyin(uap->tp, &atv32, sizeof(atv32)); + if (error) + return (error); + atv.tv_sec = atv32.tv_sec; + atv.tv_usec = atv32.tv_usec; + tvp = &atv; + } else + tvp = NULL; + if (uap->tzp) { + error = copyin(uap->tzp, &atz, sizeof(atz)); + if (error) + return (error); + tzp = &atz; + } else + tzp = NULL; + return (kern_settimeofday(td, tvp, tzp)); +} + +int linux_getrusage(struct thread *td, struct linux_getrusage_args *uap) { struct l_rusage s32; @@ -1242,7 +1271,7 @@ #ifdef DEBUG if (ldebug(set_thread_area)) - printf(ARGS(set_thread_area, "%i, %x, %x, %i, %i, %i, " + printf(ARGS(set_thread_area, "%i, %x, %x, %i, %i, %i, " "%i, %i, %i"), info.entry_number, info.base_addr, info.limit, info.seg_32bit, info.contents, info.read_exec_only, info.limit_in_pages, @@ -1261,9 +1290,10 @@ * The tls_array[] is used only in [gs]et_thread_area() syscalls and * for loading the GDT descriptors. We use just one GDT descriptor * for TLS, so we will load just one. - * XXX: This doesnt work when user-space process tries to use more + * + * XXX: This doesn't work when a user space process tries to use more * than one TLS segment. Comment in the Linux source says wine might - * do that. + * do this. */ /* @@ -1284,8 +1314,9 @@ /* * We have to copy out the GDT entry we use. - * XXX: What if userspace program does not check return value and - * tries to use 6, 7 or 8? + * + * XXX: What if a user space program does not check the return value + * and tries to use 6, 7 or 8? */ error = copyout(&info, args->desc, sizeof(struct l_user_desc)); if (error) ==== //depot/projects/opentoe/sys/dev/sound/isa/ad1816.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/ad1816.c,v 1.42 2007/03/15 16:41:25 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/ad1816.c,v 1.43 2007/04/18 18:26:38 ariff Exp $"); struct ad1816_info; @@ -318,7 +318,7 @@ ch->parent = ad1816; ch->channel = c; ch->buffer = b; - if (sndbuf_alloc(ch->buffer, ad1816->parent_dmat, ad1816->bufsize) != 0) + if (sndbuf_alloc(ch->buffer, ad1816->parent_dmat, 0, ad1816->bufsize) != 0) return NULL; return ch; } ==== //depot/projects/opentoe/sys/dev/sound/isa/ess.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/ess.c,v 1.38 2007/02/23 13:47:33 netchild Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/ess.c,v 1.39 2007/04/18 18:26:38 ariff Exp $"); #define ESS_BUFFSIZE (4096) #define ABS(x) (((x) < 0)? -(x) : (x)) @@ -563,7 +563,7 @@ ch->parent = sc; ch->channel = c; ch->buffer = b; - if (sndbuf_alloc(ch->buffer, sc->parent_dmat, sc->bufsize) != 0) + if (sndbuf_alloc(ch->buffer, sc->parent_dmat, 0, sc->bufsize) != 0) return NULL; ch->dir = dir; ch->hwch = 1; ==== //depot/projects/opentoe/sys/dev/sound/isa/mss.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/mss.c,v 1.108 2007/03/15 16:41:25 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/mss.c,v 1.109 2007/04/18 18:26:38 ariff Exp $"); /* board-specific include files */ #include @@ -1152,7 +1152,7 @@ ch->channel = c; ch->buffer = b; ch->dir = dir; - if (sndbuf_alloc(ch->buffer, mss->parent_dmat, mss->bufsize) != 0) + if (sndbuf_alloc(ch->buffer, mss->parent_dmat, 0, mss->bufsize) != 0) return NULL; sndbuf_dmasetup(ch->buffer, (dir == PCMDIR_PLAY)? mss->drq1 : mss->drq2); return ch; ==== //depot/projects/opentoe/sys/dev/sound/isa/sb16.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/sb16.c,v 1.94 2007/02/23 13:47:33 netchild Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/sb16.c,v 1.95 2007/04/18 18:26:38 ariff Exp $"); #define SB16_BUFFSIZE 4096 #define PLAIN_SB16(x) ((((x)->bd_flags) & (BD_F_SB16|BD_F_SB16X)) == BD_F_SB16) @@ -681,7 +681,7 @@ ch->buffer = b; ch->dir = dir; - if (sndbuf_alloc(ch->buffer, sb->parent_dmat, sb->bufsize) != 0) + if (sndbuf_alloc(ch->buffer, sb->parent_dmat, 0, sb->bufsize) != 0) return NULL; return ch; ==== //depot/projects/opentoe/sys/dev/sound/isa/sb8.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/sb8.c,v 1.83 2007/02/23 13:47:33 netchild Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/sb8.c,v 1.84 2007/04/18 18:26:39 ariff Exp $"); #define SB_DEFAULT_BUFSZ 4096 @@ -599,7 +599,7 @@ ch->channel = c; ch->dir = dir; ch->buffer = b; - if (sndbuf_alloc(ch->buffer, sb->parent_dmat, sb->bufsize) != 0) + if (sndbuf_alloc(ch->buffer, sb->parent_dmat, 0, sb->bufsize) != 0) return NULL; sndbuf_dmasetup(ch->buffer, sb->drq); return ch; ==== //depot/projects/opentoe/sys/dev/sound/pci/als4000.c#2 (text+ko) ==== @@ -42,7 +42,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/als4000.c,v 1.24 2007/03/15 16:41:26 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/als4000.c,v 1.25 2007/04/18 18:26:39 ariff Exp $"); /* Debugging macro's */ #undef DEB @@ -221,7 +221,7 @@ ch->buffer = b; snd_mtxunlock(sc->lock); - if (sndbuf_alloc(ch->buffer, sc->parent_dmat, sc->bufsz) != 0) + if (sndbuf_alloc(ch->buffer, sc->parent_dmat, 0, sc->bufsz) != 0) return NULL; return ch; ==== //depot/projects/opentoe/sys/dev/sound/pci/atiixp.c#3 (text+ko) ==== @@ -63,7 +63,7 @@ #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/atiixp.c,v 1.13 2007/03/21 18:17:02 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/atiixp.c,v 1.14 2007/04/18 18:26:39 ariff Exp $"); #define ATI_IXP_DMA_RETRY_MAX 100 @@ -459,7 +459,7 @@ atiixp_unlock(sc); - if (sndbuf_alloc(ch->buffer, sc->parent_dmat, sc->bufsz) == -1) + if (sndbuf_alloc(ch->buffer, sc->parent_dmat, 0, sc->bufsz) == -1) return (NULL); atiixp_lock(sc); ==== //depot/projects/opentoe/sys/dev/sound/pci/au88x0.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/sound/pci/au88x0.c,v 1.11 2007/02/23 13:47:34 netchild Exp $ + * $FreeBSD: src/sys/dev/sound/pci/au88x0.c,v 1.12 2007/04/18 18:26:39 ariff Exp $ */ #include @@ -332,7 +332,7 @@ struct au88x0_info *aui = arg; struct au88x0_chan_info *auci = au88x0_channel(aui, dir); - if (sndbuf_alloc(buf, aui->aui_dmat, aui->aui_bufsize) != 0) + if (sndbuf_alloc(buf, aui->aui_dmat, 0, aui->aui_bufsize) != 0) return (NULL); auci->auci_aui = aui; auci->auci_pcmchan = chan; ==== //depot/projects/opentoe/sys/dev/sound/pci/aureal.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ #include #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/aureal.c,v 1.33 2007/02/23 13:47:34 netchild Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/aureal.c,v 1.34 2007/04/18 18:26:39 ariff Exp $"); /* PCI IDs of supported chips */ #define AU8820_PCI_ID 0x000112eb @@ -303,7 +303,7 @@ ch->channel = c; ch->buffer = b; ch->dir = dir; - if (sndbuf_alloc(ch->buffer, au->parent_dmat, AU_BUFFSIZE) != 0) + if (sndbuf_alloc(ch->buffer, au->parent_dmat, 0, AU_BUFFSIZE) != 0) return NULL; return ch; } ==== //depot/projects/opentoe/sys/dev/sound/pci/cs4281.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/cs4281.c,v 1.23 2007/02/23 13:47:34 netchild Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/cs4281.c,v 1.24 2007/04/18 18:26:39 ariff Exp $"); #define CS4281_DEFAULT_BUFSZ 16384 @@ -314,7 +314,7 @@ struct sc_chinfo *ch = (dir == PCMDIR_PLAY) ? &sc->pch : &sc->rch; ch->buffer = b; - if (sndbuf_alloc(ch->buffer, sc->parent_dmat, sc->bufsz) != 0) { + if (sndbuf_alloc(ch->buffer, sc->parent_dmat, 0, sc->bufsz) != 0) { return NULL; } ch->parent = sc; ==== //depot/projects/opentoe/sys/dev/sound/pci/csapcm.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ #include #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/csapcm.c,v 1.38 2007/02/23 13:47:34 netchild Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/csapcm.c,v 1.39 2007/04/18 18:26:39 ariff Exp $"); /* Buffer size on dma transfer. Fixed for CS416x. */ #define CS461x_BUFFSIZE (4 * 1024) @@ -534,7 +534,7 @@ ch->channel = c; ch->buffer = b; ch->dir = dir; - if (sndbuf_alloc(ch->buffer, csa->parent_dmat, CS461x_BUFFSIZE) != 0) + if (sndbuf_alloc(ch->buffer, csa->parent_dmat, 0, CS461x_BUFFSIZE) != 0) return NULL; return ch; } ==== //depot/projects/opentoe/sys/dev/sound/pci/ds1.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ #include #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/ds1.c,v 1.49 2007/03/15 16:41:26 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/ds1.c,v 1.50 2007/04/18 18:26:39 ariff Exp $"); /* -------------------------------------------------------------------- */ @@ -490,7 +490,7 @@ ch->fmt = AFMT_U8; ch->spd = 8000; ch->run = 0; - if (sndbuf_alloc(ch->buffer, sc->buffer_dmat, sc->bufsz) != 0) + if (sndbuf_alloc(ch->buffer, sc->buffer_dmat, 0, sc->bufsz) != 0) return NULL; else { ch->lsnum = sc->pslotfree; @@ -621,7 +621,7 @@ ch->dir = dir; ch->fmt = AFMT_U8; ch->spd = 8000; - if (sndbuf_alloc(ch->buffer, sc->buffer_dmat, sc->bufsz) != 0) + if (sndbuf_alloc(ch->buffer, sc->buffer_dmat, 0, sc->bufsz) != 0) return NULL; else { ch->slot = (ch->num == DS1_RECPRIMARY)? sc->rbank + 2: sc->rbank; ==== //depot/projects/opentoe/sys/dev/sound/pci/emu10k1.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ #include #include "mpufoi_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/emu10k1.c,v 1.65 2007/03/15 16:41:26 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/emu10k1.c,v 1.66 2007/04/18 18:26:39 ariff Exp $"); /* -------------------------------------------------------------------- */ @@ -895,7 +895,7 @@ break; } sc->rnum++; - if (sndbuf_alloc(ch->buffer, sc->parent_dmat, sc->bufsz) != 0) + if (sndbuf_alloc(ch->buffer, sc->parent_dmat, 0, sc->bufsz) != 0) return NULL; else { snd_mtxlock(sc->lock); ==== //depot/projects/opentoe/sys/dev/sound/pci/emu10kx-pcm.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/sound/pci/emu10kx-pcm.c,v 1.7 2007/03/15 16:41:26 ariff Exp $ + * $FreeBSD: src/sys/dev/sound/pci/emu10kx-pcm.c,v 1.8 2007/04/18 18:26:39 ariff Exp $ */ #include @@ -602,7 +602,7 @@ ch->irqmask = INTE_ADCBUFENABLE; ch->iprmask = IPR_ADCBUFFULL | IPR_ADCBUFHALFFULL; - if (sndbuf_alloc(ch->buffer, emu_gettag(sc->card), sc->bufsz) != 0) + if (sndbuf_alloc(ch->buffer, emu_gettag(sc->card), 0, sc->bufsz) != 0) return (NULL); else { emu_wrptr(sc->card, 0, ch->basereg, sndbuf_getbufaddr(ch->buffer)); @@ -761,7 +761,7 @@ ch->channel = c; ch->blksz = sc->bufsz; - if (sndbuf_alloc(ch->buffer, emu_gettag(sc->card), sc->bufsz) != 0) + if (sndbuf_alloc(ch->buffer, emu_gettag(sc->card), 0, sc->bufsz) != 0) return (NULL); else { emu_wrptr(sc->card, 0, ch->basereg, sndbuf_getbufaddr(ch->buffer)); ==== //depot/projects/opentoe/sys/dev/sound/pci/es137x.c#2 (text+ko) ==== @@ -59,7 +59,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/es137x.c,v 1.64 2007/03/16 17:18:17 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/es137x.c,v 1.65 2007/04/18 18:26:39 ariff Exp $"); #define MEM_MAP_REG 0x14 @@ -471,7 +471,7 @@ ch->blksz = ch->bufsz / ch->blkcnt; ch->dir = dir; ES_UNLOCK(es); - if (sndbuf_alloc(ch->buffer, es->parent_dmat, ch->bufsz) != 0) + if (sndbuf_alloc(ch->buffer, es->parent_dmat, 0, ch->bufsz) != 0) return (NULL); ES_LOCK(es); if (dir == PCMDIR_PLAY) { ==== //depot/projects/opentoe/sys/dev/sound/pci/fm801.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ #include #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/fm801.c,v 1.29 2007/02/23 13:47:34 netchild Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/fm801.c,v 1.30 2007/04/18 18:26:39 ariff Exp $"); #define PCI_VENDOR_FORTEMEDIA 0x1319 #define PCI_DEVICE_FORTEMEDIA1 0x08011319 @@ -334,7 +334,7 @@ ch->channel = c; ch->buffer = b; ch->dir = dir; - if (sndbuf_alloc(ch->buffer, fm801->parent_dmat, fm801->bufsz) != 0) + if (sndbuf_alloc(ch->buffer, fm801->parent_dmat, 0, fm801->bufsz) != 0) return NULL; return (void *)ch; } ==== //depot/projects/opentoe/sys/dev/sound/pci/hda/hdac.c#4 (text+ko) ==== @@ -98,7 +98,7 @@ #define HDA_DRV_TEST_REV "20070320_0043" #define HDA_WIDGET_PARSER_REV 1 -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/hda/hdac.c,v 1.33 2007/03/21 18:17:02 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/hda/hdac.c,v 1.34 2007/04/18 18:26:40 ariff Exp $"); #undef HDA_DEBUG_ENABLED #define HDA_DEBUG_ENABLED 1 @@ -2710,7 +2710,7 @@ return (NULL); } - if (sndbuf_alloc(ch->b, sc->chan_dmat, sc->chan_size) != 0) + if (sndbuf_alloc(ch->b, sc->chan_dmat, 0, sc->chan_size) != 0) return (NULL); hdac_dma_attr((vm_offset_t)ch->b->buf, sndbuf_getmaxsize(ch->b), ==== //depot/projects/opentoe/sys/dev/sound/pci/ich.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ #include #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/ich.c,v 1.73 2007/03/21 18:17:02 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/ich.c,v 1.74 2007/04/18 18:26:39 ariff Exp $"); /* -------------------------------------------------------------------- */ @@ -393,7 +393,7 @@ ch->spdreg = 0; ICH_UNLOCK(sc); - if (sndbuf_alloc(ch->buffer, sc->dmat, sc->bufsz) != 0) + if (sndbuf_alloc(ch->buffer, sc->dmat, 0, sc->bufsz) != 0) return (NULL); ICH_LOCK(sc); ==== //depot/projects/opentoe/sys/dev/sound/pci/maestro3.c#2 (text+ko) ==== @@ -61,7 +61,7 @@ #include #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/maestro3.c,v 1.32 2007/03/15 16:41:26 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/maestro3.c,v 1.33 2007/04/18 18:26:39 ariff Exp $"); /* -------------------------------------------------------------------- */ @@ -407,7 +407,7 @@ ch->fmt = AFMT_U8; ch->spd = DSP_DEFAULT_SPEED; M3_UNLOCK(sc); /* XXX */ - if (sndbuf_alloc(ch->buffer, sc->parent_dmat, sc->bufsz) != 0) { + if (sndbuf_alloc(ch->buffer, sc->parent_dmat, 0, sc->bufsz) != 0) { device_printf(sc->dev, "m3_pchan_init chn_allocbuf failed\n"); return (NULL); } @@ -756,7 +756,7 @@ ch->fmt = AFMT_U8; ch->spd = DSP_DEFAULT_SPEED; M3_UNLOCK(sc); /* XXX */ - if (sndbuf_alloc(ch->buffer, sc->parent_dmat, sc->bufsz) != 0) { + if (sndbuf_alloc(ch->buffer, sc->parent_dmat, 0, sc->bufsz) != 0) { device_printf(sc->dev, "m3_rchan_init chn_allocbuf failed\n"); return (NULL); } ==== //depot/projects/opentoe/sys/dev/sound/pci/solo.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/solo.c,v 1.41 2007/03/15 16:41:26 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/solo.c,v 1.42 2007/04/18 18:26:40 ariff Exp $"); #define SOLO_DEFAULT_BUFSZ 16384 #define ABS(x) (((x) < 0)? -(x) : (x)) @@ -538,7 +538,7 @@ ch->channel = c; ch->buffer = b; ch->dir = dir; - if (sndbuf_alloc(ch->buffer, sc->parent_dmat, sc->bufsz) != 0) + if (sndbuf_alloc(ch->buffer, sc->parent_dmat, 0, sc->bufsz) != 0) return NULL; ch->hwch = 1; if ((dir == PCMDIR_PLAY) && (sc->duplex)) ==== //depot/projects/opentoe/sys/dev/sound/pci/t4dwave.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ #include #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/t4dwave.c,v 1.50 2007/03/15 16:41:26 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/t4dwave.c,v 1.51 2007/04/18 18:26:40 ariff Exp $"); /* -------------------------------------------------------------------- */ @@ -494,7 +494,7 @@ ch->buffer = b; ch->parent = tr; ch->channel = c; - if (sndbuf_alloc(ch->buffer, tr->parent_dmat, tr->bufsz) != 0) + if (sndbuf_alloc(ch->buffer, tr->parent_dmat, 0, tr->bufsz) != 0) return NULL; return ch; @@ -602,7 +602,7 @@ ch->buffer = b; ch->parent = tr; ch->channel = c; - if (sndbuf_alloc(ch->buffer, tr->parent_dmat, tr->bufsz) != 0) + if (sndbuf_alloc(ch->buffer, tr->parent_dmat, 0, tr->bufsz) != 0) return NULL; return ch; ==== //depot/projects/opentoe/sys/dev/sound/pci/via8233.c#3 (text+ko) ==== @@ -44,7 +44,7 @@ #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/via8233.c,v 1.32 2007/03/21 18:17:02 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/via8233.c,v 1.33 2007/04/18 18:26:40 ariff Exp $"); #define VIA8233_PCI_ID 0x30591106 @@ -671,7 +671,7 @@ via_wr(via, ch->rbase + VIA_WR_RP_SGD_FORMAT, WR_FIFO_ENABLE, 1); snd_mtxunlock(via->lock); - if (sndbuf_alloc(ch->buffer, via->parent_dmat, via->bufsz) != 0) + if (sndbuf_alloc(ch->buffer, via->parent_dmat, 0, via->bufsz) != 0) return (NULL); snd_mtxlock(via->lock); @@ -705,7 +705,7 @@ via->n_dxs_registered++; snd_mtxunlock(via->lock); - if (sndbuf_alloc(ch->buffer, via->parent_dmat, via->bufsz) != 0) + if (sndbuf_alloc(ch->buffer, via->parent_dmat, 0, via->bufsz) != 0) return (NULL); snd_mtxlock(via->lock); @@ -730,7 +730,7 @@ ch->rbase = VIA_MC_SGD_STATUS; ch->blkcnt = via->blkcnt; - if (sndbuf_alloc(ch->buffer, via->parent_dmat, via->bufsz) != 0) + if (sndbuf_alloc(ch->buffer, via->parent_dmat, 0, via->bufsz) != 0) return (NULL); snd_mtxlock(via->lock); ==== //depot/projects/opentoe/sys/dev/sound/pci/via82c686.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/via82c686.c,v 1.40 2007/03/21 18:17:02 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/via82c686.c,v 1.41 2007/04/18 18:26:40 ariff Exp $"); #define VIA_PCI_ID 0x30581106 #define NSEGS 4 /* Number of segments in SGD table */ @@ -270,7 +270,7 @@ ch->dir = dir; snd_mtxunlock(via->lock); - if (sndbuf_alloc(ch->buffer, via->parent_dmat, via->bufsz) != 0) + if (sndbuf_alloc(ch->buffer, via->parent_dmat, 0, via->bufsz) != 0) return NULL; return ch; ==== //depot/projects/opentoe/sys/dev/sound/pci/vibes.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/vibes.c,v 1.23 2007/02/23 19:39:06 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/vibes.c,v 1.24 2007/04/18 18:26:40 ariff Exp $"); /* ------------------------------------------------------------------------- */ /* Constants */ @@ -192,7 +192,7 @@ ch->channel = c; ch->dir = dir; - if (sndbuf_alloc(b, sc->parent_dmat, sc->bufsz) != 0) { + if (sndbuf_alloc(b, sc->parent_dmat, 0, sc->bufsz) != 0) { DEB(printf("svchan_init failed\n")); return NULL; } ==== //depot/projects/opentoe/sys/dev/sound/pcm/buffer.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ #include "feeder_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/buffer.c,v 1.33 2007/03/21 18:17:03 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/buffer.c,v 1.34 2007/04/18 18:26:40 ariff Exp $"); struct snd_dbuf * sndbuf_create(device_t dev, char *drv, char *desc, struct pcm_channel *channel) @@ -78,16 +78,18 @@ */ int -sndbuf_alloc(struct snd_dbuf *b, bus_dma_tag_t dmatag, unsigned int size) +sndbuf_alloc(struct snd_dbuf *b, bus_dma_tag_t dmatag, int dmaflags, + unsigned int size) { int ret; b->dmatag = dmatag; + b->dmaflags = dmaflags | BUS_DMA_NOWAIT; b->maxsize = size; b->bufsize = b->maxsize; b->buf_addr = 0; b->flags |= SNDBUF_F_MANAGED; - if (bus_dmamem_alloc(b->dmatag, (void **)&b->buf, BUS_DMA_NOWAIT, + if (bus_dmamem_alloc(b->dmatag, (void **)&b->buf, b->dmaflags, &b->dmamap)) { sndbuf_free(b); return (ENOMEM); ==== //depot/projects/opentoe/sys/dev/sound/pcm/buffer.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/sound/pcm/buffer.h,v 1.14 2007/02/01 09:46:03 ariff Exp $ + * $FreeBSD: src/sys/dev/sound/pcm/buffer.h,v 1.15 2007/04/18 18:26:40 ariff Exp $ */ #define SND_DMA(b) (sndbuf_getflags((b)) & SNDBUF_F_DMA) @@ -54,6 +54,7 @@ u_int32_t flags; bus_dmamap_t dmamap; bus_dma_tag_t dmatag; + int dmaflags; u_int32_t buf_addr; struct selinfo sel; struct pcm_channel *channel; @@ -65,7 +66,7 @@ void sndbuf_dump(struct snd_dbuf *b, char *s, u_int32_t what); -int sndbuf_alloc(struct snd_dbuf *b, bus_dma_tag_t dmatag, unsigned int size); +int sndbuf_alloc(struct snd_dbuf *b, bus_dma_tag_t dmatag, int dmaflags, unsigned int size); int sndbuf_setup(struct snd_dbuf *b, void *buf, unsigned int size); void sndbuf_free(struct snd_dbuf *b); int sndbuf_resize(struct snd_dbuf *b, unsigned int blkcnt, unsigned int blksz); ==== //depot/projects/opentoe/sys/dev/sound/pcm/sound.h#2 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/sound/pcm/sound.h,v 1.74 2007/03/16 17:15:33 ariff Exp $ + * $FreeBSD: src/sys/dev/sound/pcm/sound.h,v 1.75 2007/04/18 18:20:48 ariff Exp $ */ /* @@ -100,11 +100,11 @@ #define SND_STATUSLEN 64 -#define SOUND_MODVER 1 +#define SOUND_MODVER 2 -#define SOUND_MINVER 1 +#define SOUND_MINVER SOUND_MODVER #define SOUND_PREFVER SOUND_MODVER -#define SOUND_MAXVER 1 +#define SOUND_MAXVER SOUND_MODVER /* PROPOSAL: ==== //depot/projects/opentoe/sys/dev/sound/sbus/cs4231.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/sound/sbus/cs4231.c,v 1.7 2007/03/15 16:41:27 ariff Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/sound/sbus/cs4231.c,v 1.8 2007/04/18 18:26:41 ariff Exp $"); #include #include @@ -1036,7 +1036,7 @@ else dmat = sc->sc_dmat[0]; } - if (sndbuf_alloc(ch->buffer, dmat, sc->sc_bufsz) != 0) + if (sndbuf_alloc(ch->buffer, dmat, 0, sc->sc_bufsz) != 0) return (NULL); DPRINTF(("%s channel addr: 0x%lx\n", dir == PCMDIR_PLAY ? "playback" : "capture", sndbuf_getbufaddr(ch->buffer))); From owner-p4-projects@FreeBSD.ORG Thu Apr 19 04:13:56 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 A913A16A404; Thu, 19 Apr 2007 04:13:56 +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 3507D16A403 for ; Thu, 19 Apr 2007 04:13:56 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 248F713C489 for ; Thu, 19 Apr 2007 04:13:56 +0000 (UTC) (envelope-from zec@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 l3J4DuAe069088 for ; Thu, 19 Apr 2007 04:13:56 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3J4DtDU069075 for perforce@freebsd.org; Thu, 19 Apr 2007 04:13:55 GMT (envelope-from zec@FreeBSD.org) Date: Thu, 19 Apr 2007 04:13:55 GMT Message-Id: <200704190413.l3J4DtDU069075@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 118389 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: Thu, 19 Apr 2007 04:13:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=118389 Change 118389 by zec@zec_tca51 on 2007/04/19 04:13:05 Initial attempt at virtualizing pf (modulo pflog and pfsync). Affected files ... .. //depot/projects/vimage/src/sys/contrib/pf/net/if_pflog.c#2 edit .. //depot/projects/vimage/src/sys/contrib/pf/net/if_pflog.h#2 edit .. //depot/projects/vimage/src/sys/contrib/pf/net/if_pfsync.c#4 edit .. //depot/projects/vimage/src/sys/contrib/pf/net/if_pfsync.h#3 edit .. //depot/projects/vimage/src/sys/contrib/pf/net/pf.c#4 edit .. //depot/projects/vimage/src/sys/contrib/pf/net/pf_if.c#3 edit .. //depot/projects/vimage/src/sys/contrib/pf/net/pf_ioctl.c#4 edit .. //depot/projects/vimage/src/sys/contrib/pf/net/pf_norm.c#2 edit .. //depot/projects/vimage/src/sys/contrib/pf/net/pf_osfp.c#2 edit .. //depot/projects/vimage/src/sys/contrib/pf/net/pf_subr.c#2 edit .. //depot/projects/vimage/src/sys/contrib/pf/net/pf_table.c#2 edit .. //depot/projects/vimage/src/sys/contrib/pf/net/pfvar.h#2 edit Differences ... ==== //depot/projects/vimage/src/sys/contrib/pf/net/if_pflog.c#2 (text+ko) ==== @@ -38,6 +38,7 @@ #ifdef __FreeBSD__ #include "opt_inet.h" #include "opt_inet6.h" +#include "opt_vimage.h" #endif #ifndef __FreeBSD__ ==== //depot/projects/vimage/src/sys/contrib/pf/net/if_pflog.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/contrib/pf/net/if_pfsync.c#4 (text+ko) ==== @@ -30,6 +30,7 @@ #ifdef __FreeBSD__ #include "opt_inet.h" #include "opt_inet6.h" +#include "opt_vimage.h" #endif #ifndef __FreeBSD__ @@ -71,6 +72,7 @@ #include #include #include +#include #else #include #include @@ -353,6 +355,7 @@ int pfsync_insert_net_state(struct pfsync_state *sp) { + INIT_VNET_PF(curvnet); struct pf_state *st = NULL; struct pf_rule *r = NULL; struct pfi_kif *kif; @@ -360,7 +363,7 @@ #ifdef __FreeBSD__ PF_ASSERT(MA_OWNED); #endif - if (sp->creatorid == 0 && pf_status.debug >= PF_DEBUG_MISC) { + if (sp->creatorid == 0 && V_pf_status.debug >= PF_DEBUG_MISC) { printf("pfsync_insert_net_state: invalid creator id:" " %08x\n", ntohl(sp->creatorid)); return (EINVAL); @@ -368,7 +371,7 @@ kif = pfi_lookup_create(sp->ifname); if (kif == NULL) { - if (pf_status.debug >= PF_DEBUG_MISC) + if (V_pf_status.debug >= PF_DEBUG_MISC) printf("pfsync_insert_net_state: " "unknown interface: %s\n", sp->ifname); /* skip this state */ @@ -379,7 +382,7 @@ * Just use the default rule until we have infrastructure to find the * best matching rule. */ - r = &pf_default_rule; + r = &V_pf_default_rule; if (!r->max_states || r->states < r->max_states) st = pool_get(&pf_state_pl, PR_NOWAIT); @@ -437,6 +440,7 @@ pfsync_input(struct mbuf *m, ...) #endif { + INIT_VNET_PF(curvnet); struct ip *ip = mtod(m, struct ip *); struct pfsync_header *ph; #ifdef __FreeBSD__ @@ -458,7 +462,7 @@ pfsyncstats.pfsyncs_ipackets++; /* verify that we have a sync interface configured */ - if (!sc->sc_sync_ifp || !pf_status.running) /* XXX PF_LOCK? */ + if (!sc->sc_sync_ifp || !V_pf_status.running) /* XXX PF_LOCK? */ goto done; /* verify that the packet came in on the right interface */ @@ -525,9 +529,9 @@ PF_LOCK(); #endif if (cp->ifname[0] == '\0') { - for (st = RB_MIN(pf_state_tree_id, &tree_id); + for (st = RB_MIN(pf_state_tree_id, &V_tree_id); st; st = nexts) { - nexts = RB_NEXT(pf_state_tree_id, &tree_id, st); + nexts = RB_NEXT(pf_state_tree_id, &V_tree_id, st); if (st->creatorid == creatorid) { st->timeout = PFTM_PURGE; pf_purge_expired_state(st); @@ -536,7 +540,7 @@ } else { kif = pfi_lookup_if(cp->ifname); if (kif == NULL) { - if (pf_status.debug >= PF_DEBUG_MISC) + if (V_pf_status.debug >= PF_DEBUG_MISC) printf("pfsync_input: PFSYNC_ACT_CLR " "bad interface: %s\n", cp->ifname); splx(s); @@ -581,7 +585,7 @@ sp->dst.state > PF_TCPS_PROXY_DST || sp->direction > PF_OUT || (sp->af != AF_INET && sp->af != AF_INET6)) { - if (pf_status.debug >= PF_DEBUG_MISC) + if (V_pf_status.debug >= PF_DEBUG_MISC) printf("pfsync_insert: PFSYNC_ACT_INS: " "invalid value\n"); pfsyncstats.pfsyncs_badstate++; @@ -623,7 +627,7 @@ if (sp->timeout >= PFTM_MAX || sp->src.state > PF_TCPS_PROXY_DST || sp->dst.state > PF_TCPS_PROXY_DST) { - if (pf_status.debug >= PF_DEBUG_MISC) + if (V_pf_status.debug >= PF_DEBUG_MISC) printf("pfsync_insert: PFSYNC_ACT_UPD: " "invalid value\n"); pfsyncstats.pfsyncs_badstate++; @@ -679,7 +683,7 @@ sfail = 6; } if (sfail) { - if (pf_status.debug >= PF_DEBUG_MISC) + if (V_pf_status.debug >= PF_DEBUG_MISC) printf("pfsync: %s stale update " "(%d) id: %016llx " "creatorid: %08x\n", @@ -769,7 +773,7 @@ if (up->timeout >= PFTM_MAX || up->src.state > PF_TCPS_PROXY_DST || up->dst.state > PF_TCPS_PROXY_DST) { - if (pf_status.debug >= PF_DEBUG_MISC) + if (V_pf_status.debug >= PF_DEBUG_MISC) printf("pfsync_insert: " "PFSYNC_ACT_UPD_C: " "invalid value\n"); @@ -822,7 +826,7 @@ sfail = 6; } if (sfail) { - if (pf_status.debug >= PF_DEBUG_MISC) + if (V_pf_status.debug >= PF_DEBUG_MISC) printf("pfsync: ignoring stale update " "(%d) id: %016llx " "creatorid: %08x\n", sfail, @@ -914,7 +918,7 @@ if (key.id == 0 && key.creatorid == 0) { sc->sc_ureq_received = time_uptime; - if (pf_status.debug >= PF_DEBUG_MISC) + if (V_pf_status.debug >= PF_DEBUG_MISC) printf("pfsync: received " "bulk update request\n"); pfsync_send_bus(sc, PFSYNC_BUS_START); @@ -966,7 +970,7 @@ pf_pool_limits[PF_LIMIT_STATES].limit / (PFSYNC_BULKPACKETS * sc->sc_maxcount)); #endif - if (pf_status.debug >= PF_DEBUG_MISC) + if (V_pf_status.debug >= PF_DEBUG_MISC) printf("pfsync: received bulk " "update start\n"); break; @@ -986,11 +990,11 @@ carp_suppress_preempt--; #endif pfsync_sync_ok = 1; - if (pf_status.debug >= PF_DEBUG_MISC) + if (V_pf_status.debug >= PF_DEBUG_MISC) printf("pfsync: received valid " "bulk update end\n"); } else { - if (pf_status.debug >= PF_DEBUG_MISC) + if (V_pf_status.debug >= PF_DEBUG_MISC) printf("pfsync: received invalid " "bulk update end: bad timestamp\n"); } @@ -1016,6 +1020,7 @@ int pfsyncioctl(struct ifnet *ifp, u_long cmd, caddr_t data) { + INIT_VNET_PF(curvnet); #ifndef __FreeBSD__ struct proc *p = curproc; #endif @@ -1203,7 +1208,7 @@ carp_suppress_preempt++; #endif pfsync_sync_ok = 0; - if (pf_status.debug >= PF_DEBUG_MISC) + if (V_pf_status.debug >= PF_DEBUG_MISC) printf("pfsync: requesting bulk update\n"); #ifdef __FreeBSD__ callout_reset(&sc->sc_bulkfail_tmo, 5 * hz, @@ -1341,6 +1346,7 @@ int pfsync_pack_state(u_int8_t action, struct pf_state *st, int flags) { + INIT_VNET_PF(curvnet); #ifdef __FreeBSD__ struct ifnet *ifp = SCP2IFP(LIST_FIRST(&pfsync_list)); #else @@ -1425,8 +1431,8 @@ secs = time_second; st->pfsync_time = time_uptime; - TAILQ_REMOVE(&state_updates, st, u.s.entry_updates); - TAILQ_INSERT_TAIL(&state_updates, st, u.s.entry_updates); + TAILQ_REMOVE(&V_state_updates, st, u.s.entry_updates); + TAILQ_INSERT_TAIL(&V_state_updates, st, u.s.entry_updates); if (sp == NULL) { /* not a "duplicate" update */ @@ -1651,6 +1657,7 @@ void pfsync_send_bus(struct pfsync_softc *sc, u_int8_t status) { + INIT_VNET_PF(curvnet); struct pfsync_state_bus *bus; #ifdef __FreeBSD__ @@ -1664,7 +1671,7 @@ (void *)&sc->sc_statep.b)) != NULL) { sc->sc_mbuf->m_pkthdr.len = sc->sc_mbuf->m_len += sizeof(*bus); bus = sc->sc_statep.b; - bus->creatorid = pf_status.hostid; + bus->creatorid = V_pf_status.hostid; bus->status = status; bus->endtime = htonl(time_uptime - sc->sc_ureq_received); pfsync_sendout(sc); @@ -1674,6 +1681,7 @@ void pfsync_bulk_update(void *v) { + INIT_VNET_PF(curvnet); struct pfsync_softc *sc = v; int s, i = 0; struct pf_state *state; @@ -1689,7 +1697,7 @@ * Grab at most PFSYNC_BULKPACKETS worth of states which have not * been sent since the latest request was made. */ - while ((state = TAILQ_FIRST(&state_updates)) != NULL && + while ((state = TAILQ_FIRST(&V_state_updates)) != NULL && ++i < (sc->sc_maxcount * PFSYNC_BULKPACKETS)) { if (state->pfsync_time > sc->sc_ureq_received) { /* we're done */ @@ -1700,7 +1708,7 @@ #else timeout_del(&sc->sc_bulk_tmo); #endif - if (pf_status.debug >= PF_DEBUG_MISC) + if (V_pf_status.debug >= PF_DEBUG_MISC) printf("pfsync: bulk update complete\n"); break; } else { @@ -1708,8 +1716,8 @@ if (!state->sync_flags) pfsync_pack_state(PFSYNC_ACT_UPD, state, 0); state->pfsync_time = time_uptime; - TAILQ_REMOVE(&state_updates, state, u.s.entry_updates); - TAILQ_INSERT_TAIL(&state_updates, state, + TAILQ_REMOVE(&V_state_updates, state, u.s.entry_updates); + TAILQ_INSERT_TAIL(&V_state_updates, state, u.s.entry_updates); /* look again for more in a bit */ @@ -1732,6 +1740,7 @@ void pfsync_bulkfail(void *v) { + INIT_VNET_PF(curvnet); struct pfsync_softc *sc = v; int s, error; @@ -1749,7 +1758,7 @@ s = splnet(); error = pfsync_request_update(NULL, NULL); if (error == ENOMEM) { - if (pf_status.debug >= PF_DEBUG_MISC) + if (V_pf_status.debug >= PF_DEBUG_MISC) printf("pfsync: cannot allocate mbufs for " "bulk update\n"); } else @@ -1764,7 +1773,7 @@ carp_suppress_preempt--; #endif pfsync_sync_ok = 1; - if (pf_status.debug >= PF_DEBUG_MISC) + if (V_pf_status.debug >= PF_DEBUG_MISC) printf("pfsync: failed to receive " "bulk update status\n"); #ifdef __FreeBSD__ ==== //depot/projects/vimage/src/sys/contrib/pf/net/if_pfsync.h#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/contrib/pf/net/pf.c#4 (text+ko) ==== @@ -141,12 +141,13 @@ extern int ip_optcopy(struct ip *, struct ip *); #endif -#define DPFPRINTF(n, x) if (pf_status.debug >= (n)) printf x +#define DPFPRINTF(n, x) if (V_pf_status.debug >= (n)) printf x /* * Global variables */ +#ifndef VIMAGE struct pf_anchor_global pf_anchors; struct pf_ruleset pf_main_ruleset; struct pf_altqqueue pf_altqs[2]; @@ -159,6 +160,7 @@ u_int32_t ticket_altqs_inactive; int altqs_inactive_open; u_int32_t ticket_pabuf; +#endif #ifdef __FreeBSD__ struct callout pf_expire_to; /* expire timeout */ @@ -385,10 +387,11 @@ static int pf_anchor_compare(struct pf_anchor *, struct pf_anchor *); #endif +#ifndef VIMAGE struct pf_src_tree tree_src_tracking; - struct pf_state_tree_id tree_id; struct pf_state_queue state_updates; +#endif RB_GENERATE(pf_src_tree, pf_src_node, entry, pf_src_compare); RB_GENERATE(pf_state_tree_lan_ext, pf_state, @@ -646,16 +649,19 @@ struct pf_state * pf_find_state_byid(struct pf_state *key) { - pf_status.fcounters[FCNT_STATE_SEARCH]++; - return (RB_FIND(pf_state_tree_id, &tree_id, key)); + INIT_VNET_PF(curvnet); + + V_pf_status.fcounters[FCNT_STATE_SEARCH]++; + return (RB_FIND(pf_state_tree_id, &V_tree_id, key)); } struct pf_state * pf_find_state_recurse(struct pfi_kif *kif, struct pf_state *key, u_int8_t tree) { + INIT_VNET_PF(curvnet); struct pf_state *s; - pf_status.fcounters[FCNT_STATE_SEARCH]++; + V_pf_status.fcounters[FCNT_STATE_SEARCH]++; switch (tree) { case PF_LAN_EXT: @@ -682,14 +688,15 @@ struct pf_state * pf_find_state_all(struct pf_state *key, u_int8_t tree, int *more) { + INIT_VNET_PF(curvnet); struct pf_state *s, *ss = NULL; struct pfi_kif *kif; - pf_status.fcounters[FCNT_STATE_SEARCH]++; + V_pf_status.fcounters[FCNT_STATE_SEARCH]++; switch (tree) { case PF_LAN_EXT: - TAILQ_FOREACH(kif, &pfi_statehead, pfik_w_states) { + TAILQ_FOREACH(kif, &V_pfi_statehead, pfik_w_states) { s = RB_FIND(pf_state_tree_lan_ext, &kif->pfik_lan_ext, key); if (s == NULL) @@ -701,7 +708,7 @@ } return (ss); case PF_EXT_GWY: - TAILQ_FOREACH(kif, &pfi_statehead, pfik_w_states) { + TAILQ_FOREACH(kif, &V_pfi_statehead, pfik_w_states) { s = RB_FIND(pf_state_tree_ext_gwy, &kif->pfik_ext_gwy, key); if (s == NULL) @@ -750,6 +757,7 @@ int pf_src_connlimit(struct pf_state **state) { + INIT_VNET_PF(curvnet); struct pf_state *s; int bad = 0; @@ -762,13 +770,13 @@ if ((*state)->rule.ptr->max_src_conn && (*state)->rule.ptr->max_src_conn < (*state)->src_node->conn) { - pf_status.lcounters[LCNT_SRCCONN]++; + V_pf_status.lcounters[LCNT_SRCCONN]++; bad++; } if ((*state)->rule.ptr->max_src_conn_rate.limit && pf_check_threshold(&(*state)->src_node->conn_rate)) { - pf_status.lcounters[LCNT_SRCCONNRATE]++; + V_pf_status.lcounters[LCNT_SRCCONNRATE]++; bad++; } @@ -779,8 +787,8 @@ struct pfr_addr p; u_int32_t killed = 0; - pf_status.lcounters[LCNT_OVERLOAD_TABLE]++; - if (pf_status.debug >= PF_DEBUG_MISC) { + V_pf_status.lcounters[LCNT_OVERLOAD_TABLE]++; + if (V_pf_status.debug >= PF_DEBUG_MISC) { printf("pf_src_connlimit: blocking address "); pf_print_host(&(*state)->src_node->addr, 0, (*state)->af); @@ -808,9 +816,9 @@ /* kill existing states if that's required. */ if ((*state)->rule.ptr->flush) { - pf_status.lcounters[LCNT_OVERLOAD_FLUSH]++; + V_pf_status.lcounters[LCNT_OVERLOAD_FLUSH]++; - RB_FOREACH(s, pf_state_tree_id, &tree_id) { + RB_FOREACH(s, pf_state_tree_id, &V_tree_id) { /* * Kill states from this source. (Only those * from the same rule if PF_FLUSH_GLOBAL is not @@ -832,10 +840,10 @@ killed++; } } - if (pf_status.debug >= PF_DEBUG_MISC) + if (V_pf_status.debug >= PF_DEBUG_MISC) printf(", %u states killed", killed); } - if (pf_status.debug >= PF_DEBUG_MISC) + if (V_pf_status.debug >= PF_DEBUG_MISC) printf("\n"); } @@ -849,6 +857,7 @@ pf_insert_src_node(struct pf_src_node **sn, struct pf_rule *rule, struct pf_addr *src, sa_family_t af) { + INIT_VNET_PF(curvnet); struct pf_src_node k; if (*sn == NULL) { @@ -859,15 +868,15 @@ k.rule.ptr = rule; else k.rule.ptr = NULL; - pf_status.scounters[SCNT_SRC_NODE_SEARCH]++; - *sn = RB_FIND(pf_src_tree, &tree_src_tracking, &k); + V_pf_status.scounters[SCNT_SRC_NODE_SEARCH]++; + *sn = RB_FIND(pf_src_tree, &V_tree_src_tracking, &k); } if (*sn == NULL) { if (!rule->max_src_nodes || rule->src_nodes < rule->max_src_nodes) (*sn) = pool_get(&pf_src_tree_pl, PR_NOWAIT); else - pf_status.lcounters[LCNT_SRCNODES]++; + V_pf_status.lcounters[LCNT_SRCNODES]++; if ((*sn) == NULL) return (-1); bzero(*sn, sizeof(struct pf_src_node)); @@ -884,8 +893,8 @@ (*sn)->rule.ptr = NULL; PF_ACPY(&(*sn)->addr, src, af); if (RB_INSERT(pf_src_tree, - &tree_src_tracking, *sn) != NULL) { - if (pf_status.debug >= PF_DEBUG_MISC) { + &V_tree_src_tracking, *sn) != NULL) { + if (V_pf_status.debug >= PF_DEBUG_MISC) { printf("pf: src_tree insert failed: "); pf_print_host(&(*sn)->addr, 0, af); printf("\n"); @@ -897,12 +906,12 @@ (*sn)->ruletype = rule->action; if ((*sn)->rule.ptr != NULL) (*sn)->rule.ptr->src_nodes++; - pf_status.scounters[SCNT_SRC_NODE_INSERT]++; - pf_status.src_nodes++; + V_pf_status.scounters[SCNT_SRC_NODE_INSERT]++; + V_pf_status.src_nodes++; } else { if (rule->max_src_states && (*sn)->states >= rule->max_src_states) { - pf_status.lcounters[LCNT_SRCSTATES]++; + V_pf_status.lcounters[LCNT_SRCSTATES]++; return (-1); } } @@ -912,10 +921,12 @@ int pf_insert_state(struct pfi_kif *kif, struct pf_state *state) { + INIT_VNET_PF(curvnet); + /* Thou MUST NOT insert multiple duplicate keys */ state->u.s.kif = kif; if (RB_INSERT(pf_state_tree_lan_ext, &kif->pfik_lan_ext, state)) { - if (pf_status.debug >= PF_DEBUG_MISC) { + if (V_pf_status.debug >= PF_DEBUG_MISC) { printf("pf: state insert failed: tree_lan_ext"); printf(" lan: "); pf_print_host(&state->lan.addr, state->lan.port, @@ -934,7 +945,7 @@ } if (RB_INSERT(pf_state_tree_ext_gwy, &kif->pfik_ext_gwy, state)) { - if (pf_status.debug >= PF_DEBUG_MISC) { + if (V_pf_status.debug >= PF_DEBUG_MISC) { printf("pf: state insert failed: tree_ext_gwy"); printf(" lan: "); pf_print_host(&state->lan.addr, state->lan.port, @@ -954,11 +965,11 @@ } if (state->id == 0 && state->creatorid == 0) { - state->id = htobe64(pf_status.stateid++); - state->creatorid = pf_status.hostid; + state->id = htobe64(V_pf_status.stateid++); + state->creatorid = V_pf_status.hostid; } - if (RB_INSERT(pf_state_tree_id, &tree_id, state) != NULL) { - if (pf_status.debug >= PF_DEBUG_MISC) { + if (RB_INSERT(pf_state_tree_id, &V_tree_id, state) != NULL) { + if (V_pf_status.debug >= PF_DEBUG_MISC) { #ifdef __FreeBSD__ printf("pf: state insert failed: " "id: %016llx creatorid: %08x", @@ -977,10 +988,10 @@ RB_REMOVE(pf_state_tree_ext_gwy, &kif->pfik_ext_gwy, state); return (-1); } - TAILQ_INSERT_HEAD(&state_updates, state, u.s.entry_updates); + TAILQ_INSERT_HEAD(&V_state_updates, state, u.s.entry_updates); - pf_status.fcounters[FCNT_STATE_INSERT]++; - pf_status.states++; + V_pf_status.fcounters[FCNT_STATE_INSERT]++; + V_pf_status.states++; pfi_attach_state(kif); #if NPFSYNC pfsync_insert_state(state); @@ -991,9 +1002,9 @@ void pf_purge_timeout(void *arg) { -#ifdef __FreeBSD__ - struct callout *to = arg; -#else + CURVNET_SET((struct vnet *) arg); + INIT_VNET_PF((struct vnet *) arg); +#ifndef __FreeBSD__ struct timeout *to = arg; #endif int s; @@ -1011,16 +1022,19 @@ #endif #ifdef __FreeBSD__ - callout_reset(to, pf_default_rule.timeout[PFTM_INTERVAL] * hz, - pf_purge_timeout, to); + callout_reset(&V_pf_expire_to, + V_pf_default_rule.timeout[PFTM_INTERVAL] * hz, + pf_purge_timeout, arg); #else timeout_add(to, pf_default_rule.timeout[PFTM_INTERVAL] * hz); #endif + CURVNET_RESTORE(); } u_int32_t pf_state_expires(const struct pf_state *state) { + INIT_VNET_PF(curvnet); u_int32_t timeout; u_int32_t start; u_int32_t end; @@ -1039,15 +1053,15 @@ #endif timeout = state->rule.ptr->timeout[state->timeout]; if (!timeout) - timeout = pf_default_rule.timeout[state->timeout]; + timeout = V_pf_default_rule.timeout[state->timeout]; start = state->rule.ptr->timeout[PFTM_ADAPTIVE_START]; if (start) { end = state->rule.ptr->timeout[PFTM_ADAPTIVE_END]; states = state->rule.ptr->states; } else { - start = pf_default_rule.timeout[PFTM_ADAPTIVE_START]; - end = pf_default_rule.timeout[PFTM_ADAPTIVE_END]; - states = pf_status.states; + start = V_pf_default_rule.timeout[PFTM_ADAPTIVE_START]; + end = V_pf_default_rule.timeout[PFTM_ADAPTIVE_END]; + states = V_pf_status.states; } if (end && states > start && start < end) { if (states < end) @@ -1062,29 +1076,31 @@ void pf_purge_expired_src_nodes(void) { - struct pf_src_node *cur, *next; + INIT_VNET_PF(curvnet); + struct pf_src_node *cur, *next; - for (cur = RB_MIN(pf_src_tree, &tree_src_tracking); cur; cur = next) { - next = RB_NEXT(pf_src_tree, &tree_src_tracking, cur); + for (cur = RB_MIN(pf_src_tree, &V_tree_src_tracking); cur; cur = next) { + next = RB_NEXT(pf_src_tree, &V_tree_src_tracking, cur); - if (cur->states <= 0 && cur->expire <= time_second) { - if (cur->rule.ptr != NULL) { - cur->rule.ptr->src_nodes--; - if (cur->rule.ptr->states <= 0 && - cur->rule.ptr->max_src_nodes <= 0) - pf_rm_rule(NULL, cur->rule.ptr); - } - RB_REMOVE(pf_src_tree, &tree_src_tracking, cur); - pf_status.scounters[SCNT_SRC_NODE_REMOVALS]++; - pf_status.src_nodes--; - pool_put(&pf_src_tree_pl, cur); - } - } + if (cur->states <= 0 && cur->expire <= time_second) { + if (cur->rule.ptr != NULL) { + cur->rule.ptr->src_nodes--; + if (cur->rule.ptr->states <= 0 && + cur->rule.ptr->max_src_nodes <= 0) + pf_rm_rule(NULL, cur->rule.ptr); + } + RB_REMOVE(pf_src_tree, &V_tree_src_tracking, cur); + V_pf_status.scounters[SCNT_SRC_NODE_REMOVALS]++; + V_pf_status.src_nodes--; + pool_put(&pf_src_tree_pl, cur); + } + } } void pf_src_tree_remove_state(struct pf_state *s) { + INIT_VNET_PF(curvnet); u_int32_t timeout; if (s->src_node != NULL) { @@ -1101,7 +1117,7 @@ timeout = s->rule.ptr->timeout[PFTM_SRC_NODE]; if (!timeout) timeout = - pf_default_rule.timeout[PFTM_SRC_NODE]; + V_pf_default_rule.timeout[PFTM_SRC_NODE]; s->src_node->expire = time_second + timeout; } } @@ -1110,7 +1126,7 @@ timeout = s->rule.ptr->timeout[PFTM_SRC_NODE]; if (!timeout) timeout = - pf_default_rule.timeout[PFTM_SRC_NODE]; + V_pf_default_rule.timeout[PFTM_SRC_NODE]; s->nat_src_node->expire = time_second + timeout; } } @@ -1120,6 +1136,8 @@ void pf_purge_expired_state(struct pf_state *cur) { + INIT_VNET_PF(curvnet); + #ifdef __FreeBSD__ if (cur->local_flags & PFSTATE_EXPIRING) return; @@ -1139,7 +1157,7 @@ &cur->u.s.kif->pfik_ext_gwy, cur); RB_REMOVE(pf_state_tree_lan_ext, &cur->u.s.kif->pfik_lan_ext, cur); - RB_REMOVE(pf_state_tree_id, &tree_id, cur); + RB_REMOVE(pf_state_tree_id, &V_tree_id, cur); #if NPFSYNC pfsync_delete_state(cur); #endif @@ -1156,22 +1174,23 @@ pf_rm_rule(NULL, cur->anchor.ptr); pf_normalize_tcp_cleanup(cur); pfi_detach_state(cur->u.s.kif); - TAILQ_REMOVE(&state_updates, cur, u.s.entry_updates); + TAILQ_REMOVE(&V_state_updates, cur, u.s.entry_updates); if (cur->tag) pf_tag_unref(cur->tag); pool_put(&pf_state_pl, cur); - pf_status.fcounters[FCNT_STATE_REMOVALS]++; - pf_status.states--; + V_pf_status.fcounters[FCNT_STATE_REMOVALS]++; + V_pf_status.states--; } void pf_purge_expired_states(void) { + INIT_VNET_PF(curvnet); struct pf_state *cur, *next; - for (cur = RB_MIN(pf_state_tree_id, &tree_id); + for (cur = RB_MIN(pf_state_tree_id, &V_tree_id); cur; cur = next) { - next = RB_NEXT(pf_state_tree_id, &tree_id, cur); + next = RB_NEXT(pf_state_tree_id, &V_tree_id, cur); if (pf_state_expires(cur) <= time_second) pf_purge_expired_state(cur); } @@ -2200,6 +2219,7 @@ pf_map_addr(sa_family_t af, struct pf_rule *r, struct pf_addr *saddr, struct pf_addr *naddr, struct pf_addr *init_addr, struct pf_src_node **sn) { + INIT_VNET_PF(curvnet); unsigned char hash[16]; struct pf_pool *rpool = &r->rpool; struct pf_addr *raddr = &rpool->cur->addr.v.a.addr; @@ -2216,11 +2236,11 @@ k.rule.ptr = r; else k.rule.ptr = NULL; - pf_status.scounters[SCNT_SRC_NODE_SEARCH]++; - *sn = RB_FIND(pf_src_tree, &tree_src_tracking, &k); + V_pf_status.scounters[SCNT_SRC_NODE_SEARCH]++; + *sn = RB_FIND(pf_src_tree, &V_tree_src_tracking, &k); if (*sn != NULL && !PF_AZERO(&(*sn)->raddr, af)) { PF_ACPY(naddr, &(*sn)->raddr, af); - if (pf_status.debug >= PF_DEBUG_MISC) { + if (V_pf_status.debug >= PF_DEBUG_MISC) { printf("pf_map_addr: src tracking maps "); pf_print_host(&k.addr, 0, af); printf(" to "); @@ -2367,7 +2387,7 @@ if (*sn != NULL) PF_ACPY(&(*sn)->raddr, naddr, af); - if (pf_status.debug >= PF_DEBUG_MISC && + if (V_pf_status.debug >= PF_DEBUG_MISC && (rpool->opts & PF_POOL_TYPEMASK) != PF_POOL_NONE) { printf("pf_map_addr: selected address "); pf_print_host(naddr, 0, af); @@ -2473,13 +2493,14 @@ int direction, struct pfi_kif *kif, struct pf_addr *saddr, u_int16_t sport, struct pf_addr *daddr, u_int16_t dport, int rs_num) { + INIT_VNET_PF(curvnet); struct pf_rule *r, *rm = NULL; struct pf_ruleset *ruleset = NULL; struct pf_tag *pftag = NULL; int tag = -1; int asd = 0; - r = TAILQ_FIRST(pf_main_ruleset.rules[rs_num].active.ptr); + r = TAILQ_FIRST(V_pf_main_ruleset.rules[rs_num].active.ptr); while (r && rm == NULL) { struct pf_rule_addr *src = NULL, *dst = NULL; struct pf_addr_wrap *xdst = NULL; @@ -2551,6 +2572,7 @@ struct pf_addr *daddr, u_int16_t dport, struct pf_addr *naddr, u_int16_t *nport) { + INIT_VNET_PF(curvnet); struct pf_rule *r = NULL; if (direction == PF_OUT) { @@ -3019,6 +3041,7 @@ #endif { INIT_VNET_INET(curvnet); + INIT_VNET_PF(curvnet); struct pf_rule *nr = NULL; struct pf_addr *saddr = pd->src, *daddr = pd->dst; struct tcphdr *th = pd->hdr.tcp; @@ -3048,7 +3071,7 @@ PF_LOCK(); #endif - r = TAILQ_FIRST(pf_main_ruleset.rules[PF_RULESET_FILTER].active.ptr); + r = TAILQ_FIRST(V_pf_main_ruleset.rules[PF_RULESET_FILTER].active.ptr); if (direction == PF_OUT) { bport = nport = th->th_sport; @@ -3222,7 +3245,7 @@ /* check maximums */ if (r->max_states && (r->states >= r->max_states)) { - pf_status.lcounters[LCNT_STATES]++; + V_pf_status.lcounters[LCNT_STATES]++; REASON_SET(&reason, PFRES_MAXSTATES); goto cleanup; } @@ -3246,16 +3269,16 @@ REASON_SET(&reason, PFRES_MEMORY); cleanup: if (sn != NULL && sn->states == 0 && sn->expire == 0) { - RB_REMOVE(pf_src_tree, &tree_src_tracking, sn); - pf_status.scounters[SCNT_SRC_NODE_REMOVALS]++; - pf_status.src_nodes--; + RB_REMOVE(pf_src_tree, &V_tree_src_tracking, sn); + V_pf_status.scounters[SCNT_SRC_NODE_REMOVALS]++; + V_pf_status.src_nodes--; pool_put(&pf_src_tree_pl, sn); } if (nsn != sn && nsn != NULL && nsn->states == 0 && nsn->expire == 0) { - RB_REMOVE(pf_src_tree, &tree_src_tracking, nsn); - pf_status.scounters[SCNT_SRC_NODE_REMOVALS]++; - pf_status.src_nodes--; + RB_REMOVE(pf_src_tree, &V_tree_src_tracking, nsn); + V_pf_status.scounters[SCNT_SRC_NODE_REMOVALS]++; + V_pf_status.src_nodes--; pool_put(&pf_src_tree_pl, nsn); } return (PF_DROP); @@ -3422,6 +3445,7 @@ struct ifqueue *ifq) #endif { + INIT_VNET_PF(curvnet); struct pf_rule *nr = NULL; struct pf_addr *saddr = pd->src, *daddr = pd->dst; struct udphdr *uh = pd->hdr.udp; @@ -3450,7 +3474,7 @@ PF_LOCK(); #endif - r = TAILQ_FIRST(pf_main_ruleset.rules[PF_RULESET_FILTER].active.ptr); + r = TAILQ_FIRST(V_pf_main_ruleset.rules[PF_RULESET_FILTER].active.ptr); if (direction == PF_OUT) { bport = nport = uh->uh_sport; @@ -3599,7 +3623,7 @@ /* check maximums */ if (r->max_states && (r->states >= r->max_states)) { - pf_status.lcounters[LCNT_STATES]++; + V_pf_status.lcounters[LCNT_STATES]++; REASON_SET(&reason, PFRES_MAXSTATES); goto cleanup; } @@ -3623,16 +3647,16 @@ REASON_SET(&reason, PFRES_MEMORY); cleanup: if (sn != NULL && sn->states == 0 && sn->expire == 0) { - RB_REMOVE(pf_src_tree, &tree_src_tracking, sn); - pf_status.scounters[SCNT_SRC_NODE_REMOVALS]++; - pf_status.src_nodes--; + RB_REMOVE(pf_src_tree, &V_tree_src_tracking, sn); + V_pf_status.scounters[SCNT_SRC_NODE_REMOVALS]++; + V_pf_status.src_nodes--; pool_put(&pf_src_tree_pl, sn); } if (nsn != sn && nsn != NULL && nsn->states == 0 && nsn->expire == 0) { - RB_REMOVE(pf_src_tree, &tree_src_tracking, nsn); - pf_status.scounters[SCNT_SRC_NODE_REMOVALS]++; - pf_status.src_nodes--; + RB_REMOVE(pf_src_tree, &V_tree_src_tracking, nsn); + V_pf_status.scounters[SCNT_SRC_NODE_REMOVALS]++; + V_pf_status.src_nodes--; pool_put(&pf_src_tree_pl, nsn); } return (PF_DROP); @@ -3714,6 +3738,7 @@ struct pf_pdesc *pd, struct pf_rule **am, struct pf_ruleset **rsm, struct ifqueue *ifq) { + INIT_VNET_PF(curvnet); struct pf_rule *nr = NULL; struct pf_addr *saddr = pd->src, *daddr = pd->dst; struct pf_rule *r, *a = NULL; @@ -3767,7 +3792,7 @@ #endif /* INET6 */ } - r = TAILQ_FIRST(pf_main_ruleset.rules[PF_RULESET_FILTER].active.ptr); + r = TAILQ_FIRST(V_pf_main_ruleset.rules[PF_RULESET_FILTER].active.ptr); if (direction == PF_OUT) { bport = nport = icmpid; @@ -3905,7 +3930,7 @@ /* check maximums */ if (r->max_states && (r->states >= r->max_states)) { - pf_status.lcounters[LCNT_STATES]++; + V_pf_status.lcounters[LCNT_STATES]++; REASON_SET(&reason, PFRES_MAXSTATES); goto cleanup; } @@ -3929,16 +3954,16 @@ REASON_SET(&reason, PFRES_MEMORY); cleanup: if (sn != NULL && sn->states == 0 && sn->expire == 0) { - RB_REMOVE(pf_src_tree, &tree_src_tracking, sn); - pf_status.scounters[SCNT_SRC_NODE_REMOVALS]++; - pf_status.src_nodes--; + RB_REMOVE(pf_src_tree, &V_tree_src_tracking, sn); + V_pf_status.scounters[SCNT_SRC_NODE_REMOVALS]++; + V_pf_status.src_nodes--; pool_put(&pf_src_tree_pl, sn); } if (nsn != sn && nsn != NULL && nsn->states == 0 && nsn->expire == 0) { - RB_REMOVE(pf_src_tree, &tree_src_tracking, nsn); - pf_status.scounters[SCNT_SRC_NODE_REMOVALS]++; - pf_status.src_nodes--; + RB_REMOVE(pf_src_tree, &V_tree_src_tracking, nsn); + V_pf_status.scounters[SCNT_SRC_NODE_REMOVALS]++; + V_pf_status.src_nodes--; pool_put(&pf_src_tree_pl, nsn); } return (PF_DROP); @@ -4020,6 +4045,7 @@ struct pfi_kif *kif, struct mbuf *m, int off, void *h, struct pf_pdesc *pd, struct pf_rule **am, struct pf_ruleset **rsm, struct ifqueue *ifq) { + INIT_VNET_PF(curvnet); struct pf_rule *nr = NULL; struct pf_rule *r, *a = NULL; struct pf_ruleset *ruleset = NULL; @@ -4036,7 +4062,7 @@ return (PF_DROP); } - r = TAILQ_FIRST(pf_main_ruleset.rules[PF_RULESET_FILTER].active.ptr); + r = TAILQ_FIRST(V_pf_main_ruleset.rules[PF_RULESET_FILTER].active.ptr); if (direction == PF_OUT) { /* check outgoing packet for BINAT/NAT */ @@ -4185,7 +4211,7 @@ /* check maximums */ if (r->max_states && (r->states >= r->max_states)) { - pf_status.lcounters[LCNT_STATES]++; + V_pf_status.lcounters[LCNT_STATES]++; REASON_SET(&reason, PFRES_MAXSTATES); goto cleanup; } @@ -4209,16 +4235,16 @@ REASON_SET(&reason, PFRES_MEMORY); cleanup: if (sn != NULL && sn->states == 0 && sn->expire == 0) { - RB_REMOVE(pf_src_tree, &tree_src_tracking, sn); - pf_status.scounters[SCNT_SRC_NODE_REMOVALS]++; - pf_status.src_nodes--; + RB_REMOVE(pf_src_tree, &V_tree_src_tracking, sn); + V_pf_status.scounters[SCNT_SRC_NODE_REMOVALS]++; + V_pf_status.src_nodes--; pool_put(&pf_src_tree_pl, sn); } if (nsn != sn && nsn != NULL && nsn->states == 0 && nsn->expire == 0) { - RB_REMOVE(pf_src_tree, &tree_src_tracking, nsn); - pf_status.scounters[SCNT_SRC_NODE_REMOVALS]++; - pf_status.src_nodes--; + RB_REMOVE(pf_src_tree, &V_tree_src_tracking, nsn); + V_pf_status.scounters[SCNT_SRC_NODE_REMOVALS]++; + V_pf_status.src_nodes--; pool_put(&pf_src_tree_pl, nsn); } return (PF_DROP); @@ -4285,6 +4311,7 @@ struct mbuf *m, void *h, struct pf_pdesc *pd, struct pf_rule **am, >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Apr 19 05:38: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 A8E4716A411; Thu, 19 Apr 2007 05:38:40 +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 75C9616A40F for ; Thu, 19 Apr 2007 05:38:40 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 658BB13C4CA for ; Thu, 19 Apr 2007 05:38:40 +0000 (UTC) (envelope-from kmacy@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 l3J5cejg002172 for ; Thu, 19 Apr 2007 05:38:40 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3J5cd2g002169 for perforce@freebsd.org; Thu, 19 Apr 2007 05:38:39 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 19 Apr 2007 05:38:39 GMT Message-Id: <200704190538.l3J5cd2g002169@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 118391 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: Thu, 19 Apr 2007 05:38:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=118391 Change 118391 by kmacy@kmacy_vt-x:opentoe_init on 2007/04/19 05:38:09 make cxgb_offload compile Affected files ... .. //depot/projects/opentoe/sys/dev/cxgb/cxgb_adapter.h#7 edit .. //depot/projects/opentoe/sys/dev/cxgb/cxgb_l2t.h#2 edit .. //depot/projects/opentoe/sys/dev/cxgb/cxgb_offload.c#3 edit .. //depot/projects/opentoe/sys/dev/cxgb/cxgb_offload.h#3 edit .. //depot/projects/opentoe/sys/dev/cxgb/cxgb_toedev.h#3 edit .. //depot/projects/opentoe/sys/modules/cxgb/Makefile#4 edit Differences ... ==== //depot/projects/opentoe/sys/dev/cxgb/cxgb_adapter.h#7 (text+ko) ==== @@ -59,6 +59,7 @@ #include #include +#include struct adapter; struct sge_qset; extern int cxgb_debug; @@ -240,6 +241,7 @@ struct adapter { device_t dev; int flags; + TAILQ_ENTRY(adapter) adapter_entry; /* PCI register resources */ uint32_t regs_rid; @@ -293,7 +295,7 @@ struct port_info port[MAX_NPORTS]; device_t portdev[MAX_NPORTS]; - struct t3cdev tdev; + struct toedev tdev; char fw_version[64]; uint32_t open_device_map; struct mtx lock; @@ -384,6 +386,7 @@ void t3_os_link_changed(adapter_t *adapter, int port_id, int link_status, int speed, int duplex, int fc); void t3_sge_err_intr_handler(adapter_t *adapter); +int t3_offload_tx(struct toedev *, struct mbuf *); void t3_os_ext_intr_handler(adapter_t *adapter); void t3_os_set_hw_addr(adapter_t *adapter, int port_idx, u8 hw_addr[]); int t3_mgmt_tx(adapter_t *adap, struct mbuf *m); @@ -437,6 +440,19 @@ return container_of(q, struct sge_qset, txq[qidx]); } +static __inline struct adapter * +tdev2adap(struct toedev *d) +{ + return container_of(d, struct adapter, tdev); +} + #undef container_of +#define OFFLOAD_DEVMAP_BIT 15 +static inline int offload_running(adapter_t *adapter) +{ + return isset(&adapter->open_device_map, OFFLOAD_DEVMAP_BIT); +} + + #endif ==== //depot/projects/opentoe/sys/dev/cxgb/cxgb_l2t.h#2 (text+ko) ==== @@ -1,42 +1,8 @@ -/* - * Copyright (c) 2006 Chelsio, Inc. All rights reserved. - * Copyright (c) 2006 Open Grid Computing, Inc. All rights reserved. - * - * This software is available to you under a choice of one of two - * licenses. You may choose to be licensed under the terms of the GNU - * General Public License (GPL) Version 2, available from the file - * COPYING in the main directory of this source tree, or the - * OpenIB.org BSD license below: - * - * Redistribution and use in source and binary forms, with or - * without modification, are permitted provided that the following - * conditions are met: - * - * - Redistributions of source code must retain the above - * copyright notice, this list of conditions and the following - * disclaimer. - * - * - Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS - * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ #ifndef _CHELSIO_L2T_H #define _CHELSIO_L2T_H -#include -#include -#include "t3cdev.h" -#include +#include +#include enum { L2T_STATE_VALID, /* entry is up to date */ @@ -45,9 +11,6 @@ L2T_STATE_UNUSED /* entry not in use */ }; -struct neighbour; -struct sk_buff; - /* * Each L2T entry plays multiple roles. First of all, it keeps state for the * corresponding entry of the HW L2 table and maintains a queue of offload @@ -57,24 +20,24 @@ * first element in its chain through its first pointer. */ struct l2t_entry { - u16 state; /* entry state */ - u16 idx; /* entry index */ - u32 addr; /* dest IP address */ + uint16_t state; /* entry state */ + uint16_t idx; /* entry index */ + uint32_t addr; /* dest IP address */ int ifindex; /* neighbor's net_device's ifindex */ - u16 smt_idx; /* SMT index */ - u16 vlan; /* VLAN TCI (id: bits 0-11, prio: 13-15 */ - struct neighbour *neigh; /* associated neighbour */ + uint16_t smt_idx; /* SMT index */ + uint16_t vlan; /* VLAN TCI (id: bits 0-11, prio: 13-15 */ + struct ifnet *ifp; /* associated neighbour */ struct l2t_entry *first; /* start of hash chain */ struct l2t_entry *next; /* next l2t_entry on chain */ - struct sk_buff *arpq_head; /* queue of packets awaiting resolution */ - struct sk_buff *arpq_tail; - spinlock_t lock; - atomic_t refcnt; /* entry reference count */ - u8 dmac[6]; /* neighbour's MAC address */ + struct mbuf *arpq_head; /* queue of packets awaiting resolution */ + struct mbuf *arpq_tail; + struct mtx lock; + volatile uint32_t refcnt; /* entry reference count */ + uint8_t dmac[6]; /* neighbour's MAC address */ #ifndef NETEVENT #ifdef CONFIG_CHELSIO_T3_MODULE struct timer_list update_timer; - struct t3cdev *tdev; + struct toedev *tdev; #endif #endif }; @@ -82,41 +45,45 @@ struct l2t_data { unsigned int nentries; /* number of entries */ struct l2t_entry *rover; /* starting point for next allocation */ - atomic_t nfree; /* number of free entries */ - rwlock_t lock; + volatile uint32_t nfree; /* number of free entries */ + struct rwlock lock; struct l2t_entry l2tab[0]; }; -typedef void (*arp_failure_handler_func)(struct t3cdev *dev, - struct sk_buff *skb); +typedef void (*arp_failure_handler_func)(struct toedev *dev, + struct mbuf *m); /* * Callback stored in an skb to handle address resolution failure. */ -struct l2t_skb_cb { +struct l2t_mbuf_cb { arp_failure_handler_func arp_failure_handler; }; -#define L2T_SKB_CB(skb) ((struct l2t_skb_cb *)(skb)->cb) +/* + * XXX + */ +#define L2T_MBUF_CB(skb) ((struct l2t_mbuf_cb *)(skb)->cb) -static inline void set_arp_failure_handler(struct sk_buff *skb, +#ifdef notyet +static inline void set_arp_failure_handler(struct mbuf *m, arp_failure_handler_func hnd) { L2T_SKB_CB(skb)->arp_failure_handler = hnd; } - +#endif /* * Getting to the L2 data from an offload device. */ #define L2DATA(dev) ((dev)->l2opt) void t3_l2e_free(struct l2t_data *d, struct l2t_entry *e); -void t3_l2t_update(struct t3cdev *dev, struct neighbour *neigh); -struct l2t_entry *t3_l2t_get(struct t3cdev *dev, struct neighbour *neigh, +void t3_l2t_update(struct toedev *dev, struct ifnet *ifp); +struct l2t_entry *t3_l2t_get(struct toedev *dev, struct ifnet *neigh, unsigned int smt_idx); -int t3_l2t_send_slow(struct t3cdev *dev, struct sk_buff *skb, +int t3_l2t_send_slow(struct toedev *dev, struct mbuf *m, struct l2t_entry *e); -void t3_l2t_send_event(struct t3cdev *dev, struct l2t_entry *e); +void t3_l2t_send_event(struct toedev *dev, struct l2t_entry *e); struct l2t_data *t3_init_l2t(unsigned int l2t_capacity); void t3_free_l2t(struct l2t_data *d); @@ -128,26 +95,26 @@ #define l2t_proc_free(dir) #endif -int cxgb3_ofld_send(struct t3cdev *dev, struct sk_buff *skb); +int cxgb_ofld_send(struct toedev *dev, struct mbuf *m); -static inline int l2t_send(struct t3cdev *dev, struct sk_buff *skb, +static inline int l2t_send(struct toedev *dev, struct mbuf *m, struct l2t_entry *e) { - if (likely(e->state == L2T_STATE_VALID)) - return cxgb3_ofld_send(dev, skb); - return t3_l2t_send_slow(dev, skb, e); + if (__predict_true(e->state == L2T_STATE_VALID)) + return cxgb_ofld_send(dev, m); + return t3_l2t_send_slow(dev, m, e); } static inline void l2t_release(struct l2t_data *d, struct l2t_entry *e) { - if (atomic_dec_and_test(&e->refcnt)) + if (atomic_fetchadd_int(&e->refcnt, -1) == 1) t3_l2e_free(d, e); } static inline void l2t_hold(struct l2t_data *d, struct l2t_entry *e) { - if (atomic_add_return(1, &e->refcnt) == 1) /* 0 -> 1 transition */ - atomic_dec(&d->nfree); + if (atomic_fetchadd_int(&e->refcnt, 1) == 1) /* 0 -> 1 transition */ + atomic_add_int(&d->nfree, 1); } #endif ==== //depot/projects/opentoe/sys/dev/cxgb/cxgb_offload.c#3 (text+ko) ==== @@ -64,12 +64,24 @@ #include #include #include +#include #include +#include +#include -static LIST_HEAD(client_list); -static LIST_HEAD(ofld_dev_list); -static LIST_HEAD(adapter_list); +/* + * XXX + */ +#define LOG_ERR 1 +#define LOG_NOTICE 2 +#define BUG_ON(...) +#define VALIDATE_TID 0 + + +TAILQ_HEAD(, cxgb_client) client_list; +TAILQ_HEAD(, toedev) ofld_dev_list; +TAILQ_HEAD(, adapter) adapter_list; static struct mtx cxgb_db_lock; static struct rwlock adapter_list_lock; @@ -84,7 +96,7 @@ { struct adapter *adapter = tdev2adap(tdev); - return (test_bit(OFFLOAD_DEVMAP_BIT, &adapter->open_device_map)); + return (isset(&adapter->open_device_map, OFFLOAD_DEVMAP_BIT)); } /** @@ -184,7 +196,7 @@ TAILQ_FOREACH(adapter, &adapter_list, adapter_entry) { for_each_port(adapter, port) { - if (dev == adapter->port[port].dev) { + if (ifp == adapter->port[port].ifp) { rw_runlock(&adapter_list_lock); return 1; } @@ -197,14 +209,15 @@ static struct net_device * get_iff_from_mac(adapter_t *adapter, const uint8_t *mac, unsigned int vlan) { +#ifdef notyet int i; for_each_port(adapter, i) { const struct vlan_group *grp; const struct port_info *p = &adapter->port[i]; - struct net_device *dev = p->dev; + struct ifnet *ifnet = p->ifp; - if (!memcmp(dev->dev_addr, mac, ETH_ALEN)) { + if (!memcmp(port->hw_addr, mac, ETH_ALEN)) { if (vlan && vlan != VLAN_VID_MASK) { grp = p->vlan_grp; dev = grp ? grp->vlan_devices[vlan] : NULL; @@ -214,6 +227,7 @@ return dev; } } +#endif return NULL; } @@ -221,9 +235,9 @@ failover_fixup(adapter_t *adapter, int port) { if (adapter->params.rev == 0) { - struct net_device *dev = adapter->port[port].dev; + struct ifnet *ifp = adapter->port[port].ifp; struct cmac *mac = &adapter->port[port].mac; - if (!(dev->flags & IFF_UP)) { + if (!(ifp->if_flags & IFF_UP)) { /* Failover triggered by the interface ifdown */ t3_write_reg(adapter, A_XGM_TX_CTRL + mac->offset, F_TXEN); @@ -246,7 +260,6 @@ switch (req) { case ULP_ISCSI_GET_PARAMS: - uiip->pdev = adapter->pdev; uiip->llimit = t3_read_reg(adapter, A_ULPRX_ISCSI_LLIMIT); uiip->ulimit = t3_read_reg(adapter, A_ULPRX_ISCSI_ULIMIT); uiip->tagmask = t3_read_reg(adapter, A_ULPRX_ISCSI_TAGMASK); @@ -258,11 +271,11 @@ t3_read_reg(adapter, A_PM1_TX_CFG) >> 17); /* on rx, the iscsi pdu has to be < rx page size and the whole pdu + cpl headers has to fit into one sge buffer */ - uiip->max_rxsz = min_t(unsigned int, - adapter->params.tp.rx_pg_size, - (adapter->sge.qs[0].fl[1].buf_size - - sizeof(struct cpl_rx_data) * 2 - - sizeof(struct cpl_rx_data_ddp)) ); + uiip->max_rxsz = + (unsigned int)min(adapter->params.tp.rx_pg_size, + (adapter->sge.qs[0].fl[1].buf_size - + sizeof(struct cpl_rx_data) * 2 - + sizeof(struct cpl_rx_data_ddp)) ); break; case ULP_ISCSI_SET_PARAMS: t3_write_reg(adapter, A_ULPRX_ISCSI_TAGMASK, uiip->tagmask); @@ -283,30 +296,32 @@ switch (req) { case RDMA_GET_PARAMS: { + struct rdma_info *req = data; - struct pci_dev *pdev = adapter->pdev; +#ifdef notyet req->udbell_physbase = pci_resource_start(pdev, 2); req->udbell_len = pci_resource_len(pdev, 2); +#endif req->tpt_base = t3_read_reg(adapter, A_ULPTX_TPT_LLIMIT); req->tpt_top = t3_read_reg(adapter, A_ULPTX_TPT_ULIMIT); req->pbl_base = t3_read_reg(adapter, A_ULPTX_PBL_LLIMIT); req->pbl_top = t3_read_reg(adapter, A_ULPTX_PBL_ULIMIT); req->rqt_base = t3_read_reg(adapter, A_ULPRX_RQ_LLIMIT); req->rqt_top = t3_read_reg(adapter, A_ULPRX_RQ_ULIMIT); +#ifdef notyet req->kdb_addr = adapter->regs + A_SG_KDOORBELL; - req->pdev = pdev; +#endif break; } case RDMA_CQ_OP: { - unsigned long flags; struct rdma_cq_op *req = data; /* may be called in any context */ - spin_lock_irqsave(&adapter->sge.reg_lock, flags); + mtx_lock(&adapter->sge.reg_lock); ret = t3_sge_cqcntxt_op(adapter, req->id, req->op, req->credits); - spin_unlock_irqrestore(&adapter->sge.reg_lock, flags); + mtx_unlock(&adapter->sge.reg_lock); break; } case RDMA_GET_MEM: { @@ -332,28 +347,28 @@ case RDMA_CQ_SETUP: { struct rdma_cq_setup *req = data; - spin_lock_irq(&adapter->sge.reg_lock); + mtx_lock(&adapter->sge.reg_lock); ret = t3_sge_init_cqcntxt(adapter, req->id, req->base_addr, req->size, ASYNC_NOTIF_RSPQ, req->ovfl_mode, req->credits, req->credit_thres); - spin_unlock_irq(&adapter->sge.reg_lock); + mtx_unlock(&adapter->sge.reg_lock); break; } case RDMA_CQ_DISABLE: - spin_lock_irq(&adapter->sge.reg_lock); + mtx_lock(&adapter->sge.reg_lock); ret = t3_sge_disable_cqcntxt(adapter, *(unsigned int *)data); - spin_unlock_irq(&adapter->sge.reg_lock); + mtx_unlock(&adapter->sge.reg_lock); break; case RDMA_CTRL_QP_SETUP: { struct rdma_ctrlqp_setup *req = data; - spin_lock_irq(&adapter->sge.reg_lock); + mtx_lock(&adapter->sge.reg_lock); ret = t3_sge_init_ecntxt(adapter, FW_RI_SGEEC_START, 0, SGE_CNTXT_RDMA, ASYNC_NOTIF_RSPQ, req->base_addr, req->size, FW_RI_TID_START, 1, 0); - spin_unlock_irq(&adapter->sge.reg_lock); + mtx_unlock(&adapter->sge.reg_lock); break; } default: @@ -409,20 +424,19 @@ case GET_IFF_FROM_MAC: iffmacp = data; iffmacp->dev = get_iff_from_mac(adapter, iffmacp->mac_addr, - iffmacp->vlan_tag & VLAN_VID_MASK); + iffmacp->vlan_tag & EVL_VLID_MASK); break; case GET_DDP_PARAMS: ddpp = data; ddpp->llimit = t3_read_reg(adapter, A_ULPRX_TDDP_LLIMIT); ddpp->ulimit = t3_read_reg(adapter, A_ULPRX_TDDP_ULIMIT); ddpp->tag_mask = t3_read_reg(adapter, A_ULPRX_TDDP_TAGMASK); - ddpp->pdev = adapter->pdev; break; case GET_PORTS: ports = data; ports->nports = adapter->params.nports; for_each_port(adapter, port) - ports->lldevs[port] = adapter->port[port].dev; + ports->lldevs[port] = adapter->port[port].ifp; break; case FAILOVER: port = *(int *)data; @@ -465,14 +479,14 @@ rx_offload_blackhole(struct toedev *dev, struct mbuf **m, int n) { CH_ERR(tdev2adap(dev), "%d unexpected offload packets, first data %u\n", - n, ntohl(*(u32 *)m[0]->data)); + n, ntohl(*mtod(m[0], uint32_t *))); while (n--) m_freem(m[n]); return 0; } static void -dummy_neigh_update(struct toedev *dev, struct neighbour *neigh) +dummy_neigh_update(struct toedev *dev, struct ifnet *neigh) { } @@ -489,9 +503,9 @@ void * cxgb_free_atid(struct toedev *tdev, int atid) { - struct tid_info *t = &(T3C_DATA(tdev))->tid_maps; + struct tid_info *t = &(TOE_DATA(tdev))->tid_maps; union active_open_entry *p = atid2entry(t, atid); - void *ctx = p->t3c_tid.ctx; + void *ctx = p->toe_tid.ctx; mtx_lock(&t->atid_lock); p->next = t->afree; @@ -508,7 +522,7 @@ void cxgb_free_stid(struct toedev *tdev, int stid) { - struct tid_info *t = &(T3C_DATA(tdev))->tid_maps; + struct tid_info *t = &(TOE_DATA(tdev))->tid_maps; union listen_entry *p = stid2entry(t, stid); mtx_lock(&t->stid_lock); @@ -522,45 +536,44 @@ cxgb_insert_tid(struct toedev *tdev, struct cxgb_client *client, void *ctx, unsigned int tid) { - struct tid_info *t = &(T3C_DATA(tdev))->tid_maps; + struct tid_info *t = &(TOE_DATA(tdev))->tid_maps; t->tid_tab[tid].client = client; t->tid_tab[tid].ctx = ctx; - atomic_inc(&t->tids_in_use); + atomic_add_int(&t->tids_in_use, 1); } /* - * Populate a TID_RELEASE WR. The skb must be already propely sized. + * Populate a TID_RELEASE WR. The mbuf must be already propely sized. */ static inline void mk_tid_release(struct mbuf *m, unsigned int tid) { struct cpl_tid_release *req; - +#if 0 skb->priority = CPL_PRIORITY_SETUP; - req = (struct cpl_tid_release *)__skb_put(skb, sizeof(*req)); +#endif + req = mtod(m, struct cpl_tid_release *); req->wr.wr_hi = htonl(V_WR_OP(FW_WROPCODE_FORWARD)); OPCODE_TID(req) = htonl(MK_OPCODE_TID(CPL_TID_RELEASE, tid)); } static void -t3_process_tid_release_list(void *data) +t3_process_tid_release_list(void *data, int pending) { struct mbuf *m; struct toedev *tdev = data; - struct t3c_data *td = T3C_DATA(tdev); + struct toe_data *td = TOE_DATA(tdev); mtx_lock(&td->tid_release_lock); while (td->tid_release_list) { - struct t3c_tid_entry *p = td->tid_release_list; + struct toe_tid_entry *p = td->tid_release_list; - td->tid_release_list = (struct t3c_tid_entry *)p->ctx; + td->tid_release_list = (struct toe_tid_entry *)p->ctx; mtx_unlock(&td->tid_release_lock); - - skb = alloc_skb(sizeof(struct cpl_tid_release), - GFP_KERNEL | __GFP_NOFAIL); - mk_tid_release(skb, p - td->tid_maps.tid_tab); - cxgb_ofld_send(tdev, skb); + m = m_get(M_WAIT, MT_DATA); + mk_tid_release(m, p - td->tid_maps.tid_tab); + cxgb_ofld_send(tdev, m); p->ctx = NULL; mtx_lock(&td->tid_release_lock); } @@ -571,14 +584,16 @@ void cxgb_queue_tid_release(struct toedev *tdev, unsigned int tid) { - struct t3c_data *td = T3C_DATA(tdev); - struct t3c_tid_entry *p = &td->tid_maps.tid_tab[tid]; + struct toe_data *td = TOE_DATA(tdev); + struct toe_tid_entry *p = &td->tid_maps.tid_tab[tid]; mtx_lock(&td->tid_release_lock); p->ctx = (void *)td->tid_release_list; td->tid_release_list = p; +#if 0 if (!p->ctx) schedule_work(&td->tid_release_task); +#endif mtx_unlock(&td->tid_release_lock); } @@ -592,23 +607,23 @@ void cxgb_remove_tid(struct toedev *tdev, void *ctx, unsigned int tid) { - struct tid_info *t = &(T3C_DATA(tdev))->tid_maps; + struct tid_info *t = &(TOE_DATA(tdev))->tid_maps; BUG_ON(tid >= t->ntids); if (tdev->type == T3A) - (void)cmpxchg(&t->tid_tab[tid].ctx, ctx, NULL); + (void)atomic_cmpset_ptr(&t->tid_tab[tid].ctx, ctx, NULL); else { struct mbuf *m; - skb = alloc_skb(sizeof(struct cpl_tid_release), GFP_ATOMIC); - if (likely(skb)) { - mk_tid_release(skb, tid); - cxgb_ofld_send(tdev, skb); + m = m_get(M_NOWAIT, MT_DATA); + if (__predict_true(m != NULL)) { + mk_tid_release(m, tid); + cxgb_ofld_send(tdev, m); t->tid_tab[tid].ctx = NULL; } else cxgb_queue_tid_release(tdev, tid); } - atomic_dec(&t->tids_in_use); + atomic_add_int(&t->tids_in_use, -1); } int @@ -616,7 +631,7 @@ void *ctx) { int atid = -1; - struct tid_info *t = &(T3C_DATA(tdev))->tid_maps; + struct tid_info *t = &(TOE_DATA(tdev))->tid_maps; mtx_lock(&t->atid_lock); if (t->afree) { @@ -624,8 +639,8 @@ atid = (p - t->atid_tab) + t->atid_base; t->afree = p->next; - p->t3c_tid.ctx = ctx; - p->t3c_tid.client = client; + p->toe_tid.ctx = ctx; + p->toe_tid.client = client; t->atids_in_use++; } mtx_unlock(&t->atid_lock); @@ -637,7 +652,7 @@ void *ctx) { int stid = -1; - struct tid_info *t = &(T3C_DATA(tdev))->tid_maps; + struct tid_info *t = &(TOE_DATA(tdev))->tid_maps; mtx_lock(&t->stid_lock); if (t->sfree) { @@ -645,8 +660,8 @@ stid = (p - t->stid_tab) + t->stid_base; t->sfree = p->next; - p->t3c_tid.ctx = ctx; - p->t3c_tid.client = client; + p->toe_tid.ctx = ctx; + p->toe_tid.client = client; t->stids_in_use++; } mtx_unlock(&t->stid_lock); @@ -656,7 +671,7 @@ static int do_smt_write_rpl(struct toedev *dev, struct mbuf *m) { - struct cpl_smt_write_rpl *rpl = cplhdr(skb); + struct cpl_smt_write_rpl *rpl = cplhdr(m); if (rpl->status != CPL_ERR_NONE) log(LOG_ERR, @@ -669,7 +684,7 @@ static int do_l2t_write_rpl(struct toedev *dev, struct mbuf *m) { - struct cpl_l2t_write_rpl *rpl = cplhdr(skb); + struct cpl_l2t_write_rpl *rpl = cplhdr(m); if (rpl->status != CPL_ERR_NONE) log(LOG_ERR, @@ -682,15 +697,15 @@ static int do_act_open_rpl(struct toedev *dev, struct mbuf *m) { - struct cpl_act_open_rpl *rpl = cplhdr(skb); + struct cpl_act_open_rpl *rpl = cplhdr(m); unsigned int atid = G_TID(ntohl(rpl->atid)); - struct t3c_tid_entry *t3c_tid; + struct toe_tid_entry *toe_tid; - t3c_tid = lookup_atid(&(T3C_DATA(dev))->tid_maps, atid); - if (t3c_tid->ctx && t3c_tid->client && t3c_tid->client->handlers && - t3c_tid->client->handlers[CPL_ACT_OPEN_RPL]) { - return t3c_tid->client->handlers[CPL_ACT_OPEN_RPL] (dev, skb, - t3c_tid->ctx); + toe_tid = lookup_atid(&(TOE_DATA(dev))->tid_maps, atid); + if (toe_tid->ctx && toe_tid->client && toe_tid->client->handlers && + toe_tid->client->handlers[CPL_ACT_OPEN_RPL]) { + return toe_tid->client->handlers[CPL_ACT_OPEN_RPL] (dev, m, + toe_tid->ctx); } else { log(LOG_ERR, "%s: received clientless CPL command 0x%x\n", dev->name, CPL_ACT_OPEN_RPL); @@ -701,14 +716,14 @@ static int do_stid_rpl(struct toedev *dev, struct mbuf *m) { - union opcode_tid *p = cplhdr(skb); + union opcode_tid *p = cplhdr(m); unsigned int stid = G_TID(ntohl(p->opcode_tid)); - struct t3c_tid_entry *t3c_tid; + struct toe_tid_entry *toe_tid; - t3c_tid = lookup_stid(&(T3C_DATA(dev))->tid_maps, stid); - if (t3c_tid->ctx && t3c_tid->client->handlers && - t3c_tid->client->handlers[p->opcode]) { - return t3c_tid->client->handlers[p->opcode] (dev, skb, t3c_tid->ctx); + toe_tid = lookup_stid(&(TOE_DATA(dev))->tid_maps, stid); + if (toe_tid->ctx && toe_tid->client->handlers && + toe_tid->client->handlers[p->opcode]) { + return toe_tid->client->handlers[p->opcode] (dev, m, toe_tid->ctx); } else { log(LOG_ERR, "%s: received clientless CPL command 0x%x\n", dev->name, p->opcode); @@ -719,15 +734,15 @@ static int do_hwtid_rpl(struct toedev *dev, struct mbuf *m) { - union opcode_tid *p = cplhdr(skb); + union opcode_tid *p = cplhdr(m); unsigned int hwtid = G_TID(ntohl(p->opcode_tid)); - struct t3c_tid_entry *t3c_tid; + struct toe_tid_entry *toe_tid; - t3c_tid = lookup_tid(&(T3C_DATA(dev))->tid_maps, hwtid); - if (t3c_tid->ctx && t3c_tid->client->handlers && - t3c_tid->client->handlers[p->opcode]) { - return t3c_tid->client->handlers[p->opcode] - (dev, skb, t3c_tid->ctx); + toe_tid = lookup_tid(&(TOE_DATA(dev))->tid_maps, hwtid); + if (toe_tid->ctx && toe_tid->client->handlers && + toe_tid->client->handlers[p->opcode]) { + return toe_tid->client->handlers[p->opcode] + (dev, m, toe_tid->ctx); } else { log(LOG_ERR, "%s: received clientless CPL command 0x%x\n", dev->name, p->opcode); @@ -738,15 +753,15 @@ static int do_cr(struct toedev *dev, struct mbuf *m) { - struct cpl_pass_accept_req *req = cplhdr(skb); + struct cpl_pass_accept_req *req = cplhdr(m); unsigned int stid = G_PASS_OPEN_TID(ntohl(req->tos_tid)); - struct t3c_tid_entry *t3c_tid; + struct toe_tid_entry *toe_tid; - t3c_tid = lookup_stid(&(T3C_DATA(dev))->tid_maps, stid); - if (t3c_tid->ctx && t3c_tid->client->handlers && - t3c_tid->client->handlers[CPL_PASS_ACCEPT_REQ]) { - return t3c_tid->client->handlers[CPL_PASS_ACCEPT_REQ] - (dev, skb, t3c_tid->ctx); + toe_tid = lookup_stid(&(TOE_DATA(dev))->tid_maps, stid); + if (toe_tid->ctx && toe_tid->client->handlers && + toe_tid->client->handlers[CPL_PASS_ACCEPT_REQ]) { + return toe_tid->client->handlers[CPL_PASS_ACCEPT_REQ] + (dev, m, toe_tid->ctx); } else { log(LOG_ERR, "%s: received clientless CPL command 0x%x\n", dev->name, CPL_PASS_ACCEPT_REQ); @@ -757,35 +772,36 @@ static int do_abort_req_rss(struct toedev *dev, struct mbuf *m) { - union opcode_tid *p = cplhdr(skb); + union opcode_tid *p = cplhdr(m); unsigned int hwtid = G_TID(ntohl(p->opcode_tid)); - struct t3c_tid_entry *t3c_tid; + struct toe_tid_entry *toe_tid; - t3c_tid = lookup_tid(&(T3C_DATA(dev))->tid_maps, hwtid); - if (t3c_tid->ctx && t3c_tid->client->handlers && - t3c_tid->client->handlers[p->opcode]) { - return t3c_tid->client->handlers[p->opcode] - (dev, skb, t3c_tid->ctx); + toe_tid = lookup_tid(&(TOE_DATA(dev))->tid_maps, hwtid); + if (toe_tid->ctx && toe_tid->client->handlers && + toe_tid->client->handlers[p->opcode]) { + return toe_tid->client->handlers[p->opcode] + (dev, m, toe_tid->ctx); } else { - struct cpl_abort_req_rss *req = cplhdr(skb); + struct cpl_abort_req_rss *req = cplhdr(m); struct cpl_abort_rpl *rpl; - struct mbuf *m = - alloc_skb(sizeof(struct cpl_abort_rpl), GFP_ATOMIC); - if (!skb) { - log(LOG_NOTICE, "do_abort_req_rss: couldn't get skb!\n"); + struct mbuf *m = m_get(M_NOWAIT, MT_DATA); + if (!m) { + log(LOG_NOTICE, "do_abort_req_rss: couldn't get mbuf!\n"); goto out; } +#if 0 skb->priority = CPL_PRIORITY_DATA; __skb_put(skb, sizeof(struct cpl_abort_rpl)); - rpl = cplhdr(skb); +#endif + rpl = cplhdr(m); rpl->wr.wr_hi = htonl(V_WR_OP(FW_WROPCODE_OFLD_HOST_ABORT_CON_RPL)); rpl->wr.wr_lo = htonl(V_WR_TID(GET_TID(req))); OPCODE_TID(rpl) = htonl(MK_OPCODE_TID(CPL_ABORT_RPL, GET_TID(req))); rpl->cmd = req->status; - cxgb_ofld_send(dev, skb); + cxgb_ofld_send(dev, m); out: return CPL_RET_BUF_DONE; } @@ -794,15 +810,15 @@ static int do_act_establish(struct toedev *dev, struct mbuf *m) { - struct cpl_act_establish *req = cplhdr(skb); + struct cpl_act_establish *req = cplhdr(m); unsigned int atid = G_PASS_OPEN_TID(ntohl(req->tos_tid)); - struct t3c_tid_entry *t3c_tid; + struct toe_tid_entry *toe_tid; - t3c_tid = lookup_atid(&(T3C_DATA(dev))->tid_maps, atid); - if (t3c_tid->ctx && t3c_tid->client->handlers && - t3c_tid->client->handlers[CPL_ACT_ESTABLISH]) { - return t3c_tid->client->handlers[CPL_ACT_ESTABLISH] - (dev, skb, t3c_tid->ctx); + toe_tid = lookup_atid(&(TOE_DATA(dev))->tid_maps, atid); + if (toe_tid->ctx && toe_tid->client->handlers && + toe_tid->client->handlers[CPL_ACT_ESTABLISH]) { + return toe_tid->client->handlers[CPL_ACT_ESTABLISH] + (dev, m, toe_tid->ctx); } else { log(LOG_ERR, "%s: received clientless CPL command 0x%x\n", dev->name, CPL_PASS_ACCEPT_REQ); @@ -813,7 +829,7 @@ static int do_set_tcb_rpl(struct toedev *dev, struct mbuf *m) { - struct cpl_set_tcb_rpl *rpl = cplhdr(skb); + struct cpl_set_tcb_rpl *rpl = cplhdr(m); if (rpl->status != CPL_ERR_NONE) log(LOG_ERR, @@ -825,44 +841,50 @@ static int do_trace(struct toedev *dev, struct mbuf *m) { - struct cpl_trace_pkt *p = cplhdr(skb); +#if 0 + struct cpl_trace_pkt *p = cplhdr(m); + skb->protocol = 0xffff; skb->dev = dev->lldev; skb_pull(skb, sizeof(*p)); - skb->mac.raw = skb->data; + skb->mac.raw = mtod(m, (char *)); netif_receive_skb(skb); +#endif return 0; } static int do_term(struct toedev *dev, struct mbuf *m) { +#if 0 unsigned int hwtid = ntohl(skb->priority) >> 8 & 0xfffff; - unsigned int opcode = G_OPCODE(ntohl(skb->csum)); - struct t3c_tid_entry *t3c_tid; + unsigned int opcode = G_OPCODE(ntohl(m->m_pkthdr.csum_data)); + struct toe_tid_entry *toe_tid; - t3c_tid = lookup_tid(&(T3C_DATA(dev))->tid_maps, hwtid); - if (t3c_tid->ctx && t3c_tid->client->handlers && - t3c_tid->client->handlers[opcode]) { - return t3c_tid->client->handlers[opcode](dev,skb,t3c_tid->ctx); + toe_tid = lookup_tid(&(TOE_DATA(dev))->tid_maps, hwtid); + if (toe_tid->ctx && toe_tid->client->handlers && + toe_tid->client->handlers[opcode]) { + return toe_tid->client->handlers[opcode](dev, m, toe_tid->ctx); } else { log(LOG_ERR, "%s: received clientless CPL command 0x%x\n", dev->name, opcode); return CPL_RET_BUF_DONE | CPL_RET_BAD_MSG; } +#endif + return (0); } -#if defined (CONFIG_CHELSIO_T3_MODULE) -#include -#include -#include -#include +#if defined(FOO) +#include +#include +#include +#include -static int (*orig_arp_constructor)(struct neighbour *); +static int (*orig_arp_constructor)(struct ifnet *); static void -neigh_suspect(struct neighbour *neigh) +neigh_suspect(struct ifnet *neigh) { struct hh_cache *hh; @@ -943,16 +965,19 @@ } else { neigh->nud_state = NUD_PROBE; neigh->updated = jiffies; - atomic_set(&neigh->probes, 0); + atomic_set_int(&neigh->probes, 0); next = now + neigh->parms->retrans_time; } } else { /* NUD_PROBE|NUD_INCOMPLETE */ next = now + neigh->parms->retrans_time; } - + /* + * Needed for read of probes + */ + mb(); if ((neigh->nud_state & (NUD_INCOMPLETE | NUD_PROBE)) && - atomic_read(&neigh->probes) >= neigh_max_probes(neigh)) { + neigh->probes >= neigh_max_probes(neigh)) { struct mbuf *m; neigh->nud_state = NUD_FAILED; @@ -983,14 +1008,12 @@ } if (neigh->nud_state & (NUD_INCOMPLETE | NUD_PROBE)) { struct mbuf *m = skb_peek(&neigh->arp_queue); - /* keep skb alive even if arp_queue overflows */ - if (skb) - skb_get(skb); + write_unlock(&neigh->lock); neigh->ops->solicit(neigh, skb); - atomic_inc(&neigh->probes); - if (skb) - kfree_skb(skb); + atomic_add_int(&neigh->probes, 1); + if (m) + m_free(m); } else { out: write_unlock(&neigh->lock); @@ -1006,7 +1029,7 @@ static int arp_constructor_offload(struct neighbour *neigh) { - if (neigh->dev && is_offloading(neigh->dev)) + if (neigh->ifp && is_offloading(neigh->ifp)) neigh->timer.function = neigh_timer_handler_offload; return orig_arp_constructor(neigh); } @@ -1068,7 +1091,7 @@ static inline void restore_arp_sans_t3core(void) {} - +#endif #endif /* * Process a received packet with an unknown/unexpected CPL opcode. @@ -1077,7 +1100,7 @@ do_bad_cpl(struct toedev *dev, struct mbuf *m) { log(LOG_ERR, "%s: received bad CPL command 0x%x\n", dev->name, - *m->m_data); + *mtod(m, uint32_t *)); return (CPL_RET_BUF_DONE | CPL_RET_BAD_MSG); } @@ -1108,7 +1131,7 @@ { while (n--) { struct mbuf *m0 = *m++; - unsigned int opcode = G_OPCODE(ntohl(skb->csum)); + unsigned int opcode = G_OPCODE(ntohl(m0->m_pkthdr.csum_data)); int ret = cpl_handlers[opcode] (dev, m0); #if VALIDATE_TID @@ -1142,18 +1165,18 @@ void -cxgb_neigh_update(struct neighbour *neigh) +cxgb_neigh_update(struct ifnet *ifp) { - struct net_device *dev = neigh->dev; - if (dev && (is_offloading(dev))) { - struct toedev *tdev = TOEDEV(dev); + if (is_offloading(ifp)) { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Apr 19 06:00:09 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 8690A16A403; Thu, 19 Apr 2007 06:00:09 +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 0279B16A402 for ; Thu, 19 Apr 2007 06:00:09 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E725913C459 for ; Thu, 19 Apr 2007 06:00:08 +0000 (UTC) (envelope-from zec@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 l3J608Ki005447 for ; Thu, 19 Apr 2007 06:00:08 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3J608j9005444 for perforce@freebsd.org; Thu, 19 Apr 2007 06:00:08 GMT (envelope-from zec@FreeBSD.org) Date: Thu, 19 Apr 2007 06:00:08 GMT Message-Id: <200704190600.l3J608j9005444@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 118394 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: Thu, 19 Apr 2007 06:00:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=118394 Change 118394 by zec@zec_tca51 on 2007/04/19 05:59:49 Commit some stale s/vnet_base/vnet/ s/vnetb/vnet/ modifications from offline editing days... Affected files ... .. //depot/projects/vimage/src/sys/kern/kern_fork.c#5 edit .. //depot/projects/vimage/src/sys/kern/kern_kse.c#5 edit .. //depot/projects/vimage/src/sys/kern/subr_pcpu.c#3 edit .. //depot/projects/vimage/src/sys/net/if_var.h#6 edit .. //depot/projects/vimage/src/sys/netinet/in_pcb.h#4 edit .. //depot/projects/vimage/src/sys/netinet/tcp_syncache.h#4 edit .. //depot/projects/vimage/src/sys/netinet/tcp_var.h#5 edit .. //depot/projects/vimage/src/sys/sys/kernel.h#3 edit .. //depot/projects/vimage/src/sys/sys/proc.h#7 edit .. //depot/projects/vimage/src/sys/sys/socketvar.h#4 edit .. //depot/projects/vimage/src/sys/sys/sysctl.h#4 edit Differences ... ==== //depot/projects/vimage/src/sys/kern/kern_fork.c#5 (text+ko) ==== @@ -506,7 +506,7 @@ td2->td_sigmask = td->td_sigmask; td2->td_vimage = td->td_vimage; - td2->td_vnetb = NULL; /* XXX */ + td2->td_vnet = NULL; /* XXX */ td2->td_vnet_lpush = NULL; /* XXX */ /* ==== //depot/projects/vimage/src/sys/kern/kern_kse.c#5 (text+ko) ==== @@ -1021,7 +1021,7 @@ /* XXX don't forget refcounting in vimage */ td2->td_vimage = td->td_vimage; - td2->td_vnetb = NULL; /* XXX */ + td2->td_vnet = NULL; /* XXX */ td2->td_vnet_lpush = NULL; /* XXX */ thread_link(td2, ku->ku_proc); ==== //depot/projects/vimage/src/sys/kern/subr_pcpu.c#3 (text+ko) ==== @@ -131,7 +131,7 @@ db_show_mdpcpu(pc); #ifdef VIMAGE - db_printf("curvnetb = %p\n", pc->pc_curthread->td_vnetb); + db_printf("curvnet = %p\n", pc->pc_curthread->td_vnet); #endif #ifdef WITNESS ==== //depot/projects/vimage/src/sys/net/if_var.h#6 (text+ko) ==== @@ -186,7 +186,7 @@ TAILQ_HEAD(, ifg_list) if_groups; /* linked list of groups per if */ /* protected by if_addr_mtx */ void *if_pf_kif; - struct vnet_base *if_vnetb; /* network stack instance */ + struct vnet *if_vnet; /* network stack instance */ }; typedef void if_init_f_t(void *); ==== //depot/projects/vimage/src/sys/netinet/in_pcb.h#4 (text+ko) ==== @@ -119,7 +119,7 @@ void *inp_ppcb; /* pointer to per-protocol pcb */ struct inpcbinfo *inp_pcbinfo; /* PCB list info */ -#define inp_vnetb inp_pcbinfo->vnetb +#define inp_vnet inp_pcbinfo->vnet struct socket *inp_socket; /* back pointer to socket */ /* list for this PCB's local port */ struct label *inp_label; /* MAC label */ @@ -233,7 +233,7 @@ u_int ipi_count; /* number of pcbs in this list */ u_quad_t ipi_gencnt; /* current generation count */ struct mtx ipi_mtx; - struct vnet_base *vnetb; + struct vnet *vnet; }; #define INP_LOCK_INIT(inp, d, t) \ ==== //depot/projects/vimage/src/sys/netinet/tcp_syncache.h#4 (text+ko) ==== @@ -73,7 +73,7 @@ struct syncache_head { struct mtx sch_mtx; TAILQ_HEAD(sch_head, syncache) sch_bucket; - struct vnet_base *sch_vnetb; + struct vnet *sch_vnet; struct callout sch_timer; int sch_nextc; u_int sch_length; ==== //depot/projects/vimage/src/sys/netinet/tcp_var.h#5 (text+ko) ==== @@ -35,7 +35,7 @@ #include -struct vnet_base; +struct vnet; /* * Kernel variables for tcp. @@ -188,7 +188,7 @@ u_long snd_ssthresh_prev; /* ssthresh prior to retransmit */ tcp_seq snd_recover_prev; /* snd_recover prior to retransmit */ u_long t_badrxtwin; /* window for retransmit recovery */ - struct vnet_base *t_vnetb; /* back pointer to parent vnet */ + struct vnet *t_vnet; /* back pointer to parent vnet */ /* SACK related state */ int sack_enable; /* enable SACK for this connection */ int snd_numholes; /* number of holes seen by sender */ ==== //depot/projects/vimage/src/sys/sys/kernel.h#3 (text+ko) ==== @@ -162,7 +162,7 @@ SI_SUB_KTHREAD_BUF = 0xea00000, /* buffer daemon*/ SI_SUB_KTHREAD_UPDATE = 0xec00000, /* update daemon*/ SI_SUB_KTHREAD_IDLE = 0xee00000, /* idle procs*/ - SI_SUB_VIMAGE_DONE = 0xef00000, /* clear curvnetb*/ + SI_SUB_VIMAGE_DONE = 0xef00000, /* clear curvnet*/ SI_SUB_SMP = 0xf000000, /* start the APs*/ SI_SUB_RUN_SCHEDULER = 0xfffffff /* scheduler*/ }; ==== //depot/projects/vimage/src/sys/sys/proc.h#7 (text+ko) ==== @@ -315,7 +315,7 @@ * copied explicitly in fork1() or thread_schedule_upcall(). */ struct vimage *td_vimage; /* (*) Current vimage */ - struct vnet_base *td_vnetb; /* (*) Effective vnet */ + struct vnet *td_vnet; /* (*) Effective vnet */ const char *td_vnet_lpush; /* (*) Debugging vnet push / pop */ }; ==== //depot/projects/vimage/src/sys/sys/socketvar.h#4 (text+ko) ==== @@ -38,7 +38,7 @@ #include #include -struct vnet_base; +struct vnet; /* * Kernel structure per socket. @@ -67,7 +67,7 @@ short so_state; /* (b) internal state flags SS_* */ int so_qstate; /* (e) internal state flags SQ_* */ void *so_pcb; /* protocol control block */ - struct vnet_base *so_vnetb; /* network stack instance */ + struct vnet *so_vnet; /* network stack instance */ struct protosw *so_proto; /* (a) protocol handle */ /* * Variables for connection queuing. ==== //depot/projects/vimage/src/sys/sys/sysctl.h#4 (text+ko) ==== @@ -394,7 +394,7 @@ void *ptr; \ switch (subs) { \ case V_NET: \ - ptr = curthread->td_vimage->v_vnetb->mod_data[mod]; \ + ptr = curthread->td_vimage->v_vnet->mod_data[mod]; \ arg1 = (void *) ((int) ptr + (int) arg1); \ break; \ default: \ From owner-p4-projects@FreeBSD.ORG Thu Apr 19 06:34:53 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 4F83816A406; Thu, 19 Apr 2007 06:34:53 +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 0E10116A400 for ; Thu, 19 Apr 2007 06:34:53 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id F2E4413C458 for ; Thu, 19 Apr 2007 06:34:52 +0000 (UTC) (envelope-from kmacy@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 l3J6Yqji012491 for ; Thu, 19 Apr 2007 06:34:52 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3J6YqYI012488 for perforce@freebsd.org; Thu, 19 Apr 2007 06:34:52 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 19 Apr 2007 06:34:52 GMT Message-Id: <200704190634.l3J6YqYI012488@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 118395 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: Thu, 19 Apr 2007 06:34:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=118395 Change 118395 by kmacy@kmacy_vt-x:opentoe_init on 2007/04/19 06:34:22 clean up client list manipulation set RDMA params Affected files ... .. //depot/projects/opentoe/sys/dev/cxgb/cxgb_offload.c#4 edit .. //depot/projects/opentoe/sys/dev/cxgb/cxgb_offload.h#4 edit Differences ... ==== //depot/projects/opentoe/sys/dev/cxgb/cxgb_offload.c#4 (text+ko) ==== @@ -112,7 +112,7 @@ struct toedev *tdev; mtx_lock(&cxgb_db_lock); - TAILQ_INSERT_TAIL(&client->client_list, client, client_entry); + TAILQ_INSERT_TAIL(&client_list, client, client_entry); if (client->add) { TAILQ_FOREACH(tdev, &ofld_dev_list, ofld_entry) { @@ -123,7 +123,6 @@ mtx_unlock(&cxgb_db_lock); } - /** * cxgb_unregister_client - unregister an offload client * @client: the client @@ -137,7 +136,7 @@ struct toedev *tdev; mtx_lock(&cxgb_db_lock); - TAILQ_REMOVE(&client->client_list, client, client_entry); + TAILQ_REMOVE(&client_list, client, client_entry); if (client->remove) { TAILQ_FOREACH(tdev, &ofld_dev_list, ofld_entry) { @@ -193,7 +192,6 @@ int port; rw_rlock(&adapter_list_lock); - TAILQ_FOREACH(adapter, &adapter_list, adapter_entry) { for_each_port(adapter, port) { if (ifp == adapter->port[port].ifp) { @@ -296,13 +294,10 @@ switch (req) { case RDMA_GET_PARAMS: { - struct rdma_info *req = data; -#ifdef notyet - req->udbell_physbase = pci_resource_start(pdev, 2); - req->udbell_len = pci_resource_len(pdev, 2); -#endif + req->udbell_physbase = rman_get_start(adapter->regs_res); + req->udbell_len = rman_get_size(adapter->regs_res); req->tpt_base = t3_read_reg(adapter, A_ULPTX_TPT_LLIMIT); req->tpt_top = t3_read_reg(adapter, A_ULPTX_TPT_ULIMIT); req->pbl_base = t3_read_reg(adapter, A_ULPTX_PBL_LLIMIT); @@ -441,7 +436,7 @@ case FAILOVER: port = *(int *)data; t3_port_failover(adapter, port); - failover_fixup(adapter, !port); + failover_fixup(adapter, port); break; case FAILOVER_DONE: port = *(int *)data; ==== //depot/projects/opentoe/sys/dev/cxgb/cxgb_offload.h#4 (text+ko) ==== @@ -83,7 +83,6 @@ struct dst_entry *new, struct l2t_entry *l2t); #endif - TAILQ_HEAD(, cxgb_client) client_list; TAILQ_ENTRY(cxgb_client) client_entry; }; From owner-p4-projects@FreeBSD.ORG Thu Apr 19 07:23:55 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 A932316A404; Thu, 19 Apr 2007 07:23:55 +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 56C0116A400 for ; Thu, 19 Apr 2007 07:23:55 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 46F7013C459 for ; Thu, 19 Apr 2007 07:23:55 +0000 (UTC) (envelope-from kmacy@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 l3J7Ntgx021173 for ; Thu, 19 Apr 2007 07:23:55 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3J7NtjZ021169 for perforce@freebsd.org; Thu, 19 Apr 2007 07:23:55 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 19 Apr 2007 07:23:55 GMT Message-Id: <200704190723.l3J7NtjZ021169@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 118397 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: Thu, 19 Apr 2007 07:23:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=118397 Change 118397 by kmacy@kmacy_vt-x:opentoe_init on 2007/04/19 07:22:58 remove last vestiges of t3cdev enable offload support at attach time Affected files ... .. //depot/projects/opentoe/sys/dev/cxgb/cxgb_adapter.h#8 edit .. //depot/projects/opentoe/sys/dev/cxgb/cxgb_l2t.c#2 edit .. //depot/projects/opentoe/sys/dev/cxgb/cxgb_main.c#5 edit .. //depot/projects/opentoe/sys/dev/cxgb/cxgb_offload.c#5 edit .. //depot/projects/opentoe/sys/dev/cxgb/cxgb_offload.h#5 edit .. //depot/projects/opentoe/sys/dev/cxgb/cxgb_osdep.h#6 edit .. //depot/projects/opentoe/sys/dev/cxgb/cxgb_sge.c#6 edit Differences ... ==== //depot/projects/opentoe/sys/dev/cxgb/cxgb_adapter.h#8 (text+ko) ==== @@ -128,14 +128,6 @@ struct sge_lro_session s[MAX_LRO_PER_QSET]; }; -/* has its own header on linux XXX - * but I don't even know what it is :-/ - */ - -struct t3cdev { - int foo; /* XXX fill in */ -}; - #define RX_BUNDLE_SIZE 8 struct rsp_desc; @@ -298,6 +290,7 @@ struct toedev tdev; char fw_version[64]; uint32_t open_device_map; + uint32_t registered_device_map; struct mtx lock; }; ==== //depot/projects/opentoe/sys/dev/cxgb/cxgb_l2t.c#2 (text+ko) ==== @@ -1,42 +1,9 @@ -/* - * Copyright (c) 2006 Chelsio, Inc. All rights reserved. - * Copyright (c) 2006 Open Grid Computing, Inc. All rights reserved. - * - * This software is available to you under a choice of one of two - * licenses. You may choose to be licensed under the terms of the GNU - * General Public License (GPL) Version 2, available from the file - * COPYING in the main directory of this source tree, or the - * OpenIB.org BSD license below: - * - * Redistribution and use in source and binary forms, with or - * without modification, are permitted provided that the following - * conditions are met: - * - * - Redistributions of source code must retain the above - * copyright notice, this list of conditions and the following - * disclaimer. - * - * - Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS - * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ #include #include #include #include #include #include -#include "t3cdev.h" #include "cxgb3_defs.h" #include "l2t.h" #include "t3_cpl.h" @@ -83,7 +50,7 @@ * supplied skb is used for the CPL_L2T_WRITE_REQ. Must be called with the * entry locked. */ -static int setup_l2e_send_pending(struct t3cdev *dev, struct sk_buff *skb, +static int setup_l2e_send_pending(struct toedev *dev, struct sk_buff *skb, struct l2t_entry *e) { struct cpl_l2t_write_req *req; @@ -130,7 +97,7 @@ e->arpq_tail = skb; } -int t3_l2t_send_slow(struct t3cdev *dev, struct sk_buff *skb, +int t3_l2t_send_slow(struct toedev *dev, struct sk_buff *skb, struct l2t_entry *e) { again: @@ -178,7 +145,7 @@ } EXPORT_SYMBOL(t3_l2t_send_slow); -void t3_l2t_send_event(struct t3cdev *dev, struct l2t_entry *e) +void t3_l2t_send_event(struct toedev *dev, struct l2t_entry *e) { again: switch (e->state) { @@ -299,7 +266,7 @@ spin_unlock(&e->lock); } -struct l2t_entry *t3_l2t_get(struct t3cdev *dev, struct neighbour *neigh, +struct l2t_entry *t3_l2t_get(struct toedev *dev, struct neighbour *neigh, unsigned int smt_idx) { struct l2t_entry *e; @@ -350,7 +317,7 @@ * XXX: maybe we should abandon the latter behavior and just require a failure * handler. */ -static void handle_failed_resolution(struct t3cdev *dev, struct sk_buff *arpq) +static void handle_failed_resolution(struct toedev *dev, struct sk_buff *arpq) { while (arpq) { struct sk_buff *skb = arpq; @@ -369,7 +336,7 @@ * Called when the host's ARP layer makes a change to some entry that is * loaded into the HW L2 table. */ -void t3_l2t_update(struct t3cdev *dev, struct neighbour *neigh) +void t3_l2t_update(struct toedev *dev, struct neighbour *neigh) { struct l2t_entry *e; struct sk_buff *arpq = NULL; @@ -415,7 +382,7 @@ /* * Called from a kprobe, interrupts are off. */ -void t3_l2t_update(struct t3cdev *dev, struct neighbour *neigh) +void t3_l2t_update(struct toedev *dev, struct neighbour *neigh) { struct l2t_entry *e; struct l2t_data *d = L2DATA(dev); @@ -444,7 +411,7 @@ struct sk_buff *arpq = NULL; struct l2t_entry *e = (struct l2t_entry *)data; struct neighbour *neigh = e->neigh; - struct t3cdev *dev = e->tdev; + struct toedev *dev = e->tdev; barrier(); if (!atomic_read(&e->refcnt)) ==== //depot/projects/opentoe/sys/dev/cxgb/cxgb_main.c#5 (text+ko) ==== @@ -79,6 +79,7 @@ #include #include #include +#include #include #include #include @@ -504,6 +505,11 @@ if (error) goto out; + if (is_offload(sc)) { + setbit(&sc->registered_device_map, OFFLOAD_DEVMAP_BIT); + cxgb_adapter_ofld(sc); + } + snprintf(&sc->fw_version[0], sizeof(sc->fw_version), "%d.%d", G_FW_VERSION_MAJOR(vers), G_FW_VERSION_MINOR(vers)); ==== //depot/projects/opentoe/sys/dev/cxgb/cxgb_offload.c#5 (text+ko) ==== @@ -204,10 +204,10 @@ return 0; } -static struct net_device * +static struct ifnet * get_iff_from_mac(adapter_t *adapter, const uint8_t *mac, unsigned int vlan) { -#ifdef notyet +#ifdef notyet int i; for_each_port(adapter, i) { @@ -215,8 +215,8 @@ const struct port_info *p = &adapter->port[i]; struct ifnet *ifnet = p->ifp; - if (!memcmp(port->hw_addr, mac, ETH_ALEN)) { - if (vlan && vlan != VLAN_VID_MASK) { + if (!memcmp(p->hw_addr, mac, ETHER_ADDR_LEN)) { + if (vlan && vlan != EVL_VLID_MASK) { grp = p->vlan_grp; dev = grp ? grp->vlan_devices[vlan] : NULL; } else @@ -225,7 +225,7 @@ return dev; } } -#endif +#endif return NULL; } @@ -1444,7 +1444,7 @@ mtx_unlock(&cxgb_db_lock); } -void __devinit +void cxgb_adapter_ofld(struct adapter *adapter) { struct toedev *tdev = &adapter->tdev; ==== //depot/projects/opentoe/sys/dev/cxgb/cxgb_offload.h#5 (text+ko) ==== @@ -256,8 +256,8 @@ void cxgb_redirect(struct dst_entry *old, struct dst_entry *new); #endif int process_rx(struct toedev *dev, struct mbuf **m, int n); -int attach_t3cdev(struct toedev *dev); -void detach_t3cdev(struct toedev *dev); +int attach_toedev(struct toedev *dev); +void detach_toedev(struct toedev *dev); #endif ==== //depot/projects/opentoe/sys/dev/cxgb/cxgb_osdep.h#6 (text+ko) ==== @@ -138,6 +138,9 @@ #define t3_os_sleep(x) DELAY((x) * 1000) #define max_t(type, a, b) (type)max((a), (b)) +#define net_device ifnet + + /* Standard PHY definitions */ #define BMCR_LOOPBACK BMCR_LOOP ==== //depot/projects/opentoe/sys/dev/cxgb/cxgb_sge.c#6 (text+ko) ==== @@ -1690,13 +1690,13 @@ #define NOMEM_INTR_DELAY 2500 static __inline void -deliver_partial_bundle(struct t3cdev *tdev, struct sge_rspq *q) +deliver_partial_bundle(struct toedev *tdev, struct sge_rspq *q) { ; } static __inline void -rx_offload(struct t3cdev *tdev, struct sge_rspq *rq, +rx_offload(struct toedev *tdev, struct sge_rspq *rq, struct mbuf *m) { #ifdef notyet From owner-p4-projects@FreeBSD.ORG Thu Apr 19 07:28:01 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 4526A16A409; Thu, 19 Apr 2007 07:28:01 +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 182D416A407 for ; Thu, 19 Apr 2007 07:28:01 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 0994E13C469 for ; Thu, 19 Apr 2007 07:28:01 +0000 (UTC) (envelope-from zec@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 l3J7S08m021679 for ; Thu, 19 Apr 2007 07:28:00 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3J7S0FM021672 for perforce@freebsd.org; Thu, 19 Apr 2007 07:28:00 GMT (envelope-from zec@FreeBSD.org) Date: Thu, 19 Apr 2007 07:28:00 GMT Message-Id: <200704190728.l3J7S0FM021672@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 118398 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: Thu, 19 Apr 2007 07:28:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=118398 Change 118398 by zec@zec_tca51 on 2007/04/19 07:27:11 More cleanups after failing to properly check in offline changes all at once... Affected files ... .. //depot/projects/vimage/src/sys/netinet/in_pcb.h#5 edit .. //depot/projects/vimage/src/sys/netinet/ip_input.c#11 edit .. //depot/projects/vimage/src/sys/netinet/ip_var.h#3 edit .. //depot/projects/vimage/src/sys/netinet/tcp_var.h#6 edit Differences ... ==== //depot/projects/vimage/src/sys/netinet/in_pcb.h#5 (text+ko) ==== @@ -326,6 +326,7 @@ #define INP_CHECK_SOCKAF(so, af) (INP_SOCKAF(so) == af) #ifdef _KERNEL +#ifndef VIMAGE extern int ipport_reservedhigh; extern int ipport_reservedlow; extern int ipport_lowfirstauto; @@ -334,6 +335,11 @@ extern int ipport_lastauto; extern int ipport_hifirstauto; extern int ipport_hilastauto; +extern int ipport_randomized; +extern int ipport_randomcps; +extern int ipport_randomtime; +extern int ipport_stoprandom; +#endif extern struct callout ipport_tick_callout; void in_pcbpurgeif0(struct inpcbinfo *, struct ifnet *); ==== //depot/projects/vimage/src/sys/netinet/ip_input.c#11 (text+ko) ==== ==== //depot/projects/vimage/src/sys/netinet/ip_var.h#3 (text+ko) ==== @@ -150,21 +150,18 @@ #ifndef VIMAGE extern struct ipstat ipstat; -#endif extern u_short ip_id; /* ip packet ctr, for ids */ extern int ip_defttl; /* default IP ttl */ -#ifndef VIMAGE extern int ipforwarding; /* ip forwarding */ -#endif +extern int ip_do_randomid; #ifdef IPSTEALTH extern int ipstealth; /* stealth forwarding */ #endif -extern u_char ip_protox[]; -#ifndef VIMAGE extern int rsvp_on; extern struct socket *ip_rsvpd; /* reservation protocol daemon */ extern struct socket *ip_mrouter; /* multicast routing daemon */ #endif +extern u_char ip_protox[]; extern int (*legal_vif_num)(int); extern u_long (*ip_mcast_src)(int); extern struct pr_usrreqs rip_usrreqs; @@ -209,9 +206,7 @@ void in_delayed_cksum(struct mbuf *m); -static __inline uint16_t ip_newid(void); -extern int ip_do_randomid; - +#if 0 static __inline uint16_t ip_newid(void) { @@ -220,6 +215,9 @@ return htons(ip_id++); } +#else +#define ip_newid() (V_ip_do_randomid ? ip_randomid() : V_ip_id++) +#endif #endif /* _KERNEL */ ==== //depot/projects/vimage/src/sys/netinet/tcp_var.h#6 (text+ko) ==== @@ -491,7 +491,6 @@ extern struct inpcbhead tcb; /* head of queue of active tcpcb's */ extern struct inpcbinfo tcbinfo; extern struct tcpstat tcpstat; /* tcp statistics */ -#endif extern int tcp_mssdflt; /* XXX */ extern int tcp_minmss; extern int tcp_delack_enabled; @@ -499,8 +498,24 @@ extern int path_mtu_discovery; extern int ss_fltsz; extern int ss_fltsz_local; - extern int tcp_do_sack; /* SACK enabled/disabled */ +extern int tcp_sack_maxholes; +extern int tcp_sack_globalmaxholes; +extern int tcp_sack_globalholes; +extern int tcp_do_tso; +extern int tcp_do_autosndbuf; +extern int tcp_autosndbuf_max; +extern int tcp_autosndbuf_inc; +extern int tcp_autorcvbuf; +extern int tcp_do_autorcvbuf; +extern int tcp_autorcvbuf_inc; +extern int tcp_autorcvbuf_max; +extern int blackhole; +extern int drop_synfin; +extern int tcp_do_rfc3042; +extern int tcp_do_rfc3390; +extern int tcp_insecure_rst; +#endif int tcp_addoptions(struct tcpopt *, u_char *); struct tcpcb * From owner-p4-projects@FreeBSD.ORG Thu Apr 19 07:39:15 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 99A1C16A402; Thu, 19 Apr 2007 07:39:15 +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 6F0E116A400 for ; Thu, 19 Apr 2007 07:39:15 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 607A913C468 for ; Thu, 19 Apr 2007 07:39:15 +0000 (UTC) (envelope-from zec@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 l3J7dFba023295 for ; Thu, 19 Apr 2007 07:39:15 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3J7dFng023292 for perforce@freebsd.org; Thu, 19 Apr 2007 07:39:15 GMT (envelope-from zec@FreeBSD.org) Date: Thu, 19 Apr 2007 07:39:15 GMT Message-Id: <200704190739.l3J7dFng023292@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 118399 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: Thu, 19 Apr 2007 07:39:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=118399 Change 118399 by zec@zec_tca51 on 2007/04/19 07:38:43 Fix to allow compilation with nooptions VIMAGE. Affected files ... .. //depot/projects/vimage/src/sys/contrib/pf/net/pf_ioctl.c#5 edit Differences ... ==== //depot/projects/vimage/src/sys/contrib/pf/net/pf_ioctl.c#5 (text+ko) ==== @@ -401,10 +401,14 @@ callout_reset(&V_pf_expire_to, my_timeout[PFTM_INTERVAL] * hz, pf_purge_timeout, curvnet); -if (curvnet == &vnet_0) { +#ifdef VIMAGE + if (curvnet == &vnet_0) { +#endif pf_normalize_init(); pf_pfil_hooked = 0; -} +#ifdef VIMAGE + } +#endif bzero(&V_pf_status, sizeof(V_pf_status)); /* XXX do our best to avoid a conflict */ From owner-p4-projects@FreeBSD.ORG Thu Apr 19 11:13:44 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 1E85416A407; Thu, 19 Apr 2007 11:13:44 +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 D06D516A402 for ; Thu, 19 Apr 2007 11:13:43 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id A966113C4BC for ; Thu, 19 Apr 2007 11:13:43 +0000 (UTC) (envelope-from zec@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 l3JBDhYv072587 for ; Thu, 19 Apr 2007 11:13:43 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3JBDhK6072584 for perforce@freebsd.org; Thu, 19 Apr 2007 11:13:43 GMT (envelope-from zec@FreeBSD.org) Date: Thu, 19 Apr 2007 11:13:43 GMT Message-Id: <200704191113.l3JBDhK6072584@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 118403 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: Thu, 19 Apr 2007 11:13:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=118403 Change 118403 by zec@zec_tca51 on 2007/04/19 11:13:21 Allow for compilation of if_gre to succeed when INET6 is not defined. Affected files ... .. //depot/projects/vimage/src/sys/net/if_gre.c#3 edit Differences ... ==== //depot/projects/vimage/src/sys/net/if_gre.c#3 (text+ko) ==== @@ -241,7 +241,9 @@ gre_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst, struct rtentry *rt) { +#ifdef INET6 INIT_VNET_INET(ifp->if_vnet); +#endif int error = 0; struct gre_softc *sc = ifp->if_softc; struct greip *gh; From owner-p4-projects@FreeBSD.ORG Thu Apr 19 13:13:15 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 583E516A40D; Thu, 19 Apr 2007 13:13:15 +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 E41F516A403 for ; Thu, 19 Apr 2007 13:13:14 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id D5E6313C48A for ; Thu, 19 Apr 2007 13:13:14 +0000 (UTC) (envelope-from sephe@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 l3JDDEYM005776 for ; Thu, 19 Apr 2007 13:13:14 GMT (envelope-from sephe@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3JDDEZ6005772 for perforce@freebsd.org; Thu, 19 Apr 2007 13:13:14 GMT (envelope-from sephe@FreeBSD.org) Date: Thu, 19 Apr 2007 13:13:14 GMT Message-Id: <200704191313.l3JDDEZ6005772@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sephe@FreeBSD.org using -f From: Sepherosa Ziehau To: Perforce Change Reviews Cc: Subject: PERFORCE change 118409 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: Thu, 19 Apr 2007 13:13:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=118409 Change 118409 by sephe@sephe_zealot:sam_wifi on 2007/04/19 13:12:13 - Fix mbuf/node leakage in drivers' raw_xmit(). - For ural(4): o Fix node leakage in ural_start(), if ural_tx_mgt() fails. o Fix mbuf leakage in ural_tx_{mgt,data}(), if usbd_transfer() fails. o In ural_tx_{mgt,data}(), set ural_tx_data.{m,ni} to NULL, if usbd_transfer() fails, so they will not be freed again in ural_stop(). Approved by: sam (mentor) Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_ath.c#137 edit .. //depot/projects/wifi/sys/dev/ral/rt2560.c#18 edit .. //depot/projects/wifi/sys/dev/usb/if_ural.c#18 edit .. //depot/projects/wifi/sys/dev/wi/if_wi.c#32 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#137 (text+ko) ==== @@ -6498,6 +6498,7 @@ struct ath_buf *bf; if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0 || sc->sc_invalid) { + ieee80211_free_node(ni); m_freem(m); return ENETDOWN; } @@ -6514,6 +6515,7 @@ __func__); sc->sc_stats.ast_tx_qstop++; ifp->if_drv_flags |= IFF_DRV_OACTIVE; + ieee80211_free_node(ni); m_freem(m); return ENOBUFS; } ==== //depot/projects/wifi/sys/dev/ral/rt2560.c#18 (text) ==== @@ -1681,8 +1681,10 @@ rate = params->ibp_rate0 & IEEE80211_RATE_VAL; /* XXX validate */ - if (rate == 0) + if (rate == 0) { + m_freem(m0); return EINVAL; + } error = bus_dmamap_load_mbuf_sg(sc->prioq.data_dmat, data->map, m0, segs, &nsegs, 0); @@ -2823,11 +2825,15 @@ /* prevent management frames from being sent if we're not ready */ if (!(ifp->if_drv_flags & IFF_DRV_RUNNING)) { RAL_UNLOCK(sc); + m_freem(m); + ieee80211_free_node(ni); return ENETDOWN; } if (sc->prioq.queued >= RT2560_PRIO_RING_COUNT) { ifp->if_drv_flags |= IFF_DRV_OACTIVE; RAL_UNLOCK(sc); + m_freem(m); + ieee80211_free_node(ni); return ENOBUFS; /* XXX */ } ==== //depot/projects/wifi/sys/dev/usb/if_ural.c#18 (text+ko) ==== @@ -1246,8 +1246,12 @@ ural_txeof); error = usbd_transfer(data->xfer); - if (error != USBD_NORMAL_COMPLETION && error != USBD_IN_PROGRESS) + if (error != USBD_NORMAL_COMPLETION && error != USBD_IN_PROGRESS) { + m_freem(m0); + data->m = NULL; + data->ni = NULL; return error; + } sc->tx_queued++; @@ -1270,8 +1274,10 @@ rate = params->ibp_rate0 & IEEE80211_RATE_VAL; /* XXX validate */ - if (rate == 0) + if (rate == 0) { + m_freem(m0); return EINVAL; + } if (bpf_peers_present(sc->sc_drvbpf)) { struct ural_tx_radiotap_header *tap = &sc->sc_txtap; @@ -1314,8 +1320,12 @@ ural_txeof); error = usbd_transfer(data->xfer); - if (error != USBD_NORMAL_COMPLETION && error != USBD_IN_PROGRESS) + if (error != USBD_NORMAL_COMPLETION && error != USBD_IN_PROGRESS) { + m_freem(m0); + data->m = NULL; + data->ni = NULL; return error; + } sc->tx_queued++; @@ -1435,9 +1445,10 @@ if (bpf_peers_present(ic->ic_rawbpf)) bpf_mtap(ic->ic_rawbpf, m0); - if (ural_tx_mgt(sc, m0, ni) != 0) + if (ural_tx_mgt(sc, m0, ni) != 0) { + ieee80211_free_node(ni); break; - + } } else { if (ic->ic_state != IEEE80211_S_RUN) break; @@ -2381,10 +2392,16 @@ struct ural_softc *sc = ifp->if_softc; /* prevent management frames from being sent if we're not ready */ - if (!(ifp->if_drv_flags & IFF_DRV_RUNNING)) + if (!(ifp->if_drv_flags & IFF_DRV_RUNNING)) { + m_freem(m); + ieee80211_free_node(ni); return ENETDOWN; + } + if (sc->tx_queued >= RAL_TX_LIST_COUNT) { ifp->if_drv_flags |= IFF_DRV_OACTIVE; + m_freem(m); + ieee80211_free_node(ni); return EIO; } ==== //depot/projects/wifi/sys/dev/wi/if_wi.c#32 (text+ko) ==== @@ -1116,9 +1116,6 @@ k = ieee80211_crypto_encap(ic, ni, m0); if (k == NULL) { - if (ni != NULL) - ieee80211_free_node(ni); - m_freem(m0); rc = ENOMEM; goto out; } @@ -1139,16 +1136,20 @@ frmhdr.wi_dat_len = htole16(m0->m_pkthdr.len); if (IFF_DUMPPKTS(ifp)) wi_dump_pkt(&frmhdr, NULL, -1); - if (ni != NULL) - ieee80211_free_node(ni); - rc = wi_start_tx(ifp, &frmhdr, m0); - if (rc) + if (wi_start_tx(ifp, &frmhdr, m0) < 0) { + m0 = NULL; + rc = EIO; goto out; + } + m0 = NULL; sc->sc_txnext = cur = (cur + 1) % sc->sc_ntxbuf; out: WI_UNLOCK(sc); + if (m0 != NULL) + m_freem(m0); + ieee80211_free_node(ni); return rc; } From owner-p4-projects@FreeBSD.ORG Thu Apr 19 14:01:53 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 D593216A402; Thu, 19 Apr 2007 14:01:52 +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 5808216A406; Thu, 19 Apr 2007 14:01:52 +0000 (UTC) (envelope-from max@love2party.net) Received: from moutng.kundenserver.de (moutng.kundenserver.de [212.227.126.177]) by mx1.freebsd.org (Postfix) with ESMTP id E12D413C480; Thu, 19 Apr 2007 14:01:51 +0000 (UTC) (envelope-from max@love2party.net) Received: from [88.64.184.8] (helo=amd64.laiers.local) by mrelayeu.kundenserver.de (node=mrelayeu8) with ESMTP (Nemesis), id 0ML31I-1HeX0c3ymy-0005uv; Thu, 19 Apr 2007 15:49:15 +0200 From: Max Laier Organization: FreeBSD To: Marko Zec Date: Thu, 19 Apr 2007 15:49:07 +0200 User-Agent: KMail/1.9.5 References: <200704190739.l3J7dFng023292@repoman.freebsd.org> In-Reply-To: <200704190739.l3J7dFng023292@repoman.freebsd.org> X-Face: ,,8R(x[kmU]tKN@>gtH1yQE4aslGdu+2]; R]*pL,U>^H?)gW@49@wdJ`H<=?utf-8?q?=25=7D*=5FBD=0A=09U=5For=3D=5CmOZf764=26nYj=3DJYbR1PW0ud?=>|!~,,CPC.1-D$FG@0h3#'5"k{V]a~.<=?utf-8?q?mZ=7D44=23Se=7Em=0A=09Fe=7E=5C=5DX5B=5D=5Fxj?=(ykz9QKMw_l0C2AQ]}Ym8)fU MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart1607217.gSfsnSrB6R"; protocol="application/pgp-signature"; micalg=pgp-sha1 Content-Transfer-Encoding: 7bit Message-Id: <200704191549.13955.max@love2party.net> X-Provags-ID: V01U2FsdGVkX18U7QrOIDtHBSzCPXruglGRAh7oSlUDLCfm9Oe 6xIBN3pp9ybjy9EaKpoSxHVhwhk4Njjgi6/DXBPEMQCNB4Tg0+ x6Dr+Zot7jRFBiwg/6r0g== Cc: Perforce Change Reviews Subject: Re: PERFORCE change 118399 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: Thu, 19 Apr 2007 14:01:53 -0000 --nextPart1607217.gSfsnSrB6R Content-Type: text/plain; charset="iso-8859-6" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline On Thursday 19 April 2007 09:39, Marko Zec wrote: > http://perforce.freebsd.org/chv.cgi?CH=3D118399 > > Change 118399 by zec@zec_tca51 on 2007/04/19 07:38:43 > > Fix to allow compilation with nooptions VIMAGE. > > Affected files ... > > .. //depot/projects/vimage/src/sys/contrib/pf/net/pf_ioctl.c#5 edit > > Differences ... > > =3D=3D=3D=3D //depot/projects/vimage/src/sys/contrib/pf/net/pf_ioctl.c#5 > (text+ko) =3D=3D=3D=3D > > @@ -401,10 +401,14 @@ > callout_reset(&V_pf_expire_to, my_timeout[PFTM_INTERVAL] * hz, > pf_purge_timeout, curvnet); > > -if (curvnet =3D=3D &vnet_0) { > +#ifdef VIMAGE > + if (curvnet =3D=3D &vnet_0) { > +#endif > pf_normalize_init(); > pf_pfil_hooked =3D 0; > -} > +#ifdef VIMAGE > + } > +#endif I don't quite understand this one. I'd believe that pf_pfil_hooked should= =20 be virtualized as well. Otherwise you can only enable/hook all instances=20 at once. > bzero(&V_pf_status, sizeof(V_pf_status)); > /* XXX do our best to avoid a conflict */ =2D-=20 /"\ Best regards, | mlaier@freebsd.org \ / Max Laier | ICQ #67774661 X http://pf4freebsd.love2party.net/ | mlaier@EFnet / \ ASCII Ribbon Campaign | Against HTML Mail and News --nextPart1607217.gSfsnSrB6R Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (FreeBSD) iD8DBQBGJ3NZXyyEoT62BG0RAohuAJ0VnhsPm20LFxQXESZEWZBMFWEPZwCeMMVH a1bts9w7/jrRpq90KIYnyvc= =sAWa -----END PGP SIGNATURE----- --nextPart1607217.gSfsnSrB6R-- From owner-p4-projects@FreeBSD.ORG Thu Apr 19 14:40:17 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 3045916A40D; Thu, 19 Apr 2007 14:40:17 +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 DBC3816A408 for ; Thu, 19 Apr 2007 14:40:16 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B6A3D13C4B0 for ; Thu, 19 Apr 2007 14:40:16 +0000 (UTC) (envelope-from gonzo@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 l3JEeGA8020014 for ; Thu, 19 Apr 2007 14:40:16 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3JEe5Bf019998 for perforce@freebsd.org; Thu, 19 Apr 2007 14:40:05 GMT (envelope-from gonzo@FreeBSD.org) Date: Thu, 19 Apr 2007 14:40:05 GMT Message-Id: <200704191440.l3JEe5Bf019998@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 118414 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: Thu, 19 Apr 2007 14:40:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=118414 Change 118414 by gonzo@gonzo_jeeves on 2007/04/19 14:39:33 IFC @118401 Affected files ... .. //depot/projects/mips2/src/MAINTAINERS#5 integrate .. //depot/projects/mips2/src/Makefile.inc1#4 integrate .. //depot/projects/mips2/src/ObsoleteFiles.inc#4 integrate .. //depot/projects/mips2/src/UPDATING#4 integrate .. //depot/projects/mips2/src/bin/df/df.c#3 integrate .. //depot/projects/mips2/src/cddl/Makefile#1 branch .. //depot/projects/mips2/src/cddl/Makefile.inc#1 branch .. //depot/projects/mips2/src/cddl/lib/Makefile#1 branch .. //depot/projects/mips2/src/cddl/lib/Makefile.inc#1 branch .. //depot/projects/mips2/src/cddl/lib/libavl/Makefile#1 branch .. //depot/projects/mips2/src/cddl/lib/libnvpair/Makefile#1 branch .. //depot/projects/mips2/src/cddl/lib/libumem/Makefile#1 branch .. //depot/projects/mips2/src/cddl/lib/libuutil/Makefile#1 branch .. //depot/projects/mips2/src/cddl/lib/libzfs/Makefile#1 branch .. //depot/projects/mips2/src/cddl/lib/libzpool/Makefile#1 branch .. //depot/projects/mips2/src/cddl/sbin/Makefile#1 branch .. //depot/projects/mips2/src/cddl/sbin/Makefile.inc#1 branch .. //depot/projects/mips2/src/cddl/sbin/zfs/Makefile#1 branch .. //depot/projects/mips2/src/cddl/sbin/zpool/Makefile#1 branch .. //depot/projects/mips2/src/cddl/usr.bin/Makefile#1 branch .. //depot/projects/mips2/src/cddl/usr.bin/Makefile.inc#1 branch .. //depot/projects/mips2/src/cddl/usr.bin/ztest/Makefile#1 branch .. //depot/projects/mips2/src/cddl/usr.sbin/Makefile#1 branch .. //depot/projects/mips2/src/cddl/usr.sbin/Makefile.inc#1 branch .. //depot/projects/mips2/src/cddl/usr.sbin/zdb/Makefile#1 branch .. //depot/projects/mips2/src/compat/opensolaris/include/devid.h#1 branch .. //depot/projects/mips2/src/compat/opensolaris/include/fsshare.h#1 branch .. //depot/projects/mips2/src/compat/opensolaris/include/libintl.h#1 branch .. //depot/projects/mips2/src/compat/opensolaris/include/mnttab.h#1 branch .. //depot/projects/mips2/src/compat/opensolaris/include/priv.h#1 branch .. //depot/projects/mips2/src/compat/opensolaris/include/solaris.h#1 branch .. //depot/projects/mips2/src/compat/opensolaris/include/zone.h#1 branch .. //depot/projects/mips2/src/compat/opensolaris/lib/libumem/umem.c#1 branch .. //depot/projects/mips2/src/compat/opensolaris/lib/libumem/umem.h#1 branch .. //depot/projects/mips2/src/compat/opensolaris/misc/fsshare.c#1 branch .. //depot/projects/mips2/src/compat/opensolaris/misc/mkdirp.c#1 branch .. //depot/projects/mips2/src/compat/opensolaris/misc/mnttab.c#1 branch .. //depot/projects/mips2/src/compat/opensolaris/misc/zmount.c#1 branch .. //depot/projects/mips2/src/compat/opensolaris/misc/zone.c#1 branch .. //depot/projects/mips2/src/contrib/amd/hlfsd/hlfsd.h#2 integrate .. //depot/projects/mips2/src/contrib/binutils/gas/as.h#2 integrate .. //depot/projects/mips2/src/contrib/binutils/gas/tc.h#2 integrate .. //depot/projects/mips2/src/contrib/libreadline/FREEBSD-upgrade#3 integrate .. //depot/projects/mips2/src/contrib/libreadline/display.c#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/HISTORY#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/README#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/TODO#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/VERSION#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/bin/audit/audit.8#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/bin/auditd/auditd.8#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/bin/auditd/auditd.c#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/bin/auditfilterd/auditfilterd.8#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/bin/auditfilterd/auditfilterd.c#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/bin/auditreduce/auditreduce.1#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/bin/praudit/praudit.1#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/bin/praudit/praudit.c#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/bsm/libbsm.h#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/compat/clock_gettime.h#1 branch .. //depot/projects/mips2/src/contrib/openbsm/config/config.h#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/configure#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/configure.ac#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/etc/audit_event#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/libbsm/au_class.3#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/libbsm/au_control.3#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/libbsm/au_event.3#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/libbsm/au_free_token.3#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/libbsm/au_io.3#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/libbsm/au_mask.3#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/libbsm/au_open.3#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/libbsm/au_token.3#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/libbsm/au_user.3#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/libbsm/audit_submit.3#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/libbsm/bsm_io.c#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/libbsm/bsm_notify.c#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/libbsm/bsm_token.c#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/libbsm/bsm_wrappers.c#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/libbsm/libbsm.3#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/man/audit.2#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/man/audit.log.5#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/man/audit_class.5#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/man/audit_control.5#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/man/audit_event.5#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/man/audit_user.5#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/man/audit_warn.5#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/man/auditctl.2#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/man/auditon.2#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/man/getaudit.2#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/man/getauid.2#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/man/setaudit.2#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/man/setauid.2#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/bsm/generate.c#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/arg32_record#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/data_record#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/file_record#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/in_addr_record#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/ip_record#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/ipc_record#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/iport_record#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/opaque_record#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/path_record#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/process32_record#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/process32ex_record#2 delete .. //depot/projects/mips2/src/contrib/openbsm/test/reference/process32ex_record-IPv4#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/process32ex_record-IPv6#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/process32ex_token#2 delete .. //depot/projects/mips2/src/contrib/openbsm/test/reference/process32ex_token-IPv4#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/process32ex_token-IPv6#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/process64_record#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/process64_token#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/process64ex_record-IPv4#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/process64ex_record-IPv6#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/process64ex_token-IPv4#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/process64ex_token-IPv6#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/return32_record#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/seq_record#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/subject32_record#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/subject32ex_record#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/subject32ex_token-IPv4#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/subject32ex_token-IPv6#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/text_record#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/zonename_record#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/zonename_token#1 branch .. //depot/projects/mips2/src/contrib/openbsm/tools/audump.c#3 integrate .. //depot/projects/mips2/src/contrib/openpam/lib/openpam_readline.c#2 integrate .. //depot/projects/mips2/src/contrib/opensolaris/cmd/zdb/zdb.8#1 branch .. //depot/projects/mips2/src/contrib/opensolaris/cmd/zdb/zdb.c#1 branch .. //depot/projects/mips2/src/contrib/opensolaris/cmd/zdb/zdb_il.c#1 branch .. //depot/projects/mips2/src/contrib/opensolaris/cmd/zfs/zfs.8#1 branch .. //depot/projects/mips2/src/contrib/opensolaris/cmd/zfs/zfs_iter.c#1 branch .. //depot/projects/mips2/src/contrib/opensolaris/cmd/zfs/zfs_iter.h#1 branch .. //depot/projects/mips2/src/contrib/opensolaris/cmd/zfs/zfs_main.c#1 branch .. //depot/projects/mips2/src/contrib/opensolaris/cmd/zfs/zfs_util.h#1 branch .. //depot/projects/mips2/src/contrib/opensolaris/cmd/zpool/zpool.8#1 branch .. //depot/projects/mips2/src/contrib/opensolaris/cmd/zpool/zpool_iter.c#1 branch .. //depot/projects/mips2/src/contrib/opensolaris/cmd/zpool/zpool_main.c#1 branch .. //depot/projects/mips2/src/contrib/opensolaris/cmd/zpool/zpool_util.c#1 branch .. //depot/projects/mips2/src/contrib/opensolaris/cmd/zpool/zpool_util.h#1 branch .. //depot/projects/mips2/src/contrib/opensolaris/cmd/zpool/zpool_vdev.c#1 branch .. //depot/projects/mips2/src/contrib/opensolaris/cmd/ztest/ztest.c#1 branch .. //depot/projects/mips2/src/contrib/opensolaris/head/assert.h#1 branch .. //depot/projects/mips2/src/contrib/opensolaris/head/atomic.h#1 branch .. //depot/projects/mips2/src/contrib/opensolaris/head/libintl.h#1 branch .. //depot/projects/mips2/src/contrib/opensolaris/head/stdio_ext.h#1 branch .. //depot/projects/mips2/src/contrib/opensolaris/head/synch.h#1 branch .. //depot/projects/mips2/src/contrib/opensolaris/head/thread.h#1 branch .. //depot/projects/mips2/src/contrib/opensolaris/lib/libnvpair/libnvpair.c#1 branch .. //depot/projects/mips2/src/contrib/opensolaris/lib/libnvpair/libnvpair.h#1 branch .. //depot/projects/mips2/src/contrib/opensolaris/lib/libnvpair/nvpair_alloc_system.c#1 branch .. //depot/projects/mips2/src/contrib/opensolaris/lib/libuutil/common/libuutil.h#1 branch .. //depot/projects/mips2/src/contrib/opensolaris/lib/libuutil/common/libuutil_common.h#1 branch .. //depot/projects/mips2/src/contrib/opensolaris/lib/libuutil/common/libuutil_impl.h#1 branch .. //depot/projects/mips2/src/contrib/opensolaris/lib/libuutil/common/uu_alloc.c#1 branch .. //depot/projects/mips2/src/contrib/opensolaris/lib/libuutil/common/uu_avl.c#1 branch .. //depot/projects/mips2/src/contrib/opensolaris/lib/libuutil/common/uu_dprintf.c#1 branch .. //depot/projects/mips2/src/contrib/opensolaris/lib/libuutil/common/uu_ident.c#1 branch .. //depot/projects/mips2/src/contrib/opensolaris/lib/libuutil/common/uu_list.c#1 branch .. //depot/projects/mips2/src/contrib/opensolaris/lib/libuutil/common/uu_misc.c#1 branch .. //depot/projects/mips2/src/contrib/opensolaris/lib/libuutil/common/uu_open.c#1 branch .. //depot/projects/mips2/src/contrib/opensolaris/lib/libuutil/common/uu_pname.c#1 branch .. //depot/projects/mips2/src/contrib/opensolaris/lib/libuutil/common/uu_strtoint.c#1 branch .. //depot/projects/mips2/src/contrib/opensolaris/lib/libzfs/common/libzfs.h#1 branch .. //depot/projects/mips2/src/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#1 branch .. //depot/projects/mips2/src/contrib/opensolaris/lib/libzfs/common/libzfs_config.c#1 branch .. //depot/projects/mips2/src/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#1 branch .. //depot/projects/mips2/src/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c#1 branch .. //depot/projects/mips2/src/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#1 branch .. //depot/projects/mips2/src/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#1 branch .. //depot/projects/mips2/src/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#1 branch .. //depot/projects/mips2/src/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#1 branch .. //depot/projects/mips2/src/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#1 branch .. //depot/projects/mips2/src/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#1 branch .. //depot/projects/mips2/src/contrib/opensolaris/lib/libzpool/common/kernel.c#1 branch .. //depot/projects/mips2/src/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#1 branch .. //depot/projects/mips2/src/contrib/opensolaris/lib/libzpool/common/taskq.c#1 branch .. //depot/projects/mips2/src/contrib/opensolaris/lib/libzpool/common/util.c#1 branch .. //depot/projects/mips2/src/contrib/sendmail/FREEBSD-upgrade#3 integrate .. //depot/projects/mips2/src/contrib/sendmail/KNOWNBUGS#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/PGPKEYS#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/RELEASE_NOTES#3 integrate .. //depot/projects/mips2/src/contrib/sendmail/cf/README#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/cf/cf/knecht.mc#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/cf/cf/submit.cf#3 integrate .. //depot/projects/mips2/src/contrib/sendmail/cf/feature/access_db.m4#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/cf/feature/badmx.m4#1 branch .. //depot/projects/mips2/src/contrib/sendmail/cf/feature/block_bad_helo.m4#1 branch .. //depot/projects/mips2/src/contrib/sendmail/cf/feature/dnsbl.m4#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/cf/feature/enhdnsbl.m4#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/cf/feature/require_rdns.m4#1 branch .. //depot/projects/mips2/src/contrib/sendmail/cf/m4/proto.m4#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/cf/m4/version.m4#3 integrate .. //depot/projects/mips2/src/contrib/sendmail/cf/mailer/smtp.m4#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/contrib/cidrexpand#3 integrate .. //depot/projects/mips2/src/contrib/sendmail/contrib/qtool.pl#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/doc/op/op.me#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/editmap/Makefile.m4#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/include/libmilter/mfapi.h#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/include/libmilter/mfdef.h#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/include/libmilter/milter.h#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/include/sm/conf.h#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/include/sm/errstring.h#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/include/sm/heap.h#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/include/sm/ldap.h#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/include/sm/misc.h#1 branch .. //depot/projects/mips2/src/contrib/sendmail/include/sm/os/sm_os_qnx.h#1 branch .. //depot/projects/mips2/src/contrib/sendmail/include/sm/sendmail.h#1 branch .. //depot/projects/mips2/src/contrib/sendmail/include/sm/tailq.h#1 branch .. //depot/projects/mips2/src/contrib/sendmail/libmilter/Makefile#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/libmilter/Makefile.m4#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/libmilter/README#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/libmilter/comm.c#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/libmilter/docs/api.html#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/libmilter/docs/design.html#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/libmilter/docs/index.html#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/libmilter/docs/installation.html#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/libmilter/docs/other.html#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/libmilter/docs/overview.html#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/libmilter/docs/sample.html#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/libmilter/docs/smfi_addheader.html#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/libmilter/docs/smfi_addrcpt.html#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/libmilter/docs/smfi_addrcpt_par.html#1 branch .. //depot/projects/mips2/src/contrib/sendmail/libmilter/docs/smfi_chgfrom.html#1 branch .. //depot/projects/mips2/src/contrib/sendmail/libmilter/docs/smfi_chgheader.html#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/libmilter/docs/smfi_delrcpt.html#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/libmilter/docs/smfi_getpriv.html#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/libmilter/docs/smfi_getsymval.html#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/libmilter/docs/smfi_insheader.html#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/libmilter/docs/smfi_main.html#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/libmilter/docs/smfi_opensocket.html#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/libmilter/docs/smfi_progress.html#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/libmilter/docs/smfi_quarantine.html#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/libmilter/docs/smfi_register.html#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/libmilter/docs/smfi_replacebody.html#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/libmilter/docs/smfi_setbacklog.html#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/libmilter/docs/smfi_setconn.html#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/libmilter/docs/smfi_setdbg.html#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/libmilter/docs/smfi_setmlreply.html#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/libmilter/docs/smfi_setpriv.html#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/libmilter/docs/smfi_setreply.html#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/libmilter/docs/smfi_setsymlist.html#1 branch .. //depot/projects/mips2/src/contrib/sendmail/libmilter/docs/smfi_settimeout.html#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/libmilter/docs/smfi_stop.html#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/libmilter/docs/smfi_version.html#1 branch .. //depot/projects/mips2/src/contrib/sendmail/libmilter/docs/xxfi_abort.html#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/libmilter/docs/xxfi_body.html#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/libmilter/docs/xxfi_close.html#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/libmilter/docs/xxfi_connect.html#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/libmilter/docs/xxfi_data.html#1 branch .. //depot/projects/mips2/src/contrib/sendmail/libmilter/docs/xxfi_envfrom.html#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/libmilter/docs/xxfi_envrcpt.html#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/libmilter/docs/xxfi_eoh.html#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/libmilter/docs/xxfi_eom.html#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/libmilter/docs/xxfi_header.html#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/libmilter/docs/xxfi_helo.html#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/libmilter/docs/xxfi_negotiate.html#1 branch .. //depot/projects/mips2/src/contrib/sendmail/libmilter/docs/xxfi_unknown.html#1 branch .. //depot/projects/mips2/src/contrib/sendmail/libmilter/engine.c#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/libmilter/example.c#1 branch .. //depot/projects/mips2/src/contrib/sendmail/libmilter/handler.c#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/libmilter/libmilter.h#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/libmilter/listener.c#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/libmilter/main.c#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/libmilter/monitor.c#1 branch .. //depot/projects/mips2/src/contrib/sendmail/libmilter/smfi.c#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/libmilter/worker.c#1 branch .. //depot/projects/mips2/src/contrib/sendmail/libsm/Makefile#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/libsm/Makefile.m4#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/libsm/config.c#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/libsm/exc.c#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/libsm/exc.html#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/libsm/findfp.c#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/libsm/flags.c#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/libsm/ldap.c#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/libsm/local.h#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/libsm/memstat.c#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/libsm/snprintf.c#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/libsm/t-memstat.c#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/libsm/t-qic.c#1 branch .. //depot/projects/mips2/src/contrib/sendmail/libsm/t-sem.c#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/libsm/util.c#1 branch .. //depot/projects/mips2/src/contrib/sendmail/libsm/vfscanf.c#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/libsmdb/Makefile.m4#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/libsmutil/Makefile.m4#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/mail.local/Makefile.m4#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/mail.local/mail.local.c#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/mailstats/Makefile.m4#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/makemap/Makefile.m4#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/praliases/Makefile.m4#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/rmail/Makefile.m4#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/smrsh/Makefile.m4#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/src/Makefile#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/src/Makefile.m4#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/src/README#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/src/TRACEFLAGS#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/src/TUNING#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/src/alias.c#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/src/arpadate.c#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/src/collect.c#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/src/conf.c#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/src/conf.h#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/src/control.c#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/src/daemon.c#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/src/daemon.h#1 branch .. //depot/projects/mips2/src/contrib/sendmail/src/deliver.c#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/src/domain.c#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/src/envelope.c#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/src/err.c#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/src/headers.c#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/src/helpfile#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/src/macro.c#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/src/mailq.1#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/src/main.c#3 integrate .. //depot/projects/mips2/src/contrib/sendmail/src/map.c#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/src/map.h#1 branch .. //depot/projects/mips2/src/contrib/sendmail/src/mci.c#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/src/milter.c#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/src/mime.c#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/src/parseaddr.c#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/src/queue.c#3 integrate .. //depot/projects/mips2/src/contrib/sendmail/src/ratectrl.c#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/src/readcf.c#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/src/recipient.c#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/src/sasl.c#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/src/savemail.c#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/src/sendmail.h#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/src/sm_resolve.c#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/src/srvrsmtp.c#3 integrate .. //depot/projects/mips2/src/contrib/sendmail/src/stab.c#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/src/stats.c#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/src/timers.c#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/src/tls.c#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/src/udb.c#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/src/usersmtp.c#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/src/util.c#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/src/version.c#3 integrate .. //depot/projects/mips2/src/contrib/sendmail/test/Makefile#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/vacation/Makefile.m4#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/vacation/vacation.c#2 integrate .. //depot/projects/mips2/src/contrib/tcpdump/print-stp.c#2 integrate .. //depot/projects/mips2/src/contrib/tcsh/sh.lex.c#3 integrate .. //depot/projects/mips2/src/contrib/top/commands.c#2 integrate .. //depot/projects/mips2/src/contrib/top/machine.h#2 integrate .. //depot/projects/mips2/src/contrib/top/top.X#2 integrate .. //depot/projects/mips2/src/contrib/top/top.c#2 integrate .. //depot/projects/mips2/src/contrib/top/top.h#2 integrate .. //depot/projects/mips2/src/etc/defaults/periodic.conf#3 integrate .. //depot/projects/mips2/src/etc/defaults/rc.conf#4 integrate .. //depot/projects/mips2/src/etc/devd.conf#3 integrate .. //depot/projects/mips2/src/etc/mtree/BSD.include.dist#3 integrate .. //depot/projects/mips2/src/etc/mtree/BSD.root.dist#2 integrate .. //depot/projects/mips2/src/etc/periodic/daily/404.status-zfs#1 branch .. //depot/projects/mips2/src/etc/periodic/daily/Makefile#2 integrate .. //depot/projects/mips2/src/etc/rc.d/FILESYSTEMS#2 integrate .. //depot/projects/mips2/src/etc/rc.d/Makefile#3 integrate .. //depot/projects/mips2/src/etc/rc.d/NETWORKING#2 integrate .. //depot/projects/mips2/src/etc/rc.d/hostid#1 branch .. //depot/projects/mips2/src/etc/rc.d/ipfilter#3 integrate .. //depot/projects/mips2/src/etc/rc.d/ipsec#3 integrate .. //depot/projects/mips2/src/etc/rc.d/kldxref#3 integrate .. //depot/projects/mips2/src/etc/rc.d/mountcritremote#3 integrate .. //depot/projects/mips2/src/etc/rc.d/mountd#2 integrate .. //depot/projects/mips2/src/etc/rc.d/netoptions#2 integrate .. //depot/projects/mips2/src/etc/rc.d/nfslocking#3 integrate .. //depot/projects/mips2/src/etc/rc.d/pf#3 integrate .. //depot/projects/mips2/src/etc/rc.d/pflog#3 integrate .. //depot/projects/mips2/src/etc/rc.d/pfsync#3 integrate .. //depot/projects/mips2/src/etc/rc.d/zfs#1 branch .. //depot/projects/mips2/src/etc/rc.firewall#3 integrate .. //depot/projects/mips2/src/etc/services#2 integrate .. //depot/projects/mips2/src/include/Makefile#3 integrate .. //depot/projects/mips2/src/include/rpc/Makefile#2 integrate .. //depot/projects/mips2/src/include/rpc/types.h#2 delete .. //depot/projects/mips2/src/include/stdio.h#2 integrate .. //depot/projects/mips2/src/lib/libarchive/Makefile#3 integrate .. //depot/projects/mips2/src/lib/libarchive/archive.h.in#3 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_entry.c#3 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_platform.h#3 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_read.3#3 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_read.c#3 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_read_data_into_buffer.c#3 delete .. //depot/projects/mips2/src/lib/libarchive/archive_read_extract.c#3 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_read_support_compression_bzip2.c#3 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_read_support_compression_compress.c#3 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_read_support_compression_gzip.c#3 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_read_support_compression_none.c#3 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_read_support_format_all.c#3 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_read_support_format_ar.c#2 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_read_support_format_cpio.c#3 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_read_support_format_tar.c#3 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_read_support_format_zip.c#3 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_write_disk.c#2 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_write_set_compression_none.c#3 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_write_set_format_ar.c#2 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_write_set_format_by_name.c#3 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_write_set_format_pax.c#3 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_write_set_format_ustar.c#3 integrate .. //depot/projects/mips2/src/lib/libarchive/config_freebsd.h#2 integrate .. //depot/projects/mips2/src/lib/libarchive/libarchive-formats.5#3 integrate .. //depot/projects/mips2/src/lib/libarchive/test/Makefile#2 integrate .. //depot/projects/mips2/src/lib/libarchive/test/main.c#2 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_acl_basic.c#2 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_acl_pax.c#2 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_read_data_large.c#2 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_read_extract.c#2 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_read_format_ar.c#2 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_read_large.c#2 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_read_position.c#2 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_read_truncated.c#2 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_tar_filenames.c#1 branch .. //depot/projects/mips2/src/lib/libarchive/test/test_write_disk_perms.c#2 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_write_disk_secure.c#2 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_write_format_ar.c#2 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_write_format_tar.c#2 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_write_open_memory.c#2 integrate .. //depot/projects/mips2/src/lib/libatm/cache_key.c#2 integrate .. //depot/projects/mips2/src/lib/libc/amd64/stdlib/Makefile.inc#1 branch .. //depot/projects/mips2/src/lib/libc/amd64/stdlib/div.S#1 branch .. //depot/projects/mips2/src/lib/libc/amd64/stdlib/ldiv.S#1 branch .. //depot/projects/mips2/src/lib/libc/amd64/stdlib/lldiv.S#1 branch .. //depot/projects/mips2/src/lib/libc/gen/Symbol.map#3 integrate .. //depot/projects/mips2/src/lib/libc/gen/dlfcn.c#2 integrate .. //depot/projects/mips2/src/lib/libc/gen/getvfsbyname.3#3 integrate .. //depot/projects/mips2/src/lib/libc/gen/sysconf.c#3 integrate .. //depot/projects/mips2/src/lib/libc/gen/sysctl.3#3 integrate .. //depot/projects/mips2/src/lib/libc/i386/Symbol.map#2 integrate .. //depot/projects/mips2/src/lib/libc/resolv/Symbol.map#2 integrate .. //depot/projects/mips2/src/lib/libc/resolv/res_debug.c#3 integrate .. //depot/projects/mips2/src/lib/libc/stdlib/strtol.3#3 integrate .. //depot/projects/mips2/src/lib/libc/sys/lseek.2#3 integrate .. //depot/projects/mips2/src/lib/libc/sys/pathconf.2#3 integrate .. //depot/projects/mips2/src/lib/libc/sys/ptrace.2#3 integrate .. //depot/projects/mips2/src/lib/libc/uuid/uuid_compare.c#3 integrate .. //depot/projects/mips2/src/lib/libcrypt/crypt.3#2 integrate .. //depot/projects/mips2/src/lib/libgssapi/gss_accept_sec_context.c#2 integrate .. //depot/projects/mips2/src/lib/libgssapi/gss_add_cred.c#2 integrate .. //depot/projects/mips2/src/lib/libgssapi/gss_add_oid_set_member.c#2 integrate .. //depot/projects/mips2/src/lib/libgssapi/gss_canonicalize_name.c#2 integrate .. //depot/projects/mips2/src/lib/libgssapi/gss_display_name.c#2 integrate .. //depot/projects/mips2/src/lib/libgssapi/gss_duplicate_name.c#2 integrate .. //depot/projects/mips2/src/lib/libgssapi/gss_export_sec_context.c#2 integrate .. //depot/projects/mips2/src/lib/libgssapi/gss_import_name.c#2 integrate .. //depot/projects/mips2/src/lib/libgssapi/gss_init_sec_context.c#2 integrate .. //depot/projects/mips2/src/lib/libgssapi/gss_inquire_cred.c#2 integrate .. //depot/projects/mips2/src/lib/libgssapi/gss_names.c#2 integrate .. //depot/projects/mips2/src/lib/libgssapi/gss_utils.c#2 integrate .. //depot/projects/mips2/src/lib/libmilter/Makefile#2 integrate .. //depot/projects/mips2/src/lib/libpmc/libpmc.c#2 integrate .. //depot/projects/mips2/src/lib/libpmc/pmc.3#3 integrate .. //depot/projects/mips2/src/lib/libradius/radlib.c#2 integrate .. //depot/projects/mips2/src/lib/libsm/Makefile#2 integrate .. //depot/projects/mips2/src/lib/libstand/environment.c#2 integrate .. //depot/projects/mips2/src/lib/libthr/thread/thr_info.c#3 integrate .. //depot/projects/mips2/src/lib/ncurses/ncurses/Makefile#2 integrate .. //depot/projects/mips2/src/libexec/ftpd/ftpcmd.y#2 integrate .. //depot/projects/mips2/src/libexec/ftpd/ftpd.8#2 integrate .. //depot/projects/mips2/src/libexec/ftpd/ftpd.c#3 integrate .. //depot/projects/mips2/src/libexec/rtld-elf/Makefile#2 integrate .. //depot/projects/mips2/src/libexec/rtld-elf/Symbol.map#1 branch .. //depot/projects/mips2/src/libexec/rtld-elf/Versions.def#1 branch .. //depot/projects/mips2/src/libexec/rtld-elf/i386/Symbol.map#1 branch .. //depot/projects/mips2/src/libexec/rtld-elf/map_object.c#2 integrate .. //depot/projects/mips2/src/libexec/rtld-elf/rtld.c#5 integrate .. //depot/projects/mips2/src/libexec/rtld-elf/rtld.h#3 integrate .. //depot/projects/mips2/src/libexec/rtld-elf/rtld_lock.c#2 integrate .. //depot/projects/mips2/src/release/Makefile.inc.docports#2 integrate .. //depot/projects/mips2/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#2 integrate .. //depot/projects/mips2/src/sbin/atm/atmconfig/diag.c#2 integrate .. //depot/projects/mips2/src/sbin/dhclient/dhclient-script#3 integrate .. //depot/projects/mips2/src/sbin/dump/traverse.c#3 integrate .. //depot/projects/mips2/src/sbin/gbde/test.sh#2 integrate .. //depot/projects/mips2/src/sbin/ggate/ggatec/Makefile#2 integrate .. //depot/projects/mips2/src/sbin/ggate/shared/ggate.c#3 integrate .. //depot/projects/mips2/src/sbin/ifconfig/Makefile#2 integrate .. //depot/projects/mips2/src/sbin/ifconfig/ifconfig.8#4 integrate .. //depot/projects/mips2/src/sbin/ifconfig/iflagg.c#1 branch .. //depot/projects/mips2/src/sbin/ipfw/ipfw2.c#3 integrate .. //depot/projects/mips2/src/sbin/mount/mount.c#4 integrate .. //depot/projects/mips2/src/share/examples/cvsup/cvs-supfile#2 integrate .. //depot/projects/mips2/src/share/examples/cvsup/stable-supfile#2 integrate .. //depot/projects/mips2/src/share/examples/cvsup/standard-supfile#2 integrate .. //depot/projects/mips2/src/share/man/man4/Makefile#4 integrate .. //depot/projects/mips2/src/share/man/man4/lagg.4#1 branch .. //depot/projects/mips2/src/share/man/man4/mpt.4#3 integrate .. //depot/projects/mips2/src/share/man/man4/nfe.4#3 integrate .. //depot/projects/mips2/src/share/man/man4/pci.4#2 integrate .. //depot/projects/mips2/src/share/man/man4/polling.4#4 integrate .. //depot/projects/mips2/src/share/man/man4/tcp.4#3 integrate .. //depot/projects/mips2/src/share/man/man4/uftdi.4#3 integrate .. //depot/projects/mips2/src/share/man/man5/rc.conf.5#4 integrate .. //depot/projects/mips2/src/share/man/man5/src.conf.5#3 integrate .. //depot/projects/mips2/src/share/man/man7/hier.7#3 integrate .. //depot/projects/mips2/src/share/man/man9/VFS_SET.9#2 integrate .. //depot/projects/mips2/src/share/man/man9/hash.9#3 integrate .. //depot/projects/mips2/src/share/misc/committers-ports.dot#2 integrate .. //depot/projects/mips2/src/share/misc/committers-src.dot#2 integrate .. //depot/projects/mips2/src/share/misc/organization.dot#1 branch .. //depot/projects/mips2/src/share/mk/Makefile#2 integrate .. //depot/projects/mips2/src/share/mk/bsd.lib.mk#3 integrate .. //depot/projects/mips2/src/share/mk/bsd.libnames.mk#3 integrate .. //depot/projects/mips2/src/share/mk/bsd.own.mk#3 integrate .. //depot/projects/mips2/src/share/mk/bsd.symver.mk#1 branch .. //depot/projects/mips2/src/sys/Makefile#6 integrate .. //depot/projects/mips2/src/sys/amd64/amd64/busdma_machdep.c#3 integrate .. //depot/projects/mips2/src/sys/amd64/amd64/pmap.c#6 integrate .. //depot/projects/mips2/src/sys/amd64/conf/GENERIC#5 integrate .. //depot/projects/mips2/src/sys/amd64/linux32/linux32_dummy.c#3 integrate .. //depot/projects/mips2/src/sys/amd64/linux32/linux32_machdep.c#3 integrate .. //depot/projects/mips2/src/sys/boot/forth/loader.conf#4 integrate .. //depot/projects/mips2/src/sys/boot/pc98/boot0.5/Makefile#2 integrate .. //depot/projects/mips2/src/sys/boot/pc98/boot0.5/boot0.5.s#3 integrate .. //depot/projects/mips2/src/sys/boot/pc98/boot0.5/ldscript#1 branch .. //depot/projects/mips2/src/sys/boot/pc98/boot0.5/putssjis.s#1 branch .. //depot/projects/mips2/src/sys/boot/pc98/boot0.5/selector.s#2 integrate .. //depot/projects/mips2/src/sys/boot/pc98/boot0.5/start.s#2 integrate .. //depot/projects/mips2/src/sys/boot/pc98/boot2/boot.c#3 integrate .. //depot/projects/mips2/src/sys/cam/cam_ccb.h#3 integrate .. //depot/projects/mips2/src/sys/cam/cam_periph.c#3 integrate .. //depot/projects/mips2/src/sys/cam/cam_periph.h#2 integrate .. //depot/projects/mips2/src/sys/cam/cam_sim.c#2 integrate .. //depot/projects/mips2/src/sys/cam/cam_sim.h#2 integrate .. //depot/projects/mips2/src/sys/cam/cam_xpt.c#3 integrate .. //depot/projects/mips2/src/sys/cam/cam_xpt.h#3 integrate .. //depot/projects/mips2/src/sys/cam/cam_xpt_periph.h#2 integrate .. //depot/projects/mips2/src/sys/cam/scsi/scsi_cd.c#4 integrate .. //depot/projects/mips2/src/sys/cam/scsi/scsi_ch.c#3 integrate .. //depot/projects/mips2/src/sys/cam/scsi/scsi_da.c#4 integrate .. //depot/projects/mips2/src/sys/cam/scsi/scsi_low.c#3 integrate .. //depot/projects/mips2/src/sys/cam/scsi/scsi_pass.c#3 integrate .. //depot/projects/mips2/src/sys/cam/scsi/scsi_pt.c#3 integrate .. //depot/projects/mips2/src/sys/cam/scsi/scsi_sa.c#3 integrate .. //depot/projects/mips2/src/sys/cam/scsi/scsi_ses.c#3 integrate .. //depot/projects/mips2/src/sys/cam/scsi/scsi_sg.c#1 branch .. //depot/projects/mips2/src/sys/cam/scsi/scsi_sg.h#1 branch .. //depot/projects/mips2/src/sys/cam/scsi/scsi_targ_bh.c#3 integrate .. //depot/projects/mips2/src/sys/cam/scsi/scsi_target.c#3 integrate .. //depot/projects/mips2/src/sys/compat/linprocfs/linprocfs.c#3 integrate .. //depot/projects/mips2/src/sys/compat/linux/linux_file.c#4 integrate .. //depot/projects/mips2/src/sys/compat/linux/linux_ioctl.c#3 integrate .. //depot/projects/mips2/src/sys/compat/linux/linux_ioctl.h#2 integrate .. //depot/projects/mips2/src/sys/compat/linux/linux_socket.c#4 integrate .. //depot/projects/mips2/src/sys/compat/ndis/kern_ndis.c#3 integrate .. //depot/projects/mips2/src/sys/compat/ndis/ndis_var.h#2 integrate .. //depot/projects/mips2/src/sys/compat/ndis/subr_ndis.c#2 integrate .. //depot/projects/mips2/src/sys/compat/ndis/subr_pe.c#2 integrate .. //depot/projects/mips2/src/sys/compat/opensolaris/kern/opensolaris_kmem.c#1 branch .. //depot/projects/mips2/src/sys/compat/opensolaris/kern/opensolaris_kobj.c#1 branch .. //depot/projects/mips2/src/sys/compat/opensolaris/kern/opensolaris_kstat.c#1 branch .. //depot/projects/mips2/src/sys/compat/opensolaris/kern/opensolaris_misc.c#1 branch .. //depot/projects/mips2/src/sys/compat/opensolaris/kern/opensolaris_policy.c#1 branch .. //depot/projects/mips2/src/sys/compat/opensolaris/kern/opensolaris_string.c#1 branch .. //depot/projects/mips2/src/sys/compat/opensolaris/kern/opensolaris_vfs.c#1 branch .. //depot/projects/mips2/src/sys/compat/opensolaris/kern/opensolaris_zone.c#1 branch .. //depot/projects/mips2/src/sys/compat/opensolaris/machine/endian.h#1 branch .. //depot/projects/mips2/src/sys/compat/opensolaris/rpc/xdr.h#1 branch .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/acl.h#1 branch .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/byteorder.h#1 branch .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/callb.h#1 branch .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/cmn_err.h#1 branch .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/cred.h#1 branch .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/debug.h#1 branch .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/dirent.h#1 branch .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/dkio.h#1 branch .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/kcondvar.h#1 branch .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/kmem.h#1 branch .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/kobj.h#1 branch .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/kstat.h#1 branch .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/lock.h#1 branch .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/misc.h#1 branch .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/mntent.h#1 branch .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/mnttab.h#1 branch .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/mount.h#1 branch .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/mutex.h#1 branch .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/policy.h#1 branch .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/proc.h#1 branch .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/random.h#1 branch .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/rwlock.h#1 branch .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/sdt.h#1 branch .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/string.h#1 branch .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/sysmacros.h#1 branch .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/systm.h#1 branch .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/taskq.h#1 branch .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/taskq_impl.h#1 branch .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/time.h#1 branch .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/types.h#1 branch .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/uio.h#1 branch .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/varargs.h#1 branch .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/vfs.h#1 branch .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/vnode.h#1 branch .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/zone.h#1 branch .. //depot/projects/mips2/src/sys/compat/svr4/svr4_filio.c#2 integrate .. //depot/projects/mips2/src/sys/conf/NOTES#4 integrate .. //depot/projects/mips2/src/sys/conf/files#4 integrate .. //depot/projects/mips2/src/sys/conf/files.amd64#3 integrate .. //depot/projects/mips2/src/sys/conf/files.i386#4 integrate .. //depot/projects/mips2/src/sys/conf/files.ia64#4 integrate .. //depot/projects/mips2/src/sys/conf/files.pc98#3 integrate .. //depot/projects/mips2/src/sys/conf/files.powerpc#4 integrate .. //depot/projects/mips2/src/sys/conf/options#4 integrate .. //depot/projects/mips2/src/sys/contrib/dev/acpica/utmisc.c#3 integrate .. //depot/projects/mips2/src/sys/contrib/opensolaris/common/acl/acl_common.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/common/acl/acl_common.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/common/atomic/amd64/atomic.S#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/common/atomic/i386/atomic.S#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/common/avl/avl.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/common/nvpair/nvpair.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/common/zfs/zfs_namecheck.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/common/zfs/zfs_namecheck.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/common/zfs/zfs_prop.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/common/zfs/zfs_prop.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/Makefile.files#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/dnlc.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/gfs.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/bplist.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/dnode.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/gzip.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/lzjb.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/refcount.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sha256.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/space_map.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_file.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_rlock.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/txg.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/uberblock.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/unique.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs.conf#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/zil.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/os/callb.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/os/list.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/os/nvpair_alloc_system.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/os/taskq.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/rpc/xdr.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/rpc/xdr.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/rpc/xdr_array.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/rpc/xdr_mem.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/asm_linkage.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/atomic.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/avl.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/avl_impl.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/bitmap.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/byteorder.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/callb.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/ccompile.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/compress.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/cred.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/debug.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/dkio.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/dklabel.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/dnlc.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/errorq.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/feature_tests.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/fm/protocol.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/fm/util.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/fs/zfs.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/gfs.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/isa_defs.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/list.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/list_impl.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/note.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/nvpair.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/nvpair_impl.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/processor.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/procset.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/sdt.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/synch.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/sysevent.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/sysmacros.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/vfs.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/vmem.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/zmod.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/zmod/adler32.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/zmod/crc32.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/zmod/crc32.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/zmod/deflate.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/zmod/deflate.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/zmod/inffast.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/zmod/inffast.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/zmod/inffixed.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/zmod/inflate.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/zmod/inflate.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/zmod/inftrees.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/zmod/inftrees.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/zmod/trees.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/zmod/zconf.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/zmod/zlib.h#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/zmod/zmod.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/zmod/zmod_subr.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/zmod/zutil.c#1 branch .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/zmod/zutil.h#1 branch .. //depot/projects/mips2/src/sys/contrib/pf/net/if_pfsync.c#4 integrate .. //depot/projects/mips2/src/sys/dev/aac/aac_cam.c#4 integrate .. //depot/projects/mips2/src/sys/dev/advansys/advansys.c#3 integrate .. //depot/projects/mips2/src/sys/dev/advansys/adwcam.c#3 integrate .. //depot/projects/mips2/src/sys/dev/aha/aha.c#3 integrate .. //depot/projects/mips2/src/sys/dev/ahb/ahb.c#3 integrate .. //depot/projects/mips2/src/sys/dev/aic/aic.c#3 integrate .. //depot/projects/mips2/src/sys/dev/aic7xxx/aic7770.c#2 integrate .. //depot/projects/mips2/src/sys/dev/aic7xxx/aic79xx.c#2 integrate .. //depot/projects/mips2/src/sys/dev/aic7xxx/aic79xx.h#3 integrate .. //depot/projects/mips2/src/sys/dev/aic7xxx/aic79xx_osm.c#3 integrate .. //depot/projects/mips2/src/sys/dev/aic7xxx/aic79xx_osm.h#3 integrate .. //depot/projects/mips2/src/sys/dev/aic7xxx/aic79xx_pci.c#3 integrate .. //depot/projects/mips2/src/sys/dev/aic7xxx/aic7xxx.c#2 integrate .. //depot/projects/mips2/src/sys/dev/aic7xxx/aic7xxx.h#2 integrate .. //depot/projects/mips2/src/sys/dev/aic7xxx/aic7xxx_osm.c#3 integrate .. //depot/projects/mips2/src/sys/dev/aic7xxx/aic7xxx_osm.h#3 integrate .. //depot/projects/mips2/src/sys/dev/aic7xxx/aic7xxx_pci.c#2 integrate .. //depot/projects/mips2/src/sys/dev/aic7xxx/aic_osm_lib.c#2 integrate .. //depot/projects/mips2/src/sys/dev/aic7xxx/aic_osm_lib.h#2 integrate .. //depot/projects/mips2/src/sys/dev/amd/amd.c#3 integrate .. //depot/projects/mips2/src/sys/dev/amr/amr_cam.c#3 integrate .. //depot/projects/mips2/src/sys/dev/arcmsr/arcmsr.c#3 integrate .. //depot/projects/mips2/src/sys/dev/asr/asr.c#3 integrate .. //depot/projects/mips2/src/sys/dev/ata/ata-all.h#3 integrate .. //depot/projects/mips2/src/sys/dev/ata/ata-chipset.c#5 integrate .. //depot/projects/mips2/src/sys/dev/ata/ata-dma.c#3 integrate .. //depot/projects/mips2/src/sys/dev/ata/ata-lowlevel.c#4 integrate .. //depot/projects/mips2/src/sys/dev/ata/ata_if.m#2 integrate .. //depot/projects/mips2/src/sys/dev/ata/atapi-cam.c#3 integrate .. //depot/projects/mips2/src/sys/dev/ath/ah_osdep.c#2 integrate .. //depot/projects/mips2/src/sys/dev/buslogic/bt.c#3 integrate .. //depot/projects/mips2/src/sys/dev/ciss/ciss.c#3 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/cxgb_adapter.h#2 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/cxgb_lro.c#2 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/cxgb_main.c#2 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/cxgb_osdep.h#2 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/cxgb_sge.c#2 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/sys/mvec.h#1 branch .. //depot/projects/mips2/src/sys/dev/cxgb/sys/uipc_mvec.c#1 branch .. //depot/projects/mips2/src/sys/dev/dpt/dpt_scsi.c#3 integrate .. //depot/projects/mips2/src/sys/dev/esp/ncr53c9x.c#3 integrate .. //depot/projects/mips2/src/sys/dev/ex/if_exvar.h#2 integrate .. //depot/projects/mips2/src/sys/dev/firewire/fwdma.c#2 integrate .. //depot/projects/mips2/src/sys/dev/firewire/sbp.c#3 integrate .. //depot/projects/mips2/src/sys/dev/firewire/sbp_targ.c#3 integrate .. //depot/projects/mips2/src/sys/dev/hptmv/entry.c#3 integrate .. //depot/projects/mips2/src/sys/dev/hwpmc/hwpmc_logging.c#2 integrate .. //depot/projects/mips2/src/sys/dev/hwpmc/hwpmc_mod.c#3 integrate .. //depot/projects/mips2/src/sys/dev/hwpmc/hwpmc_piv.c#2 integrate .. //depot/projects/mips2/src/sys/dev/if_ndis/if_ndis_pccard.c#2 integrate .. //depot/projects/mips2/src/sys/dev/iicbus/icee.c#2 integrate .. //depot/projects/mips2/src/sys/dev/iir/iir.c#3 integrate .. //depot/projects/mips2/src/sys/dev/isp/isp_freebsd.c#4 integrate .. //depot/projects/mips2/src/sys/dev/mii/brgphy.c#5 integrate .. //depot/projects/mips2/src/sys/dev/mii/miidevs#4 integrate .. //depot/projects/mips2/src/sys/dev/mly/mly.c#3 integrate .. //depot/projects/mips2/src/sys/dev/mpt/mpt_cam.c#4 integrate .. //depot/projects/mips2/src/sys/dev/msk/if_msk.c#2 integrate .. //depot/projects/mips2/src/sys/dev/ppbus/vpo.c#3 integrate .. //depot/projects/mips2/src/sys/dev/re/if_re.c#3 integrate .. //depot/projects/mips2/src/sys/dev/rr232x/osm_bsd.c#3 integrate .. //depot/projects/mips2/src/sys/dev/sound/isa/ad1816.c#3 integrate .. //depot/projects/mips2/src/sys/dev/sound/isa/ess.c#3 integrate .. //depot/projects/mips2/src/sys/dev/sound/isa/mss.c#3 integrate .. //depot/projects/mips2/src/sys/dev/sound/isa/sb16.c#3 integrate .. //depot/projects/mips2/src/sys/dev/sound/isa/sb8.c#3 integrate .. //depot/projects/mips2/src/sys/dev/sound/pci/als4000.c#3 integrate .. //depot/projects/mips2/src/sys/dev/sound/pci/atiixp.c#3 integrate .. //depot/projects/mips2/src/sys/dev/sound/pci/au88x0.c#3 integrate .. //depot/projects/mips2/src/sys/dev/sound/pci/aureal.c#3 integrate .. //depot/projects/mips2/src/sys/dev/sound/pci/cmi.c#4 integrate .. //depot/projects/mips2/src/sys/dev/sound/pci/cs4281.c#3 integrate .. //depot/projects/mips2/src/sys/dev/sound/pci/csapcm.c#3 integrate .. //depot/projects/mips2/src/sys/dev/sound/pci/ds1.c#3 integrate .. //depot/projects/mips2/src/sys/dev/sound/pci/emu10k1.c#4 integrate .. //depot/projects/mips2/src/sys/dev/sound/pci/emu10kx-pcm.c#3 integrate .. //depot/projects/mips2/src/sys/dev/sound/pci/es137x.c#3 integrate .. //depot/projects/mips2/src/sys/dev/sound/pci/fm801.c#3 integrate .. //depot/projects/mips2/src/sys/dev/sound/pci/hda/hdac.c#2 integrate .. //depot/projects/mips2/src/sys/dev/sound/pci/ich.c#3 integrate .. //depot/projects/mips2/src/sys/dev/sound/pci/maestro3.c#3 integrate .. //depot/projects/mips2/src/sys/dev/sound/pci/solo.c#4 integrate .. //depot/projects/mips2/src/sys/dev/sound/pci/t4dwave.c#3 integrate .. //depot/projects/mips2/src/sys/dev/sound/pci/via8233.c#3 integrate .. //depot/projects/mips2/src/sys/dev/sound/pci/via82c686.c#3 integrate .. //depot/projects/mips2/src/sys/dev/sound/pci/vibes.c#3 integrate .. //depot/projects/mips2/src/sys/dev/sound/pcm/buffer.c#4 integrate .. //depot/projects/mips2/src/sys/dev/sound/pcm/buffer.h#4 integrate .. //depot/projects/mips2/src/sys/dev/sound/pcm/sound.h#4 integrate .. //depot/projects/mips2/src/sys/dev/sound/sbus/cs4231.c#3 integrate .. //depot/projects/mips2/src/sys/dev/streams/streams.c#3 integrate .. //depot/projects/mips2/src/sys/dev/sym/sym_hipd.c#3 integrate .. //depot/projects/mips2/src/sys/dev/trm/trm.c#3 integrate .. //depot/projects/mips2/src/sys/dev/twa/tw_osl_cam.c#3 integrate .. //depot/projects/mips2/src/sys/dev/uart/uart_bus_pci.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb/umass.c#3 integrate .. //depot/projects/mips2/src/sys/dev/usb/usbdevs#4 integrate .. //depot/projects/mips2/src/sys/dev/wds/wd7000.c#3 integrate .. //depot/projects/mips2/src/sys/fs/devfs/devfs_vnops.c#4 integrate .. //depot/projects/mips2/src/sys/fs/fdescfs/fdesc_vfsops.c#2 integrate .. //depot/projects/mips2/src/sys/fs/fdescfs/fdesc_vnops.c#3 integrate .. //depot/projects/mips2/src/sys/fs/fifofs/fifo_vnops.c#3 integrate .. //depot/projects/mips2/src/sys/fs/procfs/procfs_dbregs.c#2 integrate .. //depot/projects/mips2/src/sys/fs/procfs/procfs_fpregs.c#2 integrate .. //depot/projects/mips2/src/sys/fs/procfs/procfs_map.c#2 integrate .. //depot/projects/mips2/src/sys/fs/procfs/procfs_regs.c#2 integrate .. //depot/projects/mips2/src/sys/fs/pseudofs/pseudofs.c#3 integrate .. //depot/projects/mips2/src/sys/fs/pseudofs/pseudofs.h#3 integrate .. //depot/projects/mips2/src/sys/fs/pseudofs/pseudofs_fileno.c#2 integrate .. //depot/projects/mips2/src/sys/fs/pseudofs/pseudofs_internal.h#2 integrate .. //depot/projects/mips2/src/sys/fs/pseudofs/pseudofs_vncache.c#3 integrate .. //depot/projects/mips2/src/sys/fs/pseudofs/pseudofs_vnops.c#2 integrate .. //depot/projects/mips2/src/sys/fs/unionfs/union_subr.c#3 integrate .. //depot/projects/mips2/src/sys/geom/eli/g_eli.c#4 integrate .. //depot/projects/mips2/src/sys/geom/journal/g_journal.c#2 integrate .. //depot/projects/mips2/src/sys/geom/uzip/g_uzip.c#2 integrate .. //depot/projects/mips2/src/sys/geom/vinum/geom_vinum.h#2 integrate .. //depot/projects/mips2/src/sys/geom/vinum/geom_vinum_rm.c#2 integrate .. //depot/projects/mips2/src/sys/geom/vinum/geom_vinum_share.c#2 integrate .. //depot/projects/mips2/src/sys/geom/vinum/geom_vinum_subr.c#2 integrate .. //depot/projects/mips2/src/sys/i386/conf/GENERIC#5 integrate .. //depot/projects/mips2/src/sys/i386/i386/bios.c#2 integrate .. //depot/projects/mips2/src/sys/i386/i386/busdma_machdep.c#3 integrate .. //depot/projects/mips2/src/sys/i386/i386/identcpu.c#4 integrate .. //depot/projects/mips2/src/sys/i386/i386/initcpu.c#3 integrate .. //depot/projects/mips2/src/sys/i386/i386/minidump_machdep.c#2 integrate .. //depot/projects/mips2/src/sys/i386/i386/mp_machdep.c#3 integrate .. //depot/projects/mips2/src/sys/i386/i386/pmap.c#5 integrate .. //depot/projects/mips2/src/sys/i386/i386/trap.c#4 integrate .. //depot/projects/mips2/src/sys/i386/include/pmap.h#3 integrate .. //depot/projects/mips2/src/sys/i386/include/specialreg.h#4 integrate .. //depot/projects/mips2/src/sys/i386/include/vmparam.h#2 integrate .. //depot/projects/mips2/src/sys/ia64/conf/GENERIC#4 integrate .. //depot/projects/mips2/src/sys/isa/isa_common.c#2 integrate .. //depot/projects/mips2/src/sys/kern/kern_descrip.c#4 integrate .. //depot/projects/mips2/src/sys/kern/kern_event.c#3 integrate .. //depot/projects/mips2/src/sys/kern/kern_fork.c#3 integrate .. //depot/projects/mips2/src/sys/kern/kern_intr.c#4 integrate .. //depot/projects/mips2/src/sys/kern/kern_jail.c#3 integrate .. //depot/projects/mips2/src/sys/kern/kern_mbuf.c#3 integrate .. //depot/projects/mips2/src/sys/kern/kern_mib.c#2 integrate .. //depot/projects/mips2/src/sys/kern/kern_mutex.c#4 integrate .. //depot/projects/mips2/src/sys/kern/kern_sx.c#4 integrate .. //depot/projects/mips2/src/sys/kern/subr_lock.c#3 integrate .. //depot/projects/mips2/src/sys/kern/subr_rman.c#3 integrate .. //depot/projects/mips2/src/sys/kern/subr_witness.c#3 integrate .. //depot/projects/mips2/src/sys/kern/sys_generic.c#4 integrate .. //depot/projects/mips2/src/sys/kern/uipc_mbuf.c#3 integrate .. //depot/projects/mips2/src/sys/kern/uipc_mqueue.c#3 integrate .. //depot/projects/mips2/src/sys/kern/uipc_syscalls.c#4 integrate .. //depot/projects/mips2/src/sys/kern/uipc_usrreq.c#4 integrate .. //depot/projects/mips2/src/sys/kern/vfs_cache.c#3 integrate .. //depot/projects/mips2/src/sys/kern/vfs_lookup.c#3 integrate .. //depot/projects/mips2/src/sys/kern/vfs_mount.c#3 integrate .. //depot/projects/mips2/src/sys/kern/vfs_subr.c#5 integrate .. //depot/projects/mips2/src/sys/kern/vfs_syscalls.c#4 integrate .. //depot/projects/mips2/src/sys/libkern/index.c#2 integrate .. //depot/projects/mips2/src/sys/libkern/memset.c#1 branch .. //depot/projects/mips2/src/sys/libkern/rindex.c#2 integrate .. //depot/projects/mips2/src/sys/modules/Makefile#4 integrate .. //depot/projects/mips2/src/sys/modules/cam/Makefile#2 integrate .. //depot/projects/mips2/src/sys/modules/cxgb/Makefile#2 integrate .. //depot/projects/mips2/src/sys/modules/dpt/Makefile#2 integrate .. //depot/projects/mips2/src/sys/modules/if_lagg/Makefile#1 branch .. //depot/projects/mips2/src/sys/modules/libalias/libalias/Makefile#2 integrate .. //depot/projects/mips2/src/sys/modules/zfs/Makefile#1 branch .. //depot/projects/mips2/src/sys/net/ieee8023ad_lacp.c#1 branch .. //depot/projects/mips2/src/sys/net/ieee8023ad_lacp.h#1 branch .. //depot/projects/mips2/src/sys/net/if.c#4 integrate .. //depot/projects/mips2/src/sys/net/if_ethersubr.c#4 integrate .. //depot/projects/mips2/src/sys/net/if_lagg.c#1 branch .. //depot/projects/mips2/src/sys/net/if_lagg.h#1 branch .. //depot/projects/mips2/src/sys/net/if_var.h#3 integrate .. //depot/projects/mips2/src/sys/netinet/in_pcb.c#4 integrate .. //depot/projects/mips2/src/sys/netinet/in_pcb.h#4 integrate .. //depot/projects/mips2/src/sys/netinet/ip_fw2.c#3 integrate .. //depot/projects/mips2/src/sys/netinet/ip_var.h#3 integrate .. //depot/projects/mips2/src/sys/netinet/libalias/alias_db.c#3 integrate .. //depot/projects/mips2/src/sys/netinet/libalias/alias_ftp.c#3 integrate .. //depot/projects/mips2/src/sys/netinet/libalias/alias_irc.c#3 integrate .. //depot/projects/mips2/src/sys/netinet/libalias/alias_proxy.c#3 integrate .. //depot/projects/mips2/src/sys/netinet/libalias/alias_skinny.c#3 integrate .. //depot/projects/mips2/src/sys/netinet/sctp_constants.h#2 integrate .. //depot/projects/mips2/src/sys/netinet/sctp_crc32.c#2 integrate .. //depot/projects/mips2/src/sys/netinet/sctp_indata.c#2 integrate .. //depot/projects/mips2/src/sys/netinet/sctp_input.c#2 integrate .. //depot/projects/mips2/src/sys/netinet/sctp_output.c#2 integrate .. //depot/projects/mips2/src/sys/netinet/sctp_pcb.c#2 integrate .. //depot/projects/mips2/src/sys/netinet/sctp_peeloff.c#2 integrate .. //depot/projects/mips2/src/sys/netinet/sctp_structs.h#2 integrate .. //depot/projects/mips2/src/sys/netinet/sctp_timer.c#2 integrate .. //depot/projects/mips2/src/sys/netinet/sctp_uio.h#2 integrate .. //depot/projects/mips2/src/sys/netinet/sctp_usrreq.c#2 integrate .. //depot/projects/mips2/src/sys/netinet/sctp_var.h#2 integrate .. //depot/projects/mips2/src/sys/netinet/sctputil.c#2 integrate .. //depot/projects/mips2/src/sys/netinet/sctputil.h#2 integrate .. //depot/projects/mips2/src/sys/netinet/tcp_input.c#3 integrate .. //depot/projects/mips2/src/sys/netinet/tcp_output.c#3 integrate .. //depot/projects/mips2/src/sys/netinet/tcp_sack.c#3 integrate .. //depot/projects/mips2/src/sys/netinet/tcp_subr.c#4 integrate .. //depot/projects/mips2/src/sys/netinet/tcp_syncache.c#3 integrate .. //depot/projects/mips2/src/sys/netinet/tcp_timer.c#3 integrate .. //depot/projects/mips2/src/sys/netinet/tcp_timer.h#3 integrate .. //depot/projects/mips2/src/sys/netinet/tcp_usrreq.c#4 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Apr 19 15:56:12 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 C74E316A402; Thu, 19 Apr 2007 15:56:11 +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 4032016A400 for ; Thu, 19 Apr 2007 15:56:11 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2DBD313C455 for ; Thu, 19 Apr 2007 15:56:11 +0000 (UTC) (envelope-from rpaulo@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 l3JFuBlm039386 for ; Thu, 19 Apr 2007 15:56:11 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3JFuA4j039310 for perforce@freebsd.org; Thu, 19 Apr 2007 15:56:10 GMT (envelope-from rpaulo@FreeBSD.org) Date: Thu, 19 Apr 2007 15:56:10 GMT Message-Id: <200704191556.l3JFuA4j039310@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 118416 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: Thu, 19 Apr 2007 15:56:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=118416 Change 118416 by rpaulo@rpaulo_epsilon on 2007/04/19 15:53:55 Branch for Apple's MacBook FreeBSD SoC 2007 project. Affected files ... .. //depot/projects/soc2007/rpaulo-macbook/Makefile#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/Makefile#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/acpica/OsdEnvironment.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/acpica/acpi_machdep.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/acpica/acpi_wakeup.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/acpica/madt.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/amd64_mem.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/apic_vector.S#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/atomic.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/autoconf.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/bios.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/bpf_jit_machdep.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/bpf_jit_machdep.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/busdma_machdep.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/cpu_switch.S#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/db_disasm.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/db_interface.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/db_trace.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/dump_machdep.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/elf_machdep.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/exception.S#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/fpu.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/gdb_machdep.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/genassym.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/identcpu.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/in_cksum.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/initcpu.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/intr_machdep.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/io.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/io_apic.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/legacy.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/local_apic.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/locore.S#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/machdep.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/mem.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/minidump_machdep.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/mp_machdep.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/mp_watchdog.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/mpboot.S#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/mptable.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/mptable_pci.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/msi.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/nexus.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/pmap.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/prof_machdep.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/sigtramp.S#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/support.S#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/sys_machdep.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/trap.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/tsc.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/uio_machdep.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/uma_machdep.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/vm_machdep.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/compile/.cvsignore#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/conf/.cvsignore#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/conf/DEFAULTS#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/conf/GENERIC#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/conf/GENERIC.hints#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/conf/MAC#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/conf/Makefile#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/conf/NOTES#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/ia32/ia32_exception.S#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/ia32/ia32_reg.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/ia32/ia32_signal.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/ia32/ia32_sigtramp.S#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/ia32/ia32_syscall.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/_bus.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/_inttypes.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/_limits.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/_stdint.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/_types.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/acpica_machdep.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/apicreg.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/apicvar.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/asm.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/asmacros.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/atomic.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/bus.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/bus_dma.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/clock.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/cpu.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/cpufunc.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/cputypes.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/db_machdep.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/elf.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/endian.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/exec.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/float.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/floatingpoint.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/fpu.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/frame.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/gdb_machdep.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/ieeefp.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/in_cksum.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/intr_machdep.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/iodev.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/kdb.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/legacyvar.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/limits.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/md_var.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/memdev.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/metadata.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/minidump.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/mp_watchdog.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/mptable.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/mutex.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/param.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/pc/bios.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/pc/display.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/pcb.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/pcb_ext.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/pci_cfgreg.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/pcpu.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/pmap.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/pmc_mdep.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/ppireg.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/proc.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/profile.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/psl.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/ptrace.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/reg.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/reloc.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/resource.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/runq.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/segments.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/setjmp.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/sf_buf.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/sigframe.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/signal.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/smp.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/specialreg.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/stdarg.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/sysarch.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/timerreg.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/trap.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/tss.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/ucontext.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/varargs.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/vmparam.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/isa/atpic.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/isa/atpic_vector.S#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/isa/clock.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/isa/elcr.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/isa/icu.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/isa/isa.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/isa/isa.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/isa/isa_dma.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/isa/nmi.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/linux32/Makefile#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/linux32/linux.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/linux32/linux32_dummy.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/linux32/linux32_genassym.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/linux32/linux32_ipc64.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/linux32/linux32_locore.s#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/linux32/linux32_machdep.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/linux32/linux32_proto.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/linux32/linux32_syscall.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/linux32/linux32_sysent.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/linux32/linux32_sysvec.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/linux32/syscalls.conf#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/linux32/syscalls.master#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/pci/pci_bus.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/amd64/pci/pci_cfgreg.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/arm/autoconf.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/arm/bcopy_page.S#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/arm/bcopyinout.S#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/arm/bcopyinout_xscale.S#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/arm/blockio.S#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/arm/bootconfig.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/arm/bus_space_asm_generic.S#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/arm/busdma_machdep.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/arm/copystr.S#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/arm/cpufunc.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/arm/cpufunc_asm.S#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/arm/cpufunc_asm_arm10.S#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/arm/cpufunc_asm_arm7tdmi.S#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/arm/cpufunc_asm_arm8.S#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/arm/cpufunc_asm_arm9.S#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/arm/cpufunc_asm_armv4.S#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/arm/cpufunc_asm_ixp12x0.S#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/arm/cpufunc_asm_sa1.S#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/arm/cpufunc_asm_sa11x0.S#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/arm/cpufunc_asm_xscale.S#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/arm/db_disasm.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/arm/db_interface.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/arm/db_trace.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/arm/disassem.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/arm/dump_machdep.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/arm/elf_machdep.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/arm/elf_trampoline.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/arm/exception.S#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/arm/fiq.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/arm/fiq_subr.S#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/arm/fusu.S#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/arm/gdb_machdep.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/arm/genassym.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/arm/identcpu.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/arm/in_cksum.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/arm/in_cksum_arm.S#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/arm/inckern.S#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/arm/intr.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/arm/irq_dispatch.S#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/arm/locore.S#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/arm/machdep.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/arm/mem.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/arm/nexus.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/arm/nexus_io.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/arm/nexus_io_asm.S#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/arm/pmap.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/arm/setcpsr.S#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/arm/setstack.s#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/arm/support.S#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/arm/swtch.S#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/arm/sys_machdep.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/arm/trap.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/arm/uio_machdep.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/arm/undefined.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/arm/vectors.S#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/arm/vm_machdep.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/at91/at91.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/at91/at91_mci.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/at91/at91_mcireg.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/at91/at91_pdcreg.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/at91/at91_pio.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/at91/at91_pio_rm9200.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/at91/at91_pioreg.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/at91/at91_piovar.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/at91/at91_pmc.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/at91/at91_pmcreg.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/at91/at91_pmcvar.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/at91/at91_rtc.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/at91/at91_rtcreg.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/at91/at91_spi.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/at91/at91_spireg.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/at91/at91_ssc.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/at91/at91_sscreg.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/at91/at91_st.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/at91/at91_streg.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/at91/at91_twi.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/at91/at91_twiio.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/at91/at91_twireg.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/at91/at91_usartreg.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/at91/at91rm92reg.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/at91/at91var.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/at91/files.at91#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/at91/files.kb920x#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/at91/hints.at91rm9200#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/at91/hints.at91sam9261#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/at91/if_ate.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/at91/if_atereg.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/at91/kb920x_machdep.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/at91/ohci_atmelarm.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/at91/std.at91#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/at91/std.kb920x#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/at91/uart_bus_at91usart.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/at91/uart_cpu_at91rm9200usart.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/at91/uart_dev_at91usart.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/compile/.cvsignore#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/conf/.cvsignore#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/conf/AVILA#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/conf/BWCT#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/conf/BWCT.hints#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/conf/EP80219#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/conf/IQ31244#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/conf/KB920X#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/conf/KB920X.hints#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/conf/SIMICS#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/conf/SKYEYE#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/include/_bus.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/include/_inttypes.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/include/_limits.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/include/_stdint.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/include/_types.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/include/armreg.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/include/asm.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/include/asmacros.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/include/atomic.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/include/blockio.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/include/bootconfig.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/include/bus.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/include/bus_dma.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/include/clock.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/include/cpu.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/include/cpuconf.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/include/cpufunc.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/include/db_machdep.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/include/disassem.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/include/elf.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/include/endian.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/include/exec.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/include/fiq.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/include/float.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/include/floatingpoint.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/include/fp.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/include/frame.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/include/gdb_machdep.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/include/ieee.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/include/ieeefp.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/include/in_cksum.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/include/intr.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/include/katelib.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/include/kdb.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/include/limits.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/include/machdep.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/include/md_var.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/include/memdev.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/include/metadata.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/include/mutex.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/include/param.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/include/pcb.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/include/pcpu.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/include/pmap.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/include/pmc_mdep.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/include/proc.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/include/profile.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/include/psl.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/include/pte.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/include/ptrace.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/include/reg.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/include/reloc.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/include/resource.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/include/runq.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/include/setjmp.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/include/sf_buf.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/include/sigframe.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/include/signal.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/include/smp.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/include/stdarg.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/include/swi.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/include/sysarch.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/include/trap.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/include/ucontext.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/include/undefined.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/include/utrap.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/include/vmparam.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/sa11x0/assabet_machdep.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/sa11x0/files.sa11x0#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/sa11x0/sa11x0.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/sa11x0/sa11x0_dmacreg.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/sa11x0/sa11x0_gpioreg.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/sa11x0/sa11x0_io.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/sa11x0/sa11x0_io_asm.S#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/sa11x0/sa11x0_irq.S#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/sa11x0/sa11x0_irqhandler.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/sa11x0/sa11x0_ost.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/sa11x0/sa11x0_ostreg.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/sa11x0/sa11x0_ppcreg.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/sa11x0/sa11x0_reg.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/sa11x0/sa11x0_var.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/sa11x0/std.sa11x0#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/sa11x0/uart_bus_sa1110.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/sa11x0/uart_cpu_sa1110.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/sa11x0/uart_dev_sa1110.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/sa11x0/uart_dev_sa1110.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/i80321/ep80219_machdep.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/i80321/files.ep80219#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/i80321/files.i80219#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/i80321/files.i80321#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/i80321/files.iq31244#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/i80321/i80321.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/i80321/i80321_aau.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/i80321/i80321_dma.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/i80321/i80321_intr.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/i80321/i80321_mcu.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/i80321/i80321_pci.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/i80321/i80321_space.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/i80321/i80321_timer.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/i80321/i80321_wdog.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/i80321/i80321reg.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/i80321/i80321var.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/i80321/iq31244_7seg.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/i80321/iq31244_machdep.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/i80321/iq80321.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/i80321/iq80321reg.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/i80321/iq80321var.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/i80321/obio.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/i80321/obio_space.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/i80321/obiovar.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/i80321/std.ep80219#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/i80321/std.i80219#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/i80321/std.i80321#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/i80321/std.iq31244#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/i80321/uart_bus_i80321.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/i80321/uart_cpu_i80321.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/ixp425/avila_ata.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/ixp425/avila_led.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/ixp425/avila_machdep.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/ixp425/files.avila#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/ixp425/files.ixp425#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/ixp425/if_npe.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/ixp425/if_npereg.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/ixp425/ixdp425_pci.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/ixp425/ixdp425reg.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/ixp425/ixp425.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/ixp425/ixp425_a4x_io.S#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/ixp425/ixp425_a4x_space.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/ixp425/ixp425_iic.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/ixp425/ixp425_intr.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/ixp425/ixp425_mem.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/ixp425/ixp425_npe.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/ixp425/ixp425_npereg.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/ixp425/ixp425_npevar.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/ixp425/ixp425_pci.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/ixp425/ixp425_pci_asm.S#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/ixp425/ixp425_pci_space.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/ixp425/ixp425_qmgr.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/ixp425/ixp425_qmgr.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/ixp425/ixp425_space.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/ixp425/ixp425_timer.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/ixp425/ixp425_wdog.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/ixp425/ixp425reg.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/ixp425/ixp425var.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/ixp425/std.avila#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/ixp425/std.ixp425#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/ixp425/uart_bus_ixp425.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/ixp425/uart_cpu_ixp425.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/std.xscale#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/xscalereg.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/xscalevar.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/Makefile#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/README#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/arm/Makefile#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/arm/at91/Makefile#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/arm/at91/Makefile.inc#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/arm/at91/boot0/Makefile#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/arm/at91/boot0/README#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/arm/at91/boot0/linker.cfg#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/arm/at91/boot0/main.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/arm/at91/boot0iic/Makefile#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/arm/at91/boot0iic/main.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/arm/at91/boot0spi/Makefile#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/arm/at91/boot0spi/main.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/arm/at91/boot2/Makefile#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/arm/at91/boot2/board.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/arm/at91/boot2/boot2.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/arm/at91/boot2/kb920x_board.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/arm/at91/bootiic/Makefile#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/arm/at91/bootiic/README#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/arm/at91/bootiic/env_vars.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/arm/at91/bootiic/env_vars.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/arm/at91/bootiic/loader_prompt.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/arm/at91/bootiic/loader_prompt.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/arm/at91/bootiic/main.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/arm/at91/bootspi/Makefile#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/arm/at91/bootspi/README#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/arm/at91/bootspi/ee.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/arm/at91/bootspi/ee.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/arm/at91/bootspi/env_vars.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/arm/at91/bootspi/env_vars.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/arm/at91/bootspi/loader_prompt.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/arm/at91/bootspi/loader_prompt.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/arm/at91/bootspi/main.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/arm/at91/libat91/Makefile#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/arm/at91/libat91/arm_init.S#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/arm/at91/libat91/at91rm9200.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/arm/at91/libat91/at91rm9200_lowlevel.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/arm/at91/libat91/at91rm9200_lowlevel.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/arm/at91/libat91/delay.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/arm/at91/libat91/eeprom.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/arm/at91/libat91/emac.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/arm/at91/libat91/emac.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/arm/at91/libat91/emac_init.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/arm/at91/libat91/getc.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/arm/at91/libat91/lib.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/arm/at91/libat91/lib_AT91RM9200.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/arm/at91/libat91/mci_device.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/arm/at91/libat91/memcmp.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/arm/at91/libat91/memcpy.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/arm/at91/libat91/memset.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/arm/at91/libat91/p_string.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/arm/at91/libat91/printf.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/arm/at91/libat91/putchar.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/arm/at91/libat91/reset.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/arm/at91/libat91/sd-card.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/arm/at91/libat91/sd-card.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/arm/at91/libat91/spi_flash.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/arm/at91/libat91/spi_flash.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/arm/at91/libat91/strcmp.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/arm/at91/libat91/strcpy.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/arm/at91/libat91/strcvt.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/arm/at91/libat91/strlen.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/arm/at91/libat91/tag_list.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/arm/at91/libat91/tag_list.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/arm/at91/libat91/xmodem.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/arm/at91/linker.cfg#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/common/Makefile.inc#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/common/bcache.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/common/boot.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/common/bootstrap.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/common/commands.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/common/console.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/common/dev_net.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/common/dev_net.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/common/devopen.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/common/help.common#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/common/interp.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/common/interp_backslash.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/common/interp_forth.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/common/interp_parse.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/common/isapnp.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/common/isapnp.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/common/load.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/common/load_elf.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/common/load_elf32.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/common/load_elf32_obj.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/common/load_elf64.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/common/load_elf64_obj.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/common/load_elf_obj.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/common/loader.8#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/common/ls.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/common/merge_help.awk#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/common/misc.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/common/module.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/common/newvers.sh#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/common/panic.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/common/pnp.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/common/reloc_elf.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/common/reloc_elf32.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/common/reloc_elf64.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/common/ufsread.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/efi/Makefile#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/efi/Makefile.inc#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/efi/include/README#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/efi/include/efi.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/efi/include/efi_nii.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/efi/include/efiapi.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/efi/include/eficon.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/efi/include/efidebug.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/efi/include/efidef.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/efi/include/efidevp.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/efi/include/efierr.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/efi/include/efifpswa.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/efi/include/efifs.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/efi/include/efilib.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/efi/include/efinet.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/efi/include/efipart.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/efi/include/efiprot.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/efi/include/efipxebc.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/efi/include/efiser.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/efi/include/efistdarg.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/efi/include/i386/efibind.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/efi/include/i386/pe.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/efi/include/ia64/efibind.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/efi/include/ia64/pe.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/efi/libefi/Makefile#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/efi/libefi/delay.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/efi/libefi/efi_console.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/efi/libefi/efifs.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/efi/libefi/efinet.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/efi/libefi/errno.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/efi/libefi/handles.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/efi/libefi/libefi.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/efi/libefi/time.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ficl/Makefile#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ficl/arm/sysdep.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ficl/arm/sysdep.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ficl/dict.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ficl/ficl.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ficl/ficl.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ficl/fileaccess.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ficl/float.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ficl/i386/sysdep.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ficl/i386/sysdep.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ficl/ia64/sysdep.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ficl/ia64/sysdep.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ficl/loader.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ficl/math64.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ficl/math64.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ficl/powerpc/sysdep.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ficl/powerpc/sysdep.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ficl/prefix.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ficl/search.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ficl/softwords/classes.fr#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ficl/softwords/ficlclass.fr#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ficl/softwords/ficllocal.fr#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ficl/softwords/fileaccess.fr#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ficl/softwords/forml.fr#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ficl/softwords/freebsd.fr#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ficl/softwords/ifbrack.fr#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ficl/softwords/jhlocal.fr#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ficl/softwords/marker.fr#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ficl/softwords/oo.fr#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ficl/softwords/prefix.fr#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ficl/softwords/softcore.awk#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ficl/softwords/softcore.fr#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ficl/softwords/string.fr#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ficl/sparc64/sysdep.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ficl/sparc64/sysdep.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ficl/stack.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ficl/testmain.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ficl/tools.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ficl/unix.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ficl/vm.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ficl/words.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/forth/beastie.4th#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/forth/frames.4th#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/forth/loader.4th#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/forth/loader.4th.8#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/forth/loader.conf#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/forth/loader.conf.5#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/forth/loader.rc#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/forth/pnp.4th#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/forth/screen.4th#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/forth/support.4th#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/Makefile#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/Makefile.inc#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/boot0/Makefile#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/boot0/boot0.S#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/boot0/boot0ext.S#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/boot0ext/Makefile#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/boot0sio/Makefile#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/boot2/Makefile#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/boot2/boot1.S#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/boot2/boot2.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/boot2/lib.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/boot2/sio.S#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/btx/Makefile#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/btx/Makefile.inc#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/btx/btx/Makefile#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/btx/btx/btx.S#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/btx/btxldr/Makefile#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/btx/btxldr/btxldr.S#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/btx/lib/Makefile#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/btx/lib/btxcsu.s#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/btx/lib/btxsys.s#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/btx/lib/btxv86.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/btx/lib/btxv86.s#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/cdboot/Makefile#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/cdboot/cdboot.s#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/kgzldr/Makefile#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/kgzldr/boot.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/kgzldr/crt.s#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/kgzldr/kgzldr.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/kgzldr/lib.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/kgzldr/sio.s#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/kgzldr/start.s#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/libi386/Makefile#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/libi386/amd64_tramp.S#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/libi386/biosacpi.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/libi386/bioscd.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/libi386/biosdisk.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/libi386/biosmem.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/libi386/biospci.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/libi386/biospnp.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/libi386/biossmap.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/libi386/bootinfo.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/libi386/bootinfo32.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/libi386/bootinfo64.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/libi386/comconsole.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/libi386/devicename.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/libi386/elf32_freebsd.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/libi386/elf64_freebsd.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/libi386/i386_copy.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/libi386/i386_module.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/libi386/libi386.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/libi386/nullconsole.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/libi386/pread.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/libi386/pxe.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/libi386/pxe.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/libi386/pxetramp.s#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/libi386/smbios.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/libi386/time.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/libi386/vidconsole.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/loader/Makefile#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/loader/conf.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/loader/help.i386#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/loader/loader.rc#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/loader/main.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/loader/version#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/mbr/Makefile#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/mbr/mbr.s#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/pxeldr/Makefile#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/pxeldr/pxeboot.8#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/pxeldr/pxeldr.S#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ia64/Makefile#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ia64/Makefile.inc#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ia64/common/Makefile#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ia64/common/autoload.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ia64/common/bootinfo.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ia64/common/copy.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ia64/common/devicename.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ia64/common/exec.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ia64/common/libia64.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ia64/efi/Makefile#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ia64/efi/conf.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ia64/efi/efimd.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ia64/efi/ldscript.ia64#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ia64/efi/main.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ia64/efi/start.S#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ia64/efi/version#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ia64/ski/Makefile#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ia64/ski/acpi_stub.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ia64/ski/conf.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ia64/ski/delay.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ia64/ski/efi_stub.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ia64/ski/exit.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ia64/ski/ldscript.ia64#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ia64/ski/libski.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ia64/ski/main.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ia64/ski/pal_stub.S#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ia64/ski/sal_stub.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ia64/ski/skiconsole.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ia64/ski/skifs.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ia64/ski/skiload.cmd#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ia64/ski/skimd.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ia64/ski/ssc.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ia64/ski/start.S#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ia64/ski/time.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ia64/ski/version#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ofw/Makefile#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ofw/common/Makefile.inc#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ofw/common/main.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ofw/libofw/Makefile#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ofw/libofw/devicename.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ofw/libofw/elf_freebsd.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ofw/libofw/libofw.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ofw/libofw/ofw_console.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ofw/libofw/ofw_copy.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ofw/libofw/ofw_disk.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ofw/libofw/ofw_memory.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ofw/libofw/ofw_module.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ofw/libofw/ofw_net.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ofw/libofw/ofw_reboot.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ofw/libofw/ofw_time.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ofw/libofw/openfirm.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ofw/libofw/openfirm.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/ofw/libofw/openfirm_mmu.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/pc98/Makefile#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/pc98/Makefile.inc#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/pc98/boot0.5/Makefile#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/pc98/boot0.5/boot.s#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/pc98/boot0.5/boot0.5.s#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/pc98/boot0.5/disk.s#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/pc98/boot0.5/ldscript#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/pc98/boot0.5/putssjis.s#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/pc98/boot0.5/selector.s#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/pc98/boot0.5/start.s#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/pc98/boot0.5/support.s#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/pc98/boot0.5/syscons.s#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/pc98/boot0/Makefile#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/pc98/boot0/boot0.s#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/pc98/boot2/Makefile#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/pc98/boot2/README.serial.98#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/pc98/boot2/asm.S#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/pc98/boot2/asm.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/pc98/boot2/bios.S#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/pc98/boot2/boot.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/pc98/boot2/boot.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/pc98/boot2/boot2.S#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/pc98/boot2/dinode.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/pc98/boot2/disk.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/pc98/boot2/fs.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/pc98/boot2/inode.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/pc98/boot2/io.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/pc98/boot2/probe_keyboard.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/pc98/boot2/quota.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/pc98/boot2/serial.S#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/pc98/boot2/serial_16550.S#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/pc98/boot2/serial_8251.S#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/pc98/boot2/start.S#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/pc98/boot2/sys.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/pc98/boot2/table.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/pc98/btx/Makefile#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/pc98/btx/Makefile.inc#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/pc98/btx/btx/Makefile#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/pc98/btx/btx/btx.S#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/pc98/btx/btxldr/Makefile#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/pc98/btx/btxldr/btxldr.S#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/pc98/btx/lib/Makefile#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/pc98/btx/lib/btxcsu.s#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/pc98/btx/lib/btxsys.s#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/pc98/btx/lib/btxv86.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/pc98/btx/lib/btxv86.s#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/pc98/cdboot/Makefile#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/pc98/cdboot/cdboot.s#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/pc98/kgzldr/Makefile#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/pc98/kgzldr/crt.s#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/pc98/libpc98/Makefile#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/pc98/libpc98/bioscd.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/pc98/libpc98/biosdisk.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/pc98/libpc98/biosmem.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/pc98/libpc98/biossmap.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/pc98/libpc98/comconsole.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/pc98/libpc98/i386_module.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/pc98/libpc98/time.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/pc98/libpc98/vidconsole.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/pc98/loader/Makefile#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/pc98/loader/conf.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/pc98/loader/help.pc98#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/pc98/loader/main.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/powerpc/Makefile#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/powerpc/loader/Makefile#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/powerpc/loader/conf.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/powerpc/loader/help.ofw#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/powerpc/loader/ldscript.powerpc#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/powerpc/loader/metadata.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/powerpc/loader/start.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/powerpc/loader/version#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/sparc64/Makefile#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/sparc64/Makefile.inc#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/sparc64/boot1/Makefile#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/sparc64/boot1/_start.s#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/sparc64/boot1/boot1.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/sparc64/loader/Makefile#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/sparc64/loader/help.sparc64#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/sparc64/loader/locore.S#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/sparc64/loader/main.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/sparc64/loader/metadata.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/sparc64/loader/version#1 branch .. //depot/projects/soc2007/rpaulo-macbook/bsm/audit.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/bsm/audit_internal.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/bsm/audit_kevents.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/bsm/audit_record.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/cam/cam.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/cam/cam.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/cam/cam_ccb.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/cam/cam_debug.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/cam/cam_periph.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/cam/cam_periph.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/cam/cam_queue.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/cam/cam_queue.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/cam/cam_sim.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/cam/cam_sim.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/cam/cam_xpt.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/cam/cam_xpt.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/cam/cam_xpt_periph.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/cam/cam_xpt_sim.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/cam/scsi/scsi_all.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/cam/scsi/scsi_all.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/cam/scsi/scsi_cd.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/cam/scsi/scsi_cd.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/cam/scsi/scsi_ch.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/cam/scsi/scsi_ch.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/cam/scsi/scsi_da.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/cam/scsi/scsi_da.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/cam/scsi/scsi_dvcfg.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/cam/scsi/scsi_iu.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/cam/scsi/scsi_low.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/cam/scsi/scsi_low.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/cam/scsi/scsi_low_pisa.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/cam/scsi/scsi_low_pisa.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/cam/scsi/scsi_message.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/cam/scsi/scsi_pass.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/cam/scsi/scsi_pass.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/cam/scsi/scsi_pt.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/cam/scsi/scsi_pt.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/cam/scsi/scsi_sa.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/cam/scsi/scsi_sa.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/cam/scsi/scsi_ses.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/cam/scsi/scsi_ses.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/cam/scsi/scsi_sg.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/cam/scsi/scsi_sg.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/cam/scsi/scsi_targ_bh.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/cam/scsi/scsi_target.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/cam/scsi/scsi_targetio.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/coda/00READ#1 branch .. //depot/projects/soc2007/rpaulo-macbook/coda/README#1 branch .. //depot/projects/soc2007/rpaulo-macbook/coda/TODO#1 branch .. //depot/projects/soc2007/rpaulo-macbook/coda/cnode.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/coda/coda.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/coda/coda_fbsd.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/coda/coda_io.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/coda/coda_kernel.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/coda/coda_namecache.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/coda/coda_namecache.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/coda/coda_opstats.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/coda/coda_pioctl.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/coda/coda_psdev.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/coda/coda_psdev.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/coda/coda_subr.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/coda/coda_subr.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/coda/coda_venus.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/coda/coda_venus.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/coda/coda_vfsops.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/coda/coda_vfsops.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/coda/coda_vnops.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/coda/coda_vnops.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/freebsd32/Makefile#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/freebsd32/freebsd32.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/freebsd32/freebsd32_misc.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/freebsd32/freebsd32_proto.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/freebsd32/freebsd32_signal.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/freebsd32/freebsd32_syscall.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/freebsd32/freebsd32_syscalls.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/freebsd32/freebsd32_sysent.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/freebsd32/freebsd32_util.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/freebsd32/syscalls.conf#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/freebsd32/syscalls.master#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/ia32/ia32_genassym.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/ia32/ia32_reg.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/ia32/ia32_signal.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/ia32/ia32_sysvec.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/ia32/ia32_util.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/linprocfs/linprocfs.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/linsysfs/linsysfs.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/linux/linux_emul.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/linux/linux_emul.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/linux/linux_file.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/linux/linux_futex.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/linux/linux_futex.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/linux/linux_getcwd.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/linux/linux_ioctl.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/linux/linux_ioctl.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/linux/linux_ipc.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/linux/linux_ipc.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/linux/linux_mib.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/linux/linux_mib.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/linux/linux_misc.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/linux/linux_misc.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/linux/linux_signal.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/linux/linux_signal.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/linux/linux_socket.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/linux/linux_socket.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/linux/linux_stats.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/linux/linux_sysctl.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/linux/linux_sysproto.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/linux/linux_time.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/linux/linux_uid16.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/linux/linux_util.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/linux/linux_util.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/ndis/cfg_var.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/ndis/hal_var.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/ndis/kern_ndis.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/ndis/kern_windrv.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/ndis/ndis_var.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/ndis/ntoskrnl_var.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/ndis/pe_var.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/ndis/resource_var.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/ndis/subr_hal.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/ndis/subr_ndis.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/ndis/subr_ntoskrnl.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/ndis/subr_pe.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/ndis/subr_usbd.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/ndis/usbd_var.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/ndis/winx32_wrap.S#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/ndis/winx64_wrap.S#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/netbsd/dvcfg.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/netbsd/physio_proc.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/kern/opensolaris_kmem.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/kern/opensolaris_kobj.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/kern/opensolaris_kstat.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/kern/opensolaris_misc.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/kern/opensolaris_policy.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/kern/opensolaris_string.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/kern/opensolaris_vfs.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/kern/opensolaris_zone.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/machine/endian.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/rpc/xdr.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/sys/acl.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/sys/byteorder.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/sys/callb.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/sys/cmn_err.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/sys/cred.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/sys/debug.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/sys/dirent.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/sys/dkio.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/sys/kcondvar.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/sys/kmem.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/sys/kobj.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/sys/kstat.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/sys/lock.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/sys/misc.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/sys/mntent.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/sys/mnttab.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/sys/mount.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/sys/mutex.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/sys/policy.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/sys/proc.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/sys/random.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/sys/rwlock.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/sys/sdt.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/sys/string.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/sys/sysmacros.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/sys/systm.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/sys/taskq.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/sys/taskq_impl.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/sys/time.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/sys/types.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/sys/uio.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/sys/varargs.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/sys/vfs.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/sys/vnode.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/sys/zone.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/pecoff/imgact_pecoff.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/pecoff/imgact_pecoff.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/svr4/Makefile#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/svr4/imgact_svr4.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/svr4/svr4.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/svr4/svr4_acl.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/svr4/svr4_dirent.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/svr4/svr4_errno.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/svr4/svr4_exec.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/svr4/svr4_fcntl.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/svr4/svr4_fcntl.h#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Apr 19 16:33:59 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 5FD5A16A419; Thu, 19 Apr 2007 16:33:59 +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 3062F16A40D for ; Thu, 19 Apr 2007 16:33:59 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 077CD13C44B for ; Thu, 19 Apr 2007 16:33:59 +0000 (UTC) (envelope-from peter@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 l3JGXweG047744 for ; Thu, 19 Apr 2007 16:33:58 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3JGXwLh047741 for perforce@freebsd.org; Thu, 19 Apr 2007 16:33:58 GMT (envelope-from peter@freebsd.org) Date: Thu, 19 Apr 2007 16:33:58 GMT Message-Id: <200704191633.l3JGXwLh047741@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 118417 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: Thu, 19 Apr 2007 16:33:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=118417 Change 118417 by peter@peter_overcee on 2007/04/19 16:33:14 WTF?? Affected files ... .. //depot/projects/hammer/usr.sbin/daemon/daemon.c#7 edit Differences ... ==== //depot/projects/hammer/usr.sbin/daemon/daemon.c#7 (text+ko) ==== @@ -55,7 +55,7 @@ nochdir = noclose = 1; pidfile = user = NULL; - while ((ch = getopt(argc, argv, "-cf:p:u:")) != -1) { + while ((ch = getopt(argc, argv, "cfp:u:")) != -1) { switch (ch) { case 'c': nochdir = 0; From owner-p4-projects@FreeBSD.ORG Thu Apr 19 16:56:30 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 0DB6D16A40B; Thu, 19 Apr 2007 16:56:30 +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 DE1C316A40A for ; Thu, 19 Apr 2007 16:56:29 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B568C13C45A for ; Thu, 19 Apr 2007 16:56:29 +0000 (UTC) (envelope-from kmacy@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 l3JGuTA4059352 for ; Thu, 19 Apr 2007 16:56:29 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3JGuTjG059348 for perforce@freebsd.org; Thu, 19 Apr 2007 16:56:29 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 19 Apr 2007 16:56:29 GMT Message-Id: <200704191656.l3JGuTjG059348@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 118421 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: Thu, 19 Apr 2007 16:56:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=118421 Change 118421 by kmacy@kmacy_vt-x:opentoe_init on 2007/04/19 16:56:24 add ctl interface for offload Affected files ... .. //depot/projects/opentoe/sys/dev/cxgb/common/cxgb_ctl_defs.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Apr 19 17:21:04 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 F1C7E16A404; Thu, 19 Apr 2007 17:21:03 +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 9F5E216A401 for ; Thu, 19 Apr 2007 17:21:03 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8BD3913C4BB for ; Thu, 19 Apr 2007 17:21:03 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3JHL3vE065208 for ; Thu, 19 Apr 2007 17:21:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3JHL20a065109 for perforce@freebsd.org; Thu, 19 Apr 2007 17:21:02 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 19 Apr 2007 17:21:02 GMT Message-Id: <200704191721.l3JHL20a065109@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 118425 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: Thu, 19 Apr 2007 17:21:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=118425 Change 118425 by rwatson@rwatson_zoo on 2007/04/19 17:20:38 Integrate TrustedBSD base branch from FreeBSD CVS in order to pick up completed OpenBSM 1.0 alpha 14 import -- apparently problems in the CVS importer environment prevented this from completing previously. Also: - Ftp client FEAT support. - More CAM locking. - hwpmc locking fixes. - SCTP lock optimization. - lastcomm text output mode. Affected files ... .. //depot/projects/trustedbsd/base/UPDATING#79 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.include.dist#41 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/fputs.3#6 integrate .. //depot/projects/trustedbsd/base/libexec/ftpd/ftpcmd.y#23 integrate .. //depot/projects/trustedbsd/base/libexec/ftpd/ftpd.8#18 integrate .. //depot/projects/trustedbsd/base/libexec/ftpd/ftpd.c#34 integrate .. //depot/projects/trustedbsd/base/share/man/man7/hier.7#32 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_dummy.c#9 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_machdep.c#17 integrate .. //depot/projects/trustedbsd/base/sys/bsm/audit.h#8 integrate .. //depot/projects/trustedbsd/base/sys/bsm/audit_internal.h#7 integrate .. //depot/projects/trustedbsd/base/sys/bsm/audit_kevents.h#8 integrate .. //depot/projects/trustedbsd/base/sys/bsm/audit_record.h#8 integrate .. //depot/projects/trustedbsd/base/sys/cam/cam_sim.c#7 integrate .. //depot/projects/trustedbsd/base/sys/cam/cam_sim.h#4 integrate .. //depot/projects/trustedbsd/base/sys/cam/cam_xpt.c#32 integrate .. //depot/projects/trustedbsd/base/sys/compat/opensolaris/kern/opensolaris_vfs.c#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/ath/if_ath.c#34 integrate .. //depot/projects/trustedbsd/base/sys/dev/hwpmc/hwpmc_logging.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/hwpmc/hwpmc_mod.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/hwpmc/hwpmc_piv.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/ral/rt2560.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/isa/ad1816.c#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/isa/ess.c#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/isa/mss.c#23 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/isa/sb16.c#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/isa/sb8.c#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/als4000.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/atiixp.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/au88x0.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/aureal.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/cmi.c#24 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/cs4281.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/csapcm.c#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/ds1.c#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/emu10k1.c#22 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/emu10kx-pcm.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/es137x.c#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/fm801.c#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/hda/hdac.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/ich.c#37 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/maestro3.c#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/solo.c#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/t4dwave.c#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/via8233.c#22 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/via82c686.c#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/vibes.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/ac97.c#28 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/ac97.h#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/ac97_patch.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/ac97_patch.h#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/buffer.c#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/buffer.h#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/sound.h#24 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/sbus/cs4231.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_ural.c#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/wi/if_wi.c#60 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/bios.c#22 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/identcpu.c#43 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_intr.c#48 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_witness.c#64 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_syscalls.c#63 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_indata.c#7 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_input.c#7 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_lock_bsd.h#4 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_output.c#7 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_pcb.c#7 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_structs.h#7 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_uio.h#7 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_usrreq.c#7 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_var.h#7 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctputil.c#7 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctputil.h#7 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_subr.c#59 integrate .. //depot/projects/trustedbsd/base/sys/sys/interrupt.h#15 integrate .. //depot/projects/trustedbsd/base/sys/sys/socket.h#25 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_contig.c#37 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_param.h#8 integrate .. //depot/projects/trustedbsd/base/tools/regression/sockets/sendfile/Makefile#3 integrate .. //depot/projects/trustedbsd/base/tools/regression/sockets/sendfile/sendfile.c#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/lastcomm/lastcomm.1#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/lastcomm/lastcomm.c#10 integrate .. //depot/projects/trustedbsd/base/usr.bin/tar/test/test-basic.sh#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/tar/util.c#10 integrate Differences ... ==== //depot/projects/trustedbsd/base/UPDATING#79 (text+ko) ==== @@ -21,6 +21,17 @@ developers choose to disable these features on build machines to maximize performance. +20070418: + A new acct(5) format is imminent. If you want to maintain access + to your accounting files, use the new lastcomm(1) -X functionality to + export them into text format, and keep around a copy of the lastcomm + binary. An updated lastcomm(1) program will allow you to import + the text files into the new acct(5) format. The change will also + invalidate the condensed summary files /var/account/savacct and + /var/account/usracct. If your process accounting system relies + on them, you will need to save their contents in a readable format + before the switch. + 20070417: The new trunk(4) driver has been renamed to lagg(4) as it better reflects its purpose. ifconfig will need to be recompiled. @@ -767,4 +778,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.486 2007/04/17 00:41:59 thompsa Exp $ +$FreeBSD: src/UPDATING,v 1.487 2007/04/18 17:34:59 dds Exp $ ==== //depot/projects/trustedbsd/base/etc/mtree/BSD.include.dist#41 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.111 2007/02/27 04:01:57 mjacob Exp $ +# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.112 2007/04/18 10:16:42 trhodes Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -209,8 +209,6 @@ .. pccard .. - posix4 - .. protocols .. readline ==== //depot/projects/trustedbsd/base/lib/libc/stdio/fputs.3#6 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)fputs.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/stdio/fputs.3,v 1.12 2007/01/09 00:28:06 imp Exp $ +.\" $FreeBSD: src/lib/libc/stdio/fputs.3,v 1.13 2007/04/19 09:38:31 phk Exp $ .\" .Dd June 4, 1993 .Dt FPUTS 3 @@ -66,12 +66,9 @@ to the stream .Dv stdout . .Sh RETURN VALUES -The +The functions .Fn fputs -function -returns 0 on success and -.Dv EOF -on error; +and .Fn puts returns a nonnegative integer on success and .Dv EOF ==== //depot/projects/trustedbsd/base/libexec/ftpd/ftpcmd.y#23 (text+ko) ==== @@ -47,7 +47,7 @@ #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/libexec/ftpd/ftpcmd.y,v 1.65 2006/06/05 15:50:34 yar Exp $"); +__FBSDID("$FreeBSD: src/libexec/ftpd/ftpcmd.y,v 1.66 2007/04/18 22:43:39 yar Exp $"); #include #include @@ -95,6 +95,7 @@ extern int usedefault; extern char tmpline[]; extern int readonly; +extern int assumeutf8; extern int noepsv; extern int noretr; extern int noguestretr; @@ -135,7 +136,7 @@ ABOR DELE CWD LIST NLST SITE STAT HELP NOOP MKD RMD PWD CDUP STOU SMNT SYST SIZE MDTM - LPRT LPSV EPRT EPSV + LPRT LPSV EPRT EPSV FEAT UMASK IDLE CHMOD MDFIVE @@ -687,6 +688,25 @@ if ($4 != NULL) free($4); } + | FEAT CRLF + { + lreply(211, "Extensions supported:"); +#if 0 + /* XXX these two keywords are non-standard */ + printf(" EPRT\r\n"); + if (!noepsv) + printf(" EPSV\r\n"); +#endif + printf(" MDTM\r\n"); + printf(" REST STREAM\r\n"); + printf(" SIZE\r\n"); + if (assumeutf8) { + /* TVFS requires UTF8, see RFC 3659 */ + printf(" TVFS\r\n"); + printf(" UTF8\r\n"); + } + reply(211, "End."); + } | SYST check_login CRLF { if ($2) { @@ -1112,6 +1132,7 @@ { "NLST", NLST, OSTR, 1, "[ path-name ]" }, { "SITE", SITE, SITECMD, 1, "site-cmd [ arguments ]" }, { "SYST", SYST, ARGS, 1, "(get type of operating system)" }, + { "FEAT", FEAT, ARGS, 1, "(get extended features)" }, { "STAT", STAT, OSTR, 1, "[ path-name ]" }, { "HELP", HELP, OSTR, 1, "[ ]" }, { "NOOP", NOOP, ARGS, 1, "" }, ==== //depot/projects/trustedbsd/base/libexec/ftpd/ftpd.8#18 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ftpd.8 8.2 (Berkeley) 4/19/94 -.\" $FreeBSD: src/libexec/ftpd/ftpd.8,v 1.71 2006/01/29 13:10:38 yar Exp $ +.\" $FreeBSD: src/libexec/ftpd/ftpd.8,v 1.72 2007/04/18 22:43:39 yar Exp $ .\" .Dd January 21, 2006 .Dt FTPD 8 @@ -40,7 +40,7 @@ .Nd Internet File Transfer Protocol server .Sh SYNOPSIS .Nm -.Op Fl 46ADdEhMmOoRrSUvW +.Op Fl 468ADdEhMmOoRrSUvW .Op Fl l Op Fl l .Op Fl a Ar address .Op Fl P Ar port @@ -78,6 +78,21 @@ is specified, accept connections via .Dv AF_INET6 socket. +.It Fl 8 +The server is running in transparent UTF-8 mode. +That is, it just encourages RFC\ 2640 compliant clients to send +paths encoded in UTF-8 in their commands. +In particular, the names of files uploaded by such clients will +have UTF-8 encoding. +The clients will also assume that server replies and existing file +names have UTF-8 encoding, too. +The names of files preloaded to the server should meet this expectation +for the clients to present the correct file names to their users. +Own messages of +.Nm +are always encoded in ASCII, which in fact is a subset of UTF-8. +.Pp +Note that this option does not make the server do any encoding conversion. .It Fl A Allow only anonymous ftp access. .It Fl a @@ -250,6 +265,7 @@ .It DELE Ta "delete a file [RW]" .It EPRT Ta "specify data connection port, multiprotocol" .It EPSV Ta "prepare for server-to-server transfer, multiprotocol" +.It FEAT Ta "give information on extended features of server" .It HELP Ta "give help information" .It LIST Ta "give list files in a directory" Pq Dq Li "ls -lgA" .It LPRT Ta "specify data connection port, multiprotocol" ==== //depot/projects/trustedbsd/base/libexec/ftpd/ftpd.c#34 (text+ko) ==== @@ -46,7 +46,7 @@ #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/libexec/ftpd/ftpd.c,v 1.211 2007/02/09 17:18:39 yar Exp $"); +__FBSDID("$FreeBSD: src/libexec/ftpd/ftpd.c,v 1.212 2007/04/18 22:43:39 yar Exp $"); /* * FTP server. @@ -128,6 +128,7 @@ int restricted_data_ports = 1; int paranoid = 1; /* be extra careful about security */ int anon_only = 0; /* Only anonymous ftp allowed */ +int assumeutf8 = 0; /* Assume that server file names are in UTF-8 */ int guest; int dochroot; char *chrootdir; @@ -308,7 +309,7 @@ openlog("ftpd", LOG_PID | LOG_NDELAY, LOG_FTP); while ((ch = getopt(argc, argv, - "46a:AdDEhlmMoOp:P:rRSt:T:u:UvW")) != -1) { + "468a:AdDEhlmMoOp:P:rRSt:T:u:UvW")) != -1) { switch (ch) { case '4': family = (family == AF_INET6) ? AF_UNSPEC : AF_INET; @@ -318,6 +319,10 @@ family = (family == AF_INET) ? AF_UNSPEC : AF_INET6; break; + case '8': + assumeutf8 = 1; + break; + case 'a': bindname = optarg; break; ==== //depot/projects/trustedbsd/base/share/man/man7/hier.7#32 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)hier.7 8.1 (Berkeley) 6/5/93 -.\" $FreeBSD: src/share/man/man7/hier.7,v 1.125 2007/04/04 00:14:36 chinsan Exp $ +.\" $FreeBSD: src/share/man/man7/hier.7,v 1.126 2007/04/18 10:16:43 trhodes Exp $ .\" -.Dd April 3, 2007 +.Dd April 18, 2007 .Dt HIER 7 .Os .Sh NAME @@ -349,10 +349,6 @@ OpenSSL (Cryptography/SSL toolkit) headers .It Pa pccard/ PC-CARD controllers -.It Pa posix4/ -POSIX real-time extensions includes; -see -.Xr p1003_1b 9 .It Pa protocols/ C include files for Berkeley service protocols .It Pa readline/ ==== //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_dummy.c#9 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_dummy.c,v 1.8 2007/03/29 02:11:46 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_dummy.c,v 1.9 2007/04/18 18:08:12 jkim Exp $"); #include #include @@ -64,7 +64,6 @@ DUMMY(mincore); DUMMY(fadvise64); DUMMY(ptrace); -DUMMY(settimeofday); DUMMY(lookup_dcookie); DUMMY(epoll_create); DUMMY(epoll_ctl); ==== //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_machdep.c#17 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.39 2007/03/30 17:27:13 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.42 2007/04/18 20:12:05 jkim Exp $"); #include #include @@ -252,7 +252,7 @@ if (iovcnt > UIO_MAXIOV) return (EINVAL); iovlen = iovcnt * sizeof(struct iovec); - uio = malloc(iovlen + sizeof *uio, M_IOV, M_WAITOK); + uio = malloc(iovlen + sizeof(*uio), M_IOV, M_WAITOK); iov = (struct iovec *)(uio + 1); for (i = 0; i < iovcnt; i++) { error = copyin(&iovp[i], &iov32, sizeof(struct iovec32)); @@ -526,7 +526,9 @@ td2 = FIRST_THREAD_IN_PROC(p2); - /* make it run */ + /* + * Make this runnable after we are finished with it. + */ mtx_lock_spin(&sched_lock); TD_SET_CAN_RUN(td2); sched_add(td2, SRQ_BORING); @@ -572,8 +574,8 @@ /* * XXX: In Linux, sharing of fs info (chroot/cwd/umask) * and open files is independant. In FreeBSD, its in one - * structure but in reality it does not make any problems - * because both of these flags are set at once usually. + * structure but in reality it does not cause any problems + * because both of these flags are usually set together. */ if (!(args->flags & (LINUX_CLONE_FILES | LINUX_CLONE_FS))) ff |= RFFDG; @@ -660,15 +662,15 @@ if (args->flags & LINUX_CLONE_SETTLS) { struct user_segment_descriptor sd; struct l_user_desc info; - int a[2]; + int a[2]; - error = copyin((void *)td->td_frame->tf_rsi, &info, + error = copyin((void *)td->td_frame->tf_rsi, &info, sizeof(struct l_user_desc)); if (error) { printf(LMSG("copyin failed!")); } else { /* We might copy out the entry_number as GUGS32_SEL. */ - info.entry_number = GUGS32_SEL; + info.entry_number = GUGS32_SEL; error = copyout(&info, (void *)td->td_frame->tf_rsi, sizeof(struct l_user_desc)); if (error) @@ -871,7 +873,7 @@ * * Our mmap with MAP_STACK takes addr as the maximum * downsize limit on BOS, and as len the max size of - * the region. It them maps the top SGROWSIZ bytes, + * the region. It then maps the top SGROWSIZ bytes, * and auto grows the region down, up to the limit * in addr. * @@ -1167,17 +1169,44 @@ microtime(&atv); atv32.tv_sec = atv.tv_sec; atv32.tv_usec = atv.tv_usec; - error = copyout(&atv32, uap->tp, sizeof (atv32)); + error = copyout(&atv32, uap->tp, sizeof(atv32)); } if (error == 0 && uap->tzp != NULL) { rtz.tz_minuteswest = tz_minuteswest; rtz.tz_dsttime = tz_dsttime; - error = copyout(&rtz, uap->tzp, sizeof (rtz)); + error = copyout(&rtz, uap->tzp, sizeof(rtz)); } return (error); } int +linux_settimeofday(struct thread *td, struct linux_settimeofday_args *uap) +{ + l_timeval atv32; + struct timeval atv, *tvp; + struct timezone atz, *tzp; + int error; + + if (uap->tp) { + error = copyin(uap->tp, &atv32, sizeof(atv32)); + if (error) + return (error); + atv.tv_sec = atv32.tv_sec; + atv.tv_usec = atv32.tv_usec; + tvp = &atv; + } else + tvp = NULL; + if (uap->tzp) { + error = copyin(uap->tzp, &atz, sizeof(atz)); + if (error) + return (error); + tzp = &atz; + } else + tzp = NULL; + return (kern_settimeofday(td, tvp, tzp)); +} + +int linux_getrusage(struct thread *td, struct linux_getrusage_args *uap) { struct l_rusage s32; @@ -1242,7 +1271,7 @@ #ifdef DEBUG if (ldebug(set_thread_area)) - printf(ARGS(set_thread_area, "%i, %x, %x, %i, %i, %i, " + printf(ARGS(set_thread_area, "%i, %x, %x, %i, %i, %i, " "%i, %i, %i"), info.entry_number, info.base_addr, info.limit, info.seg_32bit, info.contents, info.read_exec_only, info.limit_in_pages, @@ -1261,9 +1290,10 @@ * The tls_array[] is used only in [gs]et_thread_area() syscalls and * for loading the GDT descriptors. We use just one GDT descriptor * for TLS, so we will load just one. - * XXX: This doesnt work when user-space process tries to use more + * + * XXX: This doesn't work when a user space process tries to use more * than one TLS segment. Comment in the Linux source says wine might - * do that. + * do this. */ /* @@ -1284,8 +1314,9 @@ /* * We have to copy out the GDT entry we use. - * XXX: What if userspace program does not check return value and - * tries to use 6, 7 or 8? + * + * XXX: What if a user space program does not check the return value + * and tries to use 6, 7 or 8? */ error = copyout(&info, args->desc, sizeof(struct l_user_desc)); if (error) ==== //depot/projects/trustedbsd/base/sys/bsm/audit.h#8 (text+ko) ==== @@ -30,8 +30,8 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/base/sys/bsm/audit.h#7 $ - * $FreeBSD: src/sys/bsm/audit.h,v 1.6 2006/09/21 07:27:02 rwatson Exp $ + * P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#36 + * $FreeBSD: src/sys/bsm/audit.h,v 1.8 2007/04/17 12:27:08 rwatson Exp $ */ #ifndef _BSM_AUDIT_H ==== //depot/projects/trustedbsd/base/sys/bsm/audit_internal.h#7 (text) ==== @@ -34,8 +34,8 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#14 $ - * $FreeBSD: src/sys/bsm/audit_internal.h,v 1.5 2006/09/21 07:27:02 rwatson Exp $ + * P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#16 + * $FreeBSD: src/sys/bsm/audit_internal.h,v 1.7 2007/04/17 12:27:08 rwatson Exp $ */ #ifndef _AUDIT_INTERNAL_H ==== //depot/projects/trustedbsd/base/sys/bsm/audit_kevents.h#8 (text+ko) ==== @@ -30,8 +30,8 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/base/sys/bsm/audit_kevents.h#7 $ - * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.9 2006/09/25 12:22:07 rwatson Exp $ + * P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#32 + * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.11 2007/04/17 12:27:08 rwatson Exp $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -475,6 +475,28 @@ #define AUE_READDIR 43118 /* Linux. */ #define AUE_IOPL 43119 /* Linux. */ #define AUE_VM86 43120 /* Linux. */ +#define AUE_MAC_GET_PROC 43121 /* FreeBSD. */ +#define AUE_MAC_SET_PROC 43122 /* FreeBSD. */ +#define AUE_MAC_GET_FD 43123 /* FreeBSD. */ +#define AUE_MAC_GET_FILE 43124 /* FreeBSD. */ +#define AUE_MAC_SET_FD 43125 /* FreeBSD. */ +#define AUE_MAC_SET_FILE 43126 /* FreeBSD. */ +#define AUE_MAC_SYSCALL 43127 /* FreeBSD. */ +#define AUE_MAC_GET_PID 43128 /* FreeBSD. */ +#define AUE_MAC_GET_LINK 43129 /* FreeBSD. */ +#define AUE_MAC_SET_LINK 43130 /* FreeBSD. */ +#define AUE_MAC_EXECVE 43131 /* FreeBSD. */ +#define AUE_GETPATH_FROMFD 43132 /* FreeBSD. */ +#define AUE_GETPATH_FROMADDR 43133 /* FreeBSD. */ +#define AUE_MQ_OPEN 43134 /* FreeBSD. */ +#define AUE_MQ_SETATTR 43135 /* FreeBSD. */ +#define AUE_MQ_TIMEDRECEIVE 43136 /* FreeBSD. */ +#define AUE_MQ_TIMEDSEND 43137 /* FreeBSD. */ +#define AUE_MQ_NOTIFY 43138 /* FreeBSD. */ +#define AUE_MQ_UNLINK 43139 /* FreeBSD. */ +#define AUE_LISTEN 43140 /* FreeBSD/Darwin/Linux. */ +#define AUE_MLOCKALL 43141 /* FreeBSD. */ +#define AUE_MUNLOCKALL 43142 /* FreeBSD. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the @@ -572,16 +594,13 @@ #define AUE_GETSOCKOPT AUE_NULL #define AUE_GTSOCKOPT AUE_GETSOCKOPT /* XXX: Typo in Darwin. */ #define AUE_ISSETUGID AUE_NULL -#define AUE_LISTEN AUE_NULL #define AUE_LSTATV AUE_NULL #define AUE_MADVISE AUE_NULL #define AUE_MINCORE AUE_NULL #define AUE_MKCOMPLEX AUE_NULL -#define AUE_MLOCKALL AUE_NULL #define AUE_MODWATCH AUE_NULL #define AUE_MSGCL AUE_NULL #define AUE_MSYNC AUE_NULL -#define AUE_MUNLOCKALL AUE_NULL #define AUE_PREAD AUE_NULL #define AUE_PWRITE AUE_NULL #define AUE_PREADV AUE_NULL ==== //depot/projects/trustedbsd/base/sys/bsm/audit_record.h#8 (text) ==== @@ -30,8 +30,8 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#21 $ - * $FreeBSD: src/sys/bsm/audit_record.h,v 1.6 2006/09/21 07:27:02 rwatson Exp $ + * P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#24 + * $FreeBSD: src/sys/bsm/audit_record.h,v 1.9 2007/04/17 12:27:08 rwatson Exp $ */ #ifndef _BSM_AUDIT_RECORD_H_ @@ -86,6 +86,7 @@ /* XXXRW: Additional X11 tokens not defined? */ #define AUT_CMD 0x51 #define AUT_EXIT 0x52 +#define AUT_ZONENAME 0x60 /* XXXRW: OpenBSM AUT_HOST 0x70? */ #define AUT_ARG64 0x71 #define AUT_RETURN64 0x72 @@ -247,6 +248,8 @@ token_t *au_to_header32_tm(int rec_size, au_event_t e_type, au_emod_t e_mod, struct timeval tm); +token_t *au_to_header64_tm(int rec_size, au_event_t e_type, au_emod_t e_mod, + struct timeval tm); #if !defined(KERNEL) && !defined(_KERNEL) token_t *au_to_header(int rec_size, au_event_t e_type, au_emod_t e_mod); token_t *au_to_header32(int rec_size, au_event_t e_type, au_emod_t e_mod); @@ -329,6 +332,7 @@ token_t *au_to_text(char *text); token_t *au_to_kevent(struct kevent *kev); token_t *au_to_trailer(int rec_size); +token_t *au_to_zonename(char *zonename); __END_DECLS ==== //depot/projects/trustedbsd/base/sys/cam/cam_sim.c#7 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_sim.c,v 1.10 2007/04/15 08:49:09 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_sim.c,v 1.11 2007/04/19 14:28:43 scottl Exp $"); #include #include @@ -95,6 +95,7 @@ } SLIST_INIT(&sim->ccb_freeq); + TAILQ_INIT(&sim->sim_doneq); return (sim); } ==== //depot/projects/trustedbsd/base/sys/cam/cam_sim.h#4 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam_sim.h,v 1.7 2007/04/15 08:49:09 scottl Exp $ + * $FreeBSD: src/sys/cam/cam_sim.h,v 1.8 2007/04/19 14:28:43 scottl Exp $ */ #ifndef _CAM_CAM_SIM_H @@ -92,6 +92,8 @@ const char *sim_name; void *softc; struct mtx *mtx; + TAILQ_HEAD(, ccb_hdr) sim_doneq; + TAILQ_ENTRY(cam_sim) links; u_int32_t path_id;/* The Boot device may set this to 0? */ u_int32_t unit_number; u_int32_t bus_id; @@ -100,6 +102,7 @@ u_int32_t flags; #define CAM_SIM_REL_TIMEOUT_PENDING 0x01 #define CAM_SIM_MPSAFE 0x02 +#define CAM_SIM_ON_DONEQ 0x04 struct callout callout; struct cam_devq *devq; /* Device Queue to use for this SIM */ ==== //depot/projects/trustedbsd/base/sys/cam/cam_xpt.c#32 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.178 2007/04/18 04:58:52 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.180 2007/04/19 14:45:37 scottl Exp $"); #include #include @@ -665,8 +665,9 @@ /* Queues for our software interrupt handler */ typedef TAILQ_HEAD(cam_isrq, ccb_hdr) cam_isrq_t; -static cam_isrq_t cam_bioq; -static struct mtx cam_bioq_lock; +typedef TAILQ_HEAD(cam_simq, cam_sim) cam_simq_t; +static cam_simq_t cam_simq; +static struct mtx cam_simq_lock; /* Pointers to software interrupt handlers */ static void *cambio_ih; @@ -821,6 +822,7 @@ static void xptaction(struct cam_sim *sim, union ccb *work_ccb); static void xptpoll(struct cam_sim *sim); static void camisr(void *); +static void camisr_runqueue(void *); static dev_match_ret xptbusmatch(struct dev_match_pattern *patterns, u_int num_patterns, struct cam_eb *bus); static dev_match_ret xptdevicematch(struct dev_match_pattern *patterns, @@ -1472,12 +1474,12 @@ cam_status status; TAILQ_INIT(&xsoftc.xpt_busses); - TAILQ_INIT(&cam_bioq); + TAILQ_INIT(&cam_simq); TAILQ_INIT(&xsoftc.ccb_scanq); STAILQ_INIT(&xsoftc.highpowerq); xsoftc.num_highpower = CAM_MAX_HIGHPOWER; - mtx_init(&cam_bioq_lock, "CAM BIOQ lock", NULL, MTX_DEF); + mtx_init(&cam_simq_lock, "CAM SIMQ lock", NULL, MTX_DEF); mtx_init(&xsoftc.xpt_lock, "XPT lock", NULL, MTX_DEF); mtx_init(&xsoftc.xpt_topo_lock, "XPT topology lock", NULL, MTX_DEF); @@ -1551,7 +1553,7 @@ printf("xpt_init: failed to create rescan thread\n"); } /* Install our software interrupt handlers */ - swi_add(NULL, "cambio", camisr, &cam_bioq, SWI_CAMBIO, INTR_MPSAFE, &cambio_ih); + swi_add(NULL, "cambio", camisr, NULL, SWI_CAMBIO, INTR_MPSAFE, &cambio_ih); return (0); } @@ -3639,7 +3641,7 @@ dev->ccbq.dev_openings < 0) && (--timeout > 0)) { DELAY(1000); (*(sim->sim_poll))(sim); - camisr(&cam_bioq); + camisr_runqueue(&sim->sim_doneq); } dev->ccbq.devq_openings++; @@ -3649,7 +3651,7 @@ xpt_action(start_ccb); while(--timeout > 0) { (*(sim->sim_poll))(sim); - camisr(&cam_bioq); + camisr_runqueue(&sim->sim_doneq); if ((start_ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_INPROG) break; @@ -4490,6 +4492,7 @@ /* The SIM may be gone, so use a dummy SIM for any stray operations. */ devq = bus_path.bus->sim->devq; + ccbsim = bus_path.bus->sim; bus_path.bus->sim = &cam_dead_sim; /* Execute any pending operations now. */ @@ -4504,7 +4507,6 @@ devq->active_dev = device; cam_ccbq_remove_ccb(&device->ccbq, work_ccb); cam_ccbq_send_ccb(&device->ccbq, work_ccb); - ccbsim = work_ccb->ccb_h.path->bus->sim; (*(ccbsim->sim_action))(ccbsim, work_ccb); } @@ -4516,8 +4518,8 @@ } /* Make sure all completed CCBs are processed. */ - while (!TAILQ_EMPTY(&cam_bioq)) { - camisr(&cam_bioq); + while (!TAILQ_EMPTY(&ccbsim->sim_doneq)) { + camisr_runqueue(&ccbsim->sim_doneq); /* Repeat the async's for the benefit of any new devices. */ xpt_async(AC_LOST_DEVICE, &bus_path, NULL); @@ -4528,10 +4530,6 @@ xpt_release_bus(bus_path.bus); xpt_release_path(&bus_path); - /* Recheck for more completed CCBs. */ - while (!TAILQ_EMPTY(&cam_bioq)) - camisr(&cam_bioq); - return (CAM_REQ_CMP); } @@ -4949,6 +4947,7 @@ void xpt_done(union ccb *done_ccb) { + struct cam_sim *sim; int s; s = splcam(); @@ -4959,13 +4958,19 @@ * Queue up the request for handling by our SWI handler * any of the "non-immediate" type of ccbs. */ + sim = done_ccb->ccb_h.path->bus->sim; switch (done_ccb->ccb_h.path->periph->type) { case CAM_PERIPH_BIO: - mtx_lock(&cam_bioq_lock); - TAILQ_INSERT_TAIL(&cam_bioq, &done_ccb->ccb_h, + TAILQ_INSERT_TAIL(&sim->sim_doneq, &done_ccb->ccb_h, sim_links.tqe); done_ccb->ccb_h.pinfo.index = CAM_DONEQ_INDEX; - mtx_unlock(&cam_bioq_lock); + if ((sim->flags & CAM_SIM_ON_DONEQ) == 0) { + mtx_lock(&cam_simq_lock); + TAILQ_INSERT_TAIL(&cam_simq, sim, + links); + sim->flags |= CAM_SIM_ON_DONEQ; + mtx_unlock(&cam_simq_lock); + } if ((done_ccb->ccb_h.path->periph->flags & CAM_PERIPH_POLLED) == 0) swi_sched(cambio_ih, 0); @@ -4983,7 +4988,7 @@ { union ccb *new_ccb; - new_ccb = malloc(sizeof(*new_ccb), M_CAMXPT, M_WAITOK); + new_ccb = malloc(sizeof(*new_ccb), M_CAMXPT, M_ZERO|M_WAITOK); return (new_ccb); } @@ -4992,7 +4997,7 @@ { union ccb *new_ccb; - new_ccb = malloc(sizeof(*new_ccb), M_CAMXPT, M_NOWAIT); + new_ccb = malloc(sizeof(*new_ccb), M_CAMXPT, M_ZERO|M_NOWAIT); return (new_ccb); } @@ -7231,31 +7236,36 @@ } static void -camisr(void *V_queue) +camisr(void *dummy) { - cam_isrq_t *oqueue = V_queue; - cam_isrq_t queue; - int s; - struct ccb_hdr *ccb_h; - struct cam_sim *sim; + cam_simq_t queue; + struct cam_sim *sim; - /* - * Transfer the ccb_bioq list to a temporary list so we can operate - * on it without needing to lock/unlock on every loop. The concat - * function with re-init the real list for us. - */ - s = splcam(); - mtx_lock(&cam_bioq_lock); + mtx_lock(&cam_simq_lock); TAILQ_INIT(&queue); - TAILQ_CONCAT(&queue, oqueue, sim_links.tqe); - mtx_unlock(&cam_bioq_lock); + TAILQ_CONCAT(&queue, &cam_simq, links); + mtx_unlock(&cam_simq_lock); + + while ((sim = TAILQ_FIRST(&queue)) != NULL) { + TAILQ_REMOVE(&queue, sim, links); + mtx_lock(sim->mtx); + sim->flags &= ~CAM_SIM_ON_DONEQ; + camisr_runqueue(&sim->sim_doneq); + mtx_unlock(sim->mtx); + } +} + +static void +camisr_runqueue(void *V_queue) +{ + cam_isrq_t *queue = V_queue; + struct ccb_hdr *ccb_h; - while ((ccb_h = TAILQ_FIRST(&queue)) != NULL) { + while ((ccb_h = TAILQ_FIRST(queue)) != NULL) { int runq; - TAILQ_REMOVE(&queue, ccb_h, sim_links.tqe); + TAILQ_REMOVE(queue, ccb_h, sim_links.tqe); ccb_h->pinfo.index = CAM_UNQUEUED_INDEX; - splx(s); CAM_DEBUG(ccb_h->path, CAM_DEBUG_TRACE, ("camisr\n")); @@ -7290,22 +7300,17 @@ mtx_unlock(&xsoftc.xpt_lock); } - sim = ccb_h->path->bus->sim; - mtx_lock(sim->mtx); - if ((ccb_h->func_code & XPT_FC_USER_CCB) == 0) { struct cam_ed *dev; dev = ccb_h->path->device; - s = splcam(); cam_ccbq_ccb_done(&dev->ccbq, (union ccb *)ccb_h); if (!SIM_DEAD(ccb_h->path->bus->sim)) { ccb_h->path->bus->sim->devq->send_active--; ccb_h->path->bus->sim->devq->send_openings++; } - splx(s); if (((dev->flags & CAM_DEV_REL_ON_COMPLETE) != 0 && (ccb_h->status&CAM_STATUS_MASK) != CAM_REQUEUE_REQ) @@ -7346,12 +7351,7 @@ /* Call the peripheral driver's callback */ (*ccb_h->cbfcnp)(ccb_h->path->periph, (union ccb *)ccb_h); - - /* Raise IPL for while test */ - mtx_unlock(sim->mtx); - s = splcam(); } - splx(s); } static void ==== //depot/projects/trustedbsd/base/sys/compat/opensolaris/kern/opensolaris_vfs.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/opensolaris/kern/opensolaris_vfs.c,v 1.2 2007/04/17 21:16:34 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/opensolaris/kern/opensolaris_vfs.c,v 1.3 2007/04/18 15:24:48 pjd Exp $"); #include #include @@ -169,9 +169,6 @@ if (strlen(fstype) >= MFSNAMELEN || strlen(fspath) >= MNAMELEN) return (ENAMETOOLONG); - if ((error = priv_check(td, PRIV_VFS_MOUNT)) != 0) - return (error); - vfsp = vfs_byname_kld(fstype, td, &error); if (vfsp == NULL) return (ENODEV); @@ -207,6 +204,13 @@ mp->mnt_flag |= MNT_RDONLY; mp->mnt_flag &=~ MNT_UPDATEMASK; mp->mnt_flag |= fsflags & (MNT_UPDATEMASK | MNT_FORCE | MNT_ROOTFS); + /* + * Unprivileged user can trigger mounting a snapshot, but we don't want + * him to unmount it, so we switch to privileged credential. + */ + crfree(mp->mnt_cred); + mp->mnt_cred = crdup(kcred); + mp->mnt_stat.f_owner = mp->mnt_cred->cr_uid; MNT_IUNLOCK(mp); /* * Mount the filesystem. @@ -260,12 +264,9 @@ VI_LOCK(vp); vp->v_iflag &= ~VI_MOUNT; VI_UNLOCK(vp); + VOP_UNLOCK(vp, 0, td); vfs_unbusy(mp, td); vfs_mount_destroy(mp); - if (VOP_ISLOCKED(vp, td) != LK_EXCLUSIVE) { - printf("%s:%u: vnode vp=%p not locked\n", __func__, __LINE__, vp); - vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Apr 19 17:27:14 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 C316E16A407; Thu, 19 Apr 2007 17:27:13 +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 4C26016A400 for ; Thu, 19 Apr 2007 17:27:13 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 38A4413C458 for ; Thu, 19 Apr 2007 17:27:13 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3JHRD34066986 for ; Thu, 19 Apr 2007 17:27:13 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3JHRBMW066983 for perforce@freebsd.org; Thu, 19 Apr 2007 17:27:11 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 19 Apr 2007 17:27:11 GMT Message-Id: <200704191727.l3JHRBMW066983@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 118426 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: Thu, 19 Apr 2007 17:27:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=118426 Change 118426 by rwatson@rwatson_zoo on 2007/04/19 17:26:35 Integrate TrustedBSD audit3 branch from TrustedBSD base branch to loop back the remainder of OpenBSM 1.0 alpha 14. Affected files ... .. //depot/projects/trustedbsd/audit3/UPDATING#20 integrate .. //depot/projects/trustedbsd/audit3/etc/mtree/BSD.include.dist#13 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/stdio/fputs.3#3 integrate .. //depot/projects/trustedbsd/audit3/libexec/ftpd/ftpcmd.y#5 integrate .. //depot/projects/trustedbsd/audit3/libexec/ftpd/ftpd.8#6 integrate .. //depot/projects/trustedbsd/audit3/libexec/ftpd/ftpd.c#8 integrate .. //depot/projects/trustedbsd/audit3/share/man/man7/hier.7#9 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/linux32/linux32_dummy.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/linux32/linux32_machdep.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#37 integrate .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#17 integrate .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#33 integrate .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#25 integrate .. //depot/projects/trustedbsd/audit3/sys/cam/cam_sim.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/cam/cam_sim.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/cam/cam_xpt.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/opensolaris/kern/opensolaris_vfs.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ath/if_ath.c#16 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/hwpmc/hwpmc_logging.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/hwpmc/hwpmc_mod.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/hwpmc/hwpmc_piv.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ral/rt2560.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/isa/ad1816.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/isa/ess.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/isa/mss.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/isa/sb16.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/isa/sb8.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/als4000.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/atiixp.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/au88x0.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/aureal.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/cmi.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/cs4281.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/csapcm.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/ds1.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/emu10k1.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/emu10kx-pcm.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/es137x.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/fm801.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/hda/hdac.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/ich.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/maestro3.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/solo.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/t4dwave.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/via8233.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/via82c686.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/vibes.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pcm/ac97.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pcm/ac97.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pcm/ac97_patch.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pcm/ac97_patch.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pcm/buffer.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pcm/buffer.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pcm/sound.h#11 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/sbus/cs4231.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/if_ural.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/wi/if_wi.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/bios.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/identcpu.c#14 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_intr.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/subr_witness.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/uipc_syscalls.c#15 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_indata.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_input.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_lock_bsd.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_output.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_pcb.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_structs.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_uio.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_usrreq.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_var.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctputil.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctputil.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_subr.c#16 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/interrupt.h#8 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/socket.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_contig.c#15 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_param.h#4 integrate .. //depot/projects/trustedbsd/audit3/tools/regression/sockets/sendfile/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/tools/regression/sockets/sendfile/sendfile.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/lastcomm/lastcomm.1#4 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/lastcomm/lastcomm.c#5 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/tar/test/test-basic.sh#2 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/tar/util.c#6 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/UPDATING#20 (text+ko) ==== @@ -21,6 +21,17 @@ developers choose to disable these features on build machines to maximize performance. +20070418: + A new acct(5) format is imminent. If you want to maintain access + to your accounting files, use the new lastcomm(1) -X functionality to + export them into text format, and keep around a copy of the lastcomm + binary. An updated lastcomm(1) program will allow you to import + the text files into the new acct(5) format. The change will also + invalidate the condensed summary files /var/account/savacct and + /var/account/usracct. If your process accounting system relies + on them, you will need to save their contents in a readable format + before the switch. + 20070417: The new trunk(4) driver has been renamed to lagg(4) as it better reflects its purpose. ifconfig will need to be recompiled. @@ -767,4 +778,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.486 2007/04/17 00:41:59 thompsa Exp $ +$FreeBSD: src/UPDATING,v 1.487 2007/04/18 17:34:59 dds Exp $ ==== //depot/projects/trustedbsd/audit3/etc/mtree/BSD.include.dist#13 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.111 2007/02/27 04:01:57 mjacob Exp $ +# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.112 2007/04/18 10:16:42 trhodes Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -209,8 +209,6 @@ .. pccard .. - posix4 - .. protocols .. readline ==== //depot/projects/trustedbsd/audit3/lib/libc/stdio/fputs.3#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)fputs.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/stdio/fputs.3,v 1.12 2007/01/09 00:28:06 imp Exp $ +.\" $FreeBSD: src/lib/libc/stdio/fputs.3,v 1.13 2007/04/19 09:38:31 phk Exp $ .\" .Dd June 4, 1993 .Dt FPUTS 3 @@ -66,12 +66,9 @@ to the stream .Dv stdout . .Sh RETURN VALUES -The +The functions .Fn fputs -function -returns 0 on success and -.Dv EOF -on error; +and .Fn puts returns a nonnegative integer on success and .Dv EOF ==== //depot/projects/trustedbsd/audit3/libexec/ftpd/ftpcmd.y#5 (text+ko) ==== @@ -47,7 +47,7 @@ #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/libexec/ftpd/ftpcmd.y,v 1.65 2006/06/05 15:50:34 yar Exp $"); +__FBSDID("$FreeBSD: src/libexec/ftpd/ftpcmd.y,v 1.66 2007/04/18 22:43:39 yar Exp $"); #include #include @@ -95,6 +95,7 @@ extern int usedefault; extern char tmpline[]; extern int readonly; +extern int assumeutf8; extern int noepsv; extern int noretr; extern int noguestretr; @@ -135,7 +136,7 @@ ABOR DELE CWD LIST NLST SITE STAT HELP NOOP MKD RMD PWD CDUP STOU SMNT SYST SIZE MDTM - LPRT LPSV EPRT EPSV + LPRT LPSV EPRT EPSV FEAT UMASK IDLE CHMOD MDFIVE @@ -687,6 +688,25 @@ if ($4 != NULL) free($4); } + | FEAT CRLF + { + lreply(211, "Extensions supported:"); +#if 0 + /* XXX these two keywords are non-standard */ + printf(" EPRT\r\n"); + if (!noepsv) + printf(" EPSV\r\n"); +#endif + printf(" MDTM\r\n"); + printf(" REST STREAM\r\n"); + printf(" SIZE\r\n"); + if (assumeutf8) { + /* TVFS requires UTF8, see RFC 3659 */ + printf(" TVFS\r\n"); + printf(" UTF8\r\n"); + } + reply(211, "End."); + } | SYST check_login CRLF { if ($2) { @@ -1112,6 +1132,7 @@ { "NLST", NLST, OSTR, 1, "[ path-name ]" }, { "SITE", SITE, SITECMD, 1, "site-cmd [ arguments ]" }, { "SYST", SYST, ARGS, 1, "(get type of operating system)" }, + { "FEAT", FEAT, ARGS, 1, "(get extended features)" }, { "STAT", STAT, OSTR, 1, "[ path-name ]" }, { "HELP", HELP, OSTR, 1, "[ ]" }, { "NOOP", NOOP, ARGS, 1, "" }, ==== //depot/projects/trustedbsd/audit3/libexec/ftpd/ftpd.8#6 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ftpd.8 8.2 (Berkeley) 4/19/94 -.\" $FreeBSD: src/libexec/ftpd/ftpd.8,v 1.71 2006/01/29 13:10:38 yar Exp $ +.\" $FreeBSD: src/libexec/ftpd/ftpd.8,v 1.72 2007/04/18 22:43:39 yar Exp $ .\" .Dd January 21, 2006 .Dt FTPD 8 @@ -40,7 +40,7 @@ .Nd Internet File Transfer Protocol server .Sh SYNOPSIS .Nm -.Op Fl 46ADdEhMmOoRrSUvW +.Op Fl 468ADdEhMmOoRrSUvW .Op Fl l Op Fl l .Op Fl a Ar address .Op Fl P Ar port @@ -78,6 +78,21 @@ is specified, accept connections via .Dv AF_INET6 socket. +.It Fl 8 +The server is running in transparent UTF-8 mode. +That is, it just encourages RFC\ 2640 compliant clients to send +paths encoded in UTF-8 in their commands. +In particular, the names of files uploaded by such clients will +have UTF-8 encoding. +The clients will also assume that server replies and existing file +names have UTF-8 encoding, too. +The names of files preloaded to the server should meet this expectation +for the clients to present the correct file names to their users. +Own messages of +.Nm +are always encoded in ASCII, which in fact is a subset of UTF-8. +.Pp +Note that this option does not make the server do any encoding conversion. .It Fl A Allow only anonymous ftp access. .It Fl a @@ -250,6 +265,7 @@ .It DELE Ta "delete a file [RW]" .It EPRT Ta "specify data connection port, multiprotocol" .It EPSV Ta "prepare for server-to-server transfer, multiprotocol" +.It FEAT Ta "give information on extended features of server" .It HELP Ta "give help information" .It LIST Ta "give list files in a directory" Pq Dq Li "ls -lgA" .It LPRT Ta "specify data connection port, multiprotocol" ==== //depot/projects/trustedbsd/audit3/libexec/ftpd/ftpd.c#8 (text+ko) ==== @@ -46,7 +46,7 @@ #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/libexec/ftpd/ftpd.c,v 1.211 2007/02/09 17:18:39 yar Exp $"); +__FBSDID("$FreeBSD: src/libexec/ftpd/ftpd.c,v 1.212 2007/04/18 22:43:39 yar Exp $"); /* * FTP server. @@ -128,6 +128,7 @@ int restricted_data_ports = 1; int paranoid = 1; /* be extra careful about security */ int anon_only = 0; /* Only anonymous ftp allowed */ +int assumeutf8 = 0; /* Assume that server file names are in UTF-8 */ int guest; int dochroot; char *chrootdir; @@ -308,7 +309,7 @@ openlog("ftpd", LOG_PID | LOG_NDELAY, LOG_FTP); while ((ch = getopt(argc, argv, - "46a:AdDEhlmMoOp:P:rRSt:T:u:UvW")) != -1) { + "468a:AdDEhlmMoOp:P:rRSt:T:u:UvW")) != -1) { switch (ch) { case '4': family = (family == AF_INET6) ? AF_UNSPEC : AF_INET; @@ -318,6 +319,10 @@ family = (family == AF_INET) ? AF_UNSPEC : AF_INET6; break; + case '8': + assumeutf8 = 1; + break; + case 'a': bindname = optarg; break; ==== //depot/projects/trustedbsd/audit3/share/man/man7/hier.7#9 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)hier.7 8.1 (Berkeley) 6/5/93 -.\" $FreeBSD: src/share/man/man7/hier.7,v 1.125 2007/04/04 00:14:36 chinsan Exp $ +.\" $FreeBSD: src/share/man/man7/hier.7,v 1.126 2007/04/18 10:16:43 trhodes Exp $ .\" -.Dd April 3, 2007 +.Dd April 18, 2007 .Dt HIER 7 .Os .Sh NAME @@ -349,10 +349,6 @@ OpenSSL (Cryptography/SSL toolkit) headers .It Pa pccard/ PC-CARD controllers -.It Pa posix4/ -POSIX real-time extensions includes; -see -.Xr p1003_1b 9 .It Pa protocols/ C include files for Berkeley service protocols .It Pa readline/ ==== //depot/projects/trustedbsd/audit3/sys/amd64/linux32/linux32_dummy.c#9 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_dummy.c,v 1.8 2007/03/29 02:11:46 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_dummy.c,v 1.9 2007/04/18 18:08:12 jkim Exp $"); #include #include @@ -64,7 +64,6 @@ DUMMY(mincore); DUMMY(fadvise64); DUMMY(ptrace); -DUMMY(settimeofday); DUMMY(lookup_dcookie); DUMMY(epoll_create); DUMMY(epoll_ctl); ==== //depot/projects/trustedbsd/audit3/sys/amd64/linux32/linux32_machdep.c#13 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.39 2007/03/30 17:27:13 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.42 2007/04/18 20:12:05 jkim Exp $"); #include #include @@ -252,7 +252,7 @@ if (iovcnt > UIO_MAXIOV) return (EINVAL); iovlen = iovcnt * sizeof(struct iovec); - uio = malloc(iovlen + sizeof *uio, M_IOV, M_WAITOK); + uio = malloc(iovlen + sizeof(*uio), M_IOV, M_WAITOK); iov = (struct iovec *)(uio + 1); for (i = 0; i < iovcnt; i++) { error = copyin(&iovp[i], &iov32, sizeof(struct iovec32)); @@ -526,7 +526,9 @@ td2 = FIRST_THREAD_IN_PROC(p2); - /* make it run */ + /* + * Make this runnable after we are finished with it. + */ mtx_lock_spin(&sched_lock); TD_SET_CAN_RUN(td2); sched_add(td2, SRQ_BORING); @@ -572,8 +574,8 @@ /* * XXX: In Linux, sharing of fs info (chroot/cwd/umask) * and open files is independant. In FreeBSD, its in one - * structure but in reality it does not make any problems - * because both of these flags are set at once usually. + * structure but in reality it does not cause any problems + * because both of these flags are usually set together. */ if (!(args->flags & (LINUX_CLONE_FILES | LINUX_CLONE_FS))) ff |= RFFDG; @@ -660,15 +662,15 @@ if (args->flags & LINUX_CLONE_SETTLS) { struct user_segment_descriptor sd; struct l_user_desc info; - int a[2]; + int a[2]; - error = copyin((void *)td->td_frame->tf_rsi, &info, + error = copyin((void *)td->td_frame->tf_rsi, &info, sizeof(struct l_user_desc)); if (error) { printf(LMSG("copyin failed!")); } else { /* We might copy out the entry_number as GUGS32_SEL. */ - info.entry_number = GUGS32_SEL; + info.entry_number = GUGS32_SEL; error = copyout(&info, (void *)td->td_frame->tf_rsi, sizeof(struct l_user_desc)); if (error) @@ -871,7 +873,7 @@ * * Our mmap with MAP_STACK takes addr as the maximum * downsize limit on BOS, and as len the max size of - * the region. It them maps the top SGROWSIZ bytes, + * the region. It then maps the top SGROWSIZ bytes, * and auto grows the region down, up to the limit * in addr. * @@ -1167,17 +1169,44 @@ microtime(&atv); atv32.tv_sec = atv.tv_sec; atv32.tv_usec = atv.tv_usec; - error = copyout(&atv32, uap->tp, sizeof (atv32)); + error = copyout(&atv32, uap->tp, sizeof(atv32)); } if (error == 0 && uap->tzp != NULL) { rtz.tz_minuteswest = tz_minuteswest; rtz.tz_dsttime = tz_dsttime; - error = copyout(&rtz, uap->tzp, sizeof (rtz)); + error = copyout(&rtz, uap->tzp, sizeof(rtz)); } return (error); } int +linux_settimeofday(struct thread *td, struct linux_settimeofday_args *uap) +{ + l_timeval atv32; + struct timeval atv, *tvp; + struct timezone atz, *tzp; + int error; + + if (uap->tp) { + error = copyin(uap->tp, &atv32, sizeof(atv32)); + if (error) + return (error); + atv.tv_sec = atv32.tv_sec; + atv.tv_usec = atv32.tv_usec; + tvp = &atv; + } else + tvp = NULL; + if (uap->tzp) { + error = copyin(uap->tzp, &atz, sizeof(atz)); + if (error) + return (error); + tzp = &atz; + } else + tzp = NULL; + return (kern_settimeofday(td, tvp, tzp)); +} + +int linux_getrusage(struct thread *td, struct linux_getrusage_args *uap) { struct l_rusage s32; @@ -1242,7 +1271,7 @@ #ifdef DEBUG if (ldebug(set_thread_area)) - printf(ARGS(set_thread_area, "%i, %x, %x, %i, %i, %i, " + printf(ARGS(set_thread_area, "%i, %x, %x, %i, %i, %i, " "%i, %i, %i"), info.entry_number, info.base_addr, info.limit, info.seg_32bit, info.contents, info.read_exec_only, info.limit_in_pages, @@ -1261,9 +1290,10 @@ * The tls_array[] is used only in [gs]et_thread_area() syscalls and * for loading the GDT descriptors. We use just one GDT descriptor * for TLS, so we will load just one. - * XXX: This doesnt work when user-space process tries to use more + * + * XXX: This doesn't work when a user space process tries to use more * than one TLS segment. Comment in the Linux source says wine might - * do that. + * do this. */ /* @@ -1284,8 +1314,9 @@ /* * We have to copy out the GDT entry we use. - * XXX: What if userspace program does not check return value and - * tries to use 6, 7 or 8? + * + * XXX: What if a user space program does not check the return value + * and tries to use 6, 7 or 8? */ error = copyout(&info, args->desc, sizeof(struct l_user_desc)); if (error) ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#37 (text+ko) ==== @@ -30,8 +30,8 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#36 $ - * $FreeBSD: src/sys/bsm/audit.h,v 1.6 2006/09/21 07:27:02 rwatson Exp $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#37 $ + * $FreeBSD: src/sys/bsm/audit.h,v 1.8 2007/04/17 12:27:08 rwatson Exp $ */ #ifndef _BSM_AUDIT_H ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#17 (text+ko) ==== @@ -34,8 +34,8 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#16 $ - * $FreeBSD: src/sys/bsm/audit_internal.h,v 1.5 2006/09/21 07:27:02 rwatson Exp $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#17 $ + * $FreeBSD: src/sys/bsm/audit_internal.h,v 1.7 2007/04/17 12:27:08 rwatson Exp $ */ #ifndef _AUDIT_INTERNAL_H ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#33 (text+ko) ==== @@ -30,8 +30,8 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#32 $ - * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.9 2006/09/25 12:22:07 rwatson Exp $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#33 $ + * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.11 2007/04/17 12:27:08 rwatson Exp $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#25 (text+ko) ==== @@ -30,8 +30,8 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#24 $ - * $FreeBSD: src/sys/bsm/audit_record.h,v 1.6 2006/09/21 07:27:02 rwatson Exp $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#25 $ + * $FreeBSD: src/sys/bsm/audit_record.h,v 1.9 2007/04/17 12:27:08 rwatson Exp $ */ #ifndef _BSM_AUDIT_RECORD_H_ ==== //depot/projects/trustedbsd/audit3/sys/cam/cam_sim.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_sim.c,v 1.10 2007/04/15 08:49:09 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_sim.c,v 1.11 2007/04/19 14:28:43 scottl Exp $"); #include #include @@ -95,6 +95,7 @@ } SLIST_INIT(&sim->ccb_freeq); + TAILQ_INIT(&sim->sim_doneq); return (sim); } ==== //depot/projects/trustedbsd/audit3/sys/cam/cam_sim.h#4 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam_sim.h,v 1.7 2007/04/15 08:49:09 scottl Exp $ + * $FreeBSD: src/sys/cam/cam_sim.h,v 1.8 2007/04/19 14:28:43 scottl Exp $ */ #ifndef _CAM_CAM_SIM_H @@ -92,6 +92,8 @@ const char *sim_name; void *softc; struct mtx *mtx; + TAILQ_HEAD(, ccb_hdr) sim_doneq; + TAILQ_ENTRY(cam_sim) links; u_int32_t path_id;/* The Boot device may set this to 0? */ u_int32_t unit_number; u_int32_t bus_id; @@ -100,6 +102,7 @@ u_int32_t flags; #define CAM_SIM_REL_TIMEOUT_PENDING 0x01 #define CAM_SIM_MPSAFE 0x02 +#define CAM_SIM_ON_DONEQ 0x04 struct callout callout; struct cam_devq *devq; /* Device Queue to use for this SIM */ ==== //depot/projects/trustedbsd/audit3/sys/cam/cam_xpt.c#13 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.178 2007/04/18 04:58:52 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.180 2007/04/19 14:45:37 scottl Exp $"); #include #include @@ -665,8 +665,9 @@ /* Queues for our software interrupt handler */ typedef TAILQ_HEAD(cam_isrq, ccb_hdr) cam_isrq_t; -static cam_isrq_t cam_bioq; -static struct mtx cam_bioq_lock; +typedef TAILQ_HEAD(cam_simq, cam_sim) cam_simq_t; +static cam_simq_t cam_simq; +static struct mtx cam_simq_lock; /* Pointers to software interrupt handlers */ static void *cambio_ih; @@ -821,6 +822,7 @@ static void xptaction(struct cam_sim *sim, union ccb *work_ccb); static void xptpoll(struct cam_sim *sim); static void camisr(void *); +static void camisr_runqueue(void *); static dev_match_ret xptbusmatch(struct dev_match_pattern *patterns, u_int num_patterns, struct cam_eb *bus); static dev_match_ret xptdevicematch(struct dev_match_pattern *patterns, @@ -1472,12 +1474,12 @@ cam_status status; TAILQ_INIT(&xsoftc.xpt_busses); - TAILQ_INIT(&cam_bioq); + TAILQ_INIT(&cam_simq); TAILQ_INIT(&xsoftc.ccb_scanq); STAILQ_INIT(&xsoftc.highpowerq); xsoftc.num_highpower = CAM_MAX_HIGHPOWER; - mtx_init(&cam_bioq_lock, "CAM BIOQ lock", NULL, MTX_DEF); + mtx_init(&cam_simq_lock, "CAM SIMQ lock", NULL, MTX_DEF); mtx_init(&xsoftc.xpt_lock, "XPT lock", NULL, MTX_DEF); mtx_init(&xsoftc.xpt_topo_lock, "XPT topology lock", NULL, MTX_DEF); @@ -1551,7 +1553,7 @@ printf("xpt_init: failed to create rescan thread\n"); } /* Install our software interrupt handlers */ - swi_add(NULL, "cambio", camisr, &cam_bioq, SWI_CAMBIO, INTR_MPSAFE, &cambio_ih); + swi_add(NULL, "cambio", camisr, NULL, SWI_CAMBIO, INTR_MPSAFE, &cambio_ih); return (0); } @@ -3639,7 +3641,7 @@ dev->ccbq.dev_openings < 0) && (--timeout > 0)) { DELAY(1000); (*(sim->sim_poll))(sim); - camisr(&cam_bioq); + camisr_runqueue(&sim->sim_doneq); } dev->ccbq.devq_openings++; @@ -3649,7 +3651,7 @@ xpt_action(start_ccb); while(--timeout > 0) { (*(sim->sim_poll))(sim); - camisr(&cam_bioq); + camisr_runqueue(&sim->sim_doneq); if ((start_ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_INPROG) break; @@ -4490,6 +4492,7 @@ /* The SIM may be gone, so use a dummy SIM for any stray operations. */ devq = bus_path.bus->sim->devq; + ccbsim = bus_path.bus->sim; bus_path.bus->sim = &cam_dead_sim; /* Execute any pending operations now. */ @@ -4504,7 +4507,6 @@ devq->active_dev = device; cam_ccbq_remove_ccb(&device->ccbq, work_ccb); cam_ccbq_send_ccb(&device->ccbq, work_ccb); - ccbsim = work_ccb->ccb_h.path->bus->sim; (*(ccbsim->sim_action))(ccbsim, work_ccb); } @@ -4516,8 +4518,8 @@ } /* Make sure all completed CCBs are processed. */ - while (!TAILQ_EMPTY(&cam_bioq)) { - camisr(&cam_bioq); + while (!TAILQ_EMPTY(&ccbsim->sim_doneq)) { + camisr_runqueue(&ccbsim->sim_doneq); /* Repeat the async's for the benefit of any new devices. */ xpt_async(AC_LOST_DEVICE, &bus_path, NULL); @@ -4528,10 +4530,6 @@ xpt_release_bus(bus_path.bus); xpt_release_path(&bus_path); - /* Recheck for more completed CCBs. */ - while (!TAILQ_EMPTY(&cam_bioq)) - camisr(&cam_bioq); - return (CAM_REQ_CMP); } @@ -4949,6 +4947,7 @@ void xpt_done(union ccb *done_ccb) { + struct cam_sim *sim; int s; s = splcam(); @@ -4959,13 +4958,19 @@ * Queue up the request for handling by our SWI handler * any of the "non-immediate" type of ccbs. */ + sim = done_ccb->ccb_h.path->bus->sim; switch (done_ccb->ccb_h.path->periph->type) { case CAM_PERIPH_BIO: - mtx_lock(&cam_bioq_lock); - TAILQ_INSERT_TAIL(&cam_bioq, &done_ccb->ccb_h, + TAILQ_INSERT_TAIL(&sim->sim_doneq, &done_ccb->ccb_h, sim_links.tqe); done_ccb->ccb_h.pinfo.index = CAM_DONEQ_INDEX; - mtx_unlock(&cam_bioq_lock); + if ((sim->flags & CAM_SIM_ON_DONEQ) == 0) { + mtx_lock(&cam_simq_lock); + TAILQ_INSERT_TAIL(&cam_simq, sim, + links); + sim->flags |= CAM_SIM_ON_DONEQ; + mtx_unlock(&cam_simq_lock); + } if ((done_ccb->ccb_h.path->periph->flags & CAM_PERIPH_POLLED) == 0) swi_sched(cambio_ih, 0); @@ -4983,7 +4988,7 @@ { union ccb *new_ccb; - new_ccb = malloc(sizeof(*new_ccb), M_CAMXPT, M_WAITOK); + new_ccb = malloc(sizeof(*new_ccb), M_CAMXPT, M_ZERO|M_WAITOK); return (new_ccb); } @@ -4992,7 +4997,7 @@ { union ccb *new_ccb; - new_ccb = malloc(sizeof(*new_ccb), M_CAMXPT, M_NOWAIT); + new_ccb = malloc(sizeof(*new_ccb), M_CAMXPT, M_ZERO|M_NOWAIT); return (new_ccb); } @@ -7231,31 +7236,36 @@ } static void -camisr(void *V_queue) +camisr(void *dummy) { - cam_isrq_t *oqueue = V_queue; - cam_isrq_t queue; - int s; - struct ccb_hdr *ccb_h; - struct cam_sim *sim; + cam_simq_t queue; + struct cam_sim *sim; - /* - * Transfer the ccb_bioq list to a temporary list so we can operate - * on it without needing to lock/unlock on every loop. The concat - * function with re-init the real list for us. - */ - s = splcam(); - mtx_lock(&cam_bioq_lock); + mtx_lock(&cam_simq_lock); TAILQ_INIT(&queue); - TAILQ_CONCAT(&queue, oqueue, sim_links.tqe); - mtx_unlock(&cam_bioq_lock); + TAILQ_CONCAT(&queue, &cam_simq, links); + mtx_unlock(&cam_simq_lock); + + while ((sim = TAILQ_FIRST(&queue)) != NULL) { + TAILQ_REMOVE(&queue, sim, links); + mtx_lock(sim->mtx); + sim->flags &= ~CAM_SIM_ON_DONEQ; + camisr_runqueue(&sim->sim_doneq); + mtx_unlock(sim->mtx); + } +} + +static void +camisr_runqueue(void *V_queue) +{ + cam_isrq_t *queue = V_queue; + struct ccb_hdr *ccb_h; - while ((ccb_h = TAILQ_FIRST(&queue)) != NULL) { + while ((ccb_h = TAILQ_FIRST(queue)) != NULL) { int runq; - TAILQ_REMOVE(&queue, ccb_h, sim_links.tqe); + TAILQ_REMOVE(queue, ccb_h, sim_links.tqe); ccb_h->pinfo.index = CAM_UNQUEUED_INDEX; - splx(s); CAM_DEBUG(ccb_h->path, CAM_DEBUG_TRACE, ("camisr\n")); @@ -7290,22 +7300,17 @@ mtx_unlock(&xsoftc.xpt_lock); } - sim = ccb_h->path->bus->sim; - mtx_lock(sim->mtx); - if ((ccb_h->func_code & XPT_FC_USER_CCB) == 0) { struct cam_ed *dev; dev = ccb_h->path->device; - s = splcam(); cam_ccbq_ccb_done(&dev->ccbq, (union ccb *)ccb_h); if (!SIM_DEAD(ccb_h->path->bus->sim)) { ccb_h->path->bus->sim->devq->send_active--; ccb_h->path->bus->sim->devq->send_openings++; } - splx(s); if (((dev->flags & CAM_DEV_REL_ON_COMPLETE) != 0 && (ccb_h->status&CAM_STATUS_MASK) != CAM_REQUEUE_REQ) @@ -7346,12 +7351,7 @@ /* Call the peripheral driver's callback */ (*ccb_h->cbfcnp)(ccb_h->path->periph, (union ccb *)ccb_h); - - /* Raise IPL for while test */ - mtx_unlock(sim->mtx); - s = splcam(); } - splx(s); } static void ==== //depot/projects/trustedbsd/audit3/sys/compat/opensolaris/kern/opensolaris_vfs.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/opensolaris/kern/opensolaris_vfs.c,v 1.2 2007/04/17 21:16:34 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/opensolaris/kern/opensolaris_vfs.c,v 1.3 2007/04/18 15:24:48 pjd Exp $"); #include #include @@ -169,9 +169,6 @@ if (strlen(fstype) >= MFSNAMELEN || strlen(fspath) >= MNAMELEN) return (ENAMETOOLONG); - if ((error = priv_check(td, PRIV_VFS_MOUNT)) != 0) - return (error); - vfsp = vfs_byname_kld(fstype, td, &error); if (vfsp == NULL) return (ENODEV); @@ -207,6 +204,13 @@ mp->mnt_flag |= MNT_RDONLY; mp->mnt_flag &=~ MNT_UPDATEMASK; mp->mnt_flag |= fsflags & (MNT_UPDATEMASK | MNT_FORCE | MNT_ROOTFS); + /* + * Unprivileged user can trigger mounting a snapshot, but we don't want + * him to unmount it, so we switch to privileged credential. + */ + crfree(mp->mnt_cred); + mp->mnt_cred = crdup(kcred); + mp->mnt_stat.f_owner = mp->mnt_cred->cr_uid; MNT_IUNLOCK(mp); /* * Mount the filesystem. @@ -260,12 +264,9 @@ VI_LOCK(vp); vp->v_iflag &= ~VI_MOUNT; VI_UNLOCK(vp); + VOP_UNLOCK(vp, 0, td); vfs_unbusy(mp, td); vfs_mount_destroy(mp); - if (VOP_ISLOCKED(vp, td) != LK_EXCLUSIVE) { - printf("%s:%u: vnode vp=%p not locked\n", __func__, __LINE__, vp); - vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); - } } return (error); } ==== //depot/projects/trustedbsd/audit3/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#4 (text+ko) ==== @@ -578,10 +578,6 @@ char *from; int error; - /* TODO: For now deny user mounts. */ - if ((error = priv_check(td, PRIV_VFS_MOUNT)) != 0) - return (error); - /* * When doing a remount, we simply refresh our temporary properties * according to those options set in the current VFS options. ==== //depot/projects/trustedbsd/audit3/sys/dev/ath/if_ath.c#16 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.164 2007/03/05 21:56:33 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.165 2007/04/19 13:09:56 sephe Exp $"); /* * Driver for the Atheros Wireless LAN controller. @@ -5838,6 +5838,7 @@ struct ath_buf *bf; if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0 || sc->sc_invalid) { + ieee80211_free_node(ni); m_freem(m); return ENETDOWN; } @@ -5854,6 +5855,7 @@ __func__); sc->sc_stats.ast_tx_qstop++; ifp->if_drv_flags |= IFF_DRV_OACTIVE; + ieee80211_free_node(ni); m_freem(m); return ENOBUFS; } ==== //depot/projects/trustedbsd/audit3/sys/dev/hwpmc/hwpmc_logging.c#4 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/hwpmc/hwpmc_logging.c,v 1.6 2006/03/26 12:20:53 jkoshy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/hwpmc/hwpmc_logging.c,v 1.7 2007/04/19 08:02:51 jkoshy Exp $"); #include #include @@ -973,8 +973,9 @@ PMCLOG_INIT_BUFFER_DESCRIPTOR(plb); TAILQ_INSERT_HEAD(&pmc_bufferlist, plb, plb_next); } - mtx_init(&pmc_bufferlist_mtx, "pmc-buffer-list", "pmc", MTX_SPIN); - mtx_init(&pmc_kthread_mtx, "pmc-kthread", "pmc", MTX_DEF); + mtx_init(&pmc_bufferlist_mtx, "pmc-buffer-list", "pmc-leaf", + MTX_SPIN); + mtx_init(&pmc_kthread_mtx, "pmc-kthread", "pmc-sleep", MTX_DEF); } /* ==== //depot/projects/trustedbsd/audit3/sys/dev/hwpmc/hwpmc_mod.c#8 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/hwpmc/hwpmc_mod.c,v 1.27 2007/02/27 17:23:27 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/hwpmc/hwpmc_mod.c,v 1.28 2007/04/19 08:02:51 jkoshy Exp $"); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Apr 19 17:34:38 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 1583616A406; Thu, 19 Apr 2007 17:34:38 +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 E048F16A400; Thu, 19 Apr 2007 17:34:37 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (66-23-211-162.clients.speedfactory.net [66.23.211.162]) by mx1.freebsd.org (Postfix) with ESMTP id 8B15713C483; Thu, 19 Apr 2007 17:34:32 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from localhost.corp.yahoo.com (john@localhost [127.0.0.1]) (authenticated bits=0) by server.baldwin.cx (8.13.8/8.13.8) with ESMTP id l3JHYUe3009763; Thu, 19 Apr 2007 13:34:31 -0400 (EDT) (envelope-from jhb@freebsd.org) From: John Baldwin To: Peter Wemm Date: Thu, 19 Apr 2007 13:10:18 -0400 User-Agent: KMail/1.9.6 References: <200704191633.l3JGXwLh047741@repoman.freebsd.org> In-Reply-To: <200704191633.l3JGXwLh047741@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200704191310.18336.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH authentication, not delayed by milter-greylist-2.0.2 (server.baldwin.cx [127.0.0.1]); Thu, 19 Apr 2007 13:34:31 -0400 (EDT) X-Virus-Scanned: ClamAV 0.88.3/3130/Thu Apr 19 11:31:36 2007 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-4.4 required=4.2 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.3 X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on server.baldwin.cx Cc: Perforce Change Reviews Subject: Re: PERFORCE change 118417 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: Thu, 19 Apr 2007 17:34:38 -0000 On Thursday 19 April 2007 12:33:58 pm Peter Wemm wrote: > http://perforce.freebsd.org/chv.cgi?CH=118417 > > Change 118417 by peter@peter_overcee on 2007/04/19 16:33:14 > > WTF?? > > Affected files ... > > .. //depot/projects/hammer/usr.sbin/daemon/daemon.c#7 edit > > Differences ... > > ==== //depot/projects/hammer/usr.sbin/daemon/daemon.c#7 (text+ko) ==== > > @@ -55,7 +55,7 @@ > > nochdir = noclose = 1; > pidfile = user = NULL; > - while ((ch = getopt(argc, argv, "-cf:p:u:")) != -1) { > + while ((ch = getopt(argc, argv, "cfp:u:")) != -1) { > switch (ch) { > case 'c': > nochdir = 0; There's a note in the BUGS of getopt(3) about what '-' does, though I don't fully parse it. -- John Baldwin From owner-p4-projects@FreeBSD.ORG Thu Apr 19 21:54:51 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 8E17216A404; Thu, 19 Apr 2007 21:54:51 +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 4A0B916A402 for ; Thu, 19 Apr 2007 21:54:51 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 3A66B13C483 for ; Thu, 19 Apr 2007 21:54:51 +0000 (UTC) (envelope-from scottl@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 l3JLspCI031664 for ; Thu, 19 Apr 2007 21:54:51 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3JLsmHo031661 for perforce@freebsd.org; Thu, 19 Apr 2007 21:54:48 GMT (envelope-from scottl@freebsd.org) Date: Thu, 19 Apr 2007 21:54:48 GMT Message-Id: <200704192154.l3JLsmHo031661@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 118434 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: Thu, 19 Apr 2007 21:54:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=118434 Change 118434 by scottl@scottl-x64 on 2007/04/19 21:54:24 IFC Affected files ... .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/busdma_machdep.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_dummy.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_machdep.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/bsm/audit.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/bsm/audit_internal.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/bsm/audit_kevents.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/bsm/audit_record.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_sim.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_sim.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#59 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt_periph.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_da.c#33 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_low.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_pass.c#24 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_pt.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_sa.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_sg.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/kern/opensolaris_vfs.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/dnlc.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7770.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx_osm.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx_osm.h#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx_pci.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx_inline.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx_osm.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx_osm.h#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx_pci.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic_osm_lib.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic_osm_lib.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/if_ath.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hwpmc/hwpmc_logging.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hwpmc/hwpmc_mod.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hwpmc/hwpmc_piv.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_freebsd.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_cam.c#24 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ral/rt2560.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/re/if_re.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/isa/ad1816.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/isa/ess.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/isa/mss.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/isa/sb16.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/isa/sb8.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/als4000.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/atiixp.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/au88x0.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/aureal.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/cmi.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/cs4281.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/csapcm.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/ds1.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/emu10k1.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/emu10kx-pcm.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/es137x.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/fm801.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/hda/hdac.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/ich.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/maestro3.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/solo.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/t4dwave.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/via8233.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/via82c686.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/vibes.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/ac97.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/ac97.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/ac97_patch.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/ac97_patch.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/buffer.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/buffer.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/sound.h#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/sbus/cs4231.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/if_ural.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/wi/if_wi.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/bios.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/busdma_machdep.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/identcpu.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/isa/isa_common.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_intr.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_witness.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_syscalls.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_mount.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_fw2.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_indata.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_input.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_lock_bsd.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_output.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_pcb.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_structs.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_uio.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_usrreq.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_var.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctputil.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctputil.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_subr.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_syncache.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/pci/if_rlreg.h#13 integrate .. //depot/projects/scottl-camlock/src/sys/pci/if_vr.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/pci/if_vrreg.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/pci/intpm.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/security/audit/audit_bsm_token.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/sys/interrupt.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/sys/mount.h#15 integrate .. //depot/projects/scottl-camlock/src/sys/sys/socket.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_contig.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_param.h#4 integrate Differences ... ==== //depot/projects/scottl-camlock/src/sys/amd64/amd64/busdma_machdep.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.79 2007/03/06 18:28:42 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.80 2007/04/17 21:05:34 jhb Exp $"); #include #include @@ -48,6 +48,7 @@ #include #include #include +#include #define MAX_BPAGES 8192 @@ -522,6 +523,9 @@ } else if ((uintptr_t)*vaddr & (dmat->alignment - 1)) { printf("bus_dmamem_alloc failed to align memory properly.\n"); } + if (flags & BUS_DMA_NOCACHE) + pmap_change_attr((vm_offset_t)*vaddr, dmat->maxsize, + PAT_UNCACHEABLE); CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d", __func__, dmat, dmat->flags, ENOMEM); return (0); @@ -540,6 +544,7 @@ */ if (map != NULL) panic("bus_dmamem_free: Invalid map freed\n"); + pmap_change_attr((vm_offset_t)vaddr, dmat->maxsize, PAT_WRITE_BACK); if ((dmat->maxsize <= PAGE_SIZE) && (dmat->alignment < dmat->maxsize) && dmat->lowaddr >= ptoa((vm_paddr_t)Maxmem)) ==== //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_dummy.c#8 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_dummy.c,v 1.8 2007/03/29 02:11:46 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_dummy.c,v 1.9 2007/04/18 18:08:12 jkim Exp $"); #include #include @@ -64,7 +64,6 @@ DUMMY(mincore); DUMMY(fadvise64); DUMMY(ptrace); -DUMMY(settimeofday); DUMMY(lookup_dcookie); DUMMY(epoll_create); DUMMY(epoll_ctl); ==== //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_machdep.c#11 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.39 2007/03/30 17:27:13 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.42 2007/04/18 20:12:05 jkim Exp $"); #include #include @@ -252,7 +252,7 @@ if (iovcnt > UIO_MAXIOV) return (EINVAL); iovlen = iovcnt * sizeof(struct iovec); - uio = malloc(iovlen + sizeof *uio, M_IOV, M_WAITOK); + uio = malloc(iovlen + sizeof(*uio), M_IOV, M_WAITOK); iov = (struct iovec *)(uio + 1); for (i = 0; i < iovcnt; i++) { error = copyin(&iovp[i], &iov32, sizeof(struct iovec32)); @@ -526,7 +526,9 @@ td2 = FIRST_THREAD_IN_PROC(p2); - /* make it run */ + /* + * Make this runnable after we are finished with it. + */ mtx_lock_spin(&sched_lock); TD_SET_CAN_RUN(td2); sched_add(td2, SRQ_BORING); @@ -572,8 +574,8 @@ /* * XXX: In Linux, sharing of fs info (chroot/cwd/umask) * and open files is independant. In FreeBSD, its in one - * structure but in reality it does not make any problems - * because both of these flags are set at once usually. + * structure but in reality it does not cause any problems + * because both of these flags are usually set together. */ if (!(args->flags & (LINUX_CLONE_FILES | LINUX_CLONE_FS))) ff |= RFFDG; @@ -660,15 +662,15 @@ if (args->flags & LINUX_CLONE_SETTLS) { struct user_segment_descriptor sd; struct l_user_desc info; - int a[2]; + int a[2]; - error = copyin((void *)td->td_frame->tf_rsi, &info, + error = copyin((void *)td->td_frame->tf_rsi, &info, sizeof(struct l_user_desc)); if (error) { printf(LMSG("copyin failed!")); } else { /* We might copy out the entry_number as GUGS32_SEL. */ - info.entry_number = GUGS32_SEL; + info.entry_number = GUGS32_SEL; error = copyout(&info, (void *)td->td_frame->tf_rsi, sizeof(struct l_user_desc)); if (error) @@ -871,7 +873,7 @@ * * Our mmap with MAP_STACK takes addr as the maximum * downsize limit on BOS, and as len the max size of - * the region. It them maps the top SGROWSIZ bytes, + * the region. It then maps the top SGROWSIZ bytes, * and auto grows the region down, up to the limit * in addr. * @@ -1167,17 +1169,44 @@ microtime(&atv); atv32.tv_sec = atv.tv_sec; atv32.tv_usec = atv.tv_usec; - error = copyout(&atv32, uap->tp, sizeof (atv32)); + error = copyout(&atv32, uap->tp, sizeof(atv32)); } if (error == 0 && uap->tzp != NULL) { rtz.tz_minuteswest = tz_minuteswest; rtz.tz_dsttime = tz_dsttime; - error = copyout(&rtz, uap->tzp, sizeof (rtz)); + error = copyout(&rtz, uap->tzp, sizeof(rtz)); } return (error); } int +linux_settimeofday(struct thread *td, struct linux_settimeofday_args *uap) +{ + l_timeval atv32; + struct timeval atv, *tvp; + struct timezone atz, *tzp; + int error; + + if (uap->tp) { + error = copyin(uap->tp, &atv32, sizeof(atv32)); + if (error) + return (error); + atv.tv_sec = atv32.tv_sec; + atv.tv_usec = atv32.tv_usec; + tvp = &atv; + } else + tvp = NULL; + if (uap->tzp) { + error = copyin(uap->tzp, &atz, sizeof(atz)); + if (error) + return (error); + tzp = &atz; + } else + tzp = NULL; + return (kern_settimeofday(td, tvp, tzp)); +} + +int linux_getrusage(struct thread *td, struct linux_getrusage_args *uap) { struct l_rusage s32; @@ -1242,7 +1271,7 @@ #ifdef DEBUG if (ldebug(set_thread_area)) - printf(ARGS(set_thread_area, "%i, %x, %x, %i, %i, %i, " + printf(ARGS(set_thread_area, "%i, %x, %x, %i, %i, %i, " "%i, %i, %i"), info.entry_number, info.base_addr, info.limit, info.seg_32bit, info.contents, info.read_exec_only, info.limit_in_pages, @@ -1261,9 +1290,10 @@ * The tls_array[] is used only in [gs]et_thread_area() syscalls and * for loading the GDT descriptors. We use just one GDT descriptor * for TLS, so we will load just one. - * XXX: This doesnt work when user-space process tries to use more + * + * XXX: This doesn't work when a user space process tries to use more * than one TLS segment. Comment in the Linux source says wine might - * do that. + * do this. */ /* @@ -1284,8 +1314,9 @@ /* * We have to copy out the GDT entry we use. - * XXX: What if userspace program does not check return value and - * tries to use 6, 7 or 8? + * + * XXX: What if a user space program does not check the return value + * and tries to use 6, 7 or 8? */ error = copyout(&info, args->desc, sizeof(struct l_user_desc)); if (error) ==== //depot/projects/scottl-camlock/src/sys/bsm/audit.h#8 (text+ko) ==== @@ -30,8 +30,8 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/scottl-camlock/src/sys/bsm/audit.h#7 $ - * $FreeBSD: src/sys/bsm/audit.h,v 1.6 2006/09/21 07:27:02 rwatson Exp $ + * P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#36 + * $FreeBSD: src/sys/bsm/audit.h,v 1.8 2007/04/17 12:27:08 rwatson Exp $ */ #ifndef _BSM_AUDIT_H ==== //depot/projects/scottl-camlock/src/sys/bsm/audit_internal.h#6 (text) ==== @@ -34,8 +34,8 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#14 $ - * $FreeBSD: src/sys/bsm/audit_internal.h,v 1.5 2006/09/21 07:27:02 rwatson Exp $ + * P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#16 + * $FreeBSD: src/sys/bsm/audit_internal.h,v 1.7 2007/04/17 12:27:08 rwatson Exp $ */ #ifndef _AUDIT_INTERNAL_H ==== //depot/projects/scottl-camlock/src/sys/bsm/audit_kevents.h#8 (text+ko) ==== @@ -30,8 +30,8 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/scottl-camlock/src/sys/bsm/audit_kevents.h#7 $ - * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.9 2006/09/25 12:22:07 rwatson Exp $ + * P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#32 + * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.11 2007/04/17 12:27:08 rwatson Exp $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -475,6 +475,28 @@ #define AUE_READDIR 43118 /* Linux. */ #define AUE_IOPL 43119 /* Linux. */ #define AUE_VM86 43120 /* Linux. */ +#define AUE_MAC_GET_PROC 43121 /* FreeBSD. */ +#define AUE_MAC_SET_PROC 43122 /* FreeBSD. */ +#define AUE_MAC_GET_FD 43123 /* FreeBSD. */ +#define AUE_MAC_GET_FILE 43124 /* FreeBSD. */ +#define AUE_MAC_SET_FD 43125 /* FreeBSD. */ +#define AUE_MAC_SET_FILE 43126 /* FreeBSD. */ +#define AUE_MAC_SYSCALL 43127 /* FreeBSD. */ +#define AUE_MAC_GET_PID 43128 /* FreeBSD. */ +#define AUE_MAC_GET_LINK 43129 /* FreeBSD. */ +#define AUE_MAC_SET_LINK 43130 /* FreeBSD. */ +#define AUE_MAC_EXECVE 43131 /* FreeBSD. */ +#define AUE_GETPATH_FROMFD 43132 /* FreeBSD. */ +#define AUE_GETPATH_FROMADDR 43133 /* FreeBSD. */ +#define AUE_MQ_OPEN 43134 /* FreeBSD. */ +#define AUE_MQ_SETATTR 43135 /* FreeBSD. */ +#define AUE_MQ_TIMEDRECEIVE 43136 /* FreeBSD. */ +#define AUE_MQ_TIMEDSEND 43137 /* FreeBSD. */ +#define AUE_MQ_NOTIFY 43138 /* FreeBSD. */ +#define AUE_MQ_UNLINK 43139 /* FreeBSD. */ +#define AUE_LISTEN 43140 /* FreeBSD/Darwin/Linux. */ +#define AUE_MLOCKALL 43141 /* FreeBSD. */ +#define AUE_MUNLOCKALL 43142 /* FreeBSD. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the @@ -572,16 +594,13 @@ #define AUE_GETSOCKOPT AUE_NULL #define AUE_GTSOCKOPT AUE_GETSOCKOPT /* XXX: Typo in Darwin. */ #define AUE_ISSETUGID AUE_NULL -#define AUE_LISTEN AUE_NULL #define AUE_LSTATV AUE_NULL #define AUE_MADVISE AUE_NULL #define AUE_MINCORE AUE_NULL #define AUE_MKCOMPLEX AUE_NULL -#define AUE_MLOCKALL AUE_NULL #define AUE_MODWATCH AUE_NULL #define AUE_MSGCL AUE_NULL #define AUE_MSYNC AUE_NULL -#define AUE_MUNLOCKALL AUE_NULL #define AUE_PREAD AUE_NULL #define AUE_PWRITE AUE_NULL #define AUE_PREADV AUE_NULL ==== //depot/projects/scottl-camlock/src/sys/bsm/audit_record.h#7 (text) ==== @@ -30,8 +30,8 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#21 $ - * $FreeBSD: src/sys/bsm/audit_record.h,v 1.6 2006/09/21 07:27:02 rwatson Exp $ + * P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#24 + * $FreeBSD: src/sys/bsm/audit_record.h,v 1.9 2007/04/17 12:27:08 rwatson Exp $ */ #ifndef _BSM_AUDIT_RECORD_H_ @@ -86,6 +86,7 @@ /* XXXRW: Additional X11 tokens not defined? */ #define AUT_CMD 0x51 #define AUT_EXIT 0x52 +#define AUT_ZONENAME 0x60 /* XXXRW: OpenBSM AUT_HOST 0x70? */ #define AUT_ARG64 0x71 #define AUT_RETURN64 0x72 @@ -247,6 +248,8 @@ token_t *au_to_header32_tm(int rec_size, au_event_t e_type, au_emod_t e_mod, struct timeval tm); +token_t *au_to_header64_tm(int rec_size, au_event_t e_type, au_emod_t e_mod, + struct timeval tm); #if !defined(KERNEL) && !defined(_KERNEL) token_t *au_to_header(int rec_size, au_event_t e_type, au_emod_t e_mod); token_t *au_to_header32(int rec_size, au_event_t e_type, au_emod_t e_mod); @@ -329,6 +332,7 @@ token_t *au_to_text(char *text); token_t *au_to_kevent(struct kevent *kev); token_t *au_to_trailer(int rec_size); +token_t *au_to_zonename(char *zonename); __END_DECLS ==== //depot/projects/scottl-camlock/src/sys/cam/cam_sim.c#11 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_sim.c,v 1.10 2007/04/15 08:49:09 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_sim.c,v 1.11 2007/04/19 14:28:43 scottl Exp $"); #include #include @@ -95,6 +95,7 @@ } SLIST_INIT(&sim->ccb_freeq); + TAILQ_INIT(&sim->sim_doneq); return (sim); } ==== //depot/projects/scottl-camlock/src/sys/cam/cam_sim.h#10 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam_sim.h,v 1.7 2007/04/15 08:49:09 scottl Exp $ + * $FreeBSD: src/sys/cam/cam_sim.h,v 1.8 2007/04/19 14:28:43 scottl Exp $ */ #ifndef _CAM_CAM_SIM_H @@ -92,6 +92,8 @@ const char *sim_name; void *softc; struct mtx *mtx; + TAILQ_HEAD(, ccb_hdr) sim_doneq; + TAILQ_ENTRY(cam_sim) links; u_int32_t path_id;/* The Boot device may set this to 0? */ u_int32_t unit_number; u_int32_t bus_id; @@ -100,6 +102,7 @@ u_int32_t flags; #define CAM_SIM_REL_TIMEOUT_PENDING 0x01 #define CAM_SIM_MPSAFE 0x02 +#define CAM_SIM_ON_DONEQ 0x04 struct callout callout; struct cam_devq *devq; /* Device Queue to use for this SIM */ ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#59 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.177 2007/04/16 19:55:36 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.180 2007/04/19 14:45:37 scottl Exp $"); #include #include @@ -665,8 +665,9 @@ /* Queues for our software interrupt handler */ typedef TAILQ_HEAD(cam_isrq, ccb_hdr) cam_isrq_t; -static cam_isrq_t cam_bioq; -static struct mtx cam_bioq_lock; +typedef TAILQ_HEAD(cam_simq, cam_sim) cam_simq_t; +static cam_simq_t cam_simq; +static struct mtx cam_simq_lock; /* Pointers to software interrupt handlers */ static void *cambio_ih; @@ -821,6 +822,7 @@ static void xptaction(struct cam_sim *sim, union ccb *work_ccb); static void xptpoll(struct cam_sim *sim); static void camisr(void *); +static void camisr_runqueue(void *); static dev_match_ret xptbusmatch(struct dev_match_pattern *patterns, u_int num_patterns, struct cam_eb *bus); static dev_match_ret xptdevicematch(struct dev_match_pattern *patterns, @@ -1072,7 +1074,7 @@ case XPT_ENG_INQ: case XPT_SCAN_LUN: - ccb = xpt_alloc_ccb(bus->sim); + ccb = xpt_alloc_ccb(); CAM_SIM_LOCK(bus->sim); @@ -1472,12 +1474,12 @@ cam_status status; TAILQ_INIT(&xsoftc.xpt_busses); - TAILQ_INIT(&cam_bioq); + TAILQ_INIT(&cam_simq); TAILQ_INIT(&xsoftc.ccb_scanq); STAILQ_INIT(&xsoftc.highpowerq); xsoftc.num_highpower = CAM_MAX_HIGHPOWER; - mtx_init(&cam_bioq_lock, "CAM BIOQ lock", NULL, MTX_DEF); + mtx_init(&cam_simq_lock, "CAM SIMQ lock", NULL, MTX_DEF); mtx_init(&xsoftc.xpt_lock, "XPT lock", NULL, MTX_DEF); mtx_init(&xsoftc.xpt_topo_lock, "XPT topology lock", NULL, MTX_DEF); @@ -1551,7 +1553,7 @@ printf("xpt_init: failed to create rescan thread\n"); } /* Install our software interrupt handlers */ - swi_add(NULL, "cambio", camisr, &cam_bioq, SWI_CAMBIO, INTR_MPSAFE, &cambio_ih); + swi_add(NULL, "cambio", camisr, NULL, SWI_CAMBIO, INTR_MPSAFE, &cambio_ih); return (0); } @@ -3639,7 +3641,7 @@ dev->ccbq.dev_openings < 0) && (--timeout > 0)) { DELAY(1000); (*(sim->sim_poll))(sim); - camisr(&cam_bioq); + camisr_runqueue(&sim->sim_doneq); } dev->ccbq.devq_openings++; @@ -3649,7 +3651,7 @@ xpt_action(start_ccb); while(--timeout > 0) { (*(sim->sim_poll))(sim); - camisr(&cam_bioq); + camisr_runqueue(&sim->sim_doneq); if ((start_ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_INPROG) break; @@ -4490,6 +4492,7 @@ /* The SIM may be gone, so use a dummy SIM for any stray operations. */ devq = bus_path.bus->sim->devq; + ccbsim = bus_path.bus->sim; bus_path.bus->sim = &cam_dead_sim; /* Execute any pending operations now. */ @@ -4504,7 +4507,6 @@ devq->active_dev = device; cam_ccbq_remove_ccb(&device->ccbq, work_ccb); cam_ccbq_send_ccb(&device->ccbq, work_ccb); - ccbsim = work_ccb->ccb_h.path->bus->sim; (*(ccbsim->sim_action))(ccbsim, work_ccb); } @@ -4516,8 +4518,8 @@ } /* Make sure all completed CCBs are processed. */ - while (!TAILQ_EMPTY(&cam_bioq)) { - camisr(&cam_bioq); + while (!TAILQ_EMPTY(&ccbsim->sim_doneq)) { + camisr_runqueue(&ccbsim->sim_doneq); /* Repeat the async's for the benefit of any new devices. */ xpt_async(AC_LOST_DEVICE, &bus_path, NULL); @@ -4528,10 +4530,6 @@ xpt_release_bus(bus_path.bus); xpt_release_path(&bus_path); - /* Recheck for more completed CCBs. */ - while (!TAILQ_EMPTY(&cam_bioq)) - camisr(&cam_bioq); - return (CAM_REQ_CMP); } @@ -4949,6 +4947,7 @@ void xpt_done(union ccb *done_ccb) { + struct cam_sim *sim; int s; s = splcam(); @@ -4959,13 +4958,19 @@ * Queue up the request for handling by our SWI handler * any of the "non-immediate" type of ccbs. */ + sim = done_ccb->ccb_h.path->bus->sim; switch (done_ccb->ccb_h.path->periph->type) { case CAM_PERIPH_BIO: - mtx_lock(&cam_bioq_lock); - TAILQ_INSERT_TAIL(&cam_bioq, &done_ccb->ccb_h, + TAILQ_INSERT_TAIL(&sim->sim_doneq, &done_ccb->ccb_h, sim_links.tqe); done_ccb->ccb_h.pinfo.index = CAM_DONEQ_INDEX; - mtx_unlock(&cam_bioq_lock); + if ((sim->flags & CAM_SIM_ON_DONEQ) == 0) { + mtx_lock(&cam_simq_lock); + TAILQ_INSERT_TAIL(&cam_simq, sim, + links); + sim->flags |= CAM_SIM_ON_DONEQ; + mtx_unlock(&cam_simq_lock); + } if ((done_ccb->ccb_h.path->periph->flags & CAM_PERIPH_POLLED) == 0) swi_sched(cambio_ih, 0); @@ -4979,26 +4984,20 @@ } union ccb * -xpt_alloc_ccb(struct cam_sim *sim) +xpt_alloc_ccb() { union ccb *new_ccb; - new_ccb = malloc(sizeof(*new_ccb), M_CAMXPT, M_WAITOK); - if ((sim != NULL) && ((sim->flags & CAM_SIM_MPSAFE) == 0)) { - callout_handle_init(&new_ccb->ccb_h.timeout_ch); - } + new_ccb = malloc(sizeof(*new_ccb), M_CAMXPT, M_ZERO|M_WAITOK); return (new_ccb); } union ccb * -xpt_alloc_ccb_nowait(struct cam_sim *sim) +xpt_alloc_ccb_nowait() { union ccb *new_ccb; - new_ccb = malloc(sizeof(*new_ccb), M_CAMXPT, M_NOWAIT); - if ((sim != NULL) && ((sim->flags & CAM_SIM_MPSAFE) == 0)) { - callout_handle_init(&new_ccb->ccb_h.timeout_ch); - } + new_ccb = malloc(sizeof(*new_ccb), M_CAMXPT, M_ZERO|M_NOWAIT); return (new_ccb); } @@ -5029,11 +5028,13 @@ s = splsoftcam(); sim = device->sim; if ((new_ccb = (union ccb *)SLIST_FIRST(&sim->ccb_freeq)) == NULL) { - new_ccb = xpt_alloc_ccb_nowait(sim); + new_ccb = xpt_alloc_ccb_nowait(); if (new_ccb == NULL) { splx(s); return (NULL); } + if ((sim->flags & CAM_SIM_MPSAFE) == 0) + callout_handle_init(&new_ccb->ccb_h.timeout_ch); SLIST_INSERT_HEAD(&sim->ccb_freeq, &new_ccb->ccb_h, xpt_links.sle); sim->ccb_count++; @@ -5353,7 +5354,12 @@ u_int initiator_id; /* Find out the characteristics of the bus */ - work_ccb = xpt_alloc_ccb_nowait(periph->sim); + work_ccb = xpt_alloc_ccb_nowait(); + if (work_ccb == NULL) { + request_ccb->ccb_h.status = CAM_RESRC_UNAVAIL; + xpt_done(request_ccb); + return; + } xpt_setup_ccb(&work_ccb->ccb_h, request_ccb->ccb_h.path, request_ccb->ccb_h.pinfo.priority); work_ccb->ccb_h.func_code = XPT_PATH_INQ; @@ -5418,7 +5424,14 @@ xpt_done(request_ccb); break; } - work_ccb = xpt_alloc_ccb_nowait(periph->sim); + work_ccb = xpt_alloc_ccb_nowait(); + if (work_ccb == NULL) { + free(scan_info, M_TEMP); + xpt_free_path(path); + request_ccb->ccb_h.status = CAM_RESRC_UNAVAIL; + xpt_done(request_ccb); + break; + } xpt_setup_ccb(&work_ccb->ccb_h, path, request_ccb->ccb_h.pinfo.priority); work_ccb->ccb_h.func_code = XPT_SCAN_LUN; @@ -6970,7 +6983,12 @@ cam_status status; int can_negotiate; - work_ccb = xpt_alloc_ccb_nowait(bus->sim); + work_ccb = xpt_alloc_ccb_nowait(); + if (work_ccb == NULL) { + busses_to_config--; + xpt_finishconfig(xpt_periph, NULL); + return(0); + } if ((status = xpt_create_path(&path, xpt_periph, bus->path_id, CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD)) !=CAM_REQ_CMP){ @@ -7218,31 +7236,36 @@ } static void -camisr(void *V_queue) +camisr(void *dummy) { - cam_isrq_t *oqueue = V_queue; - cam_isrq_t queue; - int s; - struct ccb_hdr *ccb_h; - struct cam_sim *sim; + cam_simq_t queue; + struct cam_sim *sim; - /* - * Transfer the ccb_bioq list to a temporary list so we can operate - * on it without needing to lock/unlock on every loop. The concat - * function with re-init the real list for us. - */ - s = splcam(); - mtx_lock(&cam_bioq_lock); + mtx_lock(&cam_simq_lock); TAILQ_INIT(&queue); - TAILQ_CONCAT(&queue, oqueue, sim_links.tqe); - mtx_unlock(&cam_bioq_lock); + TAILQ_CONCAT(&queue, &cam_simq, links); + mtx_unlock(&cam_simq_lock); + + while ((sim = TAILQ_FIRST(&queue)) != NULL) { + TAILQ_REMOVE(&queue, sim, links); + mtx_lock(sim->mtx); + sim->flags &= ~CAM_SIM_ON_DONEQ; + camisr_runqueue(&sim->sim_doneq); + mtx_unlock(sim->mtx); + } +} + +static void +camisr_runqueue(void *V_queue) +{ + cam_isrq_t *queue = V_queue; + struct ccb_hdr *ccb_h; - while ((ccb_h = TAILQ_FIRST(&queue)) != NULL) { + while ((ccb_h = TAILQ_FIRST(queue)) != NULL) { int runq; - TAILQ_REMOVE(&queue, ccb_h, sim_links.tqe); + TAILQ_REMOVE(queue, ccb_h, sim_links.tqe); ccb_h->pinfo.index = CAM_UNQUEUED_INDEX; - splx(s); CAM_DEBUG(ccb_h->path, CAM_DEBUG_TRACE, ("camisr\n")); @@ -7277,22 +7300,17 @@ mtx_unlock(&xsoftc.xpt_lock); } - sim = ccb_h->path->bus->sim; - mtx_lock(sim->mtx); - if ((ccb_h->func_code & XPT_FC_USER_CCB) == 0) { struct cam_ed *dev; dev = ccb_h->path->device; - s = splcam(); cam_ccbq_ccb_done(&dev->ccbq, (union ccb *)ccb_h); if (!SIM_DEAD(ccb_h->path->bus->sim)) { ccb_h->path->bus->sim->devq->send_active--; ccb_h->path->bus->sim->devq->send_openings++; } - splx(s); if (((dev->flags & CAM_DEV_REL_ON_COMPLETE) != 0 && (ccb_h->status&CAM_STATUS_MASK) != CAM_REQUEUE_REQ) @@ -7333,12 +7351,7 @@ /* Call the peripheral driver's callback */ (*ccb_h->cbfcnp)(ccb_h->path->periph, (union ccb *)ccb_h); - - /* Raise IPL for while test */ - mtx_unlock(sim->mtx); - s = splcam(); } - splx(s); } static void ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt_periph.h#10 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam_xpt_periph.h,v 1.6 2007/04/15 08:49:09 scottl Exp $ + * $FreeBSD: src/sys/cam/cam_xpt_periph.h,v 1.7 2007/04/18 04:58:52 scottl Exp $ */ #ifndef _CAM_CAM_XPT_PERIPH_H @@ -38,8 +38,8 @@ /* Functions accessed by the peripheral drivers */ #ifdef _KERNEL void xpt_polled_action(union ccb *ccb); -union ccb *xpt_alloc_ccb(struct cam_sim *sim); -union ccb *xpt_alloc_ccb_nowait(struct cam_sim *sim); +union ccb *xpt_alloc_ccb(void); +union ccb *xpt_alloc_ccb_nowait(void); void xpt_free_ccb(union ccb *free_ccb); void xpt_release_ccb(union ccb *released_ccb); void xpt_schedule(struct cam_periph *perph, u_int32_t new_priority); ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_da.c#33 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.205 2007/04/16 19:41:14 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.206 2007/04/18 05:14:16 scottl Exp $"); #include @@ -775,10 +775,13 @@ if (periph == NULL) return (ENXIO); softc = (struct da_softc *)periph->softc; + cam_periph_lock(periph); secsize = softc->params.secsize; - if ((softc->flags & DA_FLAG_PACK_INVALID) != 0) + if ((softc->flags & DA_FLAG_PACK_INVALID) != 0) { + cam_periph_unlock(periph); return (ENXIO); + } if (length > 0) { periph->flags |= CAM_PERIPH_POLLED; @@ -810,6 +813,7 @@ periph->flags |= CAM_PERIPH_POLLED; return(EIO); } + cam_periph_unlock(periph); return(0); } @@ -851,6 +855,7 @@ } } periph->flags &= ~CAM_PERIPH_POLLED; + cam_periph_unlock(periph); return (0); } @@ -1977,6 +1982,8 @@ TAILQ_FOREACH(periph, &dadriver.units, unit_links) { union ccb ccb; + + cam_periph_lock(periph); softc = (struct da_softc *)periph->softc; /* @@ -2027,7 +2034,7 @@ /*reduction*/0, /*timeout*/0, /*getcount_only*/0); - + cam_periph_unlock(periph); } } ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_low.c#13 (text+ko) ==== @@ -2,7 +2,7 @@ /* $NetBSD$ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_low.c,v 1.27 2007/04/15 08:49:10 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_low.c,v 1.28 2007/04/18 04:58:52 scottl Exp $"); #define SCSI_LOW_STATICS #define SCSI_LOW_DEBUG @@ -966,7 +966,7 @@ struct scsi_low_softc *slp; { struct cam_path *path; - union ccb *ccb = xpt_alloc_ccb(NULL); + union ccb *ccb = xpt_alloc_ccb(); cam_status status; bzero(ccb, sizeof(union ccb)); ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_pass.c#24 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_pass.c,v 1.46 2007/04/15 08:49:10 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_pass.c,v 1.47 2007/04/18 04:58:52 scottl Exp $"); #include #include @@ -490,7 +490,7 @@ inccb->ccb_h.pinfo.priority); ccb_malloced = 0; } else { - ccb = xpt_alloc_ccb_nowait(periph->sim); + ccb = xpt_alloc_ccb_nowait(); if (ccb != NULL) xpt_setup_ccb(&ccb->ccb_h, periph->path, ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_pt.c#9 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_pt.c,v 1.45 2007/04/15 08:49:10 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_pt.c,v 1.46 2007/04/19 18:14:33 scottl Exp $"); #include #include @@ -303,9 +303,11 @@ SID_TYPE(&cgd->inq_data) | DEVSTAT_TYPE_IF_SCSI, DEVSTAT_PRIORITY_OTHER); + cam_periph_unlock(periph); softc->dev = make_dev(&pt_cdevsw, periph->unit_number, UID_ROOT, GID_OPERATOR, 0600, "%s%d", periph->periph_name, periph->unit_number); + cam_periph_lock(periph); softc->dev->si_drv1 = periph; /* ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_sa.c#14 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sa.c,v 1.108 2007/04/15 08:49:10 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sa.c,v 1.109 2007/04/19 18:14:33 scottl Exp $"); #include #include @@ -1521,6 +1521,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Apr 20 06:07:24 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 5D59D16A406; Fri, 20 Apr 2007 06:07:24 +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 27EDA16A402 for ; Fri, 20 Apr 2007 06:07:24 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 1810B13C4C4 for ; Fri, 20 Apr 2007 06:07:24 +0000 (UTC) (envelope-from kmacy@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 l3K67Nkp011503 for ; Fri, 20 Apr 2007 06:07:23 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3K67LKa011495 for perforce@freebsd.org; Fri, 20 Apr 2007 06:07:21 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 20 Apr 2007 06:07:21 GMT Message-Id: <200704200607.l3K67LKa011495@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 118450 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, 20 Apr 2007 06:07:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=118450 Change 118450 by kmacy@kmacy_vt-x:opentoe_init on 2007/04/20 06:07:14 IFC Affected files ... .. //depot/projects/opentoe/UPDATING#4 integrate .. //depot/projects/opentoe/etc/mtree/BSD.include.dist#2 integrate .. //depot/projects/opentoe/lib/libc/stdio/fputs.3#2 integrate .. //depot/projects/opentoe/libexec/ftpd/ftpcmd.y#2 integrate .. //depot/projects/opentoe/libexec/ftpd/ftpd.8#2 integrate .. //depot/projects/opentoe/libexec/ftpd/ftpd.c#2 integrate .. //depot/projects/opentoe/share/man/man7/hier.7#4 integrate .. //depot/projects/opentoe/sys/bsm/audit.h#2 integrate .. //depot/projects/opentoe/sys/bsm/audit_internal.h#2 integrate .. //depot/projects/opentoe/sys/bsm/audit_kevents.h#2 integrate .. //depot/projects/opentoe/sys/bsm/audit_record.h#2 integrate .. //depot/projects/opentoe/sys/cam/cam_periph.c#3 integrate .. //depot/projects/opentoe/sys/cam/cam_periph.h#3 integrate .. //depot/projects/opentoe/sys/cam/cam_sim.c#3 integrate .. //depot/projects/opentoe/sys/cam/cam_sim.h#3 integrate .. //depot/projects/opentoe/sys/cam/cam_xpt.c#3 integrate .. //depot/projects/opentoe/sys/cam/scsi/scsi_da.c#3 integrate .. //depot/projects/opentoe/sys/cam/scsi/scsi_pt.c#3 integrate .. //depot/projects/opentoe/sys/cam/scsi/scsi_sa.c#3 integrate .. //depot/projects/opentoe/sys/compat/opensolaris/kern/opensolaris_vfs.c#2 integrate .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#2 integrate .. //depot/projects/opentoe/sys/dev/aic7xxx/aic79xx.c#3 integrate .. //depot/projects/opentoe/sys/dev/aic7xxx/aic79xx.h#3 integrate .. //depot/projects/opentoe/sys/dev/aic7xxx/aic7xxx.c#3 integrate .. //depot/projects/opentoe/sys/dev/aic7xxx/aic7xxx.h#3 integrate .. //depot/projects/opentoe/sys/dev/aic7xxx/aic7xxx_inline.h#2 integrate .. //depot/projects/opentoe/sys/dev/ath/if_ath.c#2 integrate .. //depot/projects/opentoe/sys/dev/cxgb/cxgb_sge.c#7 integrate .. //depot/projects/opentoe/sys/dev/cxgb/sys/uipc_mvec.c#2 integrate .. //depot/projects/opentoe/sys/dev/hwpmc/hwpmc_logging.c#2 integrate .. //depot/projects/opentoe/sys/dev/hwpmc/hwpmc_mod.c#2 integrate .. //depot/projects/opentoe/sys/dev/hwpmc/hwpmc_piv.c#2 integrate .. //depot/projects/opentoe/sys/dev/ral/rt2560.c#2 integrate .. //depot/projects/opentoe/sys/dev/sound/pci/envy24.c#2 integrate .. //depot/projects/opentoe/sys/dev/sound/pci/envy24ht.c#2 integrate .. //depot/projects/opentoe/sys/dev/sound/pcm/ac97.c#2 integrate .. //depot/projects/opentoe/sys/dev/sound/pcm/ac97.h#2 integrate .. //depot/projects/opentoe/sys/dev/sound/pcm/ac97_patch.c#2 integrate .. //depot/projects/opentoe/sys/dev/sound/pcm/ac97_patch.h#2 integrate .. //depot/projects/opentoe/sys/dev/usb/if_ural.c#3 integrate .. //depot/projects/opentoe/sys/dev/wi/if_wi.c#2 integrate .. //depot/projects/opentoe/sys/fs/devfs/devfs_vnops.c#4 integrate .. //depot/projects/opentoe/sys/i386/i386/bios.c#2 integrate .. //depot/projects/opentoe/sys/kern/kern_intr.c#2 integrate .. //depot/projects/opentoe/sys/kern/sched_ule.c#3 integrate .. //depot/projects/opentoe/sys/kern/subr_witness.c#5 integrate .. //depot/projects/opentoe/sys/kern/uipc_syscalls.c#4 integrate .. //depot/projects/opentoe/sys/netinet/sctp_indata.c#6 integrate .. //depot/projects/opentoe/sys/netinet/sctp_input.c#6 integrate .. //depot/projects/opentoe/sys/netinet/sctp_lock_bsd.h#2 integrate .. //depot/projects/opentoe/sys/netinet/sctp_output.c#6 integrate .. //depot/projects/opentoe/sys/netinet/sctp_pcb.c#6 integrate .. //depot/projects/opentoe/sys/netinet/sctp_structs.h#5 integrate .. //depot/projects/opentoe/sys/netinet/sctp_uio.h#5 integrate .. //depot/projects/opentoe/sys/netinet/sctp_usrreq.c#6 integrate .. //depot/projects/opentoe/sys/netinet/sctp_var.h#4 integrate .. //depot/projects/opentoe/sys/netinet/sctputil.c#6 integrate .. //depot/projects/opentoe/sys/netinet/sctputil.h#4 integrate .. //depot/projects/opentoe/sys/pci/intpm.c#2 integrate .. //depot/projects/opentoe/sys/powerpc/powerpc/nexus.c#2 integrate .. //depot/projects/opentoe/sys/sys/interrupt.h#2 integrate .. //depot/projects/opentoe/sys/sys/socket.h#2 integrate .. //depot/projects/opentoe/sys/vm/vm_contig.c#2 integrate .. //depot/projects/opentoe/sys/vm/vm_param.h#2 integrate .. //depot/projects/opentoe/tools/regression/sockets/sendfile/Makefile#2 integrate .. //depot/projects/opentoe/tools/regression/sockets/sendfile/sendfile.c#2 integrate .. //depot/projects/opentoe/usr.bin/lastcomm/lastcomm.1#3 integrate .. //depot/projects/opentoe/usr.bin/lastcomm/lastcomm.c#3 integrate .. //depot/projects/opentoe/usr.bin/tar/test/test-basic.sh#4 integrate .. //depot/projects/opentoe/usr.bin/tar/util.c#2 integrate Differences ... ==== //depot/projects/opentoe/UPDATING#4 (text+ko) ==== @@ -21,6 +21,17 @@ developers choose to disable these features on build machines to maximize performance. +20070418: + A new acct(5) format is imminent. If you want to maintain access + to your accounting files, use the new lastcomm(1) -X functionality to + export them into text format, and keep around a copy of the lastcomm + binary. An updated lastcomm(1) program will allow you to import + the text files into the new acct(5) format. The change will also + invalidate the condensed summary files /var/account/savacct and + /var/account/usracct. If your process accounting system relies + on them, you will need to save their contents in a readable format + before the switch. + 20070417: The new trunk(4) driver has been renamed to lagg(4) as it better reflects its purpose. ifconfig will need to be recompiled. @@ -767,4 +778,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.486 2007/04/17 00:41:59 thompsa Exp $ +$FreeBSD: src/UPDATING,v 1.487 2007/04/18 17:34:59 dds Exp $ ==== //depot/projects/opentoe/etc/mtree/BSD.include.dist#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.111 2007/02/27 04:01:57 mjacob Exp $ +# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.112 2007/04/18 10:16:42 trhodes Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -209,8 +209,6 @@ .. pccard .. - posix4 - .. protocols .. readline ==== //depot/projects/opentoe/lib/libc/stdio/fputs.3#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)fputs.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/stdio/fputs.3,v 1.12 2007/01/09 00:28:06 imp Exp $ +.\" $FreeBSD: src/lib/libc/stdio/fputs.3,v 1.13 2007/04/19 09:38:31 phk Exp $ .\" .Dd June 4, 1993 .Dt FPUTS 3 @@ -66,12 +66,9 @@ to the stream .Dv stdout . .Sh RETURN VALUES -The +The functions .Fn fputs -function -returns 0 on success and -.Dv EOF -on error; +and .Fn puts returns a nonnegative integer on success and .Dv EOF ==== //depot/projects/opentoe/libexec/ftpd/ftpcmd.y#2 (text+ko) ==== @@ -47,7 +47,7 @@ #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/libexec/ftpd/ftpcmd.y,v 1.65 2006/06/05 15:50:34 yar Exp $"); +__FBSDID("$FreeBSD: src/libexec/ftpd/ftpcmd.y,v 1.66 2007/04/18 22:43:39 yar Exp $"); #include #include @@ -95,6 +95,7 @@ extern int usedefault; extern char tmpline[]; extern int readonly; +extern int assumeutf8; extern int noepsv; extern int noretr; extern int noguestretr; @@ -135,7 +136,7 @@ ABOR DELE CWD LIST NLST SITE STAT HELP NOOP MKD RMD PWD CDUP STOU SMNT SYST SIZE MDTM - LPRT LPSV EPRT EPSV + LPRT LPSV EPRT EPSV FEAT UMASK IDLE CHMOD MDFIVE @@ -687,6 +688,25 @@ if ($4 != NULL) free($4); } + | FEAT CRLF + { + lreply(211, "Extensions supported:"); +#if 0 + /* XXX these two keywords are non-standard */ + printf(" EPRT\r\n"); + if (!noepsv) + printf(" EPSV\r\n"); +#endif + printf(" MDTM\r\n"); + printf(" REST STREAM\r\n"); + printf(" SIZE\r\n"); + if (assumeutf8) { + /* TVFS requires UTF8, see RFC 3659 */ + printf(" TVFS\r\n"); + printf(" UTF8\r\n"); + } + reply(211, "End."); + } | SYST check_login CRLF { if ($2) { @@ -1112,6 +1132,7 @@ { "NLST", NLST, OSTR, 1, "[ path-name ]" }, { "SITE", SITE, SITECMD, 1, "site-cmd [ arguments ]" }, { "SYST", SYST, ARGS, 1, "(get type of operating system)" }, + { "FEAT", FEAT, ARGS, 1, "(get extended features)" }, { "STAT", STAT, OSTR, 1, "[ path-name ]" }, { "HELP", HELP, OSTR, 1, "[ ]" }, { "NOOP", NOOP, ARGS, 1, "" }, ==== //depot/projects/opentoe/libexec/ftpd/ftpd.8#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ftpd.8 8.2 (Berkeley) 4/19/94 -.\" $FreeBSD: src/libexec/ftpd/ftpd.8,v 1.71 2006/01/29 13:10:38 yar Exp $ +.\" $FreeBSD: src/libexec/ftpd/ftpd.8,v 1.72 2007/04/18 22:43:39 yar Exp $ .\" .Dd January 21, 2006 .Dt FTPD 8 @@ -40,7 +40,7 @@ .Nd Internet File Transfer Protocol server .Sh SYNOPSIS .Nm -.Op Fl 46ADdEhMmOoRrSUvW +.Op Fl 468ADdEhMmOoRrSUvW .Op Fl l Op Fl l .Op Fl a Ar address .Op Fl P Ar port @@ -78,6 +78,21 @@ is specified, accept connections via .Dv AF_INET6 socket. +.It Fl 8 +The server is running in transparent UTF-8 mode. +That is, it just encourages RFC\ 2640 compliant clients to send +paths encoded in UTF-8 in their commands. +In particular, the names of files uploaded by such clients will +have UTF-8 encoding. +The clients will also assume that server replies and existing file +names have UTF-8 encoding, too. +The names of files preloaded to the server should meet this expectation +for the clients to present the correct file names to their users. +Own messages of +.Nm +are always encoded in ASCII, which in fact is a subset of UTF-8. +.Pp +Note that this option does not make the server do any encoding conversion. .It Fl A Allow only anonymous ftp access. .It Fl a @@ -250,6 +265,7 @@ .It DELE Ta "delete a file [RW]" .It EPRT Ta "specify data connection port, multiprotocol" .It EPSV Ta "prepare for server-to-server transfer, multiprotocol" +.It FEAT Ta "give information on extended features of server" .It HELP Ta "give help information" .It LIST Ta "give list files in a directory" Pq Dq Li "ls -lgA" .It LPRT Ta "specify data connection port, multiprotocol" ==== //depot/projects/opentoe/libexec/ftpd/ftpd.c#2 (text+ko) ==== @@ -46,7 +46,7 @@ #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/libexec/ftpd/ftpd.c,v 1.211 2007/02/09 17:18:39 yar Exp $"); +__FBSDID("$FreeBSD: src/libexec/ftpd/ftpd.c,v 1.212 2007/04/18 22:43:39 yar Exp $"); /* * FTP server. @@ -128,6 +128,7 @@ int restricted_data_ports = 1; int paranoid = 1; /* be extra careful about security */ int anon_only = 0; /* Only anonymous ftp allowed */ +int assumeutf8 = 0; /* Assume that server file names are in UTF-8 */ int guest; int dochroot; char *chrootdir; @@ -308,7 +309,7 @@ openlog("ftpd", LOG_PID | LOG_NDELAY, LOG_FTP); while ((ch = getopt(argc, argv, - "46a:AdDEhlmMoOp:P:rRSt:T:u:UvW")) != -1) { + "468a:AdDEhlmMoOp:P:rRSt:T:u:UvW")) != -1) { switch (ch) { case '4': family = (family == AF_INET6) ? AF_UNSPEC : AF_INET; @@ -318,6 +319,10 @@ family = (family == AF_INET) ? AF_UNSPEC : AF_INET6; break; + case '8': + assumeutf8 = 1; + break; + case 'a': bindname = optarg; break; ==== //depot/projects/opentoe/share/man/man7/hier.7#4 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)hier.7 8.1 (Berkeley) 6/5/93 -.\" $FreeBSD: src/share/man/man7/hier.7,v 1.125 2007/04/04 00:14:36 chinsan Exp $ +.\" $FreeBSD: src/share/man/man7/hier.7,v 1.126 2007/04/18 10:16:43 trhodes Exp $ .\" -.Dd April 3, 2007 +.Dd April 18, 2007 .Dt HIER 7 .Os .Sh NAME @@ -349,10 +349,6 @@ OpenSSL (Cryptography/SSL toolkit) headers .It Pa pccard/ PC-CARD controllers -.It Pa posix4/ -POSIX real-time extensions includes; -see -.Xr p1003_1b 9 .It Pa protocols/ C include files for Berkeley service protocols .It Pa readline/ ==== //depot/projects/opentoe/sys/bsm/audit.h#2 (text) ==== @@ -30,8 +30,8 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#34 $ - * $FreeBSD: src/sys/bsm/audit.h,v 1.6 2006/09/21 07:27:02 rwatson Exp $ + * P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#36 + * $FreeBSD: src/sys/bsm/audit.h,v 1.8 2007/04/17 12:27:08 rwatson Exp $ */ #ifndef _BSM_AUDIT_H ==== //depot/projects/opentoe/sys/bsm/audit_internal.h#2 (text) ==== @@ -34,8 +34,8 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#14 $ - * $FreeBSD: src/sys/bsm/audit_internal.h,v 1.5 2006/09/21 07:27:02 rwatson Exp $ + * P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#16 + * $FreeBSD: src/sys/bsm/audit_internal.h,v 1.7 2007/04/17 12:27:08 rwatson Exp $ */ #ifndef _AUDIT_INTERNAL_H ==== //depot/projects/opentoe/sys/bsm/audit_kevents.h#2 (text) ==== @@ -30,8 +30,8 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#29 $ - * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.9 2006/09/25 12:22:07 rwatson Exp $ + * P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#32 + * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.11 2007/04/17 12:27:08 rwatson Exp $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -475,6 +475,28 @@ #define AUE_READDIR 43118 /* Linux. */ #define AUE_IOPL 43119 /* Linux. */ #define AUE_VM86 43120 /* Linux. */ +#define AUE_MAC_GET_PROC 43121 /* FreeBSD. */ +#define AUE_MAC_SET_PROC 43122 /* FreeBSD. */ +#define AUE_MAC_GET_FD 43123 /* FreeBSD. */ +#define AUE_MAC_GET_FILE 43124 /* FreeBSD. */ +#define AUE_MAC_SET_FD 43125 /* FreeBSD. */ +#define AUE_MAC_SET_FILE 43126 /* FreeBSD. */ +#define AUE_MAC_SYSCALL 43127 /* FreeBSD. */ +#define AUE_MAC_GET_PID 43128 /* FreeBSD. */ +#define AUE_MAC_GET_LINK 43129 /* FreeBSD. */ +#define AUE_MAC_SET_LINK 43130 /* FreeBSD. */ +#define AUE_MAC_EXECVE 43131 /* FreeBSD. */ +#define AUE_GETPATH_FROMFD 43132 /* FreeBSD. */ +#define AUE_GETPATH_FROMADDR 43133 /* FreeBSD. */ +#define AUE_MQ_OPEN 43134 /* FreeBSD. */ +#define AUE_MQ_SETATTR 43135 /* FreeBSD. */ +#define AUE_MQ_TIMEDRECEIVE 43136 /* FreeBSD. */ +#define AUE_MQ_TIMEDSEND 43137 /* FreeBSD. */ +#define AUE_MQ_NOTIFY 43138 /* FreeBSD. */ +#define AUE_MQ_UNLINK 43139 /* FreeBSD. */ +#define AUE_LISTEN 43140 /* FreeBSD/Darwin/Linux. */ +#define AUE_MLOCKALL 43141 /* FreeBSD. */ +#define AUE_MUNLOCKALL 43142 /* FreeBSD. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the @@ -572,16 +594,13 @@ #define AUE_GETSOCKOPT AUE_NULL #define AUE_GTSOCKOPT AUE_GETSOCKOPT /* XXX: Typo in Darwin. */ #define AUE_ISSETUGID AUE_NULL -#define AUE_LISTEN AUE_NULL #define AUE_LSTATV AUE_NULL #define AUE_MADVISE AUE_NULL #define AUE_MINCORE AUE_NULL #define AUE_MKCOMPLEX AUE_NULL -#define AUE_MLOCKALL AUE_NULL #define AUE_MODWATCH AUE_NULL #define AUE_MSGCL AUE_NULL #define AUE_MSYNC AUE_NULL -#define AUE_MUNLOCKALL AUE_NULL #define AUE_PREAD AUE_NULL #define AUE_PWRITE AUE_NULL #define AUE_PREADV AUE_NULL ==== //depot/projects/opentoe/sys/bsm/audit_record.h#2 (text) ==== @@ -30,8 +30,8 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#21 $ - * $FreeBSD: src/sys/bsm/audit_record.h,v 1.6 2006/09/21 07:27:02 rwatson Exp $ + * P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#24 + * $FreeBSD: src/sys/bsm/audit_record.h,v 1.9 2007/04/17 12:27:08 rwatson Exp $ */ #ifndef _BSM_AUDIT_RECORD_H_ @@ -86,6 +86,7 @@ /* XXXRW: Additional X11 tokens not defined? */ #define AUT_CMD 0x51 #define AUT_EXIT 0x52 +#define AUT_ZONENAME 0x60 /* XXXRW: OpenBSM AUT_HOST 0x70? */ #define AUT_ARG64 0x71 #define AUT_RETURN64 0x72 @@ -247,6 +248,8 @@ token_t *au_to_header32_tm(int rec_size, au_event_t e_type, au_emod_t e_mod, struct timeval tm); +token_t *au_to_header64_tm(int rec_size, au_event_t e_type, au_emod_t e_mod, + struct timeval tm); #if !defined(KERNEL) && !defined(_KERNEL) token_t *au_to_header(int rec_size, au_event_t e_type, au_emod_t e_mod); token_t *au_to_header32(int rec_size, au_event_t e_type, au_emod_t e_mod); @@ -329,6 +332,7 @@ token_t *au_to_text(char *text); token_t *au_to_kevent(struct kevent *kev); token_t *au_to_trailer(int rec_size); +token_t *au_to_zonename(char *zonename); __END_DECLS ==== //depot/projects/opentoe/sys/cam/cam_periph.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.66 2007/04/16 19:42:23 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.68 2007/04/19 23:34:51 scottl Exp $"); #include #include @@ -131,7 +131,6 @@ lun_id_t lun_id; cam_status status; u_int init_level; - int s; init_level = 0; /* @@ -200,7 +199,6 @@ if (status != CAM_REQ_CMP) goto failure; - s = splsoftcam(); cur_periph = TAILQ_FIRST(&(*p_drv)->units); while (cur_periph != NULL && cur_periph->unit_number < periph->unit_number) @@ -213,8 +211,6 @@ (*p_drv)->generation++; } - splx(s); - init_level++; status = periph_ctor(periph, arg); @@ -228,9 +224,7 @@ /* Initialized successfully */ break; case 3: - s = splsoftcam(); TAILQ_REMOVE(&(*p_drv)->units, periph, unit_links); - splx(s); xpt_remove_periph(periph); /* FALLTHROUGH */ case 2: @@ -258,24 +252,25 @@ { struct periph_driver **p_drv; struct cam_periph *periph; - int s; + xpt_lock_buses(); for (p_drv = periph_drivers; *p_drv != NULL; p_drv++) { if (name != NULL && (strcmp((*p_drv)->driver_name, name) != 0)) continue; - s = splsoftcam(); TAILQ_FOREACH(periph, &(*p_drv)->units, unit_links) { if (xpt_path_comp(periph->path, path) == 0) { - splx(s); + xpt_unlock_buses(); return(periph); } } - splx(s); - if (name != NULL) + if (name != NULL) { + xpt_unlock_buses(); return(NULL); + } } + xpt_unlock_buses(); return(NULL); } @@ -372,11 +367,9 @@ { struct cam_periph *periph; char *periph_name; - int s; int i, val, dunit, r; const char *dname, *strval; - s = splsoftcam(); periph_name = p_drv->driver_name; for (;;newunit++) { @@ -422,7 +415,6 @@ if (r != 0) break; } - splx(s); return (newunit); } @@ -480,8 +472,7 @@ /* * We only call this routine the first time a peripheral is - * invalidated. The oninvalidate() routine is always called at - * splsoftcam(). + * invalidated. */ if (((periph->flags & CAM_PERIPH_INVALID) == 0) && (periph->periph_oninval != NULL)) @@ -550,26 +541,6 @@ } /* - * Wait interruptibly for an exclusive lock. - */ -void -cam_periph_lock(struct cam_periph *periph) -{ - - mtx_lock(periph->sim->mtx); -} - -/* - * Unlock and wake up any waiters. - */ -void -cam_periph_unlock(struct cam_periph *periph) -{ - - mtx_unlock(periph->sim->mtx); -} - -/* * Map user virtual pointers into kernel virtual address space, so we can * access the memory. This won't work on physical pointers, for now it's * up to the caller to check for that. (XXX KDM -- should we do that here @@ -808,9 +779,7 @@ { struct mtx *mtx; struct cam_sim *sim; - int s; - s = splsoftcam(); sim = xpt_path_sim(ccb->ccb_h.path); if (sim->mtx == &Giant) mtx = NULL; @@ -819,8 +788,6 @@ if ((ccb->ccb_h.pinfo.index != CAM_UNQUEUED_INDEX) || ((ccb->ccb_h.status & CAM_STATUS_MASK) == CAM_REQ_INPROG)) msleep(&ccb->ccb_h.cbfcnp, mtx, PRIBIO, "cbwait", 0); - - splx(s); } int @@ -1225,11 +1192,8 @@ { struct timeval delta; struct timeval duration_tv; - int s; - s = splclock(); microtime(&delta); - splx(s); timevalsub(&delta, event_time); duration_tv.tv_sec = duration_ms / 1000; duration_tv.tv_usec = (duration_ms % 1000) * 1000; ==== //depot/projects/opentoe/sys/cam/cam_periph.h#3 (text+ko) ==== @@ -25,13 +25,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam_periph.h,v 1.17 2007/04/15 08:49:09 scottl Exp $ + * $FreeBSD: src/sys/cam/cam_periph.h,v 1.18 2007/04/19 22:46:26 scottl Exp $ */ #ifndef _CAM_CAM_PERIPH_H #define _CAM_CAM_PERIPH_H 1 #include +#include #ifdef _KERNEL @@ -138,8 +139,6 @@ char *name, cam_periph_type type, struct cam_path *, ac_callback_t *, ac_code, void *arg); struct cam_periph *cam_periph_find(struct cam_path *path, char *name); -void cam_periph_lock(struct cam_periph *periph); -void cam_periph_unlock(struct cam_periph *periph); cam_status cam_periph_acquire(struct cam_periph *periph); void cam_periph_release(struct cam_periph *periph); int cam_periph_hold(struct cam_periph *periph, int priority); @@ -177,5 +176,17 @@ int cam_periph_error(union ccb *ccb, cam_flags camflags, u_int32_t sense_flags, union ccb *save_ccb); +static __inline void +cam_periph_lock(struct cam_periph *periph) +{ + mtx_lock(periph->sim->mtx); +} + +static __inline void +cam_periph_unlock(struct cam_periph *periph) +{ + mtx_unlock(periph->sim->mtx); +} + #endif /* _KERNEL */ #endif /* _CAM_CAM_PERIPH_H */ ==== //depot/projects/opentoe/sys/cam/cam_sim.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_sim.c,v 1.10 2007/04/15 08:49:09 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_sim.c,v 1.11 2007/04/19 14:28:43 scottl Exp $"); #include #include @@ -95,6 +95,7 @@ } SLIST_INIT(&sim->ccb_freeq); + TAILQ_INIT(&sim->sim_doneq); return (sim); } ==== //depot/projects/opentoe/sys/cam/cam_sim.h#3 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam_sim.h,v 1.7 2007/04/15 08:49:09 scottl Exp $ + * $FreeBSD: src/sys/cam/cam_sim.h,v 1.8 2007/04/19 14:28:43 scottl Exp $ */ #ifndef _CAM_CAM_SIM_H @@ -92,6 +92,8 @@ const char *sim_name; void *softc; struct mtx *mtx; + TAILQ_HEAD(, ccb_hdr) sim_doneq; + TAILQ_ENTRY(cam_sim) links; u_int32_t path_id;/* The Boot device may set this to 0? */ u_int32_t unit_number; u_int32_t bus_id; @@ -100,6 +102,7 @@ u_int32_t flags; #define CAM_SIM_REL_TIMEOUT_PENDING 0x01 #define CAM_SIM_MPSAFE 0x02 +#define CAM_SIM_ON_DONEQ 0x04 struct callout callout; struct cam_devq *devq; /* Device Queue to use for this SIM */ ==== //depot/projects/opentoe/sys/cam/cam_xpt.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.178 2007/04/18 04:58:52 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.182 2007/04/19 23:34:51 scottl Exp $"); #include #include @@ -665,8 +665,9 @@ /* Queues for our software interrupt handler */ typedef TAILQ_HEAD(cam_isrq, ccb_hdr) cam_isrq_t; -static cam_isrq_t cam_bioq; -static struct mtx cam_bioq_lock; +typedef TAILQ_HEAD(cam_simq, cam_sim) cam_simq_t; +static cam_simq_t cam_simq; +static struct mtx cam_simq_lock; /* Pointers to software interrupt handlers */ static void *cambio_ih; @@ -821,6 +822,7 @@ static void xptaction(struct cam_sim *sim, union ccb *work_ccb); static void xptpoll(struct cam_sim *sim); static void camisr(void *); +static void camisr_runqueue(void *); static dev_match_ret xptbusmatch(struct dev_match_pattern *patterns, u_int num_patterns, struct cam_eb *bus); static dev_match_ret xptdevicematch(struct dev_match_pattern *patterns, @@ -1208,7 +1210,7 @@ * we never return a status of CAM_GDEVLIST_LIST_CHANGED. It is * (or rather should be) impossible for the device peripheral driver * list to change since we look at the whole thing in one pass, and - * we do it with splcam protection. + * we do it with lock protection. * */ case CAMGETPASSTHRU: { @@ -1220,13 +1222,12 @@ u_int cur_generation; int base_periph_found; int splbreaknum; - int s; ccb = (union ccb *)addr; unit = ccb->cgdl.unit_number; name = ccb->cgdl.periph_name; /* - * Every 100 devices, we want to drop our spl protection to + * Every 100 devices, we want to drop our lock protection to * give the software interrupt handler a chance to run. * Most systems won't run into this check, but this should * avoid starvation in the software interrupt handler in @@ -1248,7 +1249,7 @@ } /* Keep the list from changing while we traverse it */ - s = splcam(); + mtx_lock(&xsoftc.xpt_topo_lock); ptstartover: cur_generation = xsoftc.xpt_generation; @@ -1258,7 +1259,7 @@ break; if (*p_drv == NULL) { - splx(s); + mtx_unlock(&xsoftc.xpt_topo_lock); ccb->ccb_h.status = CAM_REQ_CMP_ERR; ccb->cgdl.status = CAM_GDEVLIST_ERROR; *ccb->cgdl.periph_name = '\0'; @@ -1280,8 +1281,8 @@ if (periph->unit_number == unit) { break; } else if (--splbreaknum == 0) { - splx(s); - s = splcam(); + mtx_unlock(&xsoftc.xpt_topo_lock); + mtx_lock(&xsoftc.xpt_topo_lock); splbreaknum = 100; if (cur_generation != xsoftc.xpt_generation) goto ptstartover; @@ -1370,7 +1371,7 @@ "your kernel config file\n"); } } - splx(s); + mtx_unlock(&xsoftc.xpt_topo_lock); break; } default: @@ -1426,7 +1427,7 @@ TAILQ_REMOVE(&queue, &ccb->ccb_h, sim_links.tqe); sim = ccb->ccb_h.path->bus->sim; - mtx_lock(sim->mtx); + CAM_SIM_LOCK(sim); ccb->ccb_h.func_code = XPT_SCAN_BUS; ccb->ccb_h.cbfcnp = xptdone; @@ -1434,7 +1435,7 @@ cam_periph_runccb(ccb, NULL, 0, 0, NULL); xpt_free_path(ccb->ccb_h.path); xpt_free_ccb(ccb); - mtx_unlock(sim->mtx); + CAM_SIM_UNLOCK(sim); } } } @@ -1472,12 +1473,12 @@ cam_status status; TAILQ_INIT(&xsoftc.xpt_busses); - TAILQ_INIT(&cam_bioq); + TAILQ_INIT(&cam_simq); TAILQ_INIT(&xsoftc.ccb_scanq); STAILQ_INIT(&xsoftc.highpowerq); xsoftc.num_highpower = CAM_MAX_HIGHPOWER; - mtx_init(&cam_bioq_lock, "CAM BIOQ lock", NULL, MTX_DEF); + mtx_init(&cam_simq_lock, "CAM SIMQ lock", NULL, MTX_DEF); mtx_init(&xsoftc.xpt_lock, "XPT lock", NULL, MTX_DEF); mtx_init(&xsoftc.xpt_topo_lock, "XPT topology lock", NULL, MTX_DEF); @@ -1551,7 +1552,7 @@ printf("xpt_init: failed to create rescan thread\n"); } /* Install our software interrupt handlers */ - swi_add(NULL, "cambio", camisr, &cam_bioq, SWI_CAMBIO, INTR_MPSAFE, &cambio_ih); + swi_add(NULL, "cambio", camisr, NULL, SWI_CAMBIO, INTR_MPSAFE, &cambio_ih); return (0); } @@ -1590,25 +1591,22 @@ status = CAM_REQ_CMP; if (device != NULL) { - int s; - /* * Make room for this peripheral * so it will fit in the queue * when it's scheduled to run */ - s = splsoftcam(); status = camq_resize(&device->drvq, device->drvq.array_size + 1); device->generation++; SLIST_INSERT_HEAD(periph_head, periph, periph_links); - - splx(s); } - atomic_add_int(&xsoftc.xpt_generation, 1); + mtx_lock(&xsoftc.xpt_topo_lock); + xsoftc.xpt_generation++; + mtx_unlock(&xsoftc.xpt_topo_lock); return (status); } @@ -1623,24 +1621,21 @@ device = periph->path->device; if (device != NULL) { - int s; struct periph_list *periph_head; periph_head = &device->periphs; /* Release the slot for this peripheral */ - s = splsoftcam(); camq_resize(&device->drvq, device->drvq.array_size - 1); device->generation++; SLIST_REMOVE(periph_head, periph, cam_periph, periph_links); - - splx(s); } - atomic_add_int(&xsoftc.xpt_generation, 1); - + mtx_lock(&xsoftc.xpt_topo_lock); + xsoftc.xpt_generation++; + mtx_unlock(&xsoftc.xpt_topo_lock); } @@ -1653,7 +1648,6 @@ u_int speed; u_int freq; u_int mb; - int s; mtx_assert(periph->sim->mtx, MA_OWNED); @@ -1662,7 +1656,6 @@ * To ensure that this is printed in one piece, * mask out CAM interrupts. */ - s = splsoftcam(); printf("%s%d at %s%d bus %d target %d lun %d\n", periph->periph_name, periph->unit_number, path->bus->sim->sim_name, @@ -1778,7 +1771,6 @@ if (announce_string != NULL) printf("%s%d: %s\n", periph->periph_name, periph->unit_number, announce_string); - splx(s); } static dev_match_ret @@ -2659,9 +2651,9 @@ next_bus = TAILQ_NEXT(bus, links); mtx_unlock(&xsoftc.xpt_topo_lock); - mtx_lock(bus->sim->mtx); + CAM_SIM_LOCK(bus->sim); retval = tr_func(bus, arg); - mtx_unlock(bus->sim->mtx); + CAM_SIM_UNLOCK(bus->sim); if (retval == 0) return(retval); mtx_lock(&xsoftc.xpt_topo_lock); @@ -2982,13 +2974,11 @@ void xpt_action(union ccb *start_ccb) { - int iopl; CAM_DEBUG(start_ccb->ccb_h.path, CAM_DEBUG_TRACE, ("xpt_action\n")); start_ccb->ccb_h.status = CAM_REQ_INPROG; - iopl = splsoftcam(); switch (start_ccb->ccb_h.func_code) { case XPT_SCSI_IO: { @@ -3042,18 +3032,15 @@ { struct cam_path *path; struct cam_sim *sim; - int s; int runq; path = start_ccb->ccb_h.path; - s = splsoftcam(); sim = path->bus->sim; if (SIM_DEAD(sim)) { /* The SIM has gone; just execute the CCB directly. */ cam_ccbq_send_ccb(&path->device->ccbq, start_ccb); (*(sim->sim_action))(sim, start_ccb); - splx(s); break; } @@ -3062,7 +3049,6 @@ runq = xpt_schedule_dev_sendq(path->bus, path->device); else runq = 0; - splx(s); if (runq != 0) xpt_run_dev_sendq(path->bus); break; @@ -3109,7 +3095,6 @@ case XPT_ABORT: { union ccb* abort_ccb; - int s; abort_ccb = start_ccb->cab.abort_ccb; if (XPT_FC_IS_DEV_QUEUED(abort_ccb)) { @@ -3122,9 +3107,7 @@ abort_ccb->ccb_h.status = CAM_REQ_ABORTED|CAM_DEV_QFRZN; xpt_freeze_devq(abort_ccb->ccb_h.path, 1); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Apr 20 06:14:36 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 7C52716A404; Fri, 20 Apr 2007 06:14:36 +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 087AA16A400 for ; Fri, 20 Apr 2007 06:14:36 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E24B913C483 for ; Fri, 20 Apr 2007 06:14:35 +0000 (UTC) (envelope-from kmacy@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 l3K6EZwD013045 for ; Fri, 20 Apr 2007 06:14:35 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3K6EZbV013042 for perforce@freebsd.org; Fri, 20 Apr 2007 06:14:35 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 20 Apr 2007 06:14:35 GMT Message-Id: <200704200614.l3K6EZbV013042@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 118451 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, 20 Apr 2007 06:14:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=118451 Change 118451 by kmacy@kmacy_vt-x:opentoe_init on 2007/04/20 06:13:57 remove cruft from default config Affected files ... .. //depot/projects/opentoe/sys/i386/conf/GENERIC#3 edit Differences ... ==== //depot/projects/opentoe/sys/i386/conf/GENERIC#3 (text+ko) ==== @@ -90,32 +90,6 @@ device atapist # ATAPI tape drives options ATA_STATIC_ID # Static device numbering -# SCSI Controllers -device ahb # EISA AHA1742 family -device ahc # AHA2940 and onboard AIC7xxx devices -options AHC_REG_PRETTY_PRINT # Print register bitfields in debug - # output. Adds ~128k to driver. -device ahd # AHA39320/29320 and onboard AIC79xx devices -options AHD_REG_PRETTY_PRINT # Print register bitfields in debug - # output. Adds ~215k to driver. -device amd # AMD 53C974 (Tekram DC-390(T)) -device isp # Qlogic family -#device ispfw # Firmware for QLogic HBAs- normally a module -device mpt # LSI-Logic MPT-Fusion -#device ncr # NCR/Symbios Logic -device sym # NCR/Symbios Logic (newer chipsets + those of `ncr') -device trm # Tekram DC395U/UW/F DC315U adapters - -device adv # Advansys SCSI adapters -device adw # Advansys wide SCSI adapters -device aha # Adaptec 154x SCSI adapters -device aic # Adaptec 15[012]x SCSI adapters, AIC-6[23]60. -device bt # Buslogic/Mylex MultiMaster SCSI adapters - -device ncv # NCR 53C500 -device nsp # Workbit Ninja SCSI-3 -device stg # TMC 18C30/18C50 - # SCSI peripherals device scbus # SCSI bus (required for SCSI) device ch # SCSI media changers @@ -125,27 +99,6 @@ device pass # Passthrough device (direct SCSI access) device ses # SCSI Environmental Services (and SAF-TE) -# RAID controllers interfaced to the SCSI subsystem -device amr # AMI MegaRAID -device arcmsr # Areca SATA II RAID -device asr # DPT SmartRAID V, VI and Adaptec SCSI RAID -device ciss # Compaq Smart RAID 5* -device dpt # DPT Smartcache III, IV - See NOTES for options -device hptmv # Highpoint RocketRAID 182x -device rr232x # Highpoint RocketRAID 232x -device iir # Intel Integrated RAID -device ips # IBM (Adaptec) ServeRAID -device mly # Mylex AcceleRAID/eXtremeRAID -device twa # 3ware 9000 series PATA/SATA RAID - -# RAID controllers -device aac # Adaptec FSA RAID -device aacp # SCSI passthrough for aac (requires CAM) -device ida # Compaq Smart RAID -device mfi # LSI MegaRAID SAS -device mlx # Mylex DAC960 family -device pst # Promise Supertrak SX6000 -device twe # 3ware ATA RAID # atkbdc0 controls both the keyboard and the PS/2 mouse device atkbdc # AT keyboard controller @@ -192,12 +145,7 @@ #device puc # PCI Ethernet NICs. -device de # DEC/Intel DC21x4x (``Tulip'') device em # Intel PRO/1000 adapter Gigabit Ethernet Card -device ixgb # Intel PRO/10GbE Ethernet Card -device le # AMD Am7900 LANCE and Am79C9xx PCnet -device txp # 3Com 3cR990 (``Typhoon'') -device vx # 3Com 3c590, 3c595 (``Vortex'') # PCI Ethernet NICs that use the common MII bus controller code. # NOTE: Be sure to keep the 'device miibus' line in order to use these NICs! @@ -205,38 +153,6 @@ device bce # Broadcom BCM5706/BCM5708 Gigabit Ethernet device bfe # Broadcom BCM440x 10/100 Ethernet device bge # Broadcom BCM570xx Gigabit Ethernet -device dc # DEC/Intel 21143 and various workalikes -device fxp # Intel EtherExpress PRO/100B (82557, 82558) -device lge # Level 1 LXT1001 gigabit Ethernet -device msk # Marvell/SysKonnect Yukon II Gigabit Ethernet -device nge # NatSemi DP83820 gigabit Ethernet -device nve # nVidia nForce MCP on-board Ethernet Networking -device pcn # AMD Am79C97x PCI 10/100 (precedence over 'le') -device re # RealTek 8139C+/8169/8169S/8110S -device rl # RealTek 8129/8139 -device sf # Adaptec AIC-6915 (``Starfire'') -device sis # Silicon Integrated Systems SiS 900/SiS 7016 -device sk # SysKonnect SK-984x & SK-982x gigabit Ethernet -device ste # Sundance ST201 (D-Link DFE-550TX) -device stge # Sundance/Tamarack TC9021 gigabit Ethernet -device ti # Alteon Networks Tigon I/II gigabit Ethernet -device tl # Texas Instruments ThunderLAN -device tx # SMC EtherPower II (83c170 ``EPIC'') -device vge # VIA VT612x gigabit Ethernet -device vr # VIA Rhine, Rhine II -device wb # Winbond W89C840F -device xl # 3Com 3c90x (``Boomerang'', ``Cyclone'') - -# ISA Ethernet NICs. pccard NICs included. -device cs # Crystal Semiconductor CS89x0 NIC -# 'device ed' requires 'device miibus' -device ed # NE[12]000, SMC Ultra, 3c503, DS8390 cards -device ex # Intel EtherExpress Pro/10 and Pro/10+ -device ep # Etherlink III based cards -device fe # Fujitsu MB8696x based cards -device ie # EtherExpress 8/16, 3C507, StarLAN 10 etc. -device sn # SMC's 9000 series of Ethernet chips -device xe # Xircom pccard Ethernet # Wireless NIC cards device wlan # 802.11 support From owner-p4-projects@FreeBSD.ORG Fri Apr 20 11:39:01 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 8E8AD16A406; Fri, 20 Apr 2007 11:39:01 +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 34A8516A400 for ; Fri, 20 Apr 2007 11:39:01 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 23C4413C468 for ; Fri, 20 Apr 2007 11:39:01 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3KBd1sj081012 for ; Fri, 20 Apr 2007 11:39:01 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3KBd0M5081005 for perforce@freebsd.org; Fri, 20 Apr 2007 11:39:00 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 20 Apr 2007 11:39:00 GMT Message-Id: <200704201139.l3KBd0M5081005@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 118464 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, 20 Apr 2007 11:39:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=118464 Change 118464 by rwatson@rwatson_zoo on 2007/04/20 11:38:00 Move audit-related MAC check definitions from old mac_policy (now removed) to new mac_policy.h. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_policy.h#3 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/mac/mac_policy.h#3 (text+ko) ==== @@ -607,6 +607,21 @@ typedef int (*mpo_priv_check_t)(struct ucred *cred, int priv); typedef int (*mpo_priv_grant_t)(struct ucred *cred, int priv); +/* + * XXXRW: Audit checks should be above, but list them here to make a more + * sensible diff for now. + */ +typedef int (*mpo_check_system_audit_t)(struct ucred *cred, void *record, + int length); +typedef int (*mpo_check_system_auditon_t)(struct ucred *cred, int cmd); +typedef int (*mpo_check_system_auditctl_t)(struct ucred *cred, + struct vnode *vp, struct label *vplabel); +typedef int (*mpo_check_proc_getauid_t)(struct ucred *cred); +typedef int (*mpo_check_proc_setauid_t)(struct ucred *cred, uid_t auid); +typedef int (*mpo_check_proc_getaudit_t)(struct ucred *cred); +typedef int (*mpo_check_proc_setaudit_t)(struct ucred *cred, + struct auditinfo *ai); + struct mac_policy_ops { /* * Policy module operations. @@ -902,6 +917,18 @@ mpo_create_mbuf_from_syncache_t mpo_create_mbuf_from_syncache; mpo_priv_check_t mpo_priv_check; mpo_priv_grant_t mpo_priv_grant; + + /* + * XXXRW: Audit checks should be above, but list them here to make a + * more sensible diff for now. + */ + mpo_check_system_audit_t mpo_check_system_audit; + mpo_check_system_auditon_t mpo_check_system_auditon; + mpo_check_system_auditctl_t mpo_check_system_auditctl; + mpo_check_proc_getauid_t mpo_check_proc_getauid; + mpo_check_proc_setauid_t mpo_check_proc_setauid; + mpo_check_proc_getaudit_t mpo_check_proc_getaudit; + mpo_check_proc_setaudit_t mpo_check_proc_setaudit; }; /* From owner-p4-projects@FreeBSD.ORG Fri Apr 20 11:39:02 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 B1CA616A4D2; Fri, 20 Apr 2007 11:39:01 +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 8807A16A403 for ; Fri, 20 Apr 2007 11:39:01 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 7799813C46C for ; Fri, 20 Apr 2007 11:39:01 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3KBd1Gx081019 for ; Fri, 20 Apr 2007 11:39:01 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3KBd1Il081015 for perforce@freebsd.org; Fri, 20 Apr 2007 11:39:01 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 20 Apr 2007 11:39:01 GMT Message-Id: <200704201139.l3KBd1Il081015@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 118465 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, 20 Apr 2007 11:39:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=118465 Change 118465 by rwatson@rwatson_zoo on 2007/04/20 11:38:15 Clean up and update copyrights; update includes for new world order. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_audit.c#6 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/mac/mac_audit.c#6 (text+ko) ==== @@ -1,7 +1,7 @@ /*- - * Copyright (c) 1999, 2000, 2001, 2002 Robert N. M. Watson + * Copyright (c) 1999-2002, 2007 Robert N. M. Watson * Copyright (c) 2001 Ilmar S. Habibulin - * Copyright (c) 2001, 2002, 2003, 2004 Networks Associates Technology, Inc. + * Copyright (c) 2001-2004 Networks Associates Technology, Inc. * * This software was developed by Robert Watson and Ilmar Habibulin for the * TrustedBSD Project. @@ -37,13 +37,13 @@ #include #include -#include -#include #include #include +#include #include +#include int mac_check_system_audit(struct ucred *cred, void *record, int length) From owner-p4-projects@FreeBSD.ORG Fri Apr 20 12:17:52 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 48CDC16A407; Fri, 20 Apr 2007 12:17:52 +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 B0BD416A403 for ; Fri, 20 Apr 2007 12:17:51 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 87EDE13C45E for ; Fri, 20 Apr 2007 12:17:51 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3KCHpVA088427 for ; Fri, 20 Apr 2007 12:17:51 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3KCHpBJ088424 for perforce@freebsd.org; Fri, 20 Apr 2007 12:17:51 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 20 Apr 2007 12:17:51 GMT Message-Id: <200704201217.l3KCHpBJ088424@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 118466 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, 20 Apr 2007 12:17:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=118466 Change 118466 by rwatson@rwatson_zoo on 2007/04/20 12:17:08 Forward declare struct auditinfo in mac_policy.h. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_policy.h#4 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/mac/mac_policy.h#4 (text+ko) ==== @@ -62,6 +62,7 @@ #include /* XXX acl_type_t */ struct acl; +struct auditinfo; struct bpf_d; struct cdev; struct componentname; From owner-p4-projects@FreeBSD.ORG Fri Apr 20 13:05:52 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 431C916A403; Fri, 20 Apr 2007 13:05:52 +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 E95B716A401 for ; Fri, 20 Apr 2007 13:05:51 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id D792B13C46E for ; Fri, 20 Apr 2007 13:05:51 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3KD5p59006379 for ; Fri, 20 Apr 2007 13:05:51 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3KD5pHW006376 for perforce@freebsd.org; Fri, 20 Apr 2007 13:05:51 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 20 Apr 2007 13:05:51 GMT Message-Id: <200704201305.l3KD5pHW006376@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 118467 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, 20 Apr 2007 13:05:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=118467 Change 118467 by rwatson@rwatson_zoo on 2007/04/20 13:05:50 More include file updating for MAC control of audit. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_syscalls.c#34 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_syscalls.c#34 (text+ko) ==== @@ -39,7 +39,6 @@ #include "opt_mac.h" #include -#include #include #include #include @@ -52,8 +51,10 @@ #include #include + #include #include +#include SYSCTL_NODE(_security, OID_AUTO, audit, CTLFLAG_RW, 0, "TrustedBSD audit controls"); From owner-p4-projects@FreeBSD.ORG Fri Apr 20 14:27:40 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 E443616A403; Fri, 20 Apr 2007 14:27:39 +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 B968C16A401 for ; Fri, 20 Apr 2007 14:27:39 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id A820113C46E for ; Fri, 20 Apr 2007 14:27:39 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3KERdxB020444 for ; Fri, 20 Apr 2007 14:27:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3KERdtP020441 for perforce@freebsd.org; Fri, 20 Apr 2007 14:27:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 20 Apr 2007 14:27:39 GMT Message-Id: <200704201427.l3KERdtP020441@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 118475 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, 20 Apr 2007 14:27:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=118475 Change 118475 by rwatson@rwatson_zoo on 2007/04/20 14:26:55 Don't add MAC checks for audit calls where there is no further information available than via the existing privilege checks (which can also be instrumented with MAC). Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_syscalls.c#35 edit .. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_audit.c#7 edit .. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_framework.h#5 edit .. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_policy.h#5 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_syscalls.c#35 (text+ko) ==== @@ -444,12 +444,6 @@ int error; au_id_t id; -#ifdef MAC - error = mac_check_proc_getauid(td->td_ucred); - if (error) - return (error); -#endif - if (jailed(td->td_ucred)) return (ENOSYS); error = priv_check(td, PRIV_AUDIT_GETAUDIT); @@ -518,12 +512,6 @@ struct auditinfo ai; int error; -#ifdef MAC - error = mac_check_proc_getaudit(td->td_ucred); - if (error) - return (error); -#endif - if (jailed(td->td_ucred)) return (ENOSYS); error = priv_check(td, PRIV_AUDIT_GETAUDIT); @@ -594,12 +582,6 @@ struct auditinfo_addr aia; int error; -#ifdef MAC - error = mac_check_proc_getaudit(td->td_ucred); - if (error) - return (error); -#endif - if (jailed(td->td_ucred)) return (ENOSYS); error = priv_check(td, PRIV_AUDIT_GETAUDIT); ==== //depot/projects/trustedbsd/audit3/sys/security/mac/mac_audit.c#7 (text+ko) ==== @@ -81,16 +81,6 @@ } int -mac_check_proc_getauid(struct ucred *cred) -{ - int error; - - MAC_CHECK(check_proc_getauid, cred); - - return (error); -} - -int mac_check_proc_setauid(struct ucred *cred, uid_t auid) { int error; @@ -101,16 +91,6 @@ } int -mac_check_proc_getaudit(struct ucred *cred) -{ - int error; - - MAC_CHECK(check_proc_getaudit, cred); - - return (error); -} - -int mac_check_proc_setaudit(struct ucred *cred, struct auditinfo *ai) { int error; ==== //depot/projects/trustedbsd/audit3/sys/security/mac/mac_framework.h#5 (text+ko) ==== @@ -423,9 +423,7 @@ int mac_check_system_audit(struct ucred *cred, void *record, int length); int mac_check_system_auditon(struct ucred *cred, int cmd); int mac_check_system_auditctl(struct ucred *cred, struct vnode *vp); -int mac_check_proc_getauid(struct ucred *cred); int mac_check_proc_setauid(struct ucred *cred, uid_t auid); -int mac_check_proc_getaudit(struct ucred *cred); int mac_check_proc_setaudit(struct ucred *cred, struct auditinfo *ai); /* ==== //depot/projects/trustedbsd/audit3/sys/security/mac/mac_policy.h#5 (text+ko) ==== @@ -617,9 +617,7 @@ typedef int (*mpo_check_system_auditon_t)(struct ucred *cred, int cmd); typedef int (*mpo_check_system_auditctl_t)(struct ucred *cred, struct vnode *vp, struct label *vplabel); -typedef int (*mpo_check_proc_getauid_t)(struct ucred *cred); typedef int (*mpo_check_proc_setauid_t)(struct ucred *cred, uid_t auid); -typedef int (*mpo_check_proc_getaudit_t)(struct ucred *cred); typedef int (*mpo_check_proc_setaudit_t)(struct ucred *cred, struct auditinfo *ai); @@ -926,9 +924,7 @@ mpo_check_system_audit_t mpo_check_system_audit; mpo_check_system_auditon_t mpo_check_system_auditon; mpo_check_system_auditctl_t mpo_check_system_auditctl; - mpo_check_proc_getauid_t mpo_check_proc_getauid; mpo_check_proc_setauid_t mpo_check_proc_setauid; - mpo_check_proc_getaudit_t mpo_check_proc_getaudit; mpo_check_proc_setaudit_t mpo_check_proc_setaudit; }; From owner-p4-projects@FreeBSD.ORG Fri Apr 20 14:29:43 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 37ECA16A407; Fri, 20 Apr 2007 14:29:43 +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 D195816A404 for ; Fri, 20 Apr 2007 14:29:42 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id BFC9F13C459 for ; Fri, 20 Apr 2007 14:29:42 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3KETgDX020620 for ; Fri, 20 Apr 2007 14:29:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3KETgYM020617 for perforce@freebsd.org; Fri, 20 Apr 2007 14:29:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 20 Apr 2007 14:29:42 GMT Message-Id: <200704201429.l3KETgYM020617@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 118476 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, 20 Apr 2007 14:29:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=118476 Change 118476 by rwatson@rwatson_zoo on 2007/04/20 14:28:50 Remove currently unused MAC/audit code from mac_audit.c. It can be re-added as required. Update copyrights. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_audit.c#8 edit .. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_framework.h#6 edit .. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_policy.h#6 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/mac/mac_audit.c#8 (text+ko) ==== @@ -99,125 +99,3 @@ return (error); } - -#if 0 -/* - * This is the framework entry point for MAC policies to use to add arbitrary - * data to the current audit record. (Currently not supported, as no - * existing audit viewers display this format) - */ -int -mac_audit_data(int len, u_char *data, struct mac_policy_conf *caller) -{ - char *sanitized; - - if ((len <= 0) || (len > MAC_AUDIT_DATA_LIMIT)) - return (EINVAL); - - sanitized = kalloc(len); - if (sanitized == NULL) - return (ENOMEM); - - bcopy(data, sanitized, len); - return (audit_mac_data(MAC_AUDIT_DATA_TYPE, len, sanitized)); -} - -/* - * This is the entry point a MAC policy will call to add NULL-terminated - * ASCII text to the current audit record. - */ -int -mac_audit_text(char *text, struct mac_policy_conf *caller) -{ - char *sanitized; - int i, allocd, plen, len; - - len = strlen(text); - plen = 2 + strlen(caller->mpc_name); - if (plen + len >= MAC_AUDIT_DATA_LIMIT) - return (EINVAL); - - /* - * Make sure the text is only composed of only ASCII printable - * characters. - */ - for (i=0; i < len; i++) - if (text[i] < (char) 32 || text[i] > (char) 126) - return (EINVAL); - - allocd = len + plen + 1; - sanitized = kalloc(allocd); - if (sanitized == NULL) - return (ENOMEM); - - strcpy(sanitized, caller->mpc_name); - strcat(sanitized, ": "); - strcat(sanitized, text); - - return (audit_mac_data(MAC_AUDIT_TEXT_TYPE, allocd, sanitized)); -} - -int -mac_audit_preselect(struct ucred *cred, unsigned short syscode, void *args) -{ - struct mac_policy_conf *mpc; - int ret, error, entrycount; - - ret = MAC_AUDIT_DEFAULT; - LIST_FOREACH(mpc, &mac_static_policy_list, mpc_list) { - if (mpc->mpc_ops->mpo_audit_preselect != NULL) { - error = mpc->mpc_ops->mpo_audit_preselect(cred, - syscode, args); - ret = (ret > error ? ret : error); - } - } - if ((entrycount = mac_policy_list_conditional_busy()) != 0) { - LIST_FOREACH(mpc, &mac_policy_list, mpc_list) { - if (mpc->mpc_ops->mpo_audit_preselect != NULL) { - error = mpc->mpc_ops->mpo_audit_preselect( - cred, syscode, args); - ret = (ret > error ? ret : error); - } - } - mac_policy_list_unbusy(); - } - - return (ret); -} - -int -mac_audit_postselect(struct ucred *cred, unsigned short syscode, - void *args, int error, int retval, int mac_forced) -{ - struct mac_policy_conf *mpc; - int ret, mac_error, entrycount; - - /* - * If the audit was forced by a MAC policy by mac_audit_preselect(), - * echo that. - */ - if (mac_forced) - return (MAC_AUDIT_YES); - - ret = MAC_AUDIT_DEFAULT; - LIST_FOREACH(mpc, &mac_static_policy_list, mpc_list) { - if (mpc->mpc_ops->mpo_audit_postselect != NULL) { - mac_error = mpc->mpc_ops->mpo_audit_postselect(cred, - syscode, args, error, retval); - ret = (ret > mac_error ? ret : mac_error); - } - } - if ((entrycount = mac_policy_list_conditional_busy()) != 0) { - LIST_FOREACH(mpc, &mac_policy_list, mpc_list) { - if (mpc->mpc_ops->mpo_audit_postselect != NULL) { - mac_error = mpc->mpc_ops->mpo_audit_postselect( - cred, syscode, args, error, retval); - ret = (ret > mac_error ? ret : mac_error); - } - } - mac_policy_list_unbusy(); - } - - return (ret); -} -#endif ==== //depot/projects/trustedbsd/audit3/sys/security/mac/mac_framework.h#6 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1999-2002 Robert N. M. Watson + * Copyright (c) 1999-2002, 2007 Robert N. M. Watson * Copyright (c) 2001-2005 Networks Associates Technology, Inc. * Copyright (c) 2005-2006 SPARTA, Inc. * All rights reserved. ==== //depot/projects/trustedbsd/audit3/sys/security/mac/mac_policy.h#6 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1999-2002 Robert N. M. Watson + * Copyright (c) 1999-2002, 2007 Robert N. M. Watson * Copyright (c) 2001-2005 Networks Associates Technology, Inc. * Copyright (c) 2005-2006 SPARTA, Inc. * All rights reserved. From owner-p4-projects@FreeBSD.ORG Fri Apr 20 14:35:51 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 1CD2A16A407; Fri, 20 Apr 2007 14:35:51 +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 D202816A400 for ; Fri, 20 Apr 2007 14:35:50 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B55D713C44C for ; Fri, 20 Apr 2007 14:35:50 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3KEZoUY022157 for ; Fri, 20 Apr 2007 14:35:50 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3KEZo7Y022154 for perforce@freebsd.org; Fri, 20 Apr 2007 14:35:50 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 20 Apr 2007 14:35:50 GMT Message-Id: <200704201435.l3KEZo7Y022154@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 118477 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, 20 Apr 2007 14:35:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=118477 Change 118477 by rwatson@rwatson_zoo on 2007/04/20 14:35:39 Alphabetize now that things are settling out a bit. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_audit.c#9 edit .. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_framework.h#7 edit .. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_policy.h#7 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/mac/mac_audit.c#9 (text+ko) ==== @@ -46,56 +46,56 @@ #include int -mac_check_system_audit(struct ucred *cred, void *record, int length) +mac_check_proc_setaudit(struct ucred *cred, struct auditinfo *ai) { int error; - MAC_CHECK(check_system_audit, cred, record, length); + MAC_CHECK(check_proc_setaudit, cred, ai); return (error); } int -mac_check_system_auditon(struct ucred *cred, int cmd) +mac_check_proc_setauid(struct ucred *cred, uid_t auid) { int error; - MAC_CHECK(check_system_auditon, cred, cmd); + MAC_CHECK(check_proc_setauid, cred, auid); return (error); } int -mac_check_system_auditctl(struct ucred *cred, struct vnode *vp) +mac_check_system_audit(struct ucred *cred, void *record, int length) { int error; - struct label *vl; - ASSERT_VOP_LOCKED(vp, "mac_check_system_auditctl"); - - vl = (vp != NULL) ? vp->v_label : NULL; + MAC_CHECK(check_system_audit, cred, record, length); - MAC_CHECK(check_system_auditctl, cred, vp, vl); - return (error); } int -mac_check_proc_setauid(struct ucred *cred, uid_t auid) +mac_check_system_auditctl(struct ucred *cred, struct vnode *vp) { int error; + struct label *vl; + + ASSERT_VOP_LOCKED(vp, "mac_check_system_auditctl"); - MAC_CHECK(check_proc_setauid, cred, auid); + vl = (vp != NULL) ? vp->v_label : NULL; + + MAC_CHECK(check_system_auditctl, cred, vp, vl); return (error); } int -mac_check_proc_setaudit(struct ucred *cred, struct auditinfo *ai) +mac_check_system_auditon(struct ucred *cred, int cmd) { int error; - MAC_CHECK(check_proc_setaudit, cred, ai); + MAC_CHECK(check_system_auditon, cred, cmd); return (error); } ==== //depot/projects/trustedbsd/audit3/sys/security/mac/mac_framework.h#7 (text+ko) ==== @@ -298,6 +298,8 @@ int mac_check_posix_sem_wait(struct ucred *cred, struct ksem *ksemptr); int mac_check_proc_debug(struct ucred *cred, struct proc *proc); int mac_check_proc_sched(struct ucred *cred, struct proc *proc); +int mac_check_proc_setaudit(struct ucred *cred, struct auditinfo *ai); +int mac_check_proc_setauid(struct ucred *cred, uid_t auid); int mac_check_proc_setuid(struct proc *proc, struct ucred *cred, uid_t uid); int mac_check_proc_seteuid(struct proc *proc, struct ucred *cred, @@ -335,6 +337,9 @@ int mac_check_socket_visible(struct ucred *cred, struct socket *so); int mac_check_sysarch_ioperm(struct ucred *cred); int mac_check_system_acct(struct ucred *cred, struct vnode *vp); +int mac_check_system_audit(struct ucred *cred, void *record, int length); +int mac_check_system_auditctl(struct ucred *cred, struct vnode *vp); +int mac_check_system_auditon(struct ucred *cred, int cmd); int mac_check_system_nfsd(struct ucred *cred); int mac_check_system_reboot(struct ucred *cred, int howto); int mac_check_system_settime(struct ucred *cred); @@ -417,16 +422,6 @@ int mac_priv_grant(struct ucred *cred, int priv); /* - * XXXRW: Audit checks should be above, but list them here to make a more - * sensible diff for now. - */ -int mac_check_system_audit(struct ucred *cred, void *record, int length); -int mac_check_system_auditon(struct ucred *cred, int cmd); -int mac_check_system_auditctl(struct ucred *cred, struct vnode *vp); -int mac_check_proc_setauid(struct ucred *cred, uid_t auid); -int mac_check_proc_setaudit(struct ucred *cred, struct auditinfo *ai); - -/* * Calls to help various file systems implement labeling functionality using * their existing EA implementation. */ ==== //depot/projects/trustedbsd/audit3/sys/security/mac/mac_policy.h#7 (text+ko) ==== @@ -456,6 +456,9 @@ struct proc *proc); typedef int (*mpo_check_proc_sched_t)(struct ucred *cred, struct proc *proc); +typedef int (*mpo_check_proc_setaudit_t)(struct ucred *cred, + struct auditinfo *ai); +typedef int (*mpo_check_proc_setauid_t)(struct ucred *cred, uid_t auid); typedef int (*mpo_check_proc_setuid_t)(struct ucred *cred, uid_t uid); typedef int (*mpo_check_proc_seteuid_t)(struct ucred *cred, uid_t euid); typedef int (*mpo_check_proc_setgid_t)(struct ucred *cred, gid_t gid); @@ -505,6 +508,11 @@ typedef int (*mpo_check_sysarch_ioperm_t)(struct ucred *cred); typedef int (*mpo_check_system_acct_t)(struct ucred *cred, struct vnode *vp, struct label *vlabel); +typedef int (*mpo_check_system_audit_t)(struct ucred *cred, void *record, + int length); +typedef int (*mpo_check_system_auditctl_t)(struct ucred *cred, + struct vnode *vp, struct label *vplabel); +typedef int (*mpo_check_system_auditon_t)(struct ucred *cred, int cmd); typedef int (*mpo_check_system_nfsd_t)(struct ucred *cred); typedef int (*mpo_check_system_reboot_t)(struct ucred *cred, int howto); typedef int (*mpo_check_system_settime_t)(struct ucred *cred); @@ -608,19 +616,6 @@ typedef int (*mpo_priv_check_t)(struct ucred *cred, int priv); typedef int (*mpo_priv_grant_t)(struct ucred *cred, int priv); -/* - * XXXRW: Audit checks should be above, but list them here to make a more - * sensible diff for now. - */ -typedef int (*mpo_check_system_audit_t)(struct ucred *cred, void *record, - int length); -typedef int (*mpo_check_system_auditon_t)(struct ucred *cred, int cmd); -typedef int (*mpo_check_system_auditctl_t)(struct ucred *cred, - struct vnode *vp, struct label *vplabel); -typedef int (*mpo_check_proc_setauid_t)(struct ucred *cred, uid_t auid); -typedef int (*mpo_check_proc_setaudit_t)(struct ucred *cred, - struct auditinfo *ai); - struct mac_policy_ops { /* * Policy module operations. @@ -841,6 +836,8 @@ mpo_check_posix_sem_wait_t mpo_check_posix_sem_wait; mpo_check_proc_debug_t mpo_check_proc_debug; mpo_check_proc_sched_t mpo_check_proc_sched; + mpo_check_proc_setaudit_t mpo_check_proc_setaudit; + mpo_check_proc_setauid_t mpo_check_proc_setauid; mpo_check_proc_setuid_t mpo_check_proc_setuid; mpo_check_proc_seteuid_t mpo_check_proc_seteuid; mpo_check_proc_setgid_t mpo_check_proc_setgid; @@ -867,6 +864,9 @@ mpo_check_socket_visible_t mpo_check_socket_visible; mpo_check_sysarch_ioperm_t mpo_check_sysarch_ioperm; mpo_check_system_acct_t mpo_check_system_acct; + mpo_check_system_audit_t mpo_check_system_audit; + mpo_check_system_auditctl_t mpo_check_system_auditctl; + mpo_check_system_auditon_t mpo_check_system_auditon; mpo_check_system_nfsd_t mpo_check_system_nfsd; mpo_check_system_reboot_t mpo_check_system_reboot; mpo_check_system_settime_t mpo_check_system_settime; @@ -916,16 +916,6 @@ mpo_create_mbuf_from_syncache_t mpo_create_mbuf_from_syncache; mpo_priv_check_t mpo_priv_check; mpo_priv_grant_t mpo_priv_grant; - - /* - * XXXRW: Audit checks should be above, but list them here to make a - * more sensible diff for now. - */ - mpo_check_system_audit_t mpo_check_system_audit; - mpo_check_system_auditon_t mpo_check_system_auditon; - mpo_check_system_auditctl_t mpo_check_system_auditctl; - mpo_check_proc_setauid_t mpo_check_proc_setauid; - mpo_check_proc_setaudit_t mpo_check_proc_setaudit; }; /* From owner-p4-projects@FreeBSD.ORG Fri Apr 20 14:56:17 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 A46EE16A404; Fri, 20 Apr 2007 14:56:17 +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 5000D16A402 for ; Fri, 20 Apr 2007 14:56:17 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 3DEEC13C457 for ; Fri, 20 Apr 2007 14:56:17 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3KEuHqK025283 for ; Fri, 20 Apr 2007 14:56:17 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3KEuGg7025276 for perforce@freebsd.org; Fri, 20 Apr 2007 14:56:16 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 20 Apr 2007 14:56:16 GMT Message-Id: <200704201456.l3KEuGg7025276@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 118479 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, 20 Apr 2007 14:56:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=118479 Change 118479 by rwatson@rwatson_zoo on 2007/04/20 14:56:02 Implement audit MAC checks for mac_biba, mac_bsdextended, mac_lomac, mac_mls, mac_stub, mac_test. Implement and/or sort missing system checks for mac_bsdextended, mac_lomac, mac_mls, mac_stub, mac_test. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/mac_biba/mac_biba.c#11 edit .. //depot/projects/trustedbsd/audit3/sys/security/mac_bsdextended/mac_bsdextended.c#11 edit .. //depot/projects/trustedbsd/audit3/sys/security/mac_lomac/mac_lomac.c#10 edit .. //depot/projects/trustedbsd/audit3/sys/security/mac_mls/mac_mls.c#9 edit .. //depot/projects/trustedbsd/audit3/sys/security/mac_stub/mac_stub.c#8 edit .. //depot/projects/trustedbsd/audit3/sys/security/mac_test/mac_test.c#8 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/mac_biba/mac_biba.c#11 (text+ko) ==== @@ -2304,6 +2304,50 @@ } static int +mac_biba_check_system_auditctl(struct ucred *cred, struct vnode *vp, + struct label *vplabel) +{ + struct mac_biba *subj, *obj; + int error; + + if (!mac_biba_enabled) + return (0); + + subj = SLOT(cred->cr_label); + + error = mac_biba_subject_privileged(subj); + if (error) + return (error); + + if (vplabel == NULL) + return (0); + + obj = SLOT(vplabel); + if (!mac_biba_high_effective(obj)) + return (EACCES); + + return (0); +} + +static int +mac_biba_check_system_auditon(struct ucred *cred, int cmd) +{ + struct mac_biba *subj; + int error; + + if (!mac_biba_enabled) + return (0); + + subj = SLOT(cred->cr_label); + + error = mac_biba_subject_privileged(subj); + if (error) + return (error); + + return (0); +} + +static int mac_biba_check_system_settime(struct ucred *cred) { struct mac_biba *subj; @@ -3204,6 +3248,8 @@ .mpo_check_socket_visible = mac_biba_check_socket_visible, .mpo_check_sysarch_ioperm = mac_biba_check_sysarch_ioperm, .mpo_check_system_acct = mac_biba_check_system_acct, + .mpo_check_system_auditctl = mac_biba_check_system_auditctl, + .mpo_check_system_auditon = mac_biba_check_system_auditon, .mpo_check_system_settime = mac_biba_check_system_settime, .mpo_check_system_swapon = mac_biba_check_system_swapon, .mpo_check_system_swapoff = mac_biba_check_system_swapoff, ==== //depot/projects/trustedbsd/audit3/sys/security/mac_bsdextended/mac_bsdextended.c#11 (text+ko) ==== @@ -488,6 +488,30 @@ } static int +mac_bsdextended_check_system_acct(struct ucred *cred, struct vnode *vp, + struct label *label) +{ + + return (mac_bsdextended_check_vp(cred, vp, MBI_WRITE)); +} + +static int +mac_bsdextended_check_system_auditctl(struct ucred *cred, struct vnode *vp, + struct label *label) +{ + + return (mac_bsdextended_check_vp(cred, vp, MBI_WRITE)); +} + +static int +mac_bsdextended_check_system_swapoff(struct ucred *cred, struct vnode *vp, + struct label *label) +{ + + return (mac_bsdextended_check_vp(cred, vp, MBI_WRITE)); +} + +static int mac_bsdextended_check_system_swapon(struct ucred *cred, struct vnode *vp, struct label *label) { @@ -739,6 +763,9 @@ { .mpo_destroy = mac_bsdextended_destroy, .mpo_init = mac_bsdextended_init, + .mpo_check_system_acct = mac_bsdextended_check_system_acct, + .mpo_check_system_auditctl = mac_bsdextended_check_system_auditctl, + .mpo_check_system_swapoff = mac_bsdextended_check_system_swapoff, .mpo_check_system_swapon = mac_bsdextended_check_system_swapon, .mpo_check_vnode_access = mac_bsdextended_check_vnode_access, .mpo_check_vnode_chdir = mac_bsdextended_check_vnode_chdir, ==== //depot/projects/trustedbsd/audit3/sys/security/mac_lomac/mac_lomac.c#10 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1999-2002 Robert N. M. Watson + * Copyright (c) 1999-2002, 2007 Robert N. M. Watson * Copyright (c) 2001-2005 Networks Associates Technology, Inc. * All rights reserved. * @@ -2046,6 +2046,65 @@ } static int +mac_lomac_check_system_acct(struct ucred *cred, struct vnode *vp, + struct label *label) +{ + struct mac_lomac *subj, *obj; + + if (!mac_lomac_enabled) + return (0); + + subj = SLOT(cred->cr_label); + obj = SLOT(label); + + if (mac_lomac_subject_privileged(subj)) + return (EPERM); + + if (!mac_lomac_high_single(obj)) + return (EACCES); + + return (0); +} + +static int +mac_lomac_check_system_auditctl(struct ucred *cred, struct vnode *vp, + struct label *label) +{ + struct mac_lomac *subj, *obj; + + if (!mac_lomac_enabled) + return (0); + + subj = SLOT(cred->cr_label); + obj = SLOT(label); + + if (mac_lomac_subject_privileged(subj)) + return (EPERM); + + if (!mac_lomac_high_single(obj)) + return (EACCES); + + return (0); +} + +static int +mac_lomac_check_system_swapoff(struct ucred *cred, struct vnode *vp, + struct label *label) +{ + struct mac_lomac *subj; + + if (!mac_lomac_enabled) + return (0); + + subj = SLOT(cred->cr_label); + + if (mac_lomac_subject_privileged(subj)) + return (EPERM); + + return (0); +} + +static int mac_lomac_check_system_swapon(struct ucred *cred, struct vnode *vp, struct label *label) { @@ -2700,6 +2759,9 @@ .mpo_check_socket_deliver = mac_lomac_check_socket_deliver, .mpo_check_socket_relabel = mac_lomac_check_socket_relabel, .mpo_check_socket_visible = mac_lomac_check_socket_visible, + .mpo_check_system_acct = mac_lomac_check_system_acct, + .mpo_check_system_auditctl = mac_lomac_check_system_auditctl, + .mpo_check_system_swapoff = mac_lomac_check_system_swapoff, .mpo_check_system_swapon = mac_lomac_check_system_swapon, .mpo_check_system_sysctl = mac_lomac_check_system_sysctl, .mpo_check_vnode_access = mac_lomac_check_vnode_open, ==== //depot/projects/trustedbsd/audit3/sys/security/mac_mls/mac_mls.c#9 (text+ko) ==== @@ -2165,6 +2165,44 @@ } static int +mac_mls_check_system_acct(struct ucred *cred, struct vnode *vp, + struct label *label) +{ + struct mac_mls *subj, *obj; + + if (!mac_mls_enabled) + return (0); + + subj = SLOT(cred->cr_label); + obj = SLOT(label); + + if (!mac_mls_dominate_effective(obj, subj) || + !mac_mls_dominate_effective(subj, obj)) + return (EACCES); + + return (0); +} + +static int +mac_mls_check_system_auditctl(struct ucred *cred, struct vnode *vp, + struct label *label) +{ + struct mac_mls *subj, *obj; + + if (!mac_mls_enabled) + return (0); + + subj = SLOT(cred->cr_label); + obj = SLOT(label); + + if (!mac_mls_dominate_effective(obj, subj) || + !mac_mls_dominate_effective(subj, obj)) + return (EACCES); + + return (0); +} + +static int mac_mls_check_system_swapon(struct ucred *cred, struct vnode *vp, struct label *label) { @@ -2972,6 +3010,8 @@ .mpo_check_socket_deliver = mac_mls_check_socket_deliver, .mpo_check_socket_relabel = mac_mls_check_socket_relabel, .mpo_check_socket_visible = mac_mls_check_socket_visible, + .mpo_check_system_acct = mac_mls_check_system_acct, + .mpo_check_system_auditctl = mac_mls_check_system_auditctl, .mpo_check_system_swapon = mac_mls_check_system_swapon, .mpo_check_vnode_access = mac_mls_check_vnode_open, .mpo_check_vnode_chdir = mac_mls_check_vnode_chdir, ==== //depot/projects/trustedbsd/audit3/sys/security/mac_stub/mac_stub.c#8 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1999-2002 Robert N. M. Watson + * Copyright (c) 1999-2002, 2007 Robert N. M. Watson * Copyright (c) 2001-2005 McAfee, Inc. * Copyright (c) 2005 SPARTA, Inc. * All rights reserved. @@ -920,6 +920,20 @@ } static int +stub_check_proc_setaudit(struct ucred *cred, struct auditinfo *ai) +{ + + return (0); +} + +static int +stub_check_proc_setauid(struct ucred *cred, uid_t auid) +{ + + return (0); +} + +static int stub_check_proc_setuid(struct ucred *cred, uid_t uid) { @@ -1096,6 +1110,28 @@ } static int +stub_check_system_audit(struct ucred *cred, void *record, int length) +{ + + return (0); +} + +static int +stub_check_system_auditctl(struct ucred *cred, struct vnode *vp, + struct label *vlabel) +{ + + return (0); +} + +static int +stub_check_system_auditon(struct ucred *cred, int cmd) +{ + + return (0); +} + +static int stub_check_system_nfsd(struct ucred *cred) { @@ -1117,7 +1153,7 @@ } static int -stub_check_system_swapon(struct ucred *cred, struct vnode *vp, +stub_check_system_swapoff(struct ucred *cred, struct vnode *vp, struct label *label) { @@ -1125,7 +1161,7 @@ } static int -stub_check_system_swapoff(struct ucred *cred, struct vnode *vp, +stub_check_system_swapon(struct ucred *cred, struct vnode *vp, struct label *label) { @@ -1576,6 +1612,8 @@ .mpo_check_posix_sem_wait = stub_check_posix_sem_wait, .mpo_check_proc_debug = stub_check_proc_debug, .mpo_check_proc_sched = stub_check_proc_sched, + .mpo_check_proc_setaudit = stub_check_proc_setaudit, + .mpo_check_proc_setauid = stub_check_proc_setauid, .mpo_check_proc_setuid = stub_check_proc_setuid, .mpo_check_proc_seteuid = stub_check_proc_seteuid, .mpo_check_proc_setgid = stub_check_proc_setgid, @@ -1601,11 +1639,14 @@ .mpo_check_socket_visible = stub_check_socket_visible, .mpo_check_sysarch_ioperm = stub_check_sysarch_ioperm, .mpo_check_system_acct = stub_check_system_acct, + .mpo_check_system_audit = stub_check_system_audit, + .mpo_check_system_auditctl = stub_check_system_auditctl, + .mpo_check_system_auditon = stub_check_system_auditon, .mpo_check_system_nfsd = stub_check_system_nfsd, .mpo_check_system_reboot = stub_check_system_reboot, .mpo_check_system_settime = stub_check_system_settime, + .mpo_check_system_swapoff = stub_check_system_swapoff, .mpo_check_system_swapon = stub_check_system_swapon, - .mpo_check_system_swapoff = stub_check_system_swapoff, .mpo_check_system_sysctl = stub_check_system_sysctl, .mpo_check_vnode_access = stub_check_vnode_access, .mpo_check_vnode_chdir = stub_check_vnode_chdir, ==== //depot/projects/trustedbsd/audit3/sys/security/mac_test/mac_test.c#8 (text+ko) ==== @@ -1712,6 +1712,24 @@ } static int +mac_test_check_proc_setaudit(struct ucred *cred, struct auditinfo *ai) +{ + + ASSERT_CRED_LABEL(cred->cr_label); + + return (0); +} + +static int +mac_test_check_proc_setauid(struct ucred *cred, uid_t auid) +{ + + ASSERT_CRED_LABEL(cred->cr_label); + + return (0); +} + +static int mac_test_check_proc_setuid(struct ucred *cred, uid_t uid) { @@ -1942,11 +1960,45 @@ { ASSERT_CRED_LABEL(cred->cr_label); + if (label != NULL) { + ASSERT_VNODE_LABEL(label); + } + + return (0); +} + +static int +mac_test_check_system_audit(struct ucred *cred, void *record, int length) +{ + + ASSERT_CRED_LABEL(cred->cr_label); return (0); } static int +mac_test_check_system_auditctl(struct ucred *cred, struct vnode *vp, + struct label *label) +{ + + ASSERT_CRED_LABEL(cred->cr_label); + if (label != NULL) { + ASSERT_VNODE_LABEL(label); + } + + return (0); +} + +static int +mac_test_check_system_auditon(struct ucred *cred, int cmd) +{ + + ASSERT_CRED_LABEL(cred->cr_label); + + return (0); +} + +static int mac_test_check_system_reboot(struct ucred *cred, int how) { @@ -1965,7 +2017,7 @@ } static int -mac_test_check_system_swapon(struct ucred *cred, struct vnode *vp, +mac_test_check_system_swapoff(struct ucred *cred, struct vnode *vp, struct label *label) { @@ -1976,7 +2028,7 @@ } static int -mac_test_check_system_swapoff(struct ucred *cred, struct vnode *vp, +mac_test_check_system_swapon(struct ucred *cred, struct vnode *vp, struct label *label) { @@ -2515,6 +2567,8 @@ .mpo_check_posix_sem_wait = mac_test_check_posix_sem, .mpo_check_proc_debug = mac_test_check_proc_debug, .mpo_check_proc_sched = mac_test_check_proc_sched, + .mpo_check_proc_setaudit = mac_test_check_proc_setaudit, + .mpo_check_proc_setauid = mac_test_check_proc_setauid, .mpo_check_proc_setuid = mac_test_check_proc_setuid, .mpo_check_proc_seteuid = mac_test_check_proc_seteuid, .mpo_check_proc_setgid = mac_test_check_proc_setgid, @@ -2539,10 +2593,13 @@ .mpo_check_socket_visible = mac_test_check_socket_visible, .mpo_check_sysarch_ioperm = mac_test_check_sysarch_ioperm, .mpo_check_system_acct = mac_test_check_system_acct, + .mpo_check_system_audit = mac_test_check_system_audit, + .mpo_check_system_auditctl = mac_test_check_system_auditctl, + .mpo_check_system_auditon = mac_test_check_system_auditon, .mpo_check_system_reboot = mac_test_check_system_reboot, .mpo_check_system_settime = mac_test_check_system_settime, + .mpo_check_system_swapoff = mac_test_check_system_swapoff, .mpo_check_system_swapon = mac_test_check_system_swapon, - .mpo_check_system_swapoff = mac_test_check_system_swapoff, .mpo_check_system_sysctl = mac_test_check_system_sysctl, .mpo_check_vnode_access = mac_test_check_vnode_access, .mpo_check_vnode_chdir = mac_test_check_vnode_chdir, From owner-p4-projects@FreeBSD.ORG Fri Apr 20 15:25:56 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 1306B16A410; Fri, 20 Apr 2007 15:25:56 +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 D83FD16A409 for ; Fri, 20 Apr 2007 15:25:55 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C6E7413C45A for ; Fri, 20 Apr 2007 15:25:55 +0000 (UTC) (envelope-from gabor@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 l3KFPthn035303 for ; Fri, 20 Apr 2007 15:25:55 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3KFPt0I035291 for perforce@freebsd.org; Fri, 20 Apr 2007 15:25:55 GMT (envelope-from gabor@freebsd.org) Date: Fri, 20 Apr 2007 15:25:55 GMT Message-Id: <200704201525.l3KFPt0I035291@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 118482 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, 20 Apr 2007 15:25:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=118482 Change 118482 by gabor@gabor_server on 2007/04/20 15:25:18 Style and whitespace Affected files ... .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#13 edit Differences ... ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#13 (text+ko) ==== @@ -3170,8 +3170,8 @@ do-fetch: @${MKDIR} ${_DISTDIR} @cd ${_DISTDIR};\ - ${_MASTER_SITES_ENV} ; \ - for _file in ${DISTFILES}; do \ + ${_MASTER_SITES_ENV} ; \ + for _file in ${DISTFILES}; do \ file=$${_file%%:*}; \ if [ $$_file = $$file ]; then \ select=''; \ @@ -3192,7 +3192,7 @@ ${ECHO_MSG} "=> Perhaps a filesystem (most likely a CD) isn't mounted?"; \ ${ECHO_MSG} "=> Please correct this problem and try again."; \ exit 1; \ - fi ; \ + fi; \ if [ -f ${MD5_FILE} -a "x${NO_CHECKSUM}" = "x" ]; then \ _md5sum=`alg=MD5; ${DISTINFO_DATA}`; \ if [ -z "$$_md5sum" ]; then \ @@ -3213,13 +3213,13 @@ if [ ! -z \$${_MASTER_SITES_$${group}} ] ; then \ eval ___MASTER_SITES_TMP="\$${_MASTER_SITES_$${group}}" ; \ __MASTER_SITES_TMP="$${__MASTER_SITES_TMP} $${___MASTER_SITES_TMP}" ; \ - fi \ + fi; \ done; \ ___MASTER_SITES_TMP= ; \ SORTED_MASTER_SITES_CMD_TMP="${ECHO_CMD} ${_MASTER_SITE_OVERRIDE} `${ECHO_CMD} $${__MASTER_SITES_TMP} | ${AWK} '${MASTER_SORT_AWK:S|\\|\\\\|g}'` ${_MASTER_SITE_BACKUP}" ; \ else \ SORTED_MASTER_SITES_CMD_TMP="${SORTED_MASTER_SITES_DEFAULT_CMD}" ; \ - fi ; \ + fi; \ for site in `eval $$SORTED_MASTER_SITES_CMD_TMP ${_RANDOMIZE_SITES}`; do \ ${ECHO_MSG} "=> Attempting to fetch from $${site}."; \ CKSIZE=`alg=SIZE; ${DISTINFO_DATA}`; \ @@ -3230,17 +3230,17 @@ esac; \ if ${SETENV} ${FETCH_ENV} ${FETCH_CMD} ${FETCH_BEFORE_ARGS} $${args} ${FETCH_AFTER_ARGS}; then \ continue 2; \ - fi \ + fi; \ done; \ ${ECHO_MSG} "=> Couldn't fetch it - please try to retrieve this";\ ${ECHO_MSG} "=> port manually into ${_DISTDIR} and try again."; \ exit 1; \ - fi \ + fi; \ done .if defined(PATCHFILES) @cd ${_DISTDIR};\ ${_PATCH_SITES_ENV} ; \ - for _file in ${PATCHFILES}; do \ + for _file in ${PATCHFILES}; do \ file=`${ECHO_CMD} $$_file | ${SED} -E -e 's/:[^:]+$$//'` ; \ select=`${ECHO_CMD} $${_file#$${file}} | ${SED} -e 's/^://' -e 's/,/ /g'` ; \ force_fetch=false; \ @@ -3257,7 +3257,7 @@ ${ECHO_MSG} "=> Perhaps a filesystem (most likely a CD) isn't mounted?"; \ ${ECHO_MSG} "=> Please correct this problem and try again."; \ exit 1; \ - fi ; \ + fi; \ ${ECHO_MSG} "=> $$file doesn't seem to exist in ${_DISTDIR}."; \ if [ ! -z "$$select" ] ; then \ __PATCH_SITES_TMP= ; \ @@ -3265,13 +3265,13 @@ if [ ! -z \$${_PATCH_SITES_$${group}} ] ; then \ eval ___PATCH_SITES_TMP="\$${_PATCH_SITES_$${group}}" ; \ __PATCH_SITES_TMP="$${__PATCH_SITES_TMP} $${___PATCH_SITES_TMP}" ; \ - fi \ + fi; \ done; \ ___PATCH_SITES_TMP= ; \ SORTED_PATCH_SITES_CMD_TMP="${ECHO_CMD} ${_MASTER_SITE_OVERRIDE} `${ECHO_CMD} $${__PATCH_SITES_TMP} | ${AWK} '${MASTER_SORT_AWK:S|\\|\\\\|g}'` ${_MASTER_SITE_BACKUP}" ; \ else \ SORTED_PATCH_SITES_CMD_TMP="${SORTED_PATCH_SITES_DEFAULT_CMD}" ; \ - fi ; \ + fi; \ for site in `eval $$SORTED_PATCH_SITES_CMD_TMP`; do \ ${ECHO_MSG} "=> Attempting to fetch from $${site}."; \ CKSIZE=`alg=SIZE; ${DISTINFO_DATA}`; \ @@ -3282,12 +3282,12 @@ esac; \ if ${SETENV} ${FETCH_ENV} ${FETCH_CMD} ${FETCH_BEFORE_ARGS} $${args} ${FETCH_AFTER_ARGS}; then \ continue 2; \ - fi \ + fi; \ done; \ ${ECHO_MSG} "=> Couldn't fetch it - please try to retrieve this";\ ${ECHO_MSG} "=> port manually into ${_DISTDIR} and try again."; \ exit 1; \ - fi \ + fi; \ done .endif .endif @@ -3302,7 +3302,7 @@ if ! (cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS});\ then \ exit 1; \ - fi \ + fi; \ done .if !defined(EXTRACT_PRESERVE_OWNERSHIP) @if [ `${ID} -u` = 0 ]; then \ @@ -3622,7 +3622,7 @@ fi; \ fi; \ done; \ - fi ; \ + fi; \ if [ -d ${PKG_DBDIR}/${PKGNAME} -o -n "$${found_package}" ]; then \ if [ -d ${PKG_DBDIR}/${PKGNAME} ]; then \ ${ECHO_CMD} "===> ${PKGNAME} is already installed"; \ @@ -4219,13 +4219,13 @@ if [ ! -z \$${_MASTER_SITES_$${group}} ] ; then \ eval ___MASTER_SITES_TMP=\$${_MASTER_SITES_$${group}} ; \ __MASTER_SITES_TMP="$${__MASTER_SITES_TMP} $${___MASTER_SITES_TMP}" ; \ - fi \ + fi; \ done; \ ___MASTER_SITES_TMP= ; \ SORTED_MASTER_SITES_CMD_TMP="${ECHO_CMD} ${_MASTER_SITE_OVERRIDE} `${ECHO_CMD} $${__MASTER_SITES_TMP} | ${AWK} '${MASTER_SORT_AWK:S|\\|\\\\|g}'` ${_MASTER_SITE_BACKUP}" ; \ else \ SORTED_MASTER_SITES_CMD_TMP="${SORTED_MASTER_SITES_DEFAULT_CMD}" ; \ - fi ; \ + fi; \ for site in `eval $$SORTED_MASTER_SITES_CMD_TMP ${_RANDOMIZE_SITES}`; do \ if [ ! -z "`${ECHO_CMD} ${NOFETCHFILES} | ${GREP} -w $${file}`" ]; then \ if [ -z "`${ECHO_CMD} ${MASTER_SITE_OVERRIDE} | ${GREP} -w $${site}`" ]; then \ @@ -4241,7 +4241,7 @@ ${ECHO_CMD} -n ${SETENV} ${FETCH_ENV} ${FETCH_CMD} ${FETCH_BEFORE_ARGS} $${args} "${FETCH_AFTER_ARGS}" '|| ' ; \ done; \ ${ECHO_CMD} "${ECHO_CMD} $${file} not fetched" ; \ - fi \ + fi; \ done) .if defined(PATCHFILES) @(cd ${_DISTDIR}; \ @@ -4256,13 +4256,13 @@ if [ ! -z \$${_PATCH_SITES_$${group}} ] ; then \ eval ___PATCH_SITES_TMP=\$${_PATCH_SITES_$${group}} ; \ __PATCH_SITES_TMP="$${__PATCH_SITES_TMP} $${___PATCH_SITES_TMP}" ; \ - fi \ + fi; \ done; \ ___PATCH_SITES_TMP= ; \ SORTED_PATCH_SITES_CMD_TMP="${ECHO_CMD} ${_MASTER_SITE_OVERRIDE} `${ECHO_CMD} $${__PATCH_SITES_TMP} | ${AWK} '${MASTER_SORT_AWK:S|\\|\\\\|g}'` ${_MASTER_SITE_BACKUP}" ; \ else \ SORTED_PATCH_SITES_CMD_TMP="${SORTED_PATCH_SITES_DEFAULT_CMD}" ; \ - fi ; \ + fi; \ for site in `eval $$SORTED_PATCH_SITES_CMD_TMP ${_RANDOMIZE_SITES}`; do \ CKSIZE=`alg=SIZE; ${DISTINFO_DATA}`; \ case $${file} in \ @@ -4272,7 +4272,7 @@ ${ECHO_CMD} -n ${SETENV} ${FETCH_ENV} ${FETCH_CMD} ${FETCH_BEFORE_ARGS} $${args} "${FETCH_AFTER_ARGS}" '|| ' ; \ done; \ ${ECHO_CMD} "${ECHO_CMD} $${file} not fetched" ; \ - fi \ + fi; \ done) .endif .endif @@ -4442,7 +4442,7 @@ OK="true"; \ fi; \ fi; \ - fi ; \ + fi; \ \ if [ "$$OK" != "true" -a ${FETCH_REGET} -eq 0 ]; then \ ${ECHO_MSG} "===> Giving up on fetching files: $$refetchlist"; \ @@ -4453,7 +4453,7 @@ fi; \ if [ "$$OK" != "true" ]; then \ exit 1; \ - fi \ + fi; \ elif [ -n "${_CKSUMFILES:M*}" ]; then \ ${ECHO_MSG} "=> No checksum file (${MD5_FILE})."; \ fi @@ -4580,7 +4580,7 @@ fi; \ fi; \ elif ${WHICH} "$$prog" > /dev/null 2>&1 ; then \ - ${ECHO_MSG} "===> ${PKGNAME} depends on executable: $$prog - found"; \ + ${ECHO_MSG} "===> ${PKGNAME} depends on executable: $$prog - found"; \ if [ ${_DEPEND_ALWAYS} = 1 ]; then \ ${ECHO_MSG} " (but building it anyway)"; \ notfound=1; \ @@ -4592,6 +4592,7 @@ notfound=1; \ fi; \ fi; \ +### FIXME: somehow it breaks after the two fi statements? if [ $$notfound != 0 ]; then \ ${ECHO_MSG} "===> Verifying $$target for $$prog in $$dir"; \ if [ ! -d "$$dir" ]; then \ @@ -4854,7 +4855,7 @@ shift 3; \ done; \ checked="$$dir $$childdir $$checked"; \ - else \\ + else \ ${ECHO_MSG} "${PKGNAME}: \"$$dir\" non-existent -- dependency list incomplete" >&2; \ fi; \ done @@ -4878,7 +4879,7 @@ installed=$$(${PKG_INFO} -qO $${THISORIGIN}); \ if [ -z "$$installed" ]; then \ ${ECHO_CMD} $$THISORIGIN; \ - fi \ + fi; \ done ################################################################ @@ -5007,7 +5008,7 @@ ${ECHO_MSG} "${.TARGET} requires an INDEX file (${INDEXFILE}). Please run make index or make fetchindex."; \ else \ target=${.TARGET:C/pretty-print-(.*)-depends-list/\1/} ; \ - if [ "$$target" = "build" ] ; then fldnum=8 ; else fldnum=9 ; fi ; \ + if [ "$$target" = "build" ] ; then fldnum=8 ; else fldnum=9 ; fi; \ ${ECHO_MSG} -n 'This port requires package(s) "' ; \ ${ECHO_MSG} -n `${AWK} -F\| "\\$$1 ~ /^${PKGNAME}/ {print \\$$$${fldnum};}" ${INDEXDIR}/${INDEXFILE}` ; \ ${ECHO_MSG} "\" to $$target."; \ From owner-p4-projects@FreeBSD.ORG Fri Apr 20 21:16:54 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 B353716A407; Fri, 20 Apr 2007 21:16:54 +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 7F69E16A402 for ; Fri, 20 Apr 2007 21:16:54 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6F6D913C4B0 for ; Fri, 20 Apr 2007 21:16:54 +0000 (UTC) (envelope-from peter@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 l3KLGsP5033228 for ; Fri, 20 Apr 2007 21:16:54 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3KLGsBk033225 for perforce@freebsd.org; Fri, 20 Apr 2007 21:16:54 GMT (envelope-from peter@freebsd.org) Date: Fri, 20 Apr 2007 21:16:54 GMT Message-Id: <200704202116.l3KLGsBk033225@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 118498 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, 20 Apr 2007 21:16:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=118498 Change 118498 by peter@peter_daintree on 2007/04/20 21:16:02 Exclude gssapi.h includes when kerberos is turned off. This is because libgss* is part of the kerberos build. If we let the includes be installed, then certain autoconf scripts will "detect" gssapi when the backing libraries do not exist. Affected files ... .. //depot/projects/hammer/include/Makefile#60 edit Differences ... ==== //depot/projects/hammer/include/Makefile#60 (text+ko) ==== @@ -6,11 +6,12 @@ .include CLEANFILES= osreldate.h version vers.c -SUBDIR= arpa gssapi protocols rpcsvc rpc +SUBDIR= arpa ${_gssapi} protocols rpcsvc rpc INCS= a.out.h ar.h assert.h bitstring.h complex.h cpio.h _ctype.h ctype.h \ db.h \ dirent.h dlfcn.h elf.h elf-hints.h err.h float.h floatingpoint.h \ - fmtmsg.h fnmatch.h fstab.h fts.h ftw.h getopt.h glob.h grp.h gssapi.h \ + fmtmsg.h fnmatch.h fstab.h fts.h ftw.h getopt.h glob.h grp.h \ + ${_gssapi_h} \ histedit.h ieeefp.h ifaddrs.h \ inttypes.h iso646.h kenv.h langinfo.h libgen.h limits.h link.h \ locale.h malloc.h malloc_np.h memory.h monetary.h mpool.h mqueue.h \ @@ -78,6 +79,11 @@ _fs_nwfs= fs/nwfs .endif +.if ${MK_KERBEROS} != "no" +_gssapi= gssapi +_gssapi_h= gssapi.h +.endif + # Define SHARED to indicate whether you want symbolic links to the system # source (``symlinks''), or a separate copy (``copies''). ``symlinks'' is # probably only useful for developers and should be avoided if you do not From owner-p4-projects@FreeBSD.ORG Fri Apr 20 22:21:15 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 197D016A404; Fri, 20 Apr 2007 22:21:15 +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 C231F16A402 for ; Fri, 20 Apr 2007 22:21:14 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B10C413C46E for ; Fri, 20 Apr 2007 22:21:14 +0000 (UTC) (envelope-from scottl@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 l3KMLEfP045693 for ; Fri, 20 Apr 2007 22:21:14 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3KMLEl9045688 for perforce@freebsd.org; Fri, 20 Apr 2007 22:21:14 GMT (envelope-from scottl@freebsd.org) Date: Fri, 20 Apr 2007 22:21:14 GMT Message-Id: <200704202221.l3KMLEl9045688@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 118499 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, 20 Apr 2007 22:21:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=118499 Change 118499 by scottl@scottl-x64 on 2007/04/20 22:20:44 IFC Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_periph.h#14 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#60 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_da.c#34 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_sge.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/sys/uipc_mvec.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/envy24.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/envy24ht.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/fs/devfs/devfs_vnops.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sched_ule.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_syscalls.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_ppp.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_input.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_output.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_syncache.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_var.h#16 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/nexus.c#5 integrate Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#22 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.66 2007/04/16 19:42:23 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.68 2007/04/19 23:34:51 scottl Exp $"); #include #include @@ -131,7 +131,6 @@ lun_id_t lun_id; cam_status status; u_int init_level; - int s; init_level = 0; /* @@ -200,7 +199,6 @@ if (status != CAM_REQ_CMP) goto failure; - s = splsoftcam(); cur_periph = TAILQ_FIRST(&(*p_drv)->units); while (cur_periph != NULL && cur_periph->unit_number < periph->unit_number) @@ -213,8 +211,6 @@ (*p_drv)->generation++; } - splx(s); - init_level++; status = periph_ctor(periph, arg); @@ -228,9 +224,7 @@ /* Initialized successfully */ break; case 3: - s = splsoftcam(); TAILQ_REMOVE(&(*p_drv)->units, periph, unit_links); - splx(s); xpt_remove_periph(periph); /* FALLTHROUGH */ case 2: @@ -258,24 +252,25 @@ { struct periph_driver **p_drv; struct cam_periph *periph; - int s; + xpt_lock_buses(); for (p_drv = periph_drivers; *p_drv != NULL; p_drv++) { if (name != NULL && (strcmp((*p_drv)->driver_name, name) != 0)) continue; - s = splsoftcam(); TAILQ_FOREACH(periph, &(*p_drv)->units, unit_links) { if (xpt_path_comp(periph->path, path) == 0) { - splx(s); + xpt_unlock_buses(); return(periph); } } - splx(s); - if (name != NULL) + if (name != NULL) { + xpt_unlock_buses(); return(NULL); + } } + xpt_unlock_buses(); return(NULL); } @@ -372,11 +367,9 @@ { struct cam_periph *periph; char *periph_name; - int s; int i, val, dunit, r; const char *dname, *strval; - s = splsoftcam(); periph_name = p_drv->driver_name; for (;;newunit++) { @@ -422,7 +415,6 @@ if (r != 0) break; } - splx(s); return (newunit); } @@ -480,8 +472,7 @@ /* * We only call this routine the first time a peripheral is - * invalidated. The oninvalidate() routine is always called at - * splsoftcam(). + * invalidated. */ if (((periph->flags & CAM_PERIPH_INVALID) == 0) && (periph->periph_oninval != NULL)) @@ -550,26 +541,6 @@ } /* - * Wait interruptibly for an exclusive lock. - */ -void -cam_periph_lock(struct cam_periph *periph) -{ - - mtx_lock(periph->sim->mtx); -} - -/* - * Unlock and wake up any waiters. - */ -void -cam_periph_unlock(struct cam_periph *periph) -{ - - mtx_unlock(periph->sim->mtx); -} - -/* * Map user virtual pointers into kernel virtual address space, so we can * access the memory. This won't work on physical pointers, for now it's * up to the caller to check for that. (XXX KDM -- should we do that here @@ -808,9 +779,7 @@ { struct mtx *mtx; struct cam_sim *sim; - int s; - s = splsoftcam(); sim = xpt_path_sim(ccb->ccb_h.path); if (sim->mtx == &Giant) mtx = NULL; @@ -819,8 +788,6 @@ if ((ccb->ccb_h.pinfo.index != CAM_UNQUEUED_INDEX) || ((ccb->ccb_h.status & CAM_STATUS_MASK) == CAM_REQ_INPROG)) msleep(&ccb->ccb_h.cbfcnp, mtx, PRIBIO, "cbwait", 0); - - splx(s); } int @@ -1225,11 +1192,8 @@ { struct timeval delta; struct timeval duration_tv; - int s; - s = splclock(); microtime(&delta); - splx(s); timevalsub(&delta, event_time); duration_tv.tv_sec = duration_ms / 1000; duration_tv.tv_usec = (duration_ms % 1000) * 1000; ==== //depot/projects/scottl-camlock/src/sys/cam/cam_periph.h#14 (text+ko) ==== @@ -25,13 +25,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam_periph.h,v 1.17 2007/04/15 08:49:09 scottl Exp $ + * $FreeBSD: src/sys/cam/cam_periph.h,v 1.18 2007/04/19 22:46:26 scottl Exp $ */ #ifndef _CAM_CAM_PERIPH_H #define _CAM_CAM_PERIPH_H 1 #include +#include #ifdef _KERNEL @@ -138,8 +139,6 @@ char *name, cam_periph_type type, struct cam_path *, ac_callback_t *, ac_code, void *arg); struct cam_periph *cam_periph_find(struct cam_path *path, char *name); -void cam_periph_lock(struct cam_periph *periph); -void cam_periph_unlock(struct cam_periph *periph); cam_status cam_periph_acquire(struct cam_periph *periph); void cam_periph_release(struct cam_periph *periph); int cam_periph_hold(struct cam_periph *periph, int priority); @@ -177,5 +176,17 @@ int cam_periph_error(union ccb *ccb, cam_flags camflags, u_int32_t sense_flags, union ccb *save_ccb); +static __inline void +cam_periph_lock(struct cam_periph *periph) +{ + mtx_lock(periph->sim->mtx); +} + +static __inline void +cam_periph_unlock(struct cam_periph *periph) +{ + mtx_unlock(periph->sim->mtx); +} + #endif /* _KERNEL */ #endif /* _CAM_CAM_PERIPH_H */ ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#60 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.180 2007/04/19 14:45:37 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.182 2007/04/19 23:34:51 scottl Exp $"); #include #include @@ -1210,7 +1210,7 @@ * we never return a status of CAM_GDEVLIST_LIST_CHANGED. It is * (or rather should be) impossible for the device peripheral driver * list to change since we look at the whole thing in one pass, and - * we do it with splcam protection. + * we do it with lock protection. * */ case CAMGETPASSTHRU: { @@ -1222,13 +1222,12 @@ u_int cur_generation; int base_periph_found; int splbreaknum; - int s; ccb = (union ccb *)addr; unit = ccb->cgdl.unit_number; name = ccb->cgdl.periph_name; /* - * Every 100 devices, we want to drop our spl protection to + * Every 100 devices, we want to drop our lock protection to * give the software interrupt handler a chance to run. * Most systems won't run into this check, but this should * avoid starvation in the software interrupt handler in @@ -1250,7 +1249,7 @@ } /* Keep the list from changing while we traverse it */ - s = splcam(); + mtx_lock(&xsoftc.xpt_topo_lock); ptstartover: cur_generation = xsoftc.xpt_generation; @@ -1260,7 +1259,7 @@ break; if (*p_drv == NULL) { - splx(s); + mtx_unlock(&xsoftc.xpt_topo_lock); ccb->ccb_h.status = CAM_REQ_CMP_ERR; ccb->cgdl.status = CAM_GDEVLIST_ERROR; *ccb->cgdl.periph_name = '\0'; @@ -1282,8 +1281,8 @@ if (periph->unit_number == unit) { break; } else if (--splbreaknum == 0) { - splx(s); - s = splcam(); + mtx_unlock(&xsoftc.xpt_topo_lock); + mtx_lock(&xsoftc.xpt_topo_lock); splbreaknum = 100; if (cur_generation != xsoftc.xpt_generation) goto ptstartover; @@ -1372,7 +1371,7 @@ "your kernel config file\n"); } } - splx(s); + mtx_unlock(&xsoftc.xpt_topo_lock); break; } default: @@ -1428,7 +1427,7 @@ TAILQ_REMOVE(&queue, &ccb->ccb_h, sim_links.tqe); sim = ccb->ccb_h.path->bus->sim; - mtx_lock(sim->mtx); + CAM_SIM_LOCK(sim); ccb->ccb_h.func_code = XPT_SCAN_BUS; ccb->ccb_h.cbfcnp = xptdone; @@ -1436,7 +1435,7 @@ cam_periph_runccb(ccb, NULL, 0, 0, NULL); xpt_free_path(ccb->ccb_h.path); xpt_free_ccb(ccb); - mtx_unlock(sim->mtx); + CAM_SIM_UNLOCK(sim); } } } @@ -1592,25 +1591,22 @@ status = CAM_REQ_CMP; if (device != NULL) { - int s; - /* * Make room for this peripheral * so it will fit in the queue * when it's scheduled to run */ - s = splsoftcam(); status = camq_resize(&device->drvq, device->drvq.array_size + 1); device->generation++; SLIST_INSERT_HEAD(periph_head, periph, periph_links); - - splx(s); } - atomic_add_int(&xsoftc.xpt_generation, 1); + mtx_lock(&xsoftc.xpt_topo_lock); + xsoftc.xpt_generation++; + mtx_unlock(&xsoftc.xpt_topo_lock); return (status); } @@ -1625,24 +1621,21 @@ device = periph->path->device; if (device != NULL) { - int s; struct periph_list *periph_head; periph_head = &device->periphs; /* Release the slot for this peripheral */ - s = splsoftcam(); camq_resize(&device->drvq, device->drvq.array_size - 1); device->generation++; SLIST_REMOVE(periph_head, periph, cam_periph, periph_links); - - splx(s); } - atomic_add_int(&xsoftc.xpt_generation, 1); - + mtx_lock(&xsoftc.xpt_topo_lock); + xsoftc.xpt_generation++; + mtx_unlock(&xsoftc.xpt_topo_lock); } @@ -1655,7 +1648,6 @@ u_int speed; u_int freq; u_int mb; - int s; mtx_assert(periph->sim->mtx, MA_OWNED); @@ -1664,7 +1656,6 @@ * To ensure that this is printed in one piece, * mask out CAM interrupts. */ - s = splsoftcam(); printf("%s%d at %s%d bus %d target %d lun %d\n", periph->periph_name, periph->unit_number, path->bus->sim->sim_name, @@ -1780,7 +1771,6 @@ if (announce_string != NULL) printf("%s%d: %s\n", periph->periph_name, periph->unit_number, announce_string); - splx(s); } static dev_match_ret @@ -2661,9 +2651,9 @@ next_bus = TAILQ_NEXT(bus, links); mtx_unlock(&xsoftc.xpt_topo_lock); - mtx_lock(bus->sim->mtx); + CAM_SIM_LOCK(bus->sim); retval = tr_func(bus, arg); - mtx_unlock(bus->sim->mtx); + CAM_SIM_UNLOCK(bus->sim); if (retval == 0) return(retval); mtx_lock(&xsoftc.xpt_topo_lock); @@ -2984,13 +2974,11 @@ void xpt_action(union ccb *start_ccb) { - int iopl; CAM_DEBUG(start_ccb->ccb_h.path, CAM_DEBUG_TRACE, ("xpt_action\n")); start_ccb->ccb_h.status = CAM_REQ_INPROG; - iopl = splsoftcam(); switch (start_ccb->ccb_h.func_code) { case XPT_SCSI_IO: { @@ -3044,18 +3032,15 @@ { struct cam_path *path; struct cam_sim *sim; - int s; int runq; path = start_ccb->ccb_h.path; - s = splsoftcam(); sim = path->bus->sim; if (SIM_DEAD(sim)) { /* The SIM has gone; just execute the CCB directly. */ cam_ccbq_send_ccb(&path->device->ccbq, start_ccb); (*(sim->sim_action))(sim, start_ccb); - splx(s); break; } @@ -3064,7 +3049,6 @@ runq = xpt_schedule_dev_sendq(path->bus, path->device); else runq = 0; - splx(s); if (runq != 0) xpt_run_dev_sendq(path->bus); break; @@ -3111,7 +3095,6 @@ case XPT_ABORT: { union ccb* abort_ccb; - int s; abort_ccb = start_ccb->cab.abort_ccb; if (XPT_FC_IS_DEV_QUEUED(abort_ccb)) { @@ -3124,9 +3107,7 @@ abort_ccb->ccb_h.status = CAM_REQ_ABORTED|CAM_DEV_QFRZN; xpt_freeze_devq(abort_ccb->ccb_h.path, 1); - s = splcam(); xpt_done(abort_ccb); - splx(s); start_ccb->ccb_h.status = CAM_REQ_CMP; break; } @@ -3189,10 +3170,8 @@ case XPT_GDEV_TYPE: { struct cam_ed *dev; - int s; dev = start_ccb->ccb_h.path->device; - s = splcam(); if ((dev->flags & CAM_DEV_UNCONFIGURED) != 0) { start_ccb->ccb_h.status = CAM_DEV_NOT_THERE; } else { @@ -3211,16 +3190,13 @@ bcopy(dev->serial_num, cgd->serial_num, dev->serial_num_len); } - splx(s); break; } case XPT_GDEV_STATS: { struct cam_ed *dev; - int s; dev = start_ccb->ccb_h.path->device; - s = splcam(); if ((dev->flags & CAM_DEV_UNCONFIGURED) != 0) { start_ccb->ccb_h.status = CAM_DEV_NOT_THERE; } else { @@ -3243,7 +3219,6 @@ cgds->last_reset = bus->last_reset; cgds->ccb_h.status = CAM_REQ_CMP; } - splx(s); break; } case XPT_GDEVLIST: @@ -3252,7 +3227,6 @@ struct periph_list *periph_head; struct ccb_getdevlist *cgdl; u_int i; - int s; struct cam_ed *device; int found; @@ -3262,7 +3236,6 @@ /* * Don't want anyone mucking with our data. */ - s = splcam(); device = start_ccb->ccb_h.path->device; periph_head = &device->periphs; cgdl = &start_ccb->cgdl; @@ -3276,7 +3249,6 @@ if ((cgdl->index != 0) && (cgdl->generation != device->generation)) { cgdl->status = CAM_GDEVLIST_LIST_CHANGED; - splx(s); break; } @@ -3297,7 +3269,6 @@ } if (found == 0) { cgdl->status = CAM_GDEVLIST_ERROR; - splx(s); break; } @@ -3309,23 +3280,17 @@ cgdl->index++; cgdl->generation = device->generation; - splx(s); cgdl->ccb_h.status = CAM_REQ_CMP; break; } case XPT_DEV_MATCH: { - int s; dev_pos_type position_type; struct ccb_dev_match *cdm; cdm = &start_ccb->cdm; /* - * Prevent EDT changes while we traverse it. - */ - s = splcam(); - /* * There are two ways of getting at information in the EDT. * The first way is via the primary EDT tree. It starts * with a list of busses, then a list of targets on a bus, @@ -3372,8 +3337,6 @@ break; } - splx(s); - if (cdm->status == CAM_DEV_MATCH_ERROR) start_ccb->ccb_h.status = CAM_REQ_CMP_ERR; else @@ -3459,7 +3422,6 @@ { struct ccb_relsim *crs; struct cam_ed *dev; - int s; crs = &start_ccb->crs; dev = crs->ccb_h.path->device; @@ -3469,8 +3431,6 @@ break; } - s = splcam(); - if ((crs->release_flags & RELSIM_ADJUST_OPENINGS) != 0) { if (INQ_DATA_TQ_ENABLED(&dev->inq_data)) { @@ -3540,8 +3500,7 @@ start_ccb->ccb_h.flags |= CAM_DEV_QFREEZE; } } - splx(s); - + if ((start_ccb->ccb_h.flags & CAM_DEV_QFREEZE) == 0) { xpt_release_devq(crs->ccb_h.path, /*count*/1, @@ -3561,9 +3520,6 @@ break; case XPT_DEBUG: { #ifdef CAMDEBUG - int s; - - s = splcam(); #ifdef CAM_DEBUG_DELAY cam_debug_delay = CAM_DEBUG_DELAY; #endif @@ -3590,7 +3546,6 @@ cam_dpath = NULL; start_ccb->ccb_h.status = CAM_REQ_CMP; } - splx(s); #else /* !CAMDEBUG */ start_ccb->ccb_h.status = CAM_FUNC_NOTAVAIL; #endif /* CAMDEBUG */ @@ -3609,13 +3564,11 @@ start_ccb->ccb_h.status = CAM_PROVIDE_FAIL; break; } - splx(iopl); } void xpt_polled_action(union ccb *start_ccb) { - int s; u_int32_t timeout; struct cam_sim *sim; struct cam_devq *devq; @@ -3628,7 +3581,6 @@ dev = start_ccb->ccb_h.path->device; mtx_assert(sim->mtx, MA_OWNED); - s = splcam(); /* * Steal an opening so that no other queued requests @@ -3669,7 +3621,6 @@ } else { start_ccb->ccb_h.status = CAM_RESRC_UNAVAIL; } - splx(s); } /* @@ -3681,14 +3632,12 @@ { struct cam_ed *device; union ccb *work_ccb; - int s; int runq; mtx_assert(perph->sim->mtx, MA_OWNED); CAM_DEBUG(perph->path, CAM_DEBUG_TRACE, ("xpt_schedule\n")); device = perph->path->device; - s = splsoftcam(); if (periph_is_queued(perph)) { /* Simply reorder based on new priority */ CAM_DEBUG(perph->path, CAM_DEBUG_SUBTRACE, @@ -3702,7 +3651,6 @@ } else if (SIM_DEAD(perph->path->bus->sim)) { /* The SIM is gone so just call periph_start directly. */ work_ccb = xpt_get_ccb(perph->path->device); - splx(s); if (work_ccb == NULL) return; /* XXX */ xpt_setup_ccb(&work_ccb->ccb_h, perph->path, new_priority); @@ -3718,7 +3666,6 @@ camq_insert(&device->drvq, &perph->pinfo); runq = xpt_schedule_dev_allocq(perph->path->bus, device); } - splx(s); if (runq != 0) { CAM_DEBUG(perph->path, CAM_DEBUG_SUBTRACE, (" calling xpt_run_devq\n")); @@ -3733,8 +3680,7 @@ * return 1 meaning the device queue should be run. If we * were already queued, implying someone else has already * started the queue, return 0 so the caller doesn't attempt - * to run the queue. Must be run at either splsoftcam - * (or splcam since that encompases splsoftcam). + * to run the queue. */ static int xpt_schedule_dev(struct camq *queue, cam_pinfo *pinfo, @@ -3778,7 +3724,6 @@ xpt_run_dev_allocq(struct cam_eb *bus) { struct cam_devq *devq; - int s; CAM_DEBUG_PRINT(CAM_DEBUG_XPT, ("xpt_run_dev_allocq\n")); devq = bus->sim->devq; @@ -3791,7 +3736,6 @@ devq->alloc_openings, devq->alloc_active)); - s = splsoftcam(); devq->alloc_queue.qfrozen_cnt++; while ((devq->alloc_queue.entries > 0) && (devq->alloc_openings > 0) @@ -3821,7 +3765,6 @@ devq->alloc_openings--; devq->alloc_active++; drv = (struct cam_periph*)camq_remove(drvq, CAMQ_HEAD); - splx(s); xpt_setup_ccb(&work_ccb->ccb_h, drv->path, drv->pinfo.priority); CAM_DEBUG_PRINT(CAM_DEBUG_XPT, @@ -3840,43 +3783,32 @@ break; } - /* Raise IPL for possible insertion and test at top of loop */ - s = splsoftcam(); - if (drvq->entries > 0) { /* We have more work. Attempt to reschedule */ xpt_schedule_dev_allocq(bus, device); } } devq->alloc_queue.qfrozen_cnt--; - splx(s); } static void xpt_run_dev_sendq(struct cam_eb *bus) { struct cam_devq *devq; - int s; CAM_DEBUG_PRINT(CAM_DEBUG_XPT, ("xpt_run_dev_sendq\n")); devq = bus->sim->devq; - s = splcam(); devq->send_queue.qfrozen_cnt++; - splx(s); - s = splsoftcam(); while ((devq->send_queue.entries > 0) && (devq->send_openings > 0)) { struct cam_ed_qinfo *qinfo; struct cam_ed *device; union ccb *work_ccb; struct cam_sim *sim; - int ospl; - ospl = splcam(); if (devq->send_queue.qfrozen_cnt > 1) { - splx(ospl); break; } @@ -3889,7 +3821,6 @@ * to run it. */ if (device->qfrozen_cnt > 0) { - splx(ospl); continue; } @@ -3899,7 +3830,6 @@ work_ccb = cam_ccbq_peek_ccb(&device->ccbq, CAMQ_HEAD); if (work_ccb == NULL) { printf("device on run queue with no ccbs???\n"); - splx(ospl); continue; } @@ -3918,7 +3848,6 @@ &work_ccb->ccb_h, xpt_links.stqe); - splx(ospl); continue; } else { /* @@ -3933,7 +3862,6 @@ cam_ccbq_remove_ccb(&device->ccbq, work_ccb); cam_ccbq_send_ccb(&device->ccbq, work_ccb); - splx(ospl); devq->send_openings--; devq->send_active++; @@ -3946,12 +3874,8 @@ * The client wants to freeze the queue * after this CCB is sent. */ - ospl = splcam(); device->qfrozen_cnt++; - splx(ospl); } - - splx(s); /* In Target mode, the peripheral driver knows best... */ if (work_ccb->ccb_h.func_code == XPT_SCSI_IO) { @@ -3975,16 +3899,9 @@ sim = work_ccb->ccb_h.path->bus->sim; (*(sim->sim_action))(sim, work_ccb); - ospl = splcam(); devq->active_dev = NULL; - splx(ospl); - /* Raise IPL for possible insertion and test at top of loop */ - s = splsoftcam(); } - splx(s); - s = splcam(); devq->send_queue.qfrozen_cnt--; - splx(s); } /* @@ -4068,12 +3985,12 @@ bus = xpt_find_bus(path_id); if (bus != NULL) { need_unlock = 1; - mtx_lock(bus->sim->mtx); + CAM_SIM_LOCK(bus->sim); } } status = xpt_compile_path(path, periph, path_id, target_id, lun_id); if (need_unlock) - mtx_unlock(bus->sim->mtx); + CAM_SIM_UNLOCK(bus->sim); if (status != CAM_REQ_CMP) { free(path, M_CAMXPT); path = NULL; @@ -4090,7 +4007,6 @@ struct cam_et *target; struct cam_ed *device; cam_status status; - int s; status = CAM_REQ_CMP; /* Completed without error */ target = NULL; /* Wildcarded */ @@ -4100,7 +4016,6 @@ * We will potentially modify the EDT, so block interrupts * that may attempt to create cam paths. */ - s = splcam(); bus = xpt_find_bus(path_id); if (bus == NULL) { status = CAM_PATH_INVALID; @@ -4134,7 +4049,6 @@ } } } - splx(s); /* * Only touch the user's data if we are successful. @@ -4359,7 +4273,6 @@ void xpt_release_ccb(union ccb *free_ccb) { - int s; struct cam_path *path; struct cam_ed *device; struct cam_eb *bus; @@ -4370,7 +4283,6 @@ device = path->device; bus = path->bus; sim = bus->sim; - s = splsoftcam(); mtx_assert(sim->mtx, MA_OWNED); @@ -4383,7 +4295,6 @@ xpt_links.sle); } if (sim->devq == NULL) { - splx(s); return; } sim->devq->alloc_openings++; @@ -4393,7 +4304,6 @@ && (device->drvq.entries > 0)) { xpt_schedule_dev_allocq(bus, device); } - splx(s); if (dev_allocq_is_runnable(sim->devq)) xpt_run_dev_allocq(bus); } @@ -4415,7 +4325,6 @@ struct cam_eb *new_bus; struct cam_eb *old_bus; struct ccb_pathinq cpi; - int s; mtx_assert(sim->mtx, MA_OWNED); @@ -4440,7 +4349,6 @@ new_bus->flags = 0; new_bus->refcount = 1; /* Held until a bus_deregister event */ new_bus->generation = 0; - s = splcam(); mtx_lock(&xsoftc.xpt_topo_lock); old_bus = TAILQ_FIRST(&xsoftc.xpt_busses); while (old_bus != NULL @@ -4452,7 +4360,6 @@ TAILQ_INSERT_TAIL(&xsoftc.xpt_busses, new_bus, links); xsoftc.bus_generation++; mtx_unlock(&xsoftc.xpt_topo_lock); - splx(s); /* Notify interested parties */ if (sim->path_id != CAM_XPT_PATH_ID) { @@ -4614,7 +4521,6 @@ struct cam_eb *bus; struct cam_et *target, *next_target; struct cam_ed *device, *next_device; - int s; mtx_assert(path->bus->sim->mtx, MA_OWNED); @@ -4624,20 +4530,14 @@ * Most async events come from a CAM interrupt context. In * a few cases, the error recovery code at the peripheral layer, * which may run from our SWI or a process context, may signal - * deferred events with a call to xpt_async. Ensure async - * notifications are serialized by blocking cam interrupts. + * deferred events with a call to xpt_async. */ - s = splcam(); bus = path->bus; if (async_code == AC_BUS_RESET) { - int s; - - s = splclock(); /* Update our notion of when the last reset occurred */ microtime(&bus->last_reset); - splx(s); } for (target = TAILQ_FIRST(&bus->et_entries); @@ -4652,12 +4552,8 @@ continue; if (async_code == AC_SENT_BDR) { - int s; - /* Update our notion of when the last reset occurred */ - s = splclock(); microtime(&path->target->last_reset); - splx(s); } for (device = TAILQ_FIRST(&target->ed_entries); @@ -4686,7 +4582,6 @@ if (bus != xpt_periph->path->bus) xpt_async_bcast(&xpt_periph->path->device->asyncs, async_code, path, async_arg); - splx(s); } static void @@ -4780,12 +4675,10 @@ u_int32_t xpt_freeze_devq(struct cam_path *path, u_int count) { - int s; struct ccb_hdr *ccbh; mtx_assert(path->bus->sim->mtx, MA_OWNED); - s = splcam(); path->device->qfrozen_cnt += count; /* @@ -4797,14 +4690,13 @@ * freezes the queue. To completly close the * hole, controller drives must check to see * if a ccb's status is still CAM_REQ_INPROG - * under spl protection just before they queue + * just before they queue * the CCB. See ahc_action/ahc_freeze_devq for * an example. */ ccbh = TAILQ_LAST(&path->device->ccbq.active_ccbs, ccb_hdr_tailq); if (ccbh && ccbh->status == CAM_REQ_INPROG) ccbh->status = CAM_REQUEUE_REQ; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Apr 20 22:43:49 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 C3AA816A402; Fri, 20 Apr 2007 22:43:49 +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 1405916A401 for ; Fri, 20 Apr 2007 22:43:49 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 017E313C448 for ; Fri, 20 Apr 2007 22:43:49 +0000 (UTC) (envelope-from mjacob@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 l3KMhmMU052708 for ; Fri, 20 Apr 2007 22:43:48 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3KMhgtR052701 for perforce@freebsd.org; Fri, 20 Apr 2007 22:43:42 GMT (envelope-from mjacob@freebsd.org) Date: Fri, 20 Apr 2007 22:43:42 GMT Message-Id: <200704202243.l3KMhgtR052701@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 118500 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, 20 Apr 2007 22:43:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=118500 Change 118500 by mjacob@mjexp on 2007/04/20 22:42:54 IFC Affected files ... .. //depot/projects/mjexp/Makefile.inc1#8 integrate .. //depot/projects/mjexp/ObsoleteFiles.inc#13 integrate .. //depot/projects/mjexp/UPDATING#13 integrate .. //depot/projects/mjexp/cddl/Makefile#2 integrate .. //depot/projects/mjexp/cddl/Makefile.inc#2 integrate .. //depot/projects/mjexp/cddl/lib/Makefile#3 integrate .. //depot/projects/mjexp/cddl/lib/Makefile.inc#2 integrate .. //depot/projects/mjexp/cddl/lib/libavl/Makefile#2 integrate .. //depot/projects/mjexp/cddl/lib/libnvpair/Makefile#2 integrate .. //depot/projects/mjexp/cddl/lib/libumem/Makefile#2 integrate .. //depot/projects/mjexp/cddl/lib/libuutil/Makefile#2 integrate .. //depot/projects/mjexp/cddl/lib/libzfs/Makefile#2 integrate .. //depot/projects/mjexp/cddl/lib/libzpool/Makefile#3 integrate .. //depot/projects/mjexp/cddl/sbin/Makefile#2 integrate .. //depot/projects/mjexp/cddl/sbin/zfs/Makefile#2 integrate .. //depot/projects/mjexp/cddl/sbin/zpool/Makefile#2 integrate .. //depot/projects/mjexp/cddl/usr.bin/Makefile#3 integrate .. //depot/projects/mjexp/cddl/usr.bin/ztest/Makefile#2 integrate .. //depot/projects/mjexp/cddl/usr.sbin/Makefile#3 integrate .. //depot/projects/mjexp/cddl/usr.sbin/zdb/Makefile#2 integrate .. //depot/projects/mjexp/contrib/openbsm/HISTORY#2 integrate .. //depot/projects/mjexp/contrib/openbsm/README#2 integrate .. //depot/projects/mjexp/contrib/openbsm/TODO#2 integrate .. //depot/projects/mjexp/contrib/openbsm/VERSION#2 integrate .. //depot/projects/mjexp/contrib/openbsm/bin/audit/audit.8#2 integrate .. //depot/projects/mjexp/contrib/openbsm/bin/auditd/auditd.8#2 integrate .. //depot/projects/mjexp/contrib/openbsm/bin/auditd/auditd.c#2 integrate .. //depot/projects/mjexp/contrib/openbsm/bin/auditfilterd/auditfilterd.8#2 integrate .. //depot/projects/mjexp/contrib/openbsm/bin/auditfilterd/auditfilterd.c#2 integrate .. //depot/projects/mjexp/contrib/openbsm/bin/auditreduce/auditreduce.1#2 integrate .. //depot/projects/mjexp/contrib/openbsm/bin/praudit/praudit.1#2 integrate .. //depot/projects/mjexp/contrib/openbsm/bin/praudit/praudit.c#2 integrate .. //depot/projects/mjexp/contrib/openbsm/bsm/libbsm.h#2 integrate .. //depot/projects/mjexp/contrib/openbsm/compat/clock_gettime.h#1 branch .. //depot/projects/mjexp/contrib/openbsm/config/config.h#2 integrate .. //depot/projects/mjexp/contrib/openbsm/configure#2 integrate .. //depot/projects/mjexp/contrib/openbsm/configure.ac#2 integrate .. //depot/projects/mjexp/contrib/openbsm/etc/audit_event#2 integrate .. //depot/projects/mjexp/contrib/openbsm/libbsm/au_class.3#2 integrate .. //depot/projects/mjexp/contrib/openbsm/libbsm/au_control.3#2 integrate .. //depot/projects/mjexp/contrib/openbsm/libbsm/au_event.3#2 integrate .. //depot/projects/mjexp/contrib/openbsm/libbsm/au_free_token.3#2 integrate .. //depot/projects/mjexp/contrib/openbsm/libbsm/au_io.3#2 integrate .. //depot/projects/mjexp/contrib/openbsm/libbsm/au_mask.3#2 integrate .. //depot/projects/mjexp/contrib/openbsm/libbsm/au_open.3#2 integrate .. //depot/projects/mjexp/contrib/openbsm/libbsm/au_token.3#2 integrate .. //depot/projects/mjexp/contrib/openbsm/libbsm/au_user.3#2 integrate .. //depot/projects/mjexp/contrib/openbsm/libbsm/audit_submit.3#2 integrate .. //depot/projects/mjexp/contrib/openbsm/libbsm/bsm_io.c#2 integrate .. //depot/projects/mjexp/contrib/openbsm/libbsm/bsm_notify.c#2 integrate .. //depot/projects/mjexp/contrib/openbsm/libbsm/bsm_token.c#2 integrate .. //depot/projects/mjexp/contrib/openbsm/libbsm/bsm_wrappers.c#2 integrate .. //depot/projects/mjexp/contrib/openbsm/libbsm/libbsm.3#2 integrate .. //depot/projects/mjexp/contrib/openbsm/man/audit.2#2 integrate .. //depot/projects/mjexp/contrib/openbsm/man/audit.log.5#2 integrate .. //depot/projects/mjexp/contrib/openbsm/man/audit_class.5#2 integrate .. //depot/projects/mjexp/contrib/openbsm/man/audit_control.5#2 integrate .. //depot/projects/mjexp/contrib/openbsm/man/audit_event.5#2 integrate .. //depot/projects/mjexp/contrib/openbsm/man/audit_user.5#2 integrate .. //depot/projects/mjexp/contrib/openbsm/man/audit_warn.5#2 integrate .. //depot/projects/mjexp/contrib/openbsm/man/auditctl.2#2 integrate .. //depot/projects/mjexp/contrib/openbsm/man/auditon.2#2 integrate .. //depot/projects/mjexp/contrib/openbsm/man/getaudit.2#2 integrate .. //depot/projects/mjexp/contrib/openbsm/man/getauid.2#2 integrate .. //depot/projects/mjexp/contrib/openbsm/man/setaudit.2#2 integrate .. //depot/projects/mjexp/contrib/openbsm/man/setauid.2#2 integrate .. //depot/projects/mjexp/contrib/openbsm/test/bsm/generate.c#2 integrate .. //depot/projects/mjexp/contrib/openbsm/test/reference/arg32_record#2 integrate .. //depot/projects/mjexp/contrib/openbsm/test/reference/data_record#2 integrate .. //depot/projects/mjexp/contrib/openbsm/test/reference/file_record#2 integrate .. //depot/projects/mjexp/contrib/openbsm/test/reference/in_addr_record#2 integrate .. //depot/projects/mjexp/contrib/openbsm/test/reference/ip_record#2 integrate .. //depot/projects/mjexp/contrib/openbsm/test/reference/ipc_record#2 integrate .. //depot/projects/mjexp/contrib/openbsm/test/reference/iport_record#2 integrate .. //depot/projects/mjexp/contrib/openbsm/test/reference/opaque_record#2 integrate .. //depot/projects/mjexp/contrib/openbsm/test/reference/path_record#2 integrate .. //depot/projects/mjexp/contrib/openbsm/test/reference/process32_record#2 integrate .. //depot/projects/mjexp/contrib/openbsm/test/reference/process32ex_record#2 delete .. //depot/projects/mjexp/contrib/openbsm/test/reference/process32ex_record-IPv4#1 branch .. //depot/projects/mjexp/contrib/openbsm/test/reference/process32ex_record-IPv6#1 branch .. //depot/projects/mjexp/contrib/openbsm/test/reference/process32ex_token#2 delete .. //depot/projects/mjexp/contrib/openbsm/test/reference/process32ex_token-IPv4#1 branch .. //depot/projects/mjexp/contrib/openbsm/test/reference/process32ex_token-IPv6#1 branch .. //depot/projects/mjexp/contrib/openbsm/test/reference/process64_record#1 branch .. //depot/projects/mjexp/contrib/openbsm/test/reference/process64_token#1 branch .. //depot/projects/mjexp/contrib/openbsm/test/reference/process64ex_record-IPv4#1 branch .. //depot/projects/mjexp/contrib/openbsm/test/reference/process64ex_record-IPv6#1 branch .. //depot/projects/mjexp/contrib/openbsm/test/reference/process64ex_token-IPv4#1 branch .. //depot/projects/mjexp/contrib/openbsm/test/reference/process64ex_token-IPv6#1 branch .. //depot/projects/mjexp/contrib/openbsm/test/reference/return32_record#2 integrate .. //depot/projects/mjexp/contrib/openbsm/test/reference/seq_record#2 integrate .. //depot/projects/mjexp/contrib/openbsm/test/reference/subject32_record#2 integrate .. //depot/projects/mjexp/contrib/openbsm/test/reference/subject32ex_record#2 integrate .. //depot/projects/mjexp/contrib/openbsm/test/reference/subject32ex_token-IPv4#2 integrate .. //depot/projects/mjexp/contrib/openbsm/test/reference/subject32ex_token-IPv6#2 integrate .. //depot/projects/mjexp/contrib/openbsm/test/reference/text_record#2 integrate .. //depot/projects/mjexp/contrib/openbsm/test/reference/zonename_record#1 branch .. //depot/projects/mjexp/contrib/openbsm/test/reference/zonename_token#1 branch .. //depot/projects/mjexp/contrib/openbsm/tools/audump.c#2 integrate .. //depot/projects/mjexp/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#4 integrate .. //depot/projects/mjexp/contrib/top/commands.c#2 integrate .. //depot/projects/mjexp/contrib/top/machine.h#2 integrate .. //depot/projects/mjexp/contrib/top/top.X#3 integrate .. //depot/projects/mjexp/contrib/top/top.c#3 integrate .. //depot/projects/mjexp/etc/mtree/BSD.include.dist#6 integrate .. //depot/projects/mjexp/etc/rc.d/zfs#3 integrate .. //depot/projects/mjexp/lib/libarchive/archive_read_extract.c#9 integrate .. //depot/projects/mjexp/lib/libarchive/archive_write_disk_set_standard_lookup.c#2 integrate .. //depot/projects/mjexp/lib/libc/net/rthdr.c#2 integrate .. //depot/projects/mjexp/lib/libc/stdio/fputs.3#3 integrate .. //depot/projects/mjexp/lib/ncurses/ncurses/Makefile#5 integrate .. //depot/projects/mjexp/libexec/ftpd/ftpcmd.y#2 integrate .. //depot/projects/mjexp/libexec/ftpd/ftpd.8#2 integrate .. //depot/projects/mjexp/libexec/ftpd/ftpd.c#3 integrate .. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/relnotes/article.sgml#12 integrate .. //depot/projects/mjexp/sbin/ifconfig/Makefile#3 integrate .. //depot/projects/mjexp/sbin/ifconfig/ifconfig.8#10 integrate .. //depot/projects/mjexp/sbin/ifconfig/iflagg.c#1 branch .. //depot/projects/mjexp/sbin/ifconfig/iftrunk.c#2 delete .. //depot/projects/mjexp/sbin/ipfw/ipfw2.c#4 integrate .. //depot/projects/mjexp/sbin/ping6/ping6.c#2 integrate .. //depot/projects/mjexp/share/man/man4/Makefile#11 integrate .. //depot/projects/mjexp/share/man/man4/lagg.4#1 branch .. //depot/projects/mjexp/share/man/man4/trunk.4#2 delete .. //depot/projects/mjexp/share/man/man7/hier.7#6 integrate .. //depot/projects/mjexp/share/man/man8/nanobsd.8#3 integrate .. //depot/projects/mjexp/share/man/man9/pseudofs.9#2 integrate .. //depot/projects/mjexp/share/misc/organization.dot#1 branch .. //depot/projects/mjexp/sys/amd64/amd64/busdma_machdep.c#4 integrate .. //depot/projects/mjexp/sys/amd64/linux32/linux32_dummy.c#5 integrate .. //depot/projects/mjexp/sys/amd64/linux32/linux32_machdep.c#13 integrate .. //depot/projects/mjexp/sys/bsm/audit.h#3 integrate .. //depot/projects/mjexp/sys/bsm/audit_internal.h#3 integrate .. //depot/projects/mjexp/sys/bsm/audit_kevents.h#3 integrate .. //depot/projects/mjexp/sys/bsm/audit_record.h#3 integrate .. //depot/projects/mjexp/sys/cam/cam_periph.c#5 integrate .. //depot/projects/mjexp/sys/cam/cam_periph.h#3 integrate .. //depot/projects/mjexp/sys/cam/cam_sim.c#3 integrate .. //depot/projects/mjexp/sys/cam/cam_sim.h#3 integrate .. //depot/projects/mjexp/sys/cam/cam_xpt.c#9 integrate .. //depot/projects/mjexp/sys/cam/cam_xpt_periph.h#3 integrate .. //depot/projects/mjexp/sys/cam/scsi/scsi_cd.c#4 integrate .. //depot/projects/mjexp/sys/cam/scsi/scsi_da.c#8 integrate .. //depot/projects/mjexp/sys/cam/scsi/scsi_low.c#5 integrate .. //depot/projects/mjexp/sys/cam/scsi/scsi_pass.c#4 integrate .. //depot/projects/mjexp/sys/cam/scsi/scsi_pt.c#4 integrate .. //depot/projects/mjexp/sys/cam/scsi/scsi_sa.c#4 integrate .. //depot/projects/mjexp/sys/cam/scsi/scsi_sg.c#4 integrate .. //depot/projects/mjexp/sys/compat/opensolaris/kern/opensolaris_vfs.c#2 integrate .. //depot/projects/mjexp/sys/conf/NOTES#19 integrate .. //depot/projects/mjexp/sys/conf/files#20 integrate .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/dnlc.c#4 integrate .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/spa.c#4 integrate .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#3 integrate .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#3 integrate .. //depot/projects/mjexp/sys/dev/aic7xxx/aic7770.c#2 integrate .. //depot/projects/mjexp/sys/dev/aic7xxx/aic79xx.c#2 integrate .. //depot/projects/mjexp/sys/dev/aic7xxx/aic79xx.h#3 integrate .. //depot/projects/mjexp/sys/dev/aic7xxx/aic79xx_osm.c#5 integrate .. //depot/projects/mjexp/sys/dev/aic7xxx/aic79xx_osm.h#3 integrate .. //depot/projects/mjexp/sys/dev/aic7xxx/aic79xx_pci.c#3 integrate .. //depot/projects/mjexp/sys/dev/aic7xxx/aic7xxx.c#2 integrate .. //depot/projects/mjexp/sys/dev/aic7xxx/aic7xxx.h#2 integrate .. //depot/projects/mjexp/sys/dev/aic7xxx/aic7xxx_inline.h#2 integrate .. //depot/projects/mjexp/sys/dev/aic7xxx/aic7xxx_osm.c#5 integrate .. //depot/projects/mjexp/sys/dev/aic7xxx/aic7xxx_osm.h#3 integrate .. //depot/projects/mjexp/sys/dev/aic7xxx/aic7xxx_pci.c#2 integrate .. //depot/projects/mjexp/sys/dev/aic7xxx/aic_osm_lib.c#2 integrate .. //depot/projects/mjexp/sys/dev/aic7xxx/aic_osm_lib.h#2 integrate .. //depot/projects/mjexp/sys/dev/ath/if_ath.c#8 integrate .. //depot/projects/mjexp/sys/dev/cxgb/cxgb_sge.c#6 integrate .. //depot/projects/mjexp/sys/dev/cxgb/sys/uipc_mvec.c#6 integrate .. //depot/projects/mjexp/sys/dev/ex/if_exvar.h#2 integrate .. //depot/projects/mjexp/sys/dev/firewire/fwdma.c#2 integrate .. //depot/projects/mjexp/sys/dev/hwpmc/hwpmc_logging.c#2 integrate .. //depot/projects/mjexp/sys/dev/hwpmc/hwpmc_mod.c#4 integrate .. //depot/projects/mjexp/sys/dev/hwpmc/hwpmc_piv.c#2 integrate .. //depot/projects/mjexp/sys/dev/iicbus/icee.c#2 integrate .. //depot/projects/mjexp/sys/dev/isp/isp_freebsd.c#17 integrate .. //depot/projects/mjexp/sys/dev/mpt/mpt_cam.c#17 integrate .. //depot/projects/mjexp/sys/dev/ral/rt2560.c#5 integrate .. //depot/projects/mjexp/sys/dev/re/if_re.c#11 integrate .. //depot/projects/mjexp/sys/dev/sound/isa/ad1816.c#5 integrate .. //depot/projects/mjexp/sys/dev/sound/isa/ess.c#4 integrate .. //depot/projects/mjexp/sys/dev/sound/isa/mss.c#5 integrate .. //depot/projects/mjexp/sys/dev/sound/isa/sb16.c#4 integrate .. //depot/projects/mjexp/sys/dev/sound/isa/sb8.c#4 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/als4000.c#4 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/atiixp.c#6 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/au88x0.c#3 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/aureal.c#3 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/cmi.c#6 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/cs4281.c#3 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/csapcm.c#3 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/ds1.c#5 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/emu10k1.c#5 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/emu10kx-pcm.c#5 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/envy24.c#7 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/envy24ht.c#6 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/es137x.c#5 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/fm801.c#3 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/hda/hdac.c#11 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/ich.c#7 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/maestro3.c#5 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/solo.c#4 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/t4dwave.c#4 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/via8233.c#6 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/via82c686.c#4 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/vibes.c#3 integrate .. //depot/projects/mjexp/sys/dev/sound/pcm/ac97.c#6 integrate .. //depot/projects/mjexp/sys/dev/sound/pcm/ac97.h#3 integrate .. //depot/projects/mjexp/sys/dev/sound/pcm/ac97_patch.c#4 integrate .. //depot/projects/mjexp/sys/dev/sound/pcm/ac97_patch.h#3 integrate .. //depot/projects/mjexp/sys/dev/sound/pcm/buffer.c#5 integrate .. //depot/projects/mjexp/sys/dev/sound/pcm/buffer.h#4 integrate .. //depot/projects/mjexp/sys/dev/sound/pcm/sound.h#4 integrate .. //depot/projects/mjexp/sys/dev/sound/sbus/cs4231.c#5 integrate .. //depot/projects/mjexp/sys/dev/usb/if_ural.c#7 integrate .. //depot/projects/mjexp/sys/dev/wi/if_wi.c#5 integrate .. //depot/projects/mjexp/sys/fs/devfs/devfs_vnops.c#7 integrate .. //depot/projects/mjexp/sys/fs/procfs/procfs_map.c#2 integrate .. //depot/projects/mjexp/sys/fs/pseudofs/pseudofs.c#5 integrate .. //depot/projects/mjexp/sys/fs/pseudofs/pseudofs.h#5 integrate .. //depot/projects/mjexp/sys/fs/pseudofs/pseudofs_fileno.c#3 integrate .. //depot/projects/mjexp/sys/fs/pseudofs/pseudofs_internal.h#3 integrate .. //depot/projects/mjexp/sys/fs/pseudofs/pseudofs_vncache.c#5 integrate .. //depot/projects/mjexp/sys/fs/pseudofs/pseudofs_vnops.c#3 integrate .. //depot/projects/mjexp/sys/i386/i386/bios.c#2 integrate .. //depot/projects/mjexp/sys/i386/i386/busdma_machdep.c#3 integrate .. //depot/projects/mjexp/sys/i386/i386/identcpu.c#6 integrate .. //depot/projects/mjexp/sys/isa/isa_common.c#2 integrate .. //depot/projects/mjexp/sys/kern/kern_intr.c#10 integrate .. //depot/projects/mjexp/sys/kern/sched_ule.c#14 integrate .. //depot/projects/mjexp/sys/kern/subr_rman.c#4 integrate .. //depot/projects/mjexp/sys/kern/subr_witness.c#10 integrate .. //depot/projects/mjexp/sys/kern/uipc_syscalls.c#9 integrate .. //depot/projects/mjexp/sys/kern/vfs_mount.c#12 integrate .. //depot/projects/mjexp/sys/modules/Makefile#11 integrate .. //depot/projects/mjexp/sys/modules/if_lagg/Makefile#1 branch .. //depot/projects/mjexp/sys/modules/if_trunk/Makefile#2 delete .. //depot/projects/mjexp/sys/net/ieee8023ad_lacp.c#2 integrate .. //depot/projects/mjexp/sys/net/ieee8023ad_lacp.h#2 integrate .. //depot/projects/mjexp/sys/net/if.c#8 integrate .. //depot/projects/mjexp/sys/net/if_ethersubr.c#9 integrate .. //depot/projects/mjexp/sys/net/if_lagg.c#1 branch .. //depot/projects/mjexp/sys/net/if_lagg.h#1 branch .. //depot/projects/mjexp/sys/net/if_trunk.c#2 delete .. //depot/projects/mjexp/sys/net/if_trunk.h#2 delete .. //depot/projects/mjexp/sys/net/if_var.h#4 integrate .. //depot/projects/mjexp/sys/netgraph/ng_ppp.c#5 integrate .. //depot/projects/mjexp/sys/netinet/ip_fw2.c#10 integrate .. //depot/projects/mjexp/sys/netinet/sctp_indata.c#9 integrate .. //depot/projects/mjexp/sys/netinet/sctp_input.c#9 integrate .. //depot/projects/mjexp/sys/netinet/sctp_lock_bsd.h#4 integrate .. //depot/projects/mjexp/sys/netinet/sctp_output.c#10 integrate .. //depot/projects/mjexp/sys/netinet/sctp_pcb.c#9 integrate .. //depot/projects/mjexp/sys/netinet/sctp_structs.h#9 integrate .. //depot/projects/mjexp/sys/netinet/sctp_uio.h#9 integrate .. //depot/projects/mjexp/sys/netinet/sctp_usrreq.c#9 integrate .. //depot/projects/mjexp/sys/netinet/sctp_var.h#8 integrate .. //depot/projects/mjexp/sys/netinet/sctputil.c#9 integrate .. //depot/projects/mjexp/sys/netinet/sctputil.h#7 integrate .. //depot/projects/mjexp/sys/netinet/tcp.h#4 integrate .. //depot/projects/mjexp/sys/netinet/tcp_input.c#11 integrate .. //depot/projects/mjexp/sys/netinet/tcp_output.c#8 integrate .. //depot/projects/mjexp/sys/netinet/tcp_subr.c#9 integrate .. //depot/projects/mjexp/sys/netinet/tcp_syncache.c#8 integrate .. //depot/projects/mjexp/sys/netinet/tcp_var.h#6 integrate .. //depot/projects/mjexp/sys/netnatm/natm.h#3 integrate .. //depot/projects/mjexp/sys/pci/if_rlreg.h#5 integrate .. //depot/projects/mjexp/sys/pci/if_vr.c#3 integrate .. //depot/projects/mjexp/sys/pci/if_vrreg.h#2 integrate .. //depot/projects/mjexp/sys/pci/intpm.c#4 integrate .. //depot/projects/mjexp/sys/powerpc/powerpc/nexus.c#3 integrate .. //depot/projects/mjexp/sys/security/audit/audit_bsm_token.c#4 integrate .. //depot/projects/mjexp/sys/sys/interrupt.h#4 integrate .. //depot/projects/mjexp/sys/sys/mount.h#10 integrate .. //depot/projects/mjexp/sys/sys/priv.h#6 integrate .. //depot/projects/mjexp/sys/sys/socket.h#3 integrate .. //depot/projects/mjexp/sys/vm/vm_contig.c#6 integrate .. //depot/projects/mjexp/sys/vm/vm_param.h#2 integrate .. //depot/projects/mjexp/tools/regression/lib/libc/nss/Makefile#1 branch .. //depot/projects/mjexp/tools/regression/lib/libc/nss/README#1 branch .. //depot/projects/mjexp/tools/regression/lib/libc/nss/mach#1 branch .. //depot/projects/mjexp/tools/regression/lib/libc/nss/test-getaddr.c#1 branch .. //depot/projects/mjexp/tools/regression/lib/libc/nss/test-getaddr.t#1 branch .. //depot/projects/mjexp/tools/regression/lib/libc/nss/test-getgr.c#1 branch .. //depot/projects/mjexp/tools/regression/lib/libc/nss/test-getgr.t#1 branch .. //depot/projects/mjexp/tools/regression/lib/libc/nss/test-gethostby.c#1 branch .. //depot/projects/mjexp/tools/regression/lib/libc/nss/test-gethostby.t#1 branch .. //depot/projects/mjexp/tools/regression/lib/libc/nss/test-getproto.c#1 branch .. //depot/projects/mjexp/tools/regression/lib/libc/nss/test-getproto.t#1 branch .. //depot/projects/mjexp/tools/regression/lib/libc/nss/test-getpw.c#1 branch .. //depot/projects/mjexp/tools/regression/lib/libc/nss/test-getpw.t#1 branch .. //depot/projects/mjexp/tools/regression/lib/libc/nss/test-getrpc.c#1 branch .. //depot/projects/mjexp/tools/regression/lib/libc/nss/test-getrpc.t#1 branch .. //depot/projects/mjexp/tools/regression/lib/libc/nss/test-getserv.c#1 branch .. //depot/projects/mjexp/tools/regression/lib/libc/nss/test-getserv.t#1 branch .. //depot/projects/mjexp/tools/regression/lib/libc/nss/test-getusershell.c#1 branch .. //depot/projects/mjexp/tools/regression/lib/libc/nss/test-getusershell.t#1 branch .. //depot/projects/mjexp/tools/regression/lib/libc/nss/testutil.h#1 branch .. //depot/projects/mjexp/tools/regression/sockets/sendfile/Makefile#2 integrate .. //depot/projects/mjexp/tools/regression/sockets/sendfile/sendfile.c#2 integrate .. //depot/projects/mjexp/tools/tools/nanobsd/nanobsd.sh#3 integrate .. //depot/projects/mjexp/usr.bin/lastcomm/lastcomm.1#3 integrate .. //depot/projects/mjexp/usr.bin/lastcomm/lastcomm.c#3 integrate .. //depot/projects/mjexp/usr.bin/make/GNode.h#2 integrate .. //depot/projects/mjexp/usr.bin/make/main.c#3 integrate .. //depot/projects/mjexp/usr.bin/make/make.c#2 integrate .. //depot/projects/mjexp/usr.bin/make/targ.c#2 integrate .. //depot/projects/mjexp/usr.bin/tar/read.c#6 integrate .. //depot/projects/mjexp/usr.bin/tar/test/test-basic.sh#4 integrate .. //depot/projects/mjexp/usr.bin/tar/util.c#4 integrate .. //depot/projects/mjexp/usr.bin/top/machine.c#4 integrate .. //depot/projects/mjexp/usr.sbin/bsnmpd/modules/snmp_bridge/snmp_bridge.3#3 integrate .. //depot/projects/mjexp/usr.sbin/daemon/daemon.c#4 integrate Differences ... ==== //depot/projects/mjexp/Makefile.inc1#8 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.571 2007/04/06 02:13:29 pjd Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.572 2007/04/17 15:52:36 pjd Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -1016,11 +1016,11 @@ ${_lib_libgssapi} ${_lib_libipx} \ lib/libkiconv lib/libkvm lib/libmd \ lib/ncurses/ncurses lib/ncurses/ncursesw \ - lib/libopie lib/libpam \ + lib/libopie lib/libpam lib/libpthread \ lib/libradius lib/libsbuf lib/libtacplus lib/libutil \ ${_lib_libypclnt} lib/libz lib/msun \ ${_secure_lib_libcrypto} ${_secure_lib_libssh} \ - ${_secure_lib_libssl} lib/libthr + ${_secure_lib_libssl} _generic_libs= ${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib ==== //depot/projects/mjexp/ObsoleteFiles.inc#13 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.78 2007/04/09 19:16:48 pjd Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.79 2007/04/17 01:02:55 thompsa Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,8 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20070417: trunk(4) renamed to lagg(4) +OLD_FILES+=usr/include/net/if_trunk.h # 20070409: uuidgen moved to /bin/ OLD_FILES+=usr/bin/uuidgen # 20070328: bzip2 1.0.4 ==== //depot/projects/mjexp/UPDATING#13 (text+ko) ==== @@ -21,6 +21,10 @@ developers choose to disable these features on build machines to maximize performance. +20070417: + The new trunk(4) driver has been renamed to lagg(4) as it better + reflects its purpose. ifconfig will need to be recompiled. + 20070408: sendmail(8) has been updated to version 8.14.1. Mail filters (aka, milters) compiled against the libmilter included in the @@ -763,4 +767,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.485 2007/04/14 16:26:01 gshapiro Exp $ +$FreeBSD: src/UPDATING,v 1.488 2007/04/19 17:08:54 dds Exp $ ==== //depot/projects/mjexp/cddl/Makefile#2 (text+ko) ==== @@ -1,8 +1,5 @@ -# $FreeBSD: src/cddl/Makefile,v 1.1 2007/04/06 01:08:56 pjd Exp $ +# $FreeBSD: src/cddl/Makefile,v 1.2 2007/04/16 21:20:24 ru Exp $ -SUBDIR= lib -SUBDIR+=sbin -SUBDIR+=usr.bin -SUBDIR+=usr.sbin +SUBDIR= lib sbin usr.bin usr.sbin .include ==== //depot/projects/mjexp/cddl/Makefile.inc#2 (text+ko) ==== @@ -1,3 +1,3 @@ -# $FreeBSD: src/cddl/Makefile.inc,v 1.1 2007/04/06 01:08:56 pjd Exp $ +# $FreeBSD: src/cddl/Makefile.inc,v 1.2 2007/04/16 21:20:24 ru Exp $ -CFLAGS+=-D_SOLARIS_C_SOURCE +CFLAGS+= -D_SOLARIS_C_SOURCE ==== //depot/projects/mjexp/cddl/lib/Makefile#3 (text+ko) ==== @@ -1,18 +1,19 @@ -# $FreeBSD: src/cddl/lib/Makefile,v 1.2 2007/04/07 19:12:09 des Exp $ +# $FreeBSD: src/cddl/lib/Makefile,v 1.3 2007/04/16 21:20:24 ru Exp $ .include -SUBDIR= libavl -SUBDIR+=libnvpair -SUBDIR+=libumem -SUBDIR+=libuutil -.if ${MK_CDDL} != "no" -SUBDIR+=libzfs -SUBDIR+=${_libzpool} -.endif +SUBDIR= libavl \ + libnvpair \ + libumem \ + libuutil \ + ${_libzfs} \ + ${_libzpool} -.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" +.if ${MK_ZFS} != "no" +_libzfs= libzfs +.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" _libzpool= libzpool .endif +.endif .include ==== //depot/projects/mjexp/cddl/lib/Makefile.inc#2 (text+ko) ==== @@ -1,5 +1,6 @@ -# $FreeBSD: src/cddl/lib/Makefile.inc,v 1.1 2007/04/06 01:08:56 pjd Exp $ +# $FreeBSD: src/cddl/lib/Makefile.inc,v 1.2 2007/04/16 21:20:24 ru Exp $ SHLIBDIR?= /lib +SHLIB_MAJOR?= 1 .include "../Makefile.inc" ==== //depot/projects/mjexp/cddl/lib/libavl/Makefile#2 (text+ko) ==== @@ -1,13 +1,10 @@ -# $FreeBSD: src/cddl/lib/libavl/Makefile,v 1.1 2007/04/06 01:08:56 pjd Exp $ +# $FreeBSD: src/cddl/lib/libavl/Makefile,v 1.2 2007/04/16 21:20:24 ru Exp $ -.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/avl +.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/avl LIB= avl -SHLIB_MAJOR?=1 - SRCS= avl.c - -CFLAGS+=-I${.CURDIR}/../../../sys/compat/opensolaris -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common +CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common .include ==== //depot/projects/mjexp/cddl/lib/libnvpair/Makefile#2 (text+ko) ==== @@ -1,18 +1,17 @@ -# $FreeBSD: src/cddl/lib/libnvpair/Makefile,v 1.1 2007/04/06 01:08:56 pjd Exp $ +# $FreeBSD: src/cddl/lib/libnvpair/Makefile,v 1.2 2007/04/16 21:20:25 ru Exp $ -.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair -.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/nvpair +.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair +.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/nvpair LIB= nvpair -SHLIB_MAJOR?=1 -SRCS= libnvpair.c -SRCS+= nvpair_alloc_system.c -SRCS+= nvpair_alloc_fixed.c -SRCS+= nvpair.c +SRCS= libnvpair.c \ + nvpair_alloc_system.c \ + nvpair_alloc_fixed.c \ + nvpair.c -CFLAGS+=-I${.CURDIR}/../../../sys/compat/opensolaris -CFLAGS+=-I${.CURDIR}/../../../include -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common +CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris +CFLAGS+= -I${.CURDIR}/../../../include # XXX +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common .include ==== //depot/projects/mjexp/cddl/lib/libumem/Makefile#2 (text+ko) ==== @@ -1,12 +1,9 @@ -# $FreeBSD: src/cddl/lib/libumem/Makefile,v 1.1 2007/04/06 01:08:56 pjd Exp $ +# $FreeBSD: src/cddl/lib/libumem/Makefile,v 1.2 2007/04/16 21:20:25 ru Exp $ -.PATH: ${.CURDIR}/../../../compat/opensolaris/lib/libumem +.PATH: ${.CURDIR}/../../../compat/opensolaris/lib/libumem LIB= umem -SHLIB_MAJOR?=1 - SRCS= umem.c - -CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/lib/libumem +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem .include ==== //depot/projects/mjexp/cddl/lib/libuutil/Makefile#2 (text+ko) ==== @@ -1,27 +1,25 @@ -# $FreeBSD: src/cddl/lib/libuutil/Makefile,v 1.1 2007/04/06 01:08:57 pjd Exp $ +# $FreeBSD: src/cddl/lib/libuutil/Makefile,v 1.2 2007/04/16 21:20:25 ru Exp $ -.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common -.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/avl +.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common +.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/avl LIB= uutil -SHLIB_MAJOR?=1 +SRCS= avl.c \ + uu_alloc.c \ + uu_avl.c \ + uu_dprintf.c \ + uu_ident.c \ + uu_list.c \ + uu_misc.c \ + uu_open.c \ + uu_pname.c \ + uu_strtoint.c -SRCS= avl.c -SRCS+= uu_alloc.c -SRCS+= uu_avl.c -SRCS+= uu_dprintf.c -SRCS+= uu_ident.c -SRCS+= uu_list.c -SRCS+= uu_misc.c -SRCS+= uu_open.c -SRCS+= uu_pname.c -SRCS+= uu_strtoint.c - -CFLAGS+=-DNATIVE_BUILD -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common -CFLAGS+=-I${.CURDIR}/../../../sys/compat/opensolaris -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common -CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/include -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/head +CFLAGS+= -DNATIVE_BUILD +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common +CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head .include ==== //depot/projects/mjexp/cddl/lib/libzfs/Makefile#2 (text+ko) ==== @@ -1,49 +1,46 @@ -# $FreeBSD: src/cddl/lib/libzfs/Makefile,v 1.1 2007/04/06 01:08:57 pjd Exp $ +# $FreeBSD: src/cddl/lib/libzfs/Makefile,v 1.2 2007/04/16 21:20:25 ru Exp $ -.PATH: ${.CURDIR}/../../../compat/opensolaris/misc -.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs -.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs -.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common +.PATH: ${.CURDIR}/../../../compat/opensolaris/misc +.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs +.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs +.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common LIB= zfs -SHLIB_MAJOR?=1 - DPADD= ${LIBUTIL} LDADD= -lutil -SRCS= mnttab.c -SRCS+= mkdirp.c -SRCS+= zmount.c -SRCS+= fsshare.c -SRCS+= zone.c +SRCS= mnttab.c \ + mkdirp.c \ + zmount.c \ + fsshare.c \ + zone.c -SRCS+= zfs_namecheck.c -SRCS+= zfs_prop.c -SRCS+= libzfs_dataset.c -SRCS+= libzfs_util.c -SRCS+= libzfs_graph.c -SRCS+= libzfs_mount.c -SRCS+= libzfs_pool.c -SRCS+= libzfs_changelist.c -SRCS+= libzfs_config.c -SRCS+= libzfs_import.c -SRCS+= libzfs_status.c +SRCS+= zfs_namecheck.c \ + zfs_prop.c \ + libzfs_dataset.c \ + libzfs_util.c \ + libzfs_graph.c \ + libzfs_mount.c \ + libzfs_pool.c \ + libzfs_changelist.c \ + libzfs_config.c \ + libzfs_import.c \ + libzfs_status.c -CFLAGS+=-DZFS_NO_ACL -CFLAGS+=-I${.CURDIR}/../../../sbin/mount -CFLAGS+=-I${.CURDIR}/../../../cddl/lib/libumem -CFLAGS+=-I${.CURDIR}/../../../sys/compat/opensolaris -CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/include -CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/lib/libumem -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/head -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common -CFLAGS+=-I${.CURDIR}/../../../sys +CFLAGS+= -DZFS_NO_ACL +CFLAGS+= -I${.CURDIR}/../../../sbin/mount +CFLAGS+= -I${.CURDIR}/../../../cddl/lib/libumem +CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common .include ==== //depot/projects/mjexp/cddl/lib/libzpool/Makefile#3 (text+ko) ==== @@ -1,44 +1,43 @@ -# $FreeBSD: src/cddl/lib/libzpool/Makefile,v 1.2 2007/04/07 23:54:53 pjd Exp $ +# $FreeBSD: src/cddl/lib/libzpool/Makefile,v 1.4 2007/04/17 15:52:36 pjd Exp $ .include "${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/Makefile.files" # ZFS_COMMON_SRCS -.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs +.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs # ZFS_SHARED_SRCS -.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs +.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs # KERNEL_SRCS -.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common +.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common # LIST_SRCS -.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/os +.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/os # ATOMIC_SRCS -.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/atomic/${MACHINE_ARCH} +.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/atomic/${MACHINE_ARCH} -LIB= zpool -SHLIB_MAJOR?=1 +LIB= zpool -ZFS_COMMON_SRCS= ${ZFS_COMMON_OBJS:C/.o$/.c/} vdev_file.c -ZFS_SHARED_SRCS= ${ZFS_SHARED_OBJS:C/.o$/.c/} -KERNEL_SRCS= kernel.c taskq.c util.c -LIST_SRCS= list.c -ATOMIC_SRCS= atomic.S +ZFS_COMMON_SRCS= ${ZFS_COMMON_OBJS:C/.o$/.c/} vdev_file.c +ZFS_SHARED_SRCS= ${ZFS_SHARED_OBJS:C/.o$/.c/} +KERNEL_SRCS= kernel.c taskq.c util.c +LIST_SRCS= list.c +ATOMIC_SRCS= atomic.S -SRCS= ${ZFS_COMMON_SRCS} ${ZFS_SHARED_SRCS} ${KERNEL_SRCS} ${LIST_SRCS} ${ATOMIC_SRCS} +SRCS= ${ZFS_COMMON_SRCS} ${ZFS_SHARED_SRCS} \ + ${KERNEL_SRCS} ${LIST_SRCS} ${ATOMIC_SRCS} -CFLAGS+=-I${.CURDIR}/../../../sys/compat/opensolaris -CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/include -CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/lib/libumem -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/head -CFLAGS+=-I${.CURDIR}/../../../cddl/lib/libumem -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair -CFLAGS+=-I${.CURDIR}/../../../sys +CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head +CFLAGS+= -I${.CURDIR}/../../../cddl/lib/libumem +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair -DPADD= ${LIBTHR} ${LIBZ} -LDADD= -lthr -lz +DPADD= ${LIBPTHREAD} ${LIBZ} +LDADD= -lpthread -lz # atomic.S doesn't like profiling. NO_PROFILE= ==== //depot/projects/mjexp/cddl/sbin/Makefile#2 (text+ko) ==== @@ -1,11 +1,12 @@ -# $FreeBSD: src/cddl/sbin/Makefile,v 1.1 2007/04/06 01:08:57 pjd Exp $ +# $FreeBSD: src/cddl/sbin/Makefile,v 1.2 2007/04/16 21:20:25 ru Exp $ .include -SUBDIR= +SUBDIR= ${_zfs} ${_zpool} + .if ${MK_ZFS} != "no" -SUBDIR+=zfs -SUBDIR+=zpool +_zfs= zfs +_zpool= zpool .endif .include ==== //depot/projects/mjexp/cddl/sbin/zfs/Makefile#2 (text+ko) ==== @@ -1,25 +1,23 @@ -# $FreeBSD: src/cddl/sbin/zfs/Makefile,v 1.1 2007/04/06 01:08:57 pjd Exp $ +# $FreeBSD: src/cddl/sbin/zfs/Makefile,v 1.2 2007/04/16 21:20:26 ru Exp $ -.PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zfs +.PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zfs PROG= zfs MAN= zfs.8 -SRCS= zfs_main.c -SRCS+= zfs_iter.c +SRCS= zfs_main.c zfs_iter.c -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common -CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/include -CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/lib/libumem -CFLAGS+=-I${.CURDIR}/../../../sys/compat/opensolaris -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/head -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libumem/common -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys -CFLAGS+=-I${.CURDIR}/../../../sys +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem +CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libumem/common +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBZFS} LDADD= -lgeom -lm -lnvpair -luutil -lzfs ==== //depot/projects/mjexp/cddl/sbin/zpool/Makefile#2 (text+ko) ==== @@ -1,27 +1,23 @@ -# $FreeBSD: src/cddl/sbin/zpool/Makefile,v 1.1 2007/04/06 01:08:57 pjd Exp $ +# $FreeBSD: src/cddl/sbin/zpool/Makefile,v 1.2 2007/04/16 21:20:26 ru Exp $ -.PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zpool +.PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zpool PROG= zpool MAN= zpool.8 -SRCS= zpool_main.c -SRCS+= zpool_vdev.c -SRCS+= zpool_iter.c -SRCS+= zpool_util.c +SRCS= zpool_main.c zpool_vdev.c zpool_iter.c zpool_util.c -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common -CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/include -CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/lib/libumem -CFLAGS+=-I${.CURDIR}/../../../sys/compat/opensolaris -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/head -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libumem/common -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys -CFLAGS+=-I${.CURDIR}/../../../sys +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem +CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libumem/common +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBZFS} LDADD= -lavl -lgeom -lm -lnvpair -luutil -lzfs ==== //depot/projects/mjexp/cddl/usr.bin/Makefile#3 (text+ko) ==== @@ -1,13 +1,13 @@ -# $FreeBSD: src/cddl/usr.bin/Makefile,v 1.2 2007/04/07 19:12:09 des Exp $ +# $FreeBSD: src/cddl/usr.bin/Makefile,v 1.3 2007/04/16 21:20:26 ru Exp $ .include -.if ${MK_ZFS} != "no" SUBDIR= ${_ztest} -.endif -.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" +.if ${MK_ZFS} != "no" +.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" _ztest= ztest .endif +.endif .include ==== //depot/projects/mjexp/cddl/usr.bin/ztest/Makefile#2 (text+ko) ==== @@ -1,23 +1,21 @@ -# $FreeBSD: src/cddl/usr.bin/ztest/Makefile,v 1.1 2007/04/06 01:08:58 pjd Exp $ +# $FreeBSD: src/cddl/usr.bin/ztest/Makefile,v 1.3 2007/04/17 15:52:37 pjd Exp $ -.PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/ztest +.PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/ztest PROG= ztest +NO_MAN= -CFLAGS+=-I${.CURDIR}/../../../sys/compat/opensolaris -CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/include -CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/lib/libumem -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/head -CFLAGS+=-I${.CURDIR}/../../lib/libumem -CFLAGS+=-I${.CURDIR}/../../../sys +CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head +CFLAGS+= -I${.CURDIR}/../../lib/libumem -DPADD= ${LIBAVL} ${LIBM} ${LIBNVPAIR} ${LIBTHR} ${LIBUMEM} ${LIBZPOOL} -LDADD= -lavl -lm -lnvpair -lthr -lumem -lzpool - -NO_MAN= +DPADD= ${LIBAVL} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} ${LIBZPOOL} +LDADD= -lavl -lm -lnvpair -lpthread -lumem -lzpool .include ==== //depot/projects/mjexp/cddl/usr.sbin/Makefile#3 (text+ko) ==== @@ -1,14 +1,13 @@ -# $FreeBSD: src/cddl/usr.sbin/Makefile,v 1.2 2007/04/07 19:12:09 des Exp $ +# $FreeBSD: src/cddl/usr.sbin/Makefile,v 1.3 2007/04/16 21:20:26 ru Exp $ .include -SUBDIR= +SUBDIR= ${_zdb} + .if ${MK_ZFS} != "no" -SUBDIR+=${_zdb} +.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" +_zdb= zdb .endif - -.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" -_zdb= zdb .endif .include ==== //depot/projects/mjexp/cddl/usr.sbin/zdb/Makefile#2 (text+ko) ==== @@ -1,23 +1,22 @@ -# $FreeBSD: src/cddl/usr.sbin/zdb/Makefile,v 1.1 2007/04/06 01:08:58 pjd Exp $ +# $FreeBSD: src/cddl/usr.sbin/zdb/Makefile,v 1.3 2007/04/17 15:52:37 pjd Exp $ -.PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zdb +.PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zdb PROG= zdb MAN= zdb.8 -SRCS+= zdb.c zdb_il.c +SRCS= zdb.c zdb_il.c -CFLAGS+=-I${.CURDIR}/../../../sys/compat/opensolaris -CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/include -CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/lib/libumem -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/head -CFLAGS+=-I${.CURDIR}/../../lib/libumem -CFLAGS+=-I${.CURDIR}/../../../sys +CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head +CFLAGS+= -I${.CURDIR}/../../lib/libumem -DPADD= ${LIBAVL} ${LIBM} ${LIBNVPAIR} ${LIBTHR} ${LIBUMEM} ${LIBZPOOL} -LDADD= -lavl -lm -lnvpair -lthr -lumem -lzpool +DPADD= ${LIBAVL} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} ${LIBZPOOL} +LDADD= -lavl -lm -lnvpair -lpthread -lumem -lzpool .include ==== //depot/projects/mjexp/contrib/openbsm/HISTORY#2 (text) ==== @@ -1,3 +1,23 @@ +OpenBSM 1.0 alpha 14 + +- Fix endian issues when processing IPv6 addresses for extended subject + and process tokens. +- gcc41 warnings clean. +- Teach audit_submit(3) about getaudit_addr(2). +- Add support for zonename tokens. + +OpenBSM 1.0 alpha 13 + +- compat/clock_gettime.h now provides a compatibility implementation of + clock_gettime(), which fixes building on Mac OS X. +- Countless man page improvements, markup fixes, content fixs, etc. +- XML printing support via "praudit -x". +- audit.log.5 expanded to include additional BSM token types. +- Added encoding and decoding routines for process64_ex, process32_ex, + subject32_ex, header64, and attr64 tokens. +- Additional audit event identifiers for listen, mlockall/munlockall, + getpath, POSIX message queues, and mandatory access control. + >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Apr 20 23:07:19 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 4EBF216A406; Fri, 20 Apr 2007 23:07:19 +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 2732B16A403 for ; Fri, 20 Apr 2007 23:07:19 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id F354313C465 for ; Fri, 20 Apr 2007 23:07:18 +0000 (UTC) (envelope-from scottl@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 l3KN7I0D057359 for ; Fri, 20 Apr 2007 23:07:18 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3KN7Ibe057356 for perforce@freebsd.org; Fri, 20 Apr 2007 23:07:18 GMT (envelope-from scottl@freebsd.org) Date: Fri, 20 Apr 2007 23:07:18 GMT Message-Id: <200704202307.l3KN7Ibe057356@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 118501 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, 20 Apr 2007 23:07:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=118501 Change 118501 by scottl@scottl-x64 on 2007/04/20 23:06:28 The MPT lock is already held when mpt_poll is called, don't try to grab it again. Affected files ... .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_cam.c#25 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_cam.c#25 (text+ko) ==== @@ -917,9 +917,7 @@ struct mpt_softc *mpt; mpt = (struct mpt_softc *)cam_sim_softc(sim); - MPT_LOCK(mpt); mpt_intr(mpt); - MPT_UNLOCK(mpt); } /* From owner-p4-projects@FreeBSD.ORG Fri Apr 20 23:33:52 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 6AAE516A406; Fri, 20 Apr 2007 23:33:52 +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 31F2A16A402 for ; Fri, 20 Apr 2007 23:33:52 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2193B13C44B for ; Fri, 20 Apr 2007 23:33:52 +0000 (UTC) (envelope-from mjacob@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 l3KNXpHX061696 for ; Fri, 20 Apr 2007 23:33:51 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3KNXp1S061688 for perforce@freebsd.org; Fri, 20 Apr 2007 23:33:51 GMT (envelope-from mjacob@freebsd.org) Date: Fri, 20 Apr 2007 23:33:51 GMT Message-Id: <200704202333.l3KNXp1S061688@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 118502 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, 20 Apr 2007 23:33:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=118502 Change 118502 by mjacob@mjexp on 2007/04/20 23:32:53 While it's true we have motherboard blacklists for MSI breakage, it's true that this is incomplete. Save ourselves some grief by not trying to do MSI for Ultra320 chips. MFP4 after: 1 days Affected files ... .. //depot/projects/mjexp/sys/dev/mpt/mpt_pci.c#9 edit Differences ... ==== //depot/projects/mjexp/sys/dev/mpt/mpt_pci.c#9 (text+ko) ==== @@ -522,11 +522,13 @@ /* Get a handle to the interrupt */ iqd = 0; + /* * First try to alloc an MSI-X message. If that * fails, then try to alloc an MSI message instead. + * Don't do this for U320 chips. */ - if (pci_msix_count(dev) == 1) { + if (mpt->is_spi == 0 && pci_msix_count(dev) == 1) { mpt->pci_msi_count = 1; if (pci_alloc_msix(dev, &mpt->pci_msi_count) == 0) { iqd = 1; @@ -534,7 +536,7 @@ mpt->pci_msi_count = 0; } } - if (iqd == 0 && pci_msi_count(dev) == 1) { + if (mpt->is_spi == 0 && iqd == 0 && pci_msi_count(dev) == 1) { mpt->pci_msi_count = 1; if (pci_alloc_msi(dev, &mpt->pci_msi_count) == 0) { iqd = 1; From owner-p4-projects@FreeBSD.ORG Sat Apr 21 01:53:07 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 5F78316A404; Sat, 21 Apr 2007 01:53:07 +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 1602316A401 for ; Sat, 21 Apr 2007 01:53:07 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 0355013C457 for ; Sat, 21 Apr 2007 01:53:07 +0000 (UTC) (envelope-from marcel@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 l3L1r6GI094206 for ; Sat, 21 Apr 2007 01:53:06 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3L1owrN093427 for perforce@freebsd.org; Sat, 21 Apr 2007 01:50:58 GMT (envelope-from marcel@freebsd.org) Date: Sat, 21 Apr 2007 01:50:58 GMT Message-Id: <200704210150.l3L1owrN093427@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 118507 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: Sat, 21 Apr 2007 01:53:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=118507 Change 118507 by marcel@marcel_xcllnt on 2007/04/21 01:49:30 IFC @118506 Affected files ... .. //depot/projects/busdma/Makefile#5 integrate .. //depot/projects/busdma/amd64/acpica/OsdEnvironment.c#2 integrate .. //depot/projects/busdma/amd64/acpica/madt.c#3 integrate .. //depot/projects/busdma/amd64/amd64/apic_vector.S#2 integrate .. //depot/projects/busdma/amd64/amd64/busdma_machdep.c#3 integrate .. //depot/projects/busdma/amd64/amd64/cpu_switch.S#2 integrate .. //depot/projects/busdma/amd64/amd64/db_disasm.c#2 integrate .. //depot/projects/busdma/amd64/amd64/db_trace.c#3 integrate .. //depot/projects/busdma/amd64/amd64/exception.S#2 integrate .. //depot/projects/busdma/amd64/amd64/genassym.c#2 integrate .. //depot/projects/busdma/amd64/amd64/identcpu.c#3 integrate .. //depot/projects/busdma/amd64/amd64/intr_machdep.c#3 integrate .. //depot/projects/busdma/amd64/amd64/io.c#2 integrate .. //depot/projects/busdma/amd64/amd64/io_apic.c#2 integrate .. //depot/projects/busdma/amd64/amd64/legacy.c#2 integrate .. //depot/projects/busdma/amd64/amd64/local_apic.c#3 integrate .. //depot/projects/busdma/amd64/amd64/machdep.c#5 integrate .. //depot/projects/busdma/amd64/amd64/minidump_machdep.c#2 integrate .. //depot/projects/busdma/amd64/amd64/mp_machdep.c#4 integrate .. //depot/projects/busdma/amd64/amd64/mptable.c#2 integrate .. //depot/projects/busdma/amd64/amd64/mptable_pci.c#2 integrate .. //depot/projects/busdma/amd64/amd64/msi.c#1 branch .. //depot/projects/busdma/amd64/amd64/nexus.c#3 integrate .. //depot/projects/busdma/amd64/amd64/pmap.c#5 integrate .. //depot/projects/busdma/amd64/amd64/prof_machdep.c#2 integrate .. //depot/projects/busdma/amd64/amd64/support.S#3 integrate .. //depot/projects/busdma/amd64/amd64/trap.c#4 integrate .. //depot/projects/busdma/amd64/amd64/tsc.c#2 integrate .. //depot/projects/busdma/amd64/amd64/uma_machdep.c#2 integrate .. //depot/projects/busdma/amd64/conf/DEFAULTS#3 integrate .. //depot/projects/busdma/amd64/conf/GENERIC#6 integrate .. //depot/projects/busdma/amd64/conf/GENERIC.hints#2 integrate .. //depot/projects/busdma/amd64/conf/NOTES#6 integrate .. //depot/projects/busdma/amd64/ia32/ia32_exception.S#2 integrate .. //depot/projects/busdma/amd64/ia32/ia32_syscall.c#3 integrate .. //depot/projects/busdma/amd64/include/acpica_machdep.h#2 integrate .. //depot/projects/busdma/amd64/include/apicvar.h#2 integrate .. //depot/projects/busdma/amd64/include/asmacros.h#2 integrate .. //depot/projects/busdma/amd64/include/atomic.h#2 integrate .. //depot/projects/busdma/amd64/include/clock.h#4 integrate .. //depot/projects/busdma/amd64/include/gdb_machdep.h#2 integrate .. //depot/projects/busdma/amd64/include/intr_machdep.h#2 integrate .. //depot/projects/busdma/amd64/include/md_var.h#3 integrate .. //depot/projects/busdma/amd64/include/pcb.h#2 integrate .. //depot/projects/busdma/amd64/include/pcpu.h#2 integrate .. //depot/projects/busdma/amd64/include/pmap.h#3 integrate .. //depot/projects/busdma/amd64/include/profile.h#2 integrate .. //depot/projects/busdma/amd64/include/reg.h#2 integrate .. //depot/projects/busdma/amd64/include/segments.h#2 integrate .. //depot/projects/busdma/amd64/include/setjmp.h#2 integrate .. //depot/projects/busdma/amd64/include/smp.h#2 integrate .. //depot/projects/busdma/amd64/include/specialreg.h#3 integrate .. //depot/projects/busdma/amd64/include/vmparam.h#2 integrate .. //depot/projects/busdma/amd64/isa/atpic.c#2 integrate .. //depot/projects/busdma/amd64/isa/atpic_vector.S#3 integrate .. //depot/projects/busdma/amd64/isa/clock.c#3 integrate .. //depot/projects/busdma/amd64/isa/icu.h#2 integrate .. //depot/projects/busdma/amd64/isa/isa.c#2 integrate .. //depot/projects/busdma/amd64/linux32/linux.h#3 integrate .. //depot/projects/busdma/amd64/linux32/linux32_dummy.c#5 integrate .. //depot/projects/busdma/amd64/linux32/linux32_locore.s#2 integrate .. //depot/projects/busdma/amd64/linux32/linux32_machdep.c#3 integrate .. //depot/projects/busdma/amd64/linux32/linux32_proto.h#6 integrate .. //depot/projects/busdma/amd64/linux32/linux32_syscall.h#6 integrate .. //depot/projects/busdma/amd64/linux32/linux32_sysent.c#6 integrate .. //depot/projects/busdma/amd64/linux32/linux32_sysvec.c#4 integrate .. //depot/projects/busdma/amd64/linux32/syscalls.master#6 integrate .. //depot/projects/busdma/amd64/pci/pci_bus.c#2 integrate .. //depot/projects/busdma/arm/arm/busdma_machdep.c#4 integrate .. //depot/projects/busdma/arm/arm/cpufunc.c#3 integrate .. //depot/projects/busdma/arm/arm/cpufunc_asm_arm9.S#2 integrate .. //depot/projects/busdma/arm/arm/db_interface.c#2 integrate .. //depot/projects/busdma/arm/arm/elf_trampoline.c#5 integrate .. //depot/projects/busdma/arm/arm/fusu.S#3 integrate .. //depot/projects/busdma/arm/arm/genassym.c#2 integrate .. //depot/projects/busdma/arm/arm/identcpu.c#3 integrate .. //depot/projects/busdma/arm/arm/intr.c#2 integrate .. //depot/projects/busdma/arm/arm/locore.S#3 integrate .. //depot/projects/busdma/arm/arm/machdep.c#4 integrate .. //depot/projects/busdma/arm/arm/mem.c#3 integrate .. //depot/projects/busdma/arm/arm/nexus.c#2 integrate .. //depot/projects/busdma/arm/arm/nexus_io.c#2 integrate .. //depot/projects/busdma/arm/arm/pmap.c#4 integrate .. //depot/projects/busdma/arm/arm/support.S#2 integrate .. //depot/projects/busdma/arm/arm/sys_machdep.c#2 integrate .. //depot/projects/busdma/arm/arm/trap.c#3 integrate .. //depot/projects/busdma/arm/arm/undefined.c#2 integrate .. //depot/projects/busdma/arm/arm/vm_machdep.c#4 integrate .. //depot/projects/busdma/arm/at91/at91.c#4 integrate .. //depot/projects/busdma/arm/at91/at91_mci.c#1 branch .. //depot/projects/busdma/arm/at91/at91_mcireg.h#1 branch .. //depot/projects/busdma/arm/at91/at91_pio.c#4 integrate .. //depot/projects/busdma/arm/at91/at91_pioreg.h#2 integrate .. //depot/projects/busdma/arm/at91/at91_pmc.c#4 integrate .. //depot/projects/busdma/arm/at91/at91_rtc.c#3 integrate .. //depot/projects/busdma/arm/at91/at91_spi.c#3 integrate .. //depot/projects/busdma/arm/at91/at91_spireg.h#3 integrate .. //depot/projects/busdma/arm/at91/at91_ssc.c#3 integrate .. //depot/projects/busdma/arm/at91/at91_sscreg.h#2 integrate .. //depot/projects/busdma/arm/at91/at91_st.c#4 integrate .. //depot/projects/busdma/arm/at91/at91_twi.c#3 integrate .. //depot/projects/busdma/arm/at91/at91_twireg.h#2 integrate .. //depot/projects/busdma/arm/at91/files.at91#4 integrate .. //depot/projects/busdma/arm/at91/if_ate.c#4 integrate .. //depot/projects/busdma/arm/at91/kb920x_machdep.c#4 integrate .. //depot/projects/busdma/arm/at91/ohci_atmelarm.c#2 integrate .. //depot/projects/busdma/arm/at91/std.at91#3 integrate .. //depot/projects/busdma/arm/at91/std.kb920x#3 integrate .. //depot/projects/busdma/arm/at91/uart_cpu_at91rm9200usart.c#3 integrate .. //depot/projects/busdma/arm/at91/uart_dev_at91usart.c#5 integrate .. //depot/projects/busdma/arm/conf/AVILA#1 branch .. //depot/projects/busdma/arm/conf/BWCT#1 branch .. //depot/projects/busdma/arm/conf/BWCT.hints#1 branch .. //depot/projects/busdma/arm/conf/EP80219#2 integrate .. //depot/projects/busdma/arm/conf/IQ31244#3 integrate .. //depot/projects/busdma/arm/conf/KB920X#4 integrate .. //depot/projects/busdma/arm/conf/KB920X.hints#1 branch .. //depot/projects/busdma/arm/conf/SIMICS#3 integrate .. //depot/projects/busdma/arm/conf/SKYEYE#3 integrate .. //depot/projects/busdma/arm/include/armreg.h#3 integrate .. //depot/projects/busdma/arm/include/atomic.h#3 integrate .. //depot/projects/busdma/arm/include/bootconfig.h#2 integrate .. //depot/projects/busdma/arm/include/bus.h#2 integrate .. //depot/projects/busdma/arm/include/bus_dma.h#2 integrate .. //depot/projects/busdma/arm/include/cpuconf.h#4 integrate .. //depot/projects/busdma/arm/include/cpufunc.h#4 integrate .. //depot/projects/busdma/arm/include/intr.h#2 integrate .. //depot/projects/busdma/arm/include/md_var.h#2 integrate .. //depot/projects/busdma/arm/include/pcpu.h#2 integrate .. //depot/projects/busdma/arm/include/pmap.h#4 integrate .. //depot/projects/busdma/arm/include/undefined.h#2 integrate .. //depot/projects/busdma/arm/sa11x0/assabet_machdep.c#4 integrate .. //depot/projects/busdma/arm/sa11x0/sa11x0.c#2 integrate .. //depot/projects/busdma/arm/sa11x0/sa11x0_io.c#3 integrate .. //depot/projects/busdma/arm/sa11x0/sa11x0_irqhandler.c#2 integrate .. //depot/projects/busdma/arm/sa11x0/sa11x0_ost.c#2 integrate .. //depot/projects/busdma/arm/sa11x0/uart_cpu_sa1110.c#3 integrate .. //depot/projects/busdma/arm/sa11x0/uart_dev_sa1110.c#3 integrate .. //depot/projects/busdma/arm/xscale/i80321/ep80219_machdep.c#2 integrate .. //depot/projects/busdma/arm/xscale/i80321/i80321_pci.c#3 integrate .. //depot/projects/busdma/arm/xscale/i80321/i80321_space.c#3 integrate .. //depot/projects/busdma/arm/xscale/i80321/i80321_timer.c#3 integrate .. //depot/projects/busdma/arm/xscale/i80321/i80321_wdog.c#2 integrate .. //depot/projects/busdma/arm/xscale/i80321/iq31244_machdep.c#4 integrate .. //depot/projects/busdma/arm/xscale/i80321/iq80321.c#4 integrate .. //depot/projects/busdma/arm/xscale/i80321/obio_space.c#2 integrate .. //depot/projects/busdma/arm/xscale/i80321/uart_cpu_i80321.c#2 integrate .. //depot/projects/busdma/arm/xscale/ixp425/avila_ata.c#1 branch .. //depot/projects/busdma/arm/xscale/ixp425/avila_led.c#1 branch .. //depot/projects/busdma/arm/xscale/ixp425/avila_machdep.c#1 branch .. //depot/projects/busdma/arm/xscale/ixp425/files.avila#1 branch .. //depot/projects/busdma/arm/xscale/ixp425/files.ixp425#1 branch .. //depot/projects/busdma/arm/xscale/ixp425/if_npe.c#1 branch .. //depot/projects/busdma/arm/xscale/ixp425/if_npereg.h#1 branch .. //depot/projects/busdma/arm/xscale/ixp425/ixdp425_pci.c#1 branch .. //depot/projects/busdma/arm/xscale/ixp425/ixdp425reg.h#1 branch .. //depot/projects/busdma/arm/xscale/ixp425/ixp425.c#1 branch .. //depot/projects/busdma/arm/xscale/ixp425/ixp425_a4x_io.S#1 branch .. //depot/projects/busdma/arm/xscale/ixp425/ixp425_a4x_space.c#1 branch .. //depot/projects/busdma/arm/xscale/ixp425/ixp425_iic.c#1 branch .. //depot/projects/busdma/arm/xscale/ixp425/ixp425_intr.h#1 branch .. //depot/projects/busdma/arm/xscale/ixp425/ixp425_mem.c#1 branch .. //depot/projects/busdma/arm/xscale/ixp425/ixp425_npe.c#1 branch .. //depot/projects/busdma/arm/xscale/ixp425/ixp425_npereg.h#1 branch .. //depot/projects/busdma/arm/xscale/ixp425/ixp425_npevar.h#1 branch .. //depot/projects/busdma/arm/xscale/ixp425/ixp425_pci.c#1 branch .. //depot/projects/busdma/arm/xscale/ixp425/ixp425_pci_asm.S#1 branch .. //depot/projects/busdma/arm/xscale/ixp425/ixp425_pci_space.c#1 branch .. //depot/projects/busdma/arm/xscale/ixp425/ixp425_qmgr.c#1 branch .. //depot/projects/busdma/arm/xscale/ixp425/ixp425_qmgr.h#1 branch .. //depot/projects/busdma/arm/xscale/ixp425/ixp425_space.c#1 branch .. //depot/projects/busdma/arm/xscale/ixp425/ixp425_timer.c#1 branch .. //depot/projects/busdma/arm/xscale/ixp425/ixp425_wdog.c#1 branch .. //depot/projects/busdma/arm/xscale/ixp425/ixp425reg.h#1 branch .. //depot/projects/busdma/arm/xscale/ixp425/ixp425var.h#1 branch .. //depot/projects/busdma/arm/xscale/ixp425/std.avila#1 branch .. //depot/projects/busdma/arm/xscale/ixp425/std.ixp425#1 branch .. //depot/projects/busdma/arm/xscale/ixp425/uart_bus_ixp425.c#1 branch .. //depot/projects/busdma/arm/xscale/ixp425/uart_cpu_ixp425.c#1 branch .. //depot/projects/busdma/boot/Makefile#4 integrate .. //depot/projects/busdma/boot/arm/Makefile#2 integrate .. //depot/projects/busdma/boot/arm/at91/Makefile#2 integrate .. //depot/projects/busdma/boot/arm/at91/Makefile.inc#3 integrate .. //depot/projects/busdma/boot/arm/at91/boot0/Makefile#3 integrate .. //depot/projects/busdma/boot/arm/at91/boot0/arm_init.s#2 delete .. //depot/projects/busdma/boot/arm/at91/boot0iic/Makefile#3 integrate .. //depot/projects/busdma/boot/arm/at91/boot0iic/main.c#3 integrate .. //depot/projects/busdma/boot/arm/at91/boot0spi/Makefile#3 integrate .. //depot/projects/busdma/boot/arm/at91/boot0spi/main.c#3 integrate .. //depot/projects/busdma/boot/arm/at91/boot2/Makefile#1 branch .. //depot/projects/busdma/boot/arm/at91/boot2/board.h#1 branch .. //depot/projects/busdma/boot/arm/at91/boot2/boot2.c#1 branch .. //depot/projects/busdma/boot/arm/at91/boot2/kb920x_board.c#1 branch .. //depot/projects/busdma/boot/arm/at91/bootiic/Makefile#3 integrate .. //depot/projects/busdma/boot/arm/at91/bootiic/arm_init.S#3 delete .. //depot/projects/busdma/boot/arm/at91/bootiic/env_vars.c#2 integrate .. //depot/projects/busdma/boot/arm/at91/bootiic/loader_prompt.c#2 integrate .. //depot/projects/busdma/boot/arm/at91/bootspi/Makefile#3 integrate .. //depot/projects/busdma/boot/arm/at91/bootspi/arm_init.S#2 delete .. //depot/projects/busdma/boot/arm/at91/bootspi/ee.c#1 branch .. //depot/projects/busdma/boot/arm/at91/bootspi/ee.h#1 branch .. //depot/projects/busdma/boot/arm/at91/bootspi/env_vars.c#2 integrate .. //depot/projects/busdma/boot/arm/at91/bootspi/loader_prompt.c#2 integrate .. //depot/projects/busdma/boot/arm/at91/bootspi/main.c#3 integrate .. //depot/projects/busdma/boot/arm/at91/libat91/Makefile#3 integrate .. //depot/projects/busdma/boot/arm/at91/libat91/arm_init.S#1 branch .. //depot/projects/busdma/boot/arm/at91/libat91/at91rm9200.h#3 integrate .. //depot/projects/busdma/boot/arm/at91/libat91/at91rm9200_lowlevel.c#2 integrate .. //depot/projects/busdma/boot/arm/at91/libat91/at91rm9200_lowlevel.h#3 integrate .. //depot/projects/busdma/boot/arm/at91/libat91/eeprom.c#3 integrate .. //depot/projects/busdma/boot/arm/at91/libat91/emac.c#3 integrate .. //depot/projects/busdma/boot/arm/at91/libat91/emac.h#3 integrate .. //depot/projects/busdma/boot/arm/at91/libat91/emac_init.c#2 integrate .. //depot/projects/busdma/boot/arm/at91/libat91/getc.c#2 integrate .. //depot/projects/busdma/boot/arm/at91/libat91/lib.h#3 integrate .. //depot/projects/busdma/boot/arm/at91/libat91/lib_AT91RM9200.h#2 integrate .. //depot/projects/busdma/boot/arm/at91/libat91/mci_device.c#2 delete .. //depot/projects/busdma/boot/arm/at91/libat91/mci_device.h#2 integrate .. //depot/projects/busdma/boot/arm/at91/libat91/memcmp.c#1 branch .. //depot/projects/busdma/boot/arm/at91/libat91/memcpy.c#1 branch .. //depot/projects/busdma/boot/arm/at91/libat91/memset.c#1 branch .. //depot/projects/busdma/boot/arm/at91/libat91/p_string.c#3 integrate .. //depot/projects/busdma/boot/arm/at91/libat91/printf.c#2 integrate .. //depot/projects/busdma/boot/arm/at91/libat91/putchar.c#2 integrate .. //depot/projects/busdma/boot/arm/at91/libat91/sd-card.c#2 integrate .. //depot/projects/busdma/boot/arm/at91/libat91/spi_flash.c#2 integrate .. //depot/projects/busdma/boot/arm/at91/libat91/spi_flash.h#2 integrate .. //depot/projects/busdma/boot/arm/at91/libat91/strcmp.c#1 branch .. //depot/projects/busdma/boot/arm/at91/libat91/strcpy.c#1 branch .. //depot/projects/busdma/boot/arm/at91/libat91/strcvt.c#1 branch .. //depot/projects/busdma/boot/arm/at91/libat91/strlen.c#1 branch .. //depot/projects/busdma/boot/common/Makefile.inc#3 integrate .. //depot/projects/busdma/boot/common/bootstrap.h#2 integrate .. //depot/projects/busdma/boot/common/devopen.c#2 integrate .. //depot/projects/busdma/boot/common/help.common#3 integrate .. //depot/projects/busdma/boot/common/load_elf.c#3 integrate .. //depot/projects/busdma/boot/common/loader.8#4 integrate .. //depot/projects/busdma/boot/common/pnp.c#2 integrate .. //depot/projects/busdma/boot/common/pnpdata#2 delete .. //depot/projects/busdma/boot/efi/include/efi.h#2 integrate .. //depot/projects/busdma/boot/efi/include/efi_nii.h#2 integrate .. //depot/projects/busdma/boot/efi/include/efiapi.h#2 integrate .. //depot/projects/busdma/boot/efi/include/eficon.h#2 integrate .. //depot/projects/busdma/boot/efi/include/efidebug.h#2 integrate .. //depot/projects/busdma/boot/efi/include/efidef.h#2 integrate .. //depot/projects/busdma/boot/efi/include/efidevp.h#2 integrate .. //depot/projects/busdma/boot/efi/include/efierr.h#2 integrate .. //depot/projects/busdma/boot/efi/include/efifs.h#2 integrate .. //depot/projects/busdma/boot/efi/include/efilib.h#2 integrate .. //depot/projects/busdma/boot/efi/include/efinet.h#2 integrate .. //depot/projects/busdma/boot/efi/include/efipart.h#2 integrate .. //depot/projects/busdma/boot/efi/include/efiprot.h#2 integrate .. //depot/projects/busdma/boot/efi/include/efipxebc.h#2 integrate .. //depot/projects/busdma/boot/efi/include/efiser.h#2 integrate .. //depot/projects/busdma/boot/efi/include/efistdarg.h#2 integrate .. //depot/projects/busdma/boot/efi/include/i386/efibind.h#2 integrate .. //depot/projects/busdma/boot/efi/include/i386/pe.h#2 integrate .. //depot/projects/busdma/boot/efi/include/ia64/efibind.h#2 integrate .. //depot/projects/busdma/boot/efi/include/ia64/pe.h#2 integrate .. //depot/projects/busdma/boot/efi/libefi/Makefile#2 integrate .. //depot/projects/busdma/boot/efi/libefi/bootinfo.c#3 delete .. //depot/projects/busdma/boot/efi/libefi/copy.c#2 delete .. //depot/projects/busdma/boot/efi/libefi/devicename.c#2 delete .. //depot/projects/busdma/boot/efi/libefi/efiboot.h#2 delete .. //depot/projects/busdma/boot/efi/libefi/efifpswa.c#2 delete .. //depot/projects/busdma/boot/efi/libefi/efifs.c#2 integrate .. //depot/projects/busdma/boot/efi/libefi/efinet.c#2 integrate .. //depot/projects/busdma/boot/efi/libefi/elf_freebsd.c#2 delete .. //depot/projects/busdma/boot/efi/libefi/errno.c#1 branch .. //depot/projects/busdma/boot/efi/libefi/handles.c#1 branch .. //depot/projects/busdma/boot/efi/libefi/libefi.c#2 integrate .. //depot/projects/busdma/boot/efi/libefi/module.c#2 delete .. //depot/projects/busdma/boot/efi/libefi/time.c#2 integrate .. //depot/projects/busdma/boot/ficl/ficl.h#2 integrate .. //depot/projects/busdma/boot/ficl/float.c#2 integrate .. //depot/projects/busdma/boot/ficl/softwords/fileaccess.fr#2 integrate .. //depot/projects/busdma/boot/ficl/softwords/jhlocal.fr#2 integrate .. //depot/projects/busdma/boot/ficl/softwords/oo.fr#2 integrate .. //depot/projects/busdma/boot/ficl/softwords/prefix.fr#2 integrate .. //depot/projects/busdma/boot/ficl/softwords/softcore.awk#2 integrate .. //depot/projects/busdma/boot/ficl/tools.c#2 integrate .. //depot/projects/busdma/boot/ficl/unix.c#2 integrate .. //depot/projects/busdma/boot/ficl/vm.c#2 integrate .. //depot/projects/busdma/boot/ficl/words.c#2 integrate .. //depot/projects/busdma/boot/forth/loader.conf#4 integrate .. //depot/projects/busdma/boot/forth/support.4th#2 integrate .. //depot/projects/busdma/boot/i386/boot0/boot0.S#2 integrate .. //depot/projects/busdma/boot/i386/boot2/boot2.c#2 integrate .. //depot/projects/busdma/boot/i386/btx/btx/btx.S#3 integrate .. //depot/projects/busdma/boot/i386/cdboot/cdboot.s#2 integrate .. //depot/projects/busdma/boot/i386/libi386/biosacpi.c#2 integrate .. //depot/projects/busdma/boot/i386/libi386/bioscd.c#2 integrate .. //depot/projects/busdma/boot/i386/libi386/biosdisk.c#3 integrate .. //depot/projects/busdma/boot/i386/libi386/bootinfo32.c#2 integrate .. //depot/projects/busdma/boot/i386/libi386/devicename.c#2 integrate .. //depot/projects/busdma/boot/i386/libi386/elf32_freebsd.c#2 integrate .. //depot/projects/busdma/boot/i386/libi386/elf64_freebsd.c#3 integrate .. //depot/projects/busdma/boot/i386/libi386/libi386.h#3 integrate .. //depot/projects/busdma/boot/i386/loader/Makefile#2 integrate .. //depot/projects/busdma/boot/i386/loader/main.c#3 integrate .. //depot/projects/busdma/boot/ia64/Makefile#2 integrate .. //depot/projects/busdma/boot/ia64/common/Makefile#1 branch .. //depot/projects/busdma/boot/ia64/common/autoload.c#1 branch .. //depot/projects/busdma/boot/ia64/common/bootinfo.c#1 branch .. //depot/projects/busdma/boot/ia64/common/copy.c#1 branch .. //depot/projects/busdma/boot/ia64/common/devicename.c#1 branch .. //depot/projects/busdma/boot/ia64/common/exec.c#1 branch .. //depot/projects/busdma/boot/ia64/common/libia64.h#1 branch .. //depot/projects/busdma/boot/ia64/efi/Makefile#2 integrate .. //depot/projects/busdma/boot/ia64/efi/conf.c#2 integrate .. //depot/projects/busdma/boot/ia64/efi/efimd.c#2 integrate .. //depot/projects/busdma/boot/ia64/efi/main.c#2 integrate .. //depot/projects/busdma/boot/ia64/efi/version#2 integrate .. //depot/projects/busdma/boot/ia64/ski/Makefile#2 integrate .. //depot/projects/busdma/boot/ia64/ski/acpi_stub.c#2 integrate .. //depot/projects/busdma/boot/ia64/ski/bootinfo.c#3 delete .. //depot/projects/busdma/boot/ia64/ski/copy.c#2 delete .. //depot/projects/busdma/boot/ia64/ski/devicename.c#2 delete .. //depot/projects/busdma/boot/ia64/ski/efi_stub.c#2 integrate .. //depot/projects/busdma/boot/ia64/ski/elf_freebsd.c#2 delete .. //depot/projects/busdma/boot/ia64/ski/libski.h#2 integrate .. //depot/projects/busdma/boot/ia64/ski/main.c#2 integrate .. //depot/projects/busdma/boot/ia64/ski/skifs.c#2 integrate .. //depot/projects/busdma/boot/ia64/ski/skimd.c#1 branch .. //depot/projects/busdma/boot/ia64/ski/version#2 integrate .. //depot/projects/busdma/boot/ofw/common/main.c#2 integrate .. //depot/projects/busdma/boot/ofw/libofw/Makefile#2 integrate .. //depot/projects/busdma/boot/ofw/libofw/libofw.h#2 integrate .. //depot/projects/busdma/boot/ofw/libofw/openfirm.c#2 integrate .. //depot/projects/busdma/boot/ofw/libofw/openfirm_mmu.c#1 branch .. //depot/projects/busdma/boot/pc98/boot0.5/Makefile#2 integrate .. //depot/projects/busdma/boot/pc98/boot0.5/boot.s#2 integrate .. //depot/projects/busdma/boot/pc98/boot0.5/boot0.5.s#2 integrate .. //depot/projects/busdma/boot/pc98/boot0.5/disk.s#2 integrate .. //depot/projects/busdma/boot/pc98/boot0.5/ldscript#1 branch .. //depot/projects/busdma/boot/pc98/boot0.5/putssjis.s#1 branch .. //depot/projects/busdma/boot/pc98/boot0.5/selector.s#2 integrate .. //depot/projects/busdma/boot/pc98/boot0.5/start.s#2 integrate .. //depot/projects/busdma/boot/pc98/boot2/boot.c#2 integrate .. //depot/projects/busdma/boot/pc98/btx/btx/btx.S#2 integrate .. //depot/projects/busdma/boot/pc98/cdboot/cdboot.s#2 integrate .. //depot/projects/busdma/boot/pc98/libpc98/bioscd.c#2 integrate .. //depot/projects/busdma/boot/pc98/libpc98/biosdisk.c#2 integrate .. //depot/projects/busdma/boot/pc98/libpc98/biossmap.c#1 branch .. //depot/projects/busdma/boot/pc98/loader/Makefile#2 integrate .. //depot/projects/busdma/boot/pc98/loader/main.c#3 integrate .. //depot/projects/busdma/boot/sparc64/loader/main.c#2 integrate .. //depot/projects/busdma/bsm/audit.h#4 integrate .. //depot/projects/busdma/bsm/audit_internal.h#3 integrate .. //depot/projects/busdma/bsm/audit_kevents.h#4 integrate .. //depot/projects/busdma/bsm/audit_record.h#5 integrate .. //depot/projects/busdma/cam/cam_ccb.h#3 integrate .. //depot/projects/busdma/cam/cam_periph.c#4 integrate .. //depot/projects/busdma/cam/cam_periph.h#2 integrate .. //depot/projects/busdma/cam/cam_sim.c#2 integrate .. //depot/projects/busdma/cam/cam_sim.h#2 integrate .. //depot/projects/busdma/cam/cam_xpt.c#5 integrate .. //depot/projects/busdma/cam/cam_xpt.h#2 integrate .. //depot/projects/busdma/cam/cam_xpt_periph.h#2 integrate .. //depot/projects/busdma/cam/scsi/scsi_all.h#4 integrate .. //depot/projects/busdma/cam/scsi/scsi_cd.c#3 integrate .. //depot/projects/busdma/cam/scsi/scsi_ch.c#2 integrate .. //depot/projects/busdma/cam/scsi/scsi_da.c#3 integrate .. //depot/projects/busdma/cam/scsi/scsi_low.c#2 integrate .. //depot/projects/busdma/cam/scsi/scsi_pass.c#3 integrate .. //depot/projects/busdma/cam/scsi/scsi_pt.c#2 integrate .. //depot/projects/busdma/cam/scsi/scsi_sa.c#2 integrate .. //depot/projects/busdma/cam/scsi/scsi_ses.c#2 integrate .. //depot/projects/busdma/cam/scsi/scsi_sg.c#1 branch .. //depot/projects/busdma/cam/scsi/scsi_sg.h#1 branch .. //depot/projects/busdma/cam/scsi/scsi_targ_bh.c#2 integrate .. //depot/projects/busdma/cam/scsi/scsi_target.c#3 integrate .. //depot/projects/busdma/coda/coda_vfsops.h#2 integrate .. //depot/projects/busdma/coda/coda_vnops.c#2 integrate .. //depot/projects/busdma/coda/coda_vnops.h#2 integrate .. //depot/projects/busdma/compat/freebsd32/freebsd32_misc.c#4 integrate .. //depot/projects/busdma/compat/freebsd32/freebsd32_proto.h#4 integrate .. //depot/projects/busdma/compat/freebsd32/freebsd32_syscall.h#4 integrate .. //depot/projects/busdma/compat/freebsd32/freebsd32_syscalls.c#4 integrate .. //depot/projects/busdma/compat/freebsd32/freebsd32_sysent.c#4 integrate .. //depot/projects/busdma/compat/freebsd32/syscalls.master#4 integrate .. //depot/projects/busdma/compat/linprocfs/linprocfs.c#6 integrate .. //depot/projects/busdma/compat/linsysfs/linsysfs.c#2 integrate .. //depot/projects/busdma/compat/linux/linux_emul.c#2 integrate .. //depot/projects/busdma/compat/linux/linux_emul.h#2 integrate .. //depot/projects/busdma/compat/linux/linux_file.c#4 integrate .. //depot/projects/busdma/compat/linux/linux_futex.c#2 integrate .. //depot/projects/busdma/compat/linux/linux_futex.h#2 integrate .. //depot/projects/busdma/compat/linux/linux_getcwd.c#2 integrate .. //depot/projects/busdma/compat/linux/linux_ioctl.c#4 integrate .. //depot/projects/busdma/compat/linux/linux_ioctl.h#3 integrate .. //depot/projects/busdma/compat/linux/linux_ipc.c#4 integrate .. //depot/projects/busdma/compat/linux/linux_ipc.h#2 integrate .. //depot/projects/busdma/compat/linux/linux_mib.c#2 integrate .. //depot/projects/busdma/compat/linux/linux_mib.h#2 integrate .. //depot/projects/busdma/compat/linux/linux_misc.c#5 integrate .. //depot/projects/busdma/compat/linux/linux_misc.h#1 branch .. //depot/projects/busdma/compat/linux/linux_signal.c#4 integrate .. //depot/projects/busdma/compat/linux/linux_signal.h#2 integrate .. //depot/projects/busdma/compat/linux/linux_socket.c#4 integrate .. //depot/projects/busdma/compat/linux/linux_stats.c#5 integrate .. //depot/projects/busdma/compat/linux/linux_time.c#2 integrate .. //depot/projects/busdma/compat/linux/linux_uid16.c#2 integrate .. //depot/projects/busdma/compat/linux/linux_util.c#4 integrate .. //depot/projects/busdma/compat/linux/linux_util.h#4 integrate .. //depot/projects/busdma/compat/ndis/kern_ndis.c#3 integrate .. //depot/projects/busdma/compat/ndis/ndis_var.h#2 integrate .. //depot/projects/busdma/compat/ndis/subr_ndis.c#3 integrate .. //depot/projects/busdma/compat/ndis/subr_ntoskrnl.c#3 integrate .. //depot/projects/busdma/compat/ndis/subr_pe.c#2 integrate .. //depot/projects/busdma/compat/opensolaris/kern/opensolaris_kmem.c#1 branch .. //depot/projects/busdma/compat/opensolaris/kern/opensolaris_kobj.c#1 branch .. //depot/projects/busdma/compat/opensolaris/kern/opensolaris_kstat.c#1 branch .. //depot/projects/busdma/compat/opensolaris/kern/opensolaris_misc.c#1 branch .. //depot/projects/busdma/compat/opensolaris/kern/opensolaris_policy.c#1 branch .. //depot/projects/busdma/compat/opensolaris/kern/opensolaris_string.c#1 branch .. //depot/projects/busdma/compat/opensolaris/kern/opensolaris_vfs.c#1 branch .. //depot/projects/busdma/compat/opensolaris/kern/opensolaris_zone.c#1 branch .. //depot/projects/busdma/compat/opensolaris/machine/endian.h#1 branch .. //depot/projects/busdma/compat/opensolaris/rpc/xdr.h#1 branch .. //depot/projects/busdma/compat/opensolaris/sys/acl.h#1 branch .. //depot/projects/busdma/compat/opensolaris/sys/byteorder.h#1 branch .. //depot/projects/busdma/compat/opensolaris/sys/callb.h#1 branch .. //depot/projects/busdma/compat/opensolaris/sys/cmn_err.h#1 branch .. //depot/projects/busdma/compat/opensolaris/sys/cred.h#1 branch .. //depot/projects/busdma/compat/opensolaris/sys/debug.h#1 branch .. //depot/projects/busdma/compat/opensolaris/sys/dirent.h#1 branch .. //depot/projects/busdma/compat/opensolaris/sys/dkio.h#1 branch .. //depot/projects/busdma/compat/opensolaris/sys/kcondvar.h#1 branch .. //depot/projects/busdma/compat/opensolaris/sys/kmem.h#1 branch .. //depot/projects/busdma/compat/opensolaris/sys/kobj.h#1 branch .. //depot/projects/busdma/compat/opensolaris/sys/kstat.h#1 branch .. //depot/projects/busdma/compat/opensolaris/sys/lock.h#1 branch .. //depot/projects/busdma/compat/opensolaris/sys/misc.h#1 branch .. //depot/projects/busdma/compat/opensolaris/sys/mntent.h#1 branch .. //depot/projects/busdma/compat/opensolaris/sys/mnttab.h#1 branch .. //depot/projects/busdma/compat/opensolaris/sys/mount.h#1 branch .. //depot/projects/busdma/compat/opensolaris/sys/mutex.h#1 branch .. //depot/projects/busdma/compat/opensolaris/sys/policy.h#1 branch .. //depot/projects/busdma/compat/opensolaris/sys/proc.h#1 branch .. //depot/projects/busdma/compat/opensolaris/sys/random.h#1 branch .. //depot/projects/busdma/compat/opensolaris/sys/rwlock.h#1 branch .. //depot/projects/busdma/compat/opensolaris/sys/sdt.h#1 branch .. //depot/projects/busdma/compat/opensolaris/sys/string.h#1 branch .. //depot/projects/busdma/compat/opensolaris/sys/sysmacros.h#1 branch .. //depot/projects/busdma/compat/opensolaris/sys/systm.h#1 branch .. //depot/projects/busdma/compat/opensolaris/sys/taskq.h#1 branch .. //depot/projects/busdma/compat/opensolaris/sys/taskq_impl.h#1 branch .. //depot/projects/busdma/compat/opensolaris/sys/time.h#1 branch .. //depot/projects/busdma/compat/opensolaris/sys/types.h#1 branch .. //depot/projects/busdma/compat/opensolaris/sys/uio.h#1 branch .. //depot/projects/busdma/compat/opensolaris/sys/varargs.h#1 branch .. //depot/projects/busdma/compat/opensolaris/sys/vfs.h#1 branch .. //depot/projects/busdma/compat/opensolaris/sys/vnode.h#1 branch .. //depot/projects/busdma/compat/opensolaris/sys/zone.h#1 branch .. //depot/projects/busdma/compat/svr4/svr4_fcntl.c#2 integrate .. //depot/projects/busdma/compat/svr4/svr4_filio.c#2 integrate .. //depot/projects/busdma/compat/svr4/svr4_misc.c#4 integrate .. //depot/projects/busdma/compat/svr4/svr4_proto.h#4 integrate .. //depot/projects/busdma/compat/svr4/svr4_syscall.h#4 integrate .. //depot/projects/busdma/compat/svr4/svr4_syscallnames.c#4 integrate .. //depot/projects/busdma/compat/svr4/svr4_sysent.c#4 integrate .. //depot/projects/busdma/conf/NOTES#6 integrate .. //depot/projects/busdma/conf/files#6 integrate .. //depot/projects/busdma/conf/files.amd64#6 integrate .. //depot/projects/busdma/conf/files.arm#4 integrate .. //depot/projects/busdma/conf/files.i386#6 integrate .. //depot/projects/busdma/conf/files.ia64#4 integrate .. //depot/projects/busdma/conf/files.pc98#5 integrate .. //depot/projects/busdma/conf/files.powerpc#4 integrate .. //depot/projects/busdma/conf/files.sparc64#2 integrate .. //depot/projects/busdma/conf/files.sun4v#2 integrate .. //depot/projects/busdma/conf/kern.mk#5 integrate .. //depot/projects/busdma/conf/kern.post.mk#4 integrate .. //depot/projects/busdma/conf/kern.pre.mk#4 integrate .. //depot/projects/busdma/conf/kmod.mk#5 integrate .. //depot/projects/busdma/conf/options#6 integrate .. //depot/projects/busdma/conf/options.arm#4 integrate .. //depot/projects/busdma/conf/options.sparc64#2 integrate .. //depot/projects/busdma/conf/options.sun4v#2 integrate .. //depot/projects/busdma/contrib/altq/altq/altq_cbq.c#2 integrate .. //depot/projects/busdma/contrib/altq/altq/altq_cdnr.c#2 integrate .. //depot/projects/busdma/contrib/altq/altq/altq_hfsc.c#2 integrate .. //depot/projects/busdma/contrib/altq/altq/altq_priq.c#2 integrate .. //depot/projects/busdma/contrib/altq/altq/altq_red.c#2 integrate .. //depot/projects/busdma/contrib/altq/altq/altq_rio.c#2 integrate .. //depot/projects/busdma/contrib/altq/altq/altq_subr.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/CHANGES.txt#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/acapps.h#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/acconfig.h#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/acdebug.h#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/acdisasm.h#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/acdispat.h#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/acefi.h#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/acenv.h#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/acevents.h#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/acexcep.h#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/acfreebsd.h#3 integrate .. //depot/projects/busdma/contrib/dev/acpica/acgcc.h#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/acglobal.h#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/achware.h#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/acinterp.h#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/aclocal.h#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/acmacros.h#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/acnames.h#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/acnamesp.h#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/acobject.h#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/acopcode.h#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/acoutput.h#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/acparser.h#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/acpi.h#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/acpica_prep.sh#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/acpiosxf.h#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/acpixf.h#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/acresrc.h#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/acstruct.h#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/actables.h#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/actbl.h#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/actbl1.h#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/actbl2.h#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/actypes.h#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/acutils.h#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/aecommon.h#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/aeexec.c#2 delete .. //depot/projects/busdma/contrib/dev/acpica/amlcode.h#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/amlresrc.h#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/common/adfile.c#1 branch .. //depot/projects/busdma/contrib/dev/acpica/common/adisasm.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/common/adwalk.c#1 branch .. //depot/projects/busdma/contrib/dev/acpica/common/dmrestag.c#1 branch .. //depot/projects/busdma/contrib/dev/acpica/common/dmtable.c#1 branch .. //depot/projects/busdma/contrib/dev/acpica/common/dmtbdump.c#1 branch .. //depot/projects/busdma/contrib/dev/acpica/common/dmtbinfo.c#1 branch .. //depot/projects/busdma/contrib/dev/acpica/common/getopt.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/compiler/aslanalyze.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/compiler/aslcodegen.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/compiler/aslcompile.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/compiler/aslcompiler.h#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/compiler/aslcompiler.l#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/compiler/aslcompiler.y#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/compiler/asldefine.h#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/compiler/aslerror.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/compiler/aslfiles.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/compiler/aslfold.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/compiler/aslglobal.h#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/compiler/asllength.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/compiler/asllisting.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/compiler/aslload.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/compiler/asllookup.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/compiler/aslmain.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/compiler/aslmap.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/compiler/aslopcodes.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/compiler/asloperands.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/compiler/aslopt.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/compiler/aslresource.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/compiler/aslrestype1.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/compiler/aslrestype2.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/compiler/aslstubs.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/compiler/asltransform.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/compiler/asltree.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/compiler/asltypes.h#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/compiler/aslutils.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/dbcmds.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/dbdisply.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/dbexec.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/dbfileio.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/dbhistry.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/dbinput.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/dbstats.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/dbutils.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/dbxface.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/dmbuffer.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/dmnames.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/dmobject.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/dmopcode.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/dmresrc.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/dmresrcl.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/dmresrcs.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/dmutils.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/dmwalk.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/dsfield.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/dsinit.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/dsmethod.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/dsmthdat.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/dsobject.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/dsopcode.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/dsutils.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/dswexec.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/dswload.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/dswscope.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/dswstate.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/evevent.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/evgpe.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/evgpeblk.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/evmisc.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/evregion.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/evrgnini.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/evsci.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/evxface.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/evxfevnt.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/evxfregn.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/exconfig.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/exconvrt.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/excreate.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/exdump.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/exfield.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/exfldio.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/exmisc.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/exmutex.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/exnames.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/exoparg1.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/exoparg2.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/exoparg3.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/exoparg6.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/exprep.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/exregion.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/exresnte.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/exresolv.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/exresop.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/exstore.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/exstoren.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/exstorob.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/exsystem.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/exutils.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/hwacpi.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/hwgpe.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/hwregs.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/hwsleep.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/hwtimer.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/nsaccess.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/nsalloc.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/nsdump.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/nsdumpdv.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/nseval.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/nsinit.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/nsload.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/nsnames.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/nsobject.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/nsparse.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/nssearch.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/nsutils.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/nswalk.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/nsxfeval.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/nsxfname.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/nsxfobj.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/osunixxf.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/psargs.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/psloop.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/psopcode.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/psparse.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/psscope.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/pstree.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/psutils.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/pswalk.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/psxface.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/rsaddr.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/rscalc.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/rscreate.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/rsdump.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/rsinfo.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/rsio.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/rsirq.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/rslist.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/rsmemory.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/rsmisc.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/rsutils.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/rsxface.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/tbconvrt.c#2 delete .. //depot/projects/busdma/contrib/dev/acpica/tbfadt.c#1 branch .. //depot/projects/busdma/contrib/dev/acpica/tbfind.c#1 branch .. //depot/projects/busdma/contrib/dev/acpica/tbget.c#2 delete .. //depot/projects/busdma/contrib/dev/acpica/tbgetall.c#2 delete .. //depot/projects/busdma/contrib/dev/acpica/tbinstal.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/tbrsdt.c#2 delete .. //depot/projects/busdma/contrib/dev/acpica/tbutils.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/tbxface.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/tbxfroot.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/utalloc.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/utcache.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/utclib.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/utcopy.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/utdebug.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/utdelete.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/uteval.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/utglobal.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/utinit.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/utmath.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/utmisc.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/utmutex.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/utobject.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/utresrc.c#1 branch .. //depot/projects/busdma/contrib/dev/acpica/utstate.c#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/uttrack.c#1 branch .. //depot/projects/busdma/contrib/dev/acpica/utxface.c#2 integrate .. //depot/projects/busdma/contrib/dev/ath/ah.h#3 integrate .. //depot/projects/busdma/contrib/dev/ath/ah_desc.h#3 integrate .. //depot/projects/busdma/contrib/dev/ath/ah_devid.h#3 integrate .. //depot/projects/busdma/contrib/dev/ath/public/alpha-elf.hal.o.uu#3 integrate .. //depot/projects/busdma/contrib/dev/ath/public/alpha-elf.inc#2 integrate .. //depot/projects/busdma/contrib/dev/ath/public/ap30.hal.o.uu#2 integrate .. //depot/projects/busdma/contrib/dev/ath/public/ap43.hal.o.uu#2 integrate .. //depot/projects/busdma/contrib/dev/ath/public/ap51.hal.o.uu#2 integrate .. //depot/projects/busdma/contrib/dev/ath/public/ap61.hal.o.uu#2 integrate .. //depot/projects/busdma/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#3 integrate .. //depot/projects/busdma/contrib/dev/ath/public/arm9-le-thumb-elf.inc#3 integrate .. //depot/projects/busdma/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#3 integrate .. //depot/projects/busdma/contrib/dev/ath/public/armv4-be-elf.inc#3 integrate .. //depot/projects/busdma/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#3 integrate .. //depot/projects/busdma/contrib/dev/ath/public/armv4-le-elf.inc#3 integrate .. //depot/projects/busdma/contrib/dev/ath/public/i386-elf.hal.o.uu#3 integrate .. //depot/projects/busdma/contrib/dev/ath/public/mips-be-elf.hal.o.uu#3 integrate .. //depot/projects/busdma/contrib/dev/ath/public/mips-le-elf.hal.o.uu#3 integrate .. //depot/projects/busdma/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#3 integrate .. //depot/projects/busdma/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#3 integrate .. //depot/projects/busdma/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#3 integrate .. //depot/projects/busdma/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#3 integrate .. //depot/projects/busdma/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#3 integrate .. //depot/projects/busdma/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#3 integrate .. //depot/projects/busdma/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#3 integrate .. //depot/projects/busdma/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#3 integrate .. //depot/projects/busdma/contrib/dev/ath/public/sparc-be-elf.hal.o.uu#2 integrate .. //depot/projects/busdma/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#3 integrate .. //depot/projects/busdma/contrib/dev/ath/public/wackelf.c#1 branch .. //depot/projects/busdma/contrib/dev/ath/public/x86_64-elf.hal.o.uu#3 integrate .. //depot/projects/busdma/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#3 integrate .. //depot/projects/busdma/contrib/dev/ath/public/xscale-be-elf.inc#3 integrate .. //depot/projects/busdma/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#3 integrate .. //depot/projects/busdma/contrib/dev/ath/public/xscale-le-elf.inc#3 integrate .. //depot/projects/busdma/contrib/dev/ath/version.h#3 integrate .. //depot/projects/busdma/contrib/dev/ipw/LICENSE#1 branch .. //depot/projects/busdma/contrib/dev/ipw/ipw2100-1.3-i.fw.uu#1 branch .. //depot/projects/busdma/contrib/dev/ipw/ipw2100-1.3-p.fw.uu#1 branch .. //depot/projects/busdma/contrib/dev/ipw/ipw2100-1.3.fw.uu#1 branch .. //depot/projects/busdma/contrib/dev/iwi/LICENSE#1 branch .. //depot/projects/busdma/contrib/dev/iwi/ipw2200-bss.fw.uu#1 branch .. //depot/projects/busdma/contrib/dev/iwi/ipw2200-ibss.fw.uu#1 branch .. //depot/projects/busdma/contrib/dev/iwi/ipw2200-sniffer.fw.uu#1 branch .. //depot/projects/busdma/contrib/dev/oltr/if_oltr.c#3 integrate .. //depot/projects/busdma/contrib/ipfilter/netinet/ip_state.c#3 integrate .. //depot/projects/busdma/contrib/opensolaris/common/acl/acl_common.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/common/acl/acl_common.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/common/atomic/amd64/atomic.S#1 branch .. //depot/projects/busdma/contrib/opensolaris/common/atomic/i386/atomic.S#1 branch .. //depot/projects/busdma/contrib/opensolaris/common/avl/avl.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/common/nvpair/nvpair.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/common/zfs/zfs_namecheck.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/common/zfs/zfs_namecheck.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/common/zfs/zfs_prop.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/common/zfs/zfs_prop.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/Makefile.files#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/dnlc.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/gfs.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/arc.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/bplist.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/dmu.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/dnode.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/gzip.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/lzjb.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/refcount.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/sha256.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/spa.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/space_map.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_file.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_rlock.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/txg.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/uberblock.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/unique.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/vdev.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/zap.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/zfs.conf#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/zil.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/zio.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/zvol.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/os/callb.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/os/list.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/os/nvpair_alloc_system.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/os/taskq.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/rpc/xdr.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/rpc/xdr.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/rpc/xdr_array.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/rpc/xdr_mem.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/sys/asm_linkage.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/sys/atomic.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/sys/avl.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/sys/avl_impl.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/sys/bitmap.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/sys/byteorder.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/sys/callb.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/sys/ccompile.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/sys/compress.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/sys/cred.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/sys/debug.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/sys/dkio.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/sys/dklabel.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/sys/dnlc.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/sys/errorq.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/sys/feature_tests.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/sys/fm/protocol.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/sys/fm/util.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/sys/fs/zfs.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/sys/gfs.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/sys/isa_defs.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/sys/list.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/sys/list_impl.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/sys/note.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/sys/nvpair.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/sys/nvpair_impl.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/sys/processor.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/sys/procset.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/sys/sdt.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/sys/synch.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/sys/sysevent.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/sys/sysmacros.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/sys/vfs.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/sys/vmem.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/sys/zmod.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/zmod/adler32.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/zmod/crc32.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/zmod/crc32.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/zmod/deflate.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/zmod/deflate.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/zmod/inffast.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/zmod/inffast.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/zmod/inffixed.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/zmod/inflate.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/zmod/inflate.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/zmod/inftrees.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/zmod/inftrees.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/zmod/trees.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/zmod/zconf.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/zmod/zlib.h#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/zmod/zmod.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/zmod/zmod_subr.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/zmod/zutil.c#1 branch .. //depot/projects/busdma/contrib/opensolaris/uts/common/zmod/zutil.h#1 branch .. //depot/projects/busdma/contrib/pf/net/if_pfsync.c#4 integrate .. //depot/projects/busdma/contrib/pf/net/if_pfsync.h#2 integrate .. //depot/projects/busdma/contrib/pf/net/pf.c#3 integrate .. //depot/projects/busdma/contrib/pf/net/pf_ioctl.c#4 integrate .. //depot/projects/busdma/crypto/sha2/sha2.c#3 integrate .. //depot/projects/busdma/crypto/via/padlock.c#4 integrate .. //depot/projects/busdma/ddb/db_command.c#3 integrate .. //depot/projects/busdma/ddb/db_examine.c#2 integrate .. //depot/projects/busdma/ddb/db_main.c#2 integrate .. //depot/projects/busdma/ddb/db_output.c#3 integrate .. //depot/projects/busdma/ddb/db_output.h#3 integrate .. //depot/projects/busdma/ddb/db_ps.c#4 integrate .. //depot/projects/busdma/ddb/db_thread.c#3 integrate .. //depot/projects/busdma/ddb/db_watch.c#2 integrate .. //depot/projects/busdma/dev/aac/aac.c#2 integrate .. //depot/projects/busdma/dev/aac/aac_cam.c#3 integrate .. //depot/projects/busdma/dev/aac/aac_linux.c#2 integrate .. //depot/projects/busdma/dev/aac/aac_pci.c#3 integrate .. //depot/projects/busdma/dev/aac/aacvar.h#2 integrate .. //depot/projects/busdma/dev/acpi_support/acpi_aiboost.c#1 branch .. //depot/projects/busdma/dev/acpi_support/acpi_asus.c#2 integrate .. //depot/projects/busdma/dev/acpi_support/acpi_fujitsu.c#2 integrate .. //depot/projects/busdma/dev/acpi_support/acpi_ibm.c#3 integrate .. //depot/projects/busdma/dev/acpi_support/acpi_sony.c#2 integrate .. //depot/projects/busdma/dev/acpica/Osd/OsdDebug.c#2 integrate .. //depot/projects/busdma/dev/acpica/Osd/OsdInterrupt.c#2 integrate .. //depot/projects/busdma/dev/acpica/Osd/OsdMemory.c#3 integrate .. //depot/projects/busdma/dev/acpica/Osd/OsdSchedule.c#3 integrate .. //depot/projects/busdma/dev/acpica/Osd/OsdSynch.c#2 integrate .. //depot/projects/busdma/dev/acpica/Osd/OsdTable.c#2 integrate .. //depot/projects/busdma/dev/acpica/acpi.c#5 integrate .. //depot/projects/busdma/dev/acpica/acpi_acad.c#2 integrate .. //depot/projects/busdma/dev/acpica/acpi_battery.c#3 integrate .. //depot/projects/busdma/dev/acpica/acpi_button.c#2 integrate .. //depot/projects/busdma/dev/acpica/acpi_cmbat.c#2 integrate .. //depot/projects/busdma/dev/acpica/acpi_cpu.c#2 integrate .. //depot/projects/busdma/dev/acpica/acpi_dock.c#4 integrate .. //depot/projects/busdma/dev/acpica/acpi_ec.c#2 integrate .. //depot/projects/busdma/dev/acpica/acpi_hpet.c#4 integrate .. //depot/projects/busdma/dev/acpica/acpi_lid.c#2 integrate .. //depot/projects/busdma/dev/acpica/acpi_package.c#2 integrate .. //depot/projects/busdma/dev/acpica/acpi_pci_link.c#3 integrate .. //depot/projects/busdma/dev/acpica/acpi_pcib_acpi.c#2 integrate .. //depot/projects/busdma/dev/acpica/acpi_pcib_pci.c#2 integrate .. //depot/projects/busdma/dev/acpica/acpi_perf.c#3 integrate .. //depot/projects/busdma/dev/acpica/acpi_quirk.c#2 integrate .. //depot/projects/busdma/dev/acpica/acpi_resource.c#3 integrate .. //depot/projects/busdma/dev/acpica/acpi_thermal.c#4 integrate .. //depot/projects/busdma/dev/acpica/acpi_throttle.c#2 integrate .. //depot/projects/busdma/dev/acpica/acpi_timer.c#2 integrate .. //depot/projects/busdma/dev/acpica/acpivar.h#4 integrate .. //depot/projects/busdma/dev/adlink/adlink.c#2 integrate .. //depot/projects/busdma/dev/advansys/adv_eisa.c#2 integrate .. //depot/projects/busdma/dev/advansys/adv_isa.c#2 integrate .. //depot/projects/busdma/dev/advansys/adv_pci.c#2 integrate .. //depot/projects/busdma/dev/advansys/advansys.c#2 integrate .. //depot/projects/busdma/dev/advansys/advlib.c#2 integrate .. //depot/projects/busdma/dev/advansys/adw_pci.c#2 integrate .. //depot/projects/busdma/dev/advansys/adwcam.c#2 integrate .. //depot/projects/busdma/dev/aha/aha.c#2 integrate .. //depot/projects/busdma/dev/aha/aha_isa.c#2 integrate .. //depot/projects/busdma/dev/aha/aha_mca.c#2 integrate .. //depot/projects/busdma/dev/aha/ahareg.h#2 integrate .. //depot/projects/busdma/dev/ahb/ahb.c#3 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Apr 21 03:29:34 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 4DF1E16A409; Sat, 21 Apr 2007 03:29:34 +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 DC57316A400 for ; Sat, 21 Apr 2007 03:29:33 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id CA30B13C457 for ; Sat, 21 Apr 2007 03:29:33 +0000 (UTC) (envelope-from marcel@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 l3L3TXrc011308 for ; Sat, 21 Apr 2007 03:29:33 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3L3PC03010922 for perforce@freebsd.org; Sat, 21 Apr 2007 03:25:12 GMT (envelope-from marcel@freebsd.org) Date: Sat, 21 Apr 2007 03:25:12 GMT Message-Id: <200704210325.l3L3PC03010922@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 118509 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: Sat, 21 Apr 2007 03:29:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=118509 Change 118509 by marcel@marcel_xcllnt on 2007/04/21 03:21:46 IFC @118506 Affected files ... .. //depot/projects/gdb/COPYRIGHT#3 integrate .. //depot/projects/gdb/MAINTAINERS#17 integrate .. //depot/projects/gdb/Makefile#13 integrate .. //depot/projects/gdb/Makefile.inc1#19 integrate .. //depot/projects/gdb/ObsoleteFiles.inc#5 integrate .. //depot/projects/gdb/UPDATING#28 integrate .. //depot/projects/gdb/bin/cat/cat.1#5 integrate .. //depot/projects/gdb/bin/chmod/chmod.1#4 integrate .. //depot/projects/gdb/bin/cp/cp.1#7 integrate .. //depot/projects/gdb/bin/cp/cp.c#6 integrate .. //depot/projects/gdb/bin/csh/config.h#4 integrate .. //depot/projects/gdb/bin/csh/config_p.h#2 integrate .. //depot/projects/gdb/bin/df/df.1#9 integrate .. //depot/projects/gdb/bin/df/df.c#14 integrate .. //depot/projects/gdb/bin/domainname/domainname.1#5 integrate .. //depot/projects/gdb/bin/expr/expr.1#5 integrate .. //depot/projects/gdb/bin/expr/expr.y#3 integrate .. //depot/projects/gdb/bin/hostname/hostname.1#5 integrate .. //depot/projects/gdb/bin/hostname/hostname.c#4 integrate .. //depot/projects/gdb/bin/kill/kill.1#5 integrate .. //depot/projects/gdb/bin/ls/ls.1#9 integrate .. //depot/projects/gdb/bin/ls/print.c#10 integrate .. //depot/projects/gdb/bin/mkdir/mkdir.1#5 integrate .. //depot/projects/gdb/bin/mkdir/mkdir.c#4 integrate .. //depot/projects/gdb/bin/pax/cpio.c#3 integrate .. //depot/projects/gdb/bin/pax/tar.c#4 integrate .. //depot/projects/gdb/bin/rcp/rcp.1#6 integrate .. //depot/projects/gdb/bin/rm/rm.1#5 integrate .. //depot/projects/gdb/bin/rm/rm.c#4 integrate .. //depot/projects/gdb/bin/rmdir/rmdir.1#5 integrate .. //depot/projects/gdb/bin/setfacl/setfacl.c#3 integrate .. //depot/projects/gdb/bin/sh/exec.c#4 integrate .. //depot/projects/gdb/bin/sh/expand.c#4 integrate .. //depot/projects/gdb/bin/sh/parser.c#6 integrate .. //depot/projects/gdb/bin/sh/parser.h#3 integrate .. //depot/projects/gdb/bin/test/test.1#8 integrate .. //depot/projects/gdb/cddl/Makefile#1 branch .. //depot/projects/gdb/cddl/Makefile.inc#1 branch .. //depot/projects/gdb/cddl/lib/Makefile#1 branch .. //depot/projects/gdb/cddl/lib/Makefile.inc#1 branch .. //depot/projects/gdb/cddl/lib/libavl/Makefile#1 branch .. //depot/projects/gdb/cddl/lib/libnvpair/Makefile#1 branch .. //depot/projects/gdb/cddl/lib/libumem/Makefile#1 branch .. //depot/projects/gdb/cddl/lib/libuutil/Makefile#1 branch .. //depot/projects/gdb/cddl/lib/libzfs/Makefile#1 branch .. //depot/projects/gdb/cddl/lib/libzpool/Makefile#1 branch .. //depot/projects/gdb/cddl/sbin/Makefile#1 branch .. //depot/projects/gdb/cddl/sbin/Makefile.inc#1 branch .. //depot/projects/gdb/cddl/sbin/zfs/Makefile#1 branch .. //depot/projects/gdb/cddl/sbin/zpool/Makefile#1 branch .. //depot/projects/gdb/cddl/usr.bin/Makefile#1 branch .. //depot/projects/gdb/cddl/usr.bin/Makefile.inc#1 branch .. //depot/projects/gdb/cddl/usr.bin/ztest/Makefile#1 branch .. //depot/projects/gdb/cddl/usr.sbin/Makefile#1 branch .. //depot/projects/gdb/cddl/usr.sbin/Makefile.inc#1 branch .. //depot/projects/gdb/cddl/usr.sbin/zdb/Makefile#1 branch .. //depot/projects/gdb/compat/opensolaris/include/devid.h#1 branch .. //depot/projects/gdb/compat/opensolaris/include/fsshare.h#1 branch .. //depot/projects/gdb/compat/opensolaris/include/libintl.h#1 branch .. //depot/projects/gdb/compat/opensolaris/include/mnttab.h#1 branch .. //depot/projects/gdb/compat/opensolaris/include/priv.h#1 branch .. //depot/projects/gdb/compat/opensolaris/include/solaris.h#1 branch .. //depot/projects/gdb/compat/opensolaris/include/zone.h#1 branch .. //depot/projects/gdb/compat/opensolaris/lib/libumem/umem.c#1 branch .. //depot/projects/gdb/compat/opensolaris/lib/libumem/umem.h#1 branch .. //depot/projects/gdb/compat/opensolaris/misc/fsshare.c#1 branch .. //depot/projects/gdb/compat/opensolaris/misc/mkdirp.c#1 branch .. //depot/projects/gdb/compat/opensolaris/misc/mnttab.c#1 branch .. //depot/projects/gdb/compat/opensolaris/misc/zmount.c#1 branch .. //depot/projects/gdb/compat/opensolaris/misc/zone.c#1 branch .. //depot/projects/gdb/contrib/amd/hlfsd/hlfsd.h#3 integrate .. //depot/projects/gdb/contrib/bind9/CHANGES#3 integrate .. //depot/projects/gdb/contrib/bind9/COPYRIGHT#2 integrate .. //depot/projects/gdb/contrib/bind9/FAQ#2 integrate .. //depot/projects/gdb/contrib/bind9/FAQ.xml#2 integrate .. //depot/projects/gdb/contrib/bind9/Makefile.in#2 integrate .. //depot/projects/gdb/contrib/bind9/README#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/check/named-checkconf.8#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/check/named-checkconf.c#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/check/named-checkconf.html#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/check/named-checkzone.8#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/check/named-checkzone.docbook#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/check/named-checkzone.html#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/dig/dig.1#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/dig/dig.c#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/dig/dig.html#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/dig/dighost.c#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/dig/host.1#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/dig/host.c#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/dig/host.html#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/dig/include/dig/dig.h#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/dig/nslookup.1#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/dig/nslookup.c#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/dig/nslookup.docbook#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/dig/nslookup.html#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/dnssec/dnssec-keygen.8#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/dnssec/dnssec-keygen.html#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/dnssec/dnssec-signzone.8#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/dnssec/dnssec-signzone.c#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/dnssec/dnssec-signzone.html#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/named/aclconf.c#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/named/client.c#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/named/config.c#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/named/controlconf.c#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/named/include/named/aclconf.h#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/named/include/named/client.h#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/named/include/named/config.h#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/named/include/named/control.h#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/named/include/named/globals.h#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/named/include/named/logconf.h#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/named/include/named/lwresd.h#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/named/include/named/server.h#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/named/include/named/sortlist.h#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/named/include/named/tkeyconf.h#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/named/include/named/tsigconf.h#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/named/include/named/zoneconf.h#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/named/interfacemgr.c#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/named/logconf.c#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/named/lwdgabn.c#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/named/lwdgrbn.c#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/named/lwresd.8#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/named/lwresd.c#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/named/lwresd.html#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/named/main.c#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/named/named.8#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/named/named.conf.5#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/named/named.conf.docbook#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/named/named.conf.html#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/named/named.docbook#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/named/named.html#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/named/query.c#3 integrate .. //depot/projects/gdb/contrib/bind9/bin/named/server.c#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/named/sortlist.c#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/named/tkeyconf.c#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/named/tsigconf.c#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/named/unix/os.c#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/named/update.c#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/named/zoneconf.c#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/nsupdate/nsupdate.8#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/nsupdate/nsupdate.c#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/nsupdate/nsupdate.html#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/rndc/rndc-confgen.8#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/rndc/rndc-confgen.html#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/rndc/rndc.8#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/rndc/rndc.c#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/rndc/rndc.conf.5#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/rndc/rndc.conf.html#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/rndc/rndc.html#2 integrate .. //depot/projects/gdb/contrib/bind9/config.threads.in#2 integrate .. //depot/projects/gdb/contrib/bind9/configure.in#2 integrate .. //depot/projects/gdb/contrib/bind9/doc/arm/Bv9ARM-book.xml#2 integrate .. //depot/projects/gdb/contrib/bind9/doc/arm/Bv9ARM.ch01.html#2 integrate .. //depot/projects/gdb/contrib/bind9/doc/arm/Bv9ARM.ch02.html#2 integrate .. //depot/projects/gdb/contrib/bind9/doc/arm/Bv9ARM.ch03.html#2 integrate .. //depot/projects/gdb/contrib/bind9/doc/arm/Bv9ARM.ch04.html#2 integrate .. //depot/projects/gdb/contrib/bind9/doc/arm/Bv9ARM.ch05.html#2 integrate .. //depot/projects/gdb/contrib/bind9/doc/arm/Bv9ARM.ch06.html#2 integrate .. //depot/projects/gdb/contrib/bind9/doc/arm/Bv9ARM.ch07.html#2 integrate .. //depot/projects/gdb/contrib/bind9/doc/arm/Bv9ARM.ch08.html#2 integrate .. //depot/projects/gdb/contrib/bind9/doc/arm/Bv9ARM.ch09.html#2 integrate .. //depot/projects/gdb/contrib/bind9/doc/arm/Bv9ARM.html#2 integrate .. //depot/projects/gdb/contrib/bind9/doc/arm/Bv9ARM.pdf#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/bind/Makefile.in#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/bind/api#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/bind/config.h.in#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/bind/configure#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/bind/configure.in#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/bind/dst/dst_api.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/bind/dst/hmac_link.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/bind/include/arpa/nameser_compat.h#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/bind/include/isc/list.h#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/bind/include/netdb.h#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/bind/inet/inet_cidr_ntop.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/bind/inet/inet_net_ntop.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/dns.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/dns_ho.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/gai_strerror.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/gen_ho.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/getaddrinfo.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/gethostent.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/getnameinfo.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/getprotoent_r.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/getservent_r.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/irp.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/irp_nw.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/irpmarshall.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/irs_data.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/lcl_ho.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/lcl_pr.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/bind/isc/ev_connects.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/bind/isc/eventlib.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/bind/isc/eventlib_p.h#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/bind/isc/heap.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/bind/isc/hex.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/bind/isc/memcluster.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/bind/nameser/ns_sign.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/bind/nameser/ns_verify.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/bind/port_after.h.in#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/bind/port_before.h.in#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/bind/resolv/mtctxres.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/bind/resolv/res_init.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/bind/resolv/res_send.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/bind/resolv/res_sendsigned.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/bind9/api#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/bind9/check.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/bind9/include/bind9/check.h#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/Makefile.in#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/acl.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/adb.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/api#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/cache.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/compress.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/dispatch.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/dnssec.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/dst_api.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/gen.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/include/dns/acl.h#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/include/dns/cache.h#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/include/dns/compress.h#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/include/dns/keytable.h#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/include/dns/message.h#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/include/dns/name.h#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/include/dns/peer.h#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/include/dns/rdataset.h#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/include/dns/resolver.h#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/include/dns/types.h#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/include/dns/validator.h#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/include/dns/xfrin.h#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/include/dns/zone.h#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/keytable.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/lookup.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/masterdump.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/message.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/name.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/openssl_link.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/openssldh_link.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/openssldsa_link.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/opensslrsa_link.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/peer.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/portlist.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/rbtdb.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/rdata.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/rdata/generic/dlv_32769.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/dns/rdata/generic/dlv_32769.h#1 branch .. //depot/projects/gdb/contrib/bind9/lib/dns/rdata/generic/dlv_65323.c#2 delete .. //depot/projects/gdb/contrib/bind9/lib/dns/rdata/generic/dlv_65323.h#2 delete .. //depot/projects/gdb/contrib/bind9/lib/dns/rdataset.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/request.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/resolver.c#3 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/tcpmsg.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/tkey.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/tsig.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/validator.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/xfrin.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/zone.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/isc/api#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/isc/hash.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/isc/heap.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/isc/hmacmd5.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/isc/include/isc/heap.h#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/isc/include/isc/list.h#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/isc/include/isc/sockaddr.h#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/isc/include/isc/symtab.h#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/isc/lex.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/isc/log.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/isc/netscope.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/isc/nothreads/condition.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/isc/nothreads/mutex.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/isc/print.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/isc/sockaddr.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/isc/taskpool.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/isc/timer.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/isc/unix/entropy.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/isc/unix/fsaccess.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/isc/unix/ipv6.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/isc/unix/socket.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/isccc/api#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/isccfg/include/isccfg/cfg.h#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/isccfg/include/isccfg/grammar.h#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/isccfg/namedconf.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/isccfg/parser.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/lwres/api#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/lwres/gai_strerror.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/lwres/getaddrinfo.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/lwres/lwconfig.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/lwres/man/lwres.3#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/lwres/man/lwres.html#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/lwres/man/lwres_buffer.3#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/lwres/man/lwres_buffer.html#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/lwres/man/lwres_config.3#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/lwres/man/lwres_config.html#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/lwres/man/lwres_context.3#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/lwres/man/lwres_context.html#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/lwres/man/lwres_gabn.3#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/lwres/man/lwres_gabn.html#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/lwres/man/lwres_gai_strerror.3#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.3#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/lwres/man/lwres_gethostent.3#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/lwres/man/lwres_gethostent.html#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/lwres/man/lwres_getipnode.3#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/lwres/man/lwres_getipnode.html#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/lwres/man/lwres_getnameinfo.3#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.3#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/lwres/man/lwres_gnba.3#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/lwres/man/lwres_gnba.html#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/lwres/man/lwres_hstrerror.3#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/lwres/man/lwres_hstrerror.html#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/lwres/man/lwres_inetntop.3#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/lwres/man/lwres_inetntop.html#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/lwres/man/lwres_noop.3#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/lwres/man/lwres_noop.html#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/lwres/man/lwres_packet.3#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/lwres/man/lwres_packet.html#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/lwres/man/lwres_resutil.3#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/lwres/man/lwres_resutil.html#2 integrate .. //depot/projects/gdb/contrib/bind9/libtool.m4#2 integrate .. //depot/projects/gdb/contrib/bind9/ltmain.sh#2 integrate .. //depot/projects/gdb/contrib/bind9/make/rules.in#2 integrate .. //depot/projects/gdb/contrib/bind9/version#3 integrate .. //depot/projects/gdb/contrib/binutils/gas/as.h#5 integrate .. //depot/projects/gdb/contrib/binutils/gas/tc.h#5 integrate .. //depot/projects/gdb/contrib/bsnmp/snmp_mibII/mibII.c#6 integrate .. //depot/projects/gdb/contrib/bsnmp/snmpd/action.c#5 integrate .. //depot/projects/gdb/contrib/bsnmp/snmpd/tree.def#4 integrate .. //depot/projects/gdb/contrib/bzip2/CHANGES#3 integrate .. //depot/projects/gdb/contrib/bzip2/FREEBSD-upgrade#3 integrate .. //depot/projects/gdb/contrib/bzip2/LICENSE#3 integrate .. //depot/projects/gdb/contrib/bzip2/Makefile#3 integrate .. //depot/projects/gdb/contrib/bzip2/Makefile-libbz2_so#3 integrate .. //depot/projects/gdb/contrib/bzip2/README#3 integrate .. //depot/projects/gdb/contrib/bzip2/README.COMPILATION.PROBLEMS#3 integrate .. //depot/projects/gdb/contrib/bzip2/Y2K_INFO#2 delete .. //depot/projects/gdb/contrib/bzip2/blocksort.c#3 integrate .. //depot/projects/gdb/contrib/bzip2/bzip2.1#3 integrate .. //depot/projects/gdb/contrib/bzip2/bzip2.c#3 integrate .. //depot/projects/gdb/contrib/bzip2/bzip2recover.c#3 integrate .. //depot/projects/gdb/contrib/bzip2/bzlib.c#3 integrate .. //depot/projects/gdb/contrib/bzip2/bzlib.h#3 integrate .. //depot/projects/gdb/contrib/bzip2/bzlib_private.h#3 integrate .. //depot/projects/gdb/contrib/bzip2/compress.c#3 integrate .. //depot/projects/gdb/contrib/bzip2/crctable.c#3 integrate .. //depot/projects/gdb/contrib/bzip2/decompress.c#3 integrate .. //depot/projects/gdb/contrib/bzip2/dlltest.c#2 integrate .. //depot/projects/gdb/contrib/bzip2/huffman.c#3 integrate .. //depot/projects/gdb/contrib/bzip2/manual.texi#2 delete .. //depot/projects/gdb/contrib/bzip2/randtable.c#3 integrate .. //depot/projects/gdb/contrib/bzip2/sample1.bz2.uu#3 integrate .. //depot/projects/gdb/contrib/bzip2/sample1.ref.gz.uu#3 integrate .. //depot/projects/gdb/contrib/bzip2/sample2.bz2.uu#3 integrate .. //depot/projects/gdb/contrib/bzip2/sample2.ref.gz.uu#3 integrate .. //depot/projects/gdb/contrib/bzip2/sample3.bz2.uu#3 integrate .. //depot/projects/gdb/contrib/bzip2/sample3.ref.gz.uu#3 integrate .. //depot/projects/gdb/contrib/bzip2/spewG.c#2 integrate .. //depot/projects/gdb/contrib/bzip2/unzcrash.c#2 integrate .. //depot/projects/gdb/contrib/bzip2/words0#2 integrate .. //depot/projects/gdb/contrib/bzip2/words2#2 integrate .. //depot/projects/gdb/contrib/bzip2/words3#2 integrate .. //depot/projects/gdb/contrib/cvs/src/log.c#5 integrate .. //depot/projects/gdb/contrib/gcc/function.c#4 integrate .. //depot/projects/gdb/contrib/gdtoa/README#2 integrate .. //depot/projects/gdb/contrib/gdtoa/arithchk.c#2 integrate .. //depot/projects/gdb/contrib/gdtoa/dmisc.c#2 integrate .. //depot/projects/gdb/contrib/gdtoa/dtoa.c#2 integrate .. //depot/projects/gdb/contrib/gdtoa/g_Qfmt.c#2 integrate .. //depot/projects/gdb/contrib/gdtoa/g__fmt.c#2 integrate .. //depot/projects/gdb/contrib/gdtoa/g_ddfmt.c#2 integrate .. //depot/projects/gdb/contrib/gdtoa/g_dfmt.c#2 integrate .. //depot/projects/gdb/contrib/gdtoa/g_ffmt.c#2 integrate .. //depot/projects/gdb/contrib/gdtoa/g_xLfmt.c#2 integrate .. //depot/projects/gdb/contrib/gdtoa/g_xfmt.c#2 integrate .. //depot/projects/gdb/contrib/gdtoa/gdtoa.c#2 integrate .. //depot/projects/gdb/contrib/gdtoa/gdtoa.h#2 integrate .. //depot/projects/gdb/contrib/gdtoa/gdtoaimp.h#3 integrate .. //depot/projects/gdb/contrib/gdtoa/gethex.c#3 integrate .. //depot/projects/gdb/contrib/gdtoa/gmisc.c#2 integrate .. //depot/projects/gdb/contrib/gdtoa/hd_init.c#2 integrate .. //depot/projects/gdb/contrib/gdtoa/hexnan.c#2 integrate .. //depot/projects/gdb/contrib/gdtoa/makefile#2 integrate .. //depot/projects/gdb/contrib/gdtoa/misc.c#2 integrate .. //depot/projects/gdb/contrib/gdtoa/qnan.c#1 branch .. //depot/projects/gdb/contrib/gdtoa/smisc.c#2 integrate .. //depot/projects/gdb/contrib/gdtoa/strtoIQ.c#2 integrate .. //depot/projects/gdb/contrib/gdtoa/strtoId.c#2 integrate .. //depot/projects/gdb/contrib/gdtoa/strtoIdd.c#2 integrate .. //depot/projects/gdb/contrib/gdtoa/strtoIf.c#2 integrate .. //depot/projects/gdb/contrib/gdtoa/strtoIg.c#2 integrate .. //depot/projects/gdb/contrib/gdtoa/strtoIx.c#2 integrate .. //depot/projects/gdb/contrib/gdtoa/strtoIxL.c#2 integrate .. //depot/projects/gdb/contrib/gdtoa/strtod.c#3 integrate .. //depot/projects/gdb/contrib/gdtoa/strtodI.c#2 integrate .. //depot/projects/gdb/contrib/gdtoa/strtodg.c#2 integrate .. //depot/projects/gdb/contrib/gdtoa/strtodnrp.c#1 branch .. //depot/projects/gdb/contrib/gdtoa/strtof.c#2 integrate .. //depot/projects/gdb/contrib/gdtoa/strtopQ.c#2 integrate .. //depot/projects/gdb/contrib/gdtoa/strtopd.c#2 integrate .. //depot/projects/gdb/contrib/gdtoa/strtopdd.c#2 integrate .. //depot/projects/gdb/contrib/gdtoa/strtopf.c#2 integrate .. //depot/projects/gdb/contrib/gdtoa/strtopx.c#2 integrate .. //depot/projects/gdb/contrib/gdtoa/strtopxL.c#2 integrate .. //depot/projects/gdb/contrib/gdtoa/strtorQ.c#2 integrate .. //depot/projects/gdb/contrib/gdtoa/strtord.c#2 integrate .. //depot/projects/gdb/contrib/gdtoa/strtordd.c#2 integrate .. //depot/projects/gdb/contrib/gdtoa/strtorf.c#2 integrate .. //depot/projects/gdb/contrib/gdtoa/strtorx.c#2 integrate .. //depot/projects/gdb/contrib/gdtoa/strtorxL.c#2 integrate .. //depot/projects/gdb/contrib/gdtoa/sum.c#2 integrate .. //depot/projects/gdb/contrib/gdtoa/test/Qtest.c#2 integrate .. //depot/projects/gdb/contrib/gdtoa/test/dItest.c#2 integrate .. //depot/projects/gdb/contrib/gdtoa/test/ddtest.c#2 integrate .. //depot/projects/gdb/contrib/gdtoa/test/dt.c#2 integrate .. //depot/projects/gdb/contrib/gdtoa/test/dtest.c#2 integrate .. //depot/projects/gdb/contrib/gdtoa/test/dtst.out#2 integrate .. //depot/projects/gdb/contrib/gdtoa/test/ftest.c#2 integrate .. //depot/projects/gdb/contrib/gdtoa/test/getround.c#2 integrate .. //depot/projects/gdb/contrib/gdtoa/test/makefile#2 integrate .. //depot/projects/gdb/contrib/gdtoa/test/strtodt.c#2 integrate .. //depot/projects/gdb/contrib/gdtoa/test/x.ou0#2 integrate .. //depot/projects/gdb/contrib/gdtoa/test/x.ou1#2 integrate .. //depot/projects/gdb/contrib/gdtoa/test/xL.ou1#2 integrate .. //depot/projects/gdb/contrib/gdtoa/test/xLtest.c#2 integrate .. //depot/projects/gdb/contrib/gdtoa/test/xsum0.out#2 integrate .. //depot/projects/gdb/contrib/gdtoa/test/xtest.c#2 integrate .. //depot/projects/gdb/contrib/gdtoa/ulp.c#2 integrate .. //depot/projects/gdb/contrib/gdtoa/xsum0.out#3 integrate .. //depot/projects/gdb/contrib/groff/tmac/doc-common#4 integrate .. //depot/projects/gdb/contrib/groff/tmac/doc-syms#5 integrate .. //depot/projects/gdb/contrib/groff/tmac/groff_mdoc.man#4 integrate .. //depot/projects/gdb/contrib/libbegemot/rpoll.c#2 integrate .. //depot/projects/gdb/contrib/libbegemot/rpoll.h#2 integrate .. //depot/projects/gdb/contrib/libbegemot/rpoll.man#2 integrate .. //depot/projects/gdb/contrib/libpcap/pcap-bpf.c#7 integrate .. //depot/projects/gdb/contrib/libreadline/CHANGELOG#3 integrate .. //depot/projects/gdb/contrib/libreadline/CHANGES#3 integrate .. //depot/projects/gdb/contrib/libreadline/FREEBSD-upgrade#4 integrate .. //depot/projects/gdb/contrib/libreadline/INSTALL#3 integrate .. //depot/projects/gdb/contrib/libreadline/NEWS#2 integrate .. //depot/projects/gdb/contrib/libreadline/README#3 integrate .. //depot/projects/gdb/contrib/libreadline/aclocal.m4#3 integrate .. //depot/projects/gdb/contrib/libreadline/bind.c#4 integrate .. //depot/projects/gdb/contrib/libreadline/callback.c#3 integrate .. //depot/projects/gdb/contrib/libreadline/complete.c#4 integrate .. //depot/projects/gdb/contrib/libreadline/config.h.in#3 integrate .. //depot/projects/gdb/contrib/libreadline/configure#3 integrate .. //depot/projects/gdb/contrib/libreadline/configure.in#3 integrate .. //depot/projects/gdb/contrib/libreadline/display.c#4 integrate .. //depot/projects/gdb/contrib/libreadline/doc/history.texi#2 integrate .. //depot/projects/gdb/contrib/libreadline/doc/hstech.texi#2 integrate .. //depot/projects/gdb/contrib/libreadline/doc/hsuser.texi#2 integrate .. //depot/projects/gdb/contrib/libreadline/doc/readline.3#4 integrate .. //depot/projects/gdb/contrib/libreadline/doc/rlman.texi#2 integrate .. //depot/projects/gdb/contrib/libreadline/doc/rltech.texi#2 integrate .. //depot/projects/gdb/contrib/libreadline/doc/rluser.texi#2 integrate .. //depot/projects/gdb/contrib/libreadline/doc/rluserman.texi#2 integrate .. //depot/projects/gdb/contrib/libreadline/doc/version.texi#2 integrate .. //depot/projects/gdb/contrib/libreadline/examples/excallback.c#2 integrate .. //depot/projects/gdb/contrib/libreadline/examples/rlfe/Makefile.in#2 integrate .. //depot/projects/gdb/contrib/libreadline/histexpand.c#3 integrate .. //depot/projects/gdb/contrib/libreadline/histfile.c#3 integrate .. //depot/projects/gdb/contrib/libreadline/history.c#3 integrate .. //depot/projects/gdb/contrib/libreadline/input.c#3 integrate .. //depot/projects/gdb/contrib/libreadline/isearch.c#3 integrate .. //depot/projects/gdb/contrib/libreadline/kill.c#3 integrate .. //depot/projects/gdb/contrib/libreadline/macro.c#3 integrate .. //depot/projects/gdb/contrib/libreadline/misc.c#3 integrate .. //depot/projects/gdb/contrib/libreadline/readline.c#4 integrate .. //depot/projects/gdb/contrib/libreadline/readline.h#4 integrate .. //depot/projects/gdb/contrib/libreadline/rlconf.h#4 integrate .. //depot/projects/gdb/contrib/libreadline/rlmbutil.h#3 integrate .. //depot/projects/gdb/contrib/libreadline/rlprivate.h#3 integrate .. //depot/projects/gdb/contrib/libreadline/rltty.c#3 integrate .. //depot/projects/gdb/contrib/libreadline/search.c#3 integrate .. //depot/projects/gdb/contrib/libreadline/signals.c#3 integrate .. //depot/projects/gdb/contrib/libreadline/support/shlib-install#3 integrate .. //depot/projects/gdb/contrib/libreadline/support/shobj-conf#3 integrate .. //depot/projects/gdb/contrib/libreadline/terminal.c#4 integrate .. //depot/projects/gdb/contrib/libreadline/text.c#3 integrate .. //depot/projects/gdb/contrib/libreadline/tilde.c#3 integrate .. //depot/projects/gdb/contrib/libreadline/undo.c#3 integrate .. //depot/projects/gdb/contrib/libreadline/vi_mode.c#4 integrate .. //depot/projects/gdb/contrib/ncurses/ANNOUNCE#2 integrate .. //depot/projects/gdb/contrib/ncurses/AUTHORS#1 branch .. //depot/projects/gdb/contrib/ncurses/FREEBSD-Xlist#1 branch .. //depot/projects/gdb/contrib/ncurses/FREEBSD-upgrade#1 branch .. //depot/projects/gdb/contrib/ncurses/INSTALL#2 integrate .. //depot/projects/gdb/contrib/ncurses/MANIFEST#2 integrate .. //depot/projects/gdb/contrib/ncurses/Makefile.glibc#2 delete .. //depot/projects/gdb/contrib/ncurses/Makefile.in#2 integrate .. //depot/projects/gdb/contrib/ncurses/Makefile.os2#2 integrate .. //depot/projects/gdb/contrib/ncurses/NEWS#2 integrate .. //depot/projects/gdb/contrib/ncurses/README#2 integrate .. //depot/projects/gdb/contrib/ncurses/README.emx#2 integrate .. //depot/projects/gdb/contrib/ncurses/README.glibc#2 delete .. //depot/projects/gdb/contrib/ncurses/TO-DO#2 integrate .. //depot/projects/gdb/contrib/ncurses/aclocal.m4#2 integrate .. //depot/projects/gdb/contrib/ncurses/announce.html.in#2 integrate .. //depot/projects/gdb/contrib/ncurses/c++/Makefile.in#2 delete .. //depot/projects/gdb/contrib/ncurses/c++/NEWS#2 delete .. //depot/projects/gdb/contrib/ncurses/c++/PROBLEMS#2 delete .. //depot/projects/gdb/contrib/ncurses/c++/README-first#2 delete .. //depot/projects/gdb/contrib/ncurses/c++/cursesapp.cc#2 delete .. //depot/projects/gdb/contrib/ncurses/c++/cursesapp.h#2 delete .. //depot/projects/gdb/contrib/ncurses/c++/cursesf.cc#2 delete .. //depot/projects/gdb/contrib/ncurses/c++/cursesf.h#2 delete .. //depot/projects/gdb/contrib/ncurses/c++/cursesm.cc#2 delete .. //depot/projects/gdb/contrib/ncurses/c++/cursesm.h#2 delete .. //depot/projects/gdb/contrib/ncurses/c++/cursesmain.cc#2 delete .. //depot/projects/gdb/contrib/ncurses/c++/cursesp.cc#2 delete .. //depot/projects/gdb/contrib/ncurses/c++/cursesp.h#2 delete .. //depot/projects/gdb/contrib/ncurses/c++/cursespad.cc#2 delete .. //depot/projects/gdb/contrib/ncurses/c++/cursesw.cc#2 delete .. //depot/projects/gdb/contrib/ncurses/c++/cursesw.h#2 delete .. //depot/projects/gdb/contrib/ncurses/c++/cursslk.cc#2 delete .. //depot/projects/gdb/contrib/ncurses/c++/cursslk.h#2 delete .. //depot/projects/gdb/contrib/ncurses/c++/demo.cc#2 delete .. //depot/projects/gdb/contrib/ncurses/c++/edit_cfg.sh#2 delete .. //depot/projects/gdb/contrib/ncurses/c++/etip.h.in#2 delete .. //depot/projects/gdb/contrib/ncurses/c++/headers#2 delete .. //depot/projects/gdb/contrib/ncurses/c++/internal.h#2 delete .. //depot/projects/gdb/contrib/ncurses/c++/modules#2 delete .. //depot/projects/gdb/contrib/ncurses/config.guess#2 integrate .. //depot/projects/gdb/contrib/ncurses/config.sub#2 integrate .. //depot/projects/gdb/contrib/ncurses/configure#2 integrate .. //depot/projects/gdb/contrib/ncurses/configure.in#2 integrate .. //depot/projects/gdb/contrib/ncurses/convert_configure.pl#2 integrate .. //depot/projects/gdb/contrib/ncurses/dist.mk#2 integrate .. //depot/projects/gdb/contrib/ncurses/doc/hackguide.doc#2 integrate .. //depot/projects/gdb/contrib/ncurses/doc/html/NCURSES-Programming-HOWTO.html#1 branch .. //depot/projects/gdb/contrib/ncurses/doc/html/announce.html#2 integrate .. //depot/projects/gdb/contrib/ncurses/doc/html/hackguide.html#2 integrate .. //depot/projects/gdb/contrib/ncurses/doc/html/ncurses-intro.html#2 integrate .. //depot/projects/gdb/contrib/ncurses/doc/ncurses-intro.doc#2 integrate .. //depot/projects/gdb/contrib/ncurses/form/Makefile.in#2 integrate .. //depot/projects/gdb/contrib/ncurses/form/READ.ME#2 integrate .. //depot/projects/gdb/contrib/ncurses/form/f_trace.c#1 branch .. //depot/projects/gdb/contrib/ncurses/form/fld_arg.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/form/fld_attr.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/form/fld_current.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/form/fld_def.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/form/fld_dup.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/form/fld_ftchoice.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/form/fld_ftlink.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/form/fld_info.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/form/fld_just.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/form/fld_link.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/form/fld_max.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/form/fld_move.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/form/fld_newftyp.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/form/fld_opts.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/form/fld_pad.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/form/fld_page.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/form/fld_stat.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/form/fld_type.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/form/fld_user.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/form/form.h#2 integrate .. //depot/projects/gdb/contrib/ncurses/form/form.priv.h#2 integrate .. //depot/projects/gdb/contrib/ncurses/form/frm_cursor.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/form/frm_data.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/form/frm_def.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/form/frm_driver.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/form/frm_hook.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/form/frm_opts.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/form/frm_page.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/form/frm_post.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/form/frm_req_name.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/form/frm_scale.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/form/frm_sub.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/form/frm_user.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/form/frm_win.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/form/fty_alnum.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/form/fty_alpha.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/form/fty_enum.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/form/fty_int.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/form/fty_ipv4.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/form/fty_num.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/form/fty_regex.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/form/llib-lform#2 integrate .. //depot/projects/gdb/contrib/ncurses/form/llib-lformw#1 branch .. //depot/projects/gdb/contrib/ncurses/form/modules#2 integrate .. //depot/projects/gdb/contrib/ncurses/include/Caps#2 integrate .. //depot/projects/gdb/contrib/ncurses/include/Caps.aix4#2 integrate .. //depot/projects/gdb/contrib/ncurses/include/Caps.hpux11#1 branch .. //depot/projects/gdb/contrib/ncurses/include/Caps.keys#2 integrate .. //depot/projects/gdb/contrib/ncurses/include/Caps.osf1r5#2 integrate .. //depot/projects/gdb/contrib/ncurses/include/Caps.uwin#2 integrate .. //depot/projects/gdb/contrib/ncurses/include/MKhashsize.sh#2 integrate .. //depot/projects/gdb/contrib/ncurses/include/MKkey_defs.sh#2 integrate .. //depot/projects/gdb/contrib/ncurses/include/MKncurses_def.sh#2 integrate .. //depot/projects/gdb/contrib/ncurses/include/MKparametrized.sh#2 integrate .. //depot/projects/gdb/contrib/ncurses/include/MKterm.h.awk.in#2 integrate .. //depot/projects/gdb/contrib/ncurses/include/curses.h.in#2 integrate .. //depot/projects/gdb/contrib/ncurses/include/curses.tail#2 integrate .. //depot/projects/gdb/contrib/ncurses/include/curses.wide#2 integrate .. //depot/projects/gdb/contrib/ncurses/include/hashed_db.h#1 branch .. //depot/projects/gdb/contrib/ncurses/include/nc_alloc.h#2 integrate .. //depot/projects/gdb/contrib/ncurses/include/nc_tparm.h#1 branch .. //depot/projects/gdb/contrib/ncurses/include/ncurses_cfg.hin#2 integrate .. //depot/projects/gdb/contrib/ncurses/include/ncurses_defs#2 integrate .. //depot/projects/gdb/contrib/ncurses/include/ncurses_dll.h#2 integrate .. //depot/projects/gdb/contrib/ncurses/include/term_entry.h#2 integrate .. //depot/projects/gdb/contrib/ncurses/include/tic.h#2 integrate .. //depot/projects/gdb/contrib/ncurses/install-sh#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/MKterminfo.sh#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/Makefile.in#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/captoinfo.1m#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/clear.1#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/curs_add_wch.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/curs_add_wchstr.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/curs_addch.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/curs_addchstr.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/curs_addstr.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/curs_addwstr.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/curs_attr.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/curs_beep.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/curs_bkgd.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/curs_bkgrnd.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/curs_border.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/curs_border_set.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/curs_clear.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/curs_color.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/curs_delch.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/curs_deleteln.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/curs_extend.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/curs_get_wch.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/curs_get_wstr.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/curs_getcchar.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/curs_getch.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/curs_getstr.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/curs_getyx.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/curs_in_wch.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/curs_in_wchstr.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/curs_inch.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/curs_inchstr.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/curs_initscr.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/curs_inopts.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/curs_ins_wch.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/curs_ins_wstr.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/curs_insch.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/curs_insstr.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/curs_instr.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/curs_inwstr.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/curs_kernel.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/curs_mouse.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/curs_move.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/curs_outopts.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/curs_overlay.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/curs_pad.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/curs_print.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/curs_printw.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/curs_refresh.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/curs_scanw.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/curs_scr_dump.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/curs_scroll.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/curs_slk.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/curs_termattrs.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/curs_termcap.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/curs_terminfo.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/curs_touch.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/curs_trace.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/curs_util.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/curs_window.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/default_colors.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/define_key.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/form.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/form_cursor.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/form_data.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/form_driver.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/form_field.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/form_field_attributes.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/form_field_buffer.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/form_field_info.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/form_field_just.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/form_field_new.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/form_field_opts.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/form_field_userptr.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/form_field_validation.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/form_fieldtype.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/form_hook.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/form_new.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/form_new_page.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/form_opts.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/form_page.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/form_post.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/form_requestname.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/form_userptr.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/form_win.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/infocmp.1m#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/infotocap.1m#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/key_defined.3x#1 branch .. //depot/projects/gdb/contrib/ncurses/man/keybound.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/keyok.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/legacy_coding.3x#1 branch .. //depot/projects/gdb/contrib/ncurses/man/make_sed.sh#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/man_db.renames#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/manlinks.sed#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/menu.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/menu_attributes.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/menu_cursor.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/menu_driver.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/menu_format.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/menu_hook.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/menu_items.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/menu_mark.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/menu_new.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/menu_opts.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/menu_pattern.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/menu_post.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/menu_requestname.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/menu_spacing.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/menu_userptr.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/menu_win.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/mitem_current.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/mitem_name.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/mitem_new.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/mitem_opts.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/mitem_userptr.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/mitem_value.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/ncurses.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/panel.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/resizeterm.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/term.5#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/term.7#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/terminfo.head#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/terminfo.tail#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/tic.1m#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/toe.1m#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/tput.1#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/tset.1#2 integrate .. //depot/projects/gdb/contrib/ncurses/man/wresize.3x#2 integrate .. //depot/projects/gdb/contrib/ncurses/menu/Makefile.in#2 integrate .. //depot/projects/gdb/contrib/ncurses/menu/READ.ME#2 integrate .. //depot/projects/gdb/contrib/ncurses/menu/eti.h#2 integrate .. //depot/projects/gdb/contrib/ncurses/menu/llib-lmenu#2 integrate .. //depot/projects/gdb/contrib/ncurses/menu/llib-lmenuw#1 branch .. //depot/projects/gdb/contrib/ncurses/menu/m_attribs.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/menu/m_cursor.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/menu/m_driver.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/menu/m_format.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/menu/m_global.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/menu/m_hook.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/menu/m_item_cur.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/menu/m_item_nam.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/menu/m_item_new.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/menu/m_item_opt.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/menu/m_item_top.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/menu/m_item_use.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/menu/m_item_val.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/menu/m_item_vis.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/menu/m_items.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/menu/m_new.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/menu/m_opts.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/menu/m_pad.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/menu/m_pattern.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/menu/m_post.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/menu/m_req_name.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/menu/m_scale.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/menu/m_spacing.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/menu/m_sub.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/menu/m_trace.c#1 branch .. //depot/projects/gdb/contrib/ncurses/menu/m_userptr.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/menu/m_win.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/menu/menu.h#2 integrate .. //depot/projects/gdb/contrib/ncurses/menu/menu.priv.h#2 integrate .. //depot/projects/gdb/contrib/ncurses/menu/mf_common.h#2 integrate .. //depot/projects/gdb/contrib/ncurses/menu/modules#2 integrate .. //depot/projects/gdb/contrib/ncurses/misc/Makefile.in#2 integrate .. //depot/projects/gdb/contrib/ncurses/misc/chkdef.cmd#2 integrate .. //depot/projects/gdb/contrib/ncurses/misc/cleantic.cmd#2 integrate .. //depot/projects/gdb/contrib/ncurses/misc/cmpdef.cmd#2 integrate .. //depot/projects/gdb/contrib/ncurses/misc/csort#1 branch .. //depot/projects/gdb/contrib/ncurses/misc/emx.src#2 integrate .. //depot/projects/gdb/contrib/ncurses/misc/gen_edit.sh#1 branch .. //depot/projects/gdb/contrib/ncurses/misc/indent.pro#2 delete .. //depot/projects/gdb/contrib/ncurses/misc/jpf-indent#1 branch .. //depot/projects/gdb/contrib/ncurses/misc/makedef.cmd#2 integrate .. //depot/projects/gdb/contrib/ncurses/misc/ncu-indent#1 branch .. //depot/projects/gdb/contrib/ncurses/misc/ncurses-config.in#1 branch .. //depot/projects/gdb/contrib/ncurses/misc/run_tic.in#2 integrate .. //depot/projects/gdb/contrib/ncurses/misc/shlib#2 integrate .. //depot/projects/gdb/contrib/ncurses/misc/terminfo.src#2 integrate .. //depot/projects/gdb/contrib/ncurses/mk-0th.awk#2 integrate .. //depot/projects/gdb/contrib/ncurses/mk-1st.awk#2 integrate .. //depot/projects/gdb/contrib/ncurses/mk-2nd.awk#2 integrate .. //depot/projects/gdb/contrib/ncurses/mkinstalldirs#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/Makefile.in#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/README#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/README.IZ#1 branch .. //depot/projects/gdb/contrib/ncurses/ncurses/SigAction.h#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/base/MKkeyname.awk#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/base/MKlib_gen.sh#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/base/MKunctrl.awk#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/base/README#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/base/define_key.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/base/key_defined.c#1 branch .. //depot/projects/gdb/contrib/ncurses/ncurses/base/keybound.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/base/keyok.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/base/legacy_coding.c#1 branch .. //depot/projects/gdb/contrib/ncurses/ncurses/base/lib_addch.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/base/lib_addstr.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/base/lib_beep.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/base/lib_bkgd.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/base/lib_box.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/base/lib_chgat.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/base/lib_clrbot.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/base/lib_color.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/base/lib_colorset.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/base/lib_dft_fgbg.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/base/lib_erase.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/base/lib_freeall.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/base/lib_getch.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/base/lib_getstr.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/base/lib_hline.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/base/lib_initscr.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/base/lib_insch.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/base/lib_insdel.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/base/lib_insnstr.c#1 branch .. //depot/projects/gdb/contrib/ncurses/ncurses/base/lib_insstr.c#2 delete .. //depot/projects/gdb/contrib/ncurses/ncurses/base/lib_instr.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/base/lib_mouse.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/base/lib_move.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/base/lib_mvwin.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/base/lib_newterm.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/base/lib_newwin.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/base/lib_overlay.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/base/lib_pad.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/base/lib_printw.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/base/lib_redrawln.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/base/lib_refresh.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/base/lib_restart.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/base/lib_screen.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/base/lib_scroll.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/base/lib_set_term.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/base/lib_slk.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/base/lib_slkatr_set.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/base/lib_slkatrof.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/base/lib_slkatron.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/base/lib_slkatrset.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/base/lib_slkattr.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/base/lib_slkclear.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/base/lib_slkcolor.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/base/lib_slklab.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/base/lib_slkrefr.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/base/lib_slkset.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/base/lib_ungetch.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/base/lib_vline.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/base/lib_wattroff.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/base/lib_wattron.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/base/lib_window.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/base/resizeterm.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/base/safe_sprintf.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/base/sigaction.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/base/tries.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/base/version.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/base/vsscanf.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/base/wresize.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/curses.priv.h#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/llib-lncurses#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/llib-lncursesw#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/modules#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/tinfo/MKcaptab.awk#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/tinfo/MKfallback.sh#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/tinfo/MKkeys_list.sh#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/tinfo/MKnames.awk#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/tinfo/README#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/tinfo/access.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/tinfo/add_tries.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/tinfo/alloc_entry.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/tinfo/alloc_ttype.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/tinfo/captoinfo.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/tinfo/comp_error.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/tinfo/comp_expand.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/tinfo/comp_hash.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/tinfo/comp_parse.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/tinfo/comp_scan.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/tinfo/db_iterator.c#1 branch .. //depot/projects/gdb/contrib/ncurses/ncurses/tinfo/doalloc.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/tinfo/free_ttype.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/tinfo/hashed_db.c#1 branch .. //depot/projects/gdb/contrib/ncurses/ncurses/tinfo/home_terminfo.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/tinfo/init_keytry.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/tinfo/lib_acs.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/tinfo/lib_cur_term.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/tinfo/lib_data.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/tinfo/lib_has_cap.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/tinfo/lib_kernel.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/tinfo/lib_napms.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/tinfo/lib_options.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/tinfo/lib_print.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/tinfo/lib_raw.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/tinfo/lib_setup.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/tinfo/lib_termcap.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/tinfo/lib_termname.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/tinfo/lib_tgoto.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/tinfo/lib_ti.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/tinfo/lib_tparm.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/tinfo/lib_tputs.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/tinfo/lib_ttyflags.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/tinfo/make_keys.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/tinfo/name_match.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/tinfo/parse_entry.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/tinfo/read_entry.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/tinfo/read_termcap.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/tinfo/setbuf.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/tinfo/strings.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/tinfo/trim_sgr0.c#1 branch .. //depot/projects/gdb/contrib/ncurses/ncurses/tinfo/write_entry.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/trace/README#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/trace/lib_trace.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/trace/lib_traceatr.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/trace/lib_tracebits.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/trace/lib_tracechr.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/trace/lib_tracedmp.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/trace/lib_tracemse.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/trace/trace_buf.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/trace/varargs.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/trace/visbuf.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/tty/MKexpanded.sh#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/tty/hashmap.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/tty/lib_mvcur.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/tty/lib_tstp.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/tty/lib_twait.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/tty/lib_vidattr.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/tty/tty_display.h#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/tty/tty_update.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/widechar/charable.c#1 branch .. //depot/projects/gdb/contrib/ncurses/ncurses/widechar/lib_add_wch.c#1 branch .. //depot/projects/gdb/contrib/ncurses/ncurses/widechar/lib_box_set.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/widechar/lib_cchar.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/widechar/lib_get_wch.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/widechar/lib_get_wstr.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/widechar/lib_in_wch.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/widechar/lib_in_wchnstr.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/widechar/lib_ins_nwstr.c#2 delete .. //depot/projects/gdb/contrib/ncurses/ncurses/widechar/lib_ins_wch.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/widechar/lib_inwstr.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/widechar/lib_pecho_wchar.c#1 branch .. //depot/projects/gdb/contrib/ncurses/ncurses/widechar/lib_slk_wset.c#1 branch .. //depot/projects/gdb/contrib/ncurses/ncurses/widechar/lib_unget_wch.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/widechar/lib_vid_attr.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/widechar/lib_wacs.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/ncurses/widechar/lib_wunctrl.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/panel/Makefile.in#2 integrate .. //depot/projects/gdb/contrib/ncurses/panel/llib-lpanel#2 integrate .. //depot/projects/gdb/contrib/ncurses/panel/llib-lpanelw#1 branch .. //depot/projects/gdb/contrib/ncurses/panel/p_above.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/panel/p_below.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/panel/p_bottom.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/panel/p_delete.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/panel/p_hidden.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/panel/p_hide.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/panel/p_move.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/panel/p_new.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/panel/p_replace.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/panel/p_show.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/panel/p_top.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/panel/p_update.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/panel/p_user.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/panel/p_win.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/panel/panel.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/panel/panel.h#2 integrate .. //depot/projects/gdb/contrib/ncurses/panel/panel.priv.h#2 integrate .. //depot/projects/gdb/contrib/ncurses/progs/MKtermsort.sh#2 integrate .. //depot/projects/gdb/contrib/ncurses/progs/Makefile.in#2 integrate .. //depot/projects/gdb/contrib/ncurses/progs/capconvert#2 integrate .. //depot/projects/gdb/contrib/ncurses/progs/clear.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/progs/clear.sh#2 integrate .. //depot/projects/gdb/contrib/ncurses/progs/dump_entry.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/progs/dump_entry.h#2 integrate .. //depot/projects/gdb/contrib/ncurses/progs/infocmp.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/progs/modules#2 integrate .. //depot/projects/gdb/contrib/ncurses/progs/progs.priv.h#2 integrate .. //depot/projects/gdb/contrib/ncurses/progs/tic.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/progs/toe.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/progs/tput.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/progs/tset.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/tack/COPYING#2 integrate .. //depot/projects/gdb/contrib/ncurses/tack/HISTORY#2 integrate .. //depot/projects/gdb/contrib/ncurses/tack/Makefile.in#2 integrate .. //depot/projects/gdb/contrib/ncurses/tack/ansi.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/tack/charset.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/tack/color.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/tack/control.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/tack/crum.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/tack/edit.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/tack/fun.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/tack/init.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/tack/menu.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/tack/modes.c#2 integrate .. //depot/projects/gdb/contrib/ncurses/tack/modules#2 integrate .. //depot/projects/gdb/contrib/ncurses/tack/output.c#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Apr 21 04:13:18 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 D01B416A406; Sat, 21 Apr 2007 04:13:17 +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 A1FD816A401 for ; Sat, 21 Apr 2007 04:13:17 +0000 (UTC) (envelope-from zec@icir.org) Received: from xaqua.tel.fer.hr (xaqua.tel.fer.hr [161.53.19.25]) by mx1.freebsd.org (Postfix) with ESMTP id 60CFC13C45B for ; Sat, 21 Apr 2007 04:13:17 +0000 (UTC) (envelope-from zec@icir.org) Received: by xaqua.tel.fer.hr (Postfix, from userid 20006) id 02B9C9B6F6; Sat, 21 Apr 2007 06:13:16 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.1.7 (2006-10-05) on xaqua.tel.fer.hr X-Spam-Level: X-Spam-Status: No, score=-4.3 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.7 Received: from [192.168.200.106] (zec2.tel.fer.hr [161.53.19.79]) by xaqua.tel.fer.hr (Postfix) with ESMTP id 3DF649B656; Sat, 21 Apr 2007 06:13:15 +0200 (CEST) From: Marko Zec To: Max Laier Date: Sat, 21 Apr 2007 06:12:51 +0200 User-Agent: KMail/1.9.1 References: <200704190739.l3J7dFng023292@repoman.freebsd.org> <200704191549.13955.max@love2party.net> In-Reply-To: <200704191549.13955.max@love2party.net> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-2" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200704210612.52050.zec@icir.org> Cc: perforce@freebsd.org Subject: Re: PERFORCE change 118399 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: Sat, 21 Apr 2007 04:13:18 -0000 On Thursday 19 April 2007 15:49, you wrote: > On Thursday 19 April 2007 09:39, Marko Zec wrote: > > http://perforce.freebsd.org/chv.cgi?CH=118399 > > > > Change 118399 by zec@zec_tca51 on 2007/04/19 07:38:43 > > > > Fix to allow compilation with nooptions VIMAGE. > > > > Affected files ... > > > > .. //depot/projects/vimage/src/sys/contrib/pf/net/pf_ioctl.c#5 edit > > > > Differences ... > > > > ==== //depot/projects/vimage/src/sys/contrib/pf/net/pf_ioctl.c#5 > > (text+ko) ==== > > > > @@ -401,10 +401,14 @@ > > callout_reset(&V_pf_expire_to, my_timeout[PFTM_INTERVAL] * hz, > > pf_purge_timeout, curvnet); > > > > -if (curvnet == &vnet_0) { > > +#ifdef VIMAGE > > + if (curvnet == &vnet_0) { > > +#endif > > pf_normalize_init(); > > pf_pfil_hooked = 0; > > -} > > +#ifdef VIMAGE > > + } > > +#endif > > I don't quite understand this one. I'd believe that pf_pfil_hooked > should be virtualized as well. Otherwise you can only enable/hook > all instances at once. I think you're right that this needs more work. Note that virtualizing pf_pfil_hooked would be incorrect at this point, given that the pfil_hooks infrastructure (lists) are not virtualized. So either we should implement a per-stack instance of pfil_hooks (in net/pfil.c), or in pf we should register / deregister hook handles only once, in pf_load() and pf_unload(), and dump the pf_pfil_hooked flag away... Marko From owner-p4-projects@FreeBSD.ORG Sat Apr 21 04:18:58 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 B55D516A407; Sat, 21 Apr 2007 04:18:57 +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 2AD7416A400 for ; Sat, 21 Apr 2007 04:18:57 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 18ECC13C44C for ; Sat, 21 Apr 2007 04:18:57 +0000 (UTC) (envelope-from marcel@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 l3L4Iv06021956 for ; Sat, 21 Apr 2007 04:18:57 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3L4GVCx020214 for perforce@freebsd.org; Sat, 21 Apr 2007 04:16:31 GMT (envelope-from marcel@freebsd.org) Date: Sat, 21 Apr 2007 04:16:31 GMT Message-Id: <200704210416.l3L4GVCx020214@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 118510 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: Sat, 21 Apr 2007 04:18:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=118510 Change 118510 by marcel@marcel_xcllnt on 2007/04/21 04:15:35 IFC @118506 Affected files ... .. //depot/projects/ia64/MAINTAINERS#57 integrate .. //depot/projects/ia64/Makefile#55 integrate .. //depot/projects/ia64/Makefile.inc1#116 integrate .. //depot/projects/ia64/ObsoleteFiles.inc#17 integrate .. //depot/projects/ia64/UPDATING#96 integrate .. //depot/projects/ia64/bin/csh/config.h#6 integrate .. //depot/projects/ia64/bin/csh/config_p.h#3 integrate .. //depot/projects/ia64/bin/df/df.1#11 integrate .. //depot/projects/ia64/bin/df/df.c#25 integrate .. //depot/projects/ia64/bin/expr/expr.1#11 integrate .. //depot/projects/ia64/bin/kill/kill.1#7 integrate .. //depot/projects/ia64/bin/rcp/rcp.1#8 integrate .. //depot/projects/ia64/bin/setfacl/setfacl.c#10 integrate .. //depot/projects/ia64/cddl/Makefile#1 branch .. //depot/projects/ia64/cddl/Makefile.inc#1 branch .. //depot/projects/ia64/cddl/lib/Makefile#1 branch .. //depot/projects/ia64/cddl/lib/Makefile.inc#1 branch .. //depot/projects/ia64/cddl/lib/libavl/Makefile#1 branch .. //depot/projects/ia64/cddl/lib/libnvpair/Makefile#1 branch .. //depot/projects/ia64/cddl/lib/libumem/Makefile#1 branch .. //depot/projects/ia64/cddl/lib/libuutil/Makefile#1 branch .. //depot/projects/ia64/cddl/lib/libzfs/Makefile#1 branch .. //depot/projects/ia64/cddl/lib/libzpool/Makefile#1 branch .. //depot/projects/ia64/cddl/sbin/Makefile#1 branch .. //depot/projects/ia64/cddl/sbin/Makefile.inc#1 branch .. //depot/projects/ia64/cddl/sbin/zfs/Makefile#1 branch .. //depot/projects/ia64/cddl/sbin/zpool/Makefile#1 branch .. //depot/projects/ia64/cddl/usr.bin/Makefile#1 branch .. //depot/projects/ia64/cddl/usr.bin/Makefile.inc#1 branch .. //depot/projects/ia64/cddl/usr.bin/ztest/Makefile#1 branch .. //depot/projects/ia64/cddl/usr.sbin/Makefile#1 branch .. //depot/projects/ia64/cddl/usr.sbin/Makefile.inc#1 branch .. //depot/projects/ia64/cddl/usr.sbin/zdb/Makefile#1 branch .. //depot/projects/ia64/compat/opensolaris/include/devid.h#1 branch .. //depot/projects/ia64/compat/opensolaris/include/fsshare.h#1 branch .. //depot/projects/ia64/compat/opensolaris/include/libintl.h#1 branch .. //depot/projects/ia64/compat/opensolaris/include/mnttab.h#1 branch .. //depot/projects/ia64/compat/opensolaris/include/priv.h#1 branch .. //depot/projects/ia64/compat/opensolaris/include/solaris.h#1 branch .. //depot/projects/ia64/compat/opensolaris/include/zone.h#1 branch .. //depot/projects/ia64/compat/opensolaris/lib/libumem/umem.c#1 branch .. //depot/projects/ia64/compat/opensolaris/lib/libumem/umem.h#1 branch .. //depot/projects/ia64/compat/opensolaris/misc/fsshare.c#1 branch .. //depot/projects/ia64/compat/opensolaris/misc/mkdirp.c#1 branch .. //depot/projects/ia64/compat/opensolaris/misc/mnttab.c#1 branch .. //depot/projects/ia64/compat/opensolaris/misc/zmount.c#1 branch .. //depot/projects/ia64/compat/opensolaris/misc/zone.c#1 branch .. //depot/projects/ia64/contrib/amd/hlfsd/hlfsd.h#6 integrate .. //depot/projects/ia64/contrib/binutils/gas/as.h#5 integrate .. //depot/projects/ia64/contrib/binutils/gas/tc.h#4 integrate .. //depot/projects/ia64/contrib/bzip2/CHANGES#4 integrate .. //depot/projects/ia64/contrib/bzip2/FREEBSD-upgrade#3 integrate .. //depot/projects/ia64/contrib/bzip2/LICENSE#4 integrate .. //depot/projects/ia64/contrib/bzip2/Makefile#4 integrate .. //depot/projects/ia64/contrib/bzip2/Makefile-libbz2_so#4 integrate .. //depot/projects/ia64/contrib/bzip2/README#4 integrate .. //depot/projects/ia64/contrib/bzip2/README.COMPILATION.PROBLEMS#4 integrate .. //depot/projects/ia64/contrib/bzip2/Y2K_INFO#2 delete .. //depot/projects/ia64/contrib/bzip2/blocksort.c#4 integrate .. //depot/projects/ia64/contrib/bzip2/bzip2.1#4 integrate .. //depot/projects/ia64/contrib/bzip2/bzip2.c#5 integrate .. //depot/projects/ia64/contrib/bzip2/bzip2recover.c#4 integrate .. //depot/projects/ia64/contrib/bzip2/bzlib.c#5 integrate .. //depot/projects/ia64/contrib/bzip2/bzlib.h#4 integrate .. //depot/projects/ia64/contrib/bzip2/bzlib_private.h#4 integrate .. //depot/projects/ia64/contrib/bzip2/compress.c#4 integrate .. //depot/projects/ia64/contrib/bzip2/crctable.c#4 integrate .. //depot/projects/ia64/contrib/bzip2/decompress.c#4 integrate .. //depot/projects/ia64/contrib/bzip2/dlltest.c#3 integrate .. //depot/projects/ia64/contrib/bzip2/huffman.c#4 integrate .. //depot/projects/ia64/contrib/bzip2/manual.texi#3 delete .. //depot/projects/ia64/contrib/bzip2/randtable.c#4 integrate .. //depot/projects/ia64/contrib/bzip2/sample1.bz2.uu#4 integrate .. //depot/projects/ia64/contrib/bzip2/sample1.ref.gz.uu#4 integrate .. //depot/projects/ia64/contrib/bzip2/sample2.bz2.uu#4 integrate .. //depot/projects/ia64/contrib/bzip2/sample2.ref.gz.uu#3 integrate .. //depot/projects/ia64/contrib/bzip2/sample3.bz2.uu#4 integrate .. //depot/projects/ia64/contrib/bzip2/sample3.ref.gz.uu#3 integrate .. //depot/projects/ia64/contrib/bzip2/spewG.c#2 integrate .. //depot/projects/ia64/contrib/bzip2/unzcrash.c#2 integrate .. //depot/projects/ia64/contrib/bzip2/words0#2 integrate .. //depot/projects/ia64/contrib/bzip2/words2#2 integrate .. //depot/projects/ia64/contrib/bzip2/words3#3 integrate .. //depot/projects/ia64/contrib/libpcap/pcap-bpf.c#11 integrate .. //depot/projects/ia64/contrib/libreadline/FREEBSD-upgrade#7 integrate .. //depot/projects/ia64/contrib/libreadline/display.c#7 integrate .. //depot/projects/ia64/contrib/netcat/nc.1#5 integrate .. //depot/projects/ia64/contrib/netcat/netcat.c#3 integrate .. //depot/projects/ia64/contrib/netcat/socks.c#3 integrate .. //depot/projects/ia64/contrib/openbsm/HISTORY#5 integrate .. //depot/projects/ia64/contrib/openbsm/README#4 integrate .. //depot/projects/ia64/contrib/openbsm/TODO#4 integrate .. //depot/projects/ia64/contrib/openbsm/VERSION#5 integrate .. //depot/projects/ia64/contrib/openbsm/bin/audit/audit.8#2 integrate .. //depot/projects/ia64/contrib/openbsm/bin/auditd/auditd.8#3 integrate .. //depot/projects/ia64/contrib/openbsm/bin/auditd/auditd.c#4 integrate .. //depot/projects/ia64/contrib/openbsm/bin/auditfilterd/auditfilterd.8#2 integrate .. //depot/projects/ia64/contrib/openbsm/bin/auditfilterd/auditfilterd.c#3 integrate .. //depot/projects/ia64/contrib/openbsm/bin/auditreduce/auditreduce.1#3 integrate .. //depot/projects/ia64/contrib/openbsm/bin/praudit/praudit.1#2 integrate .. //depot/projects/ia64/contrib/openbsm/bin/praudit/praudit.c#2 integrate .. //depot/projects/ia64/contrib/openbsm/bsm/libbsm.h#5 integrate .. //depot/projects/ia64/contrib/openbsm/compat/clock_gettime.h#1 branch .. //depot/projects/ia64/contrib/openbsm/config/config.h#4 integrate .. //depot/projects/ia64/contrib/openbsm/configure#5 integrate .. //depot/projects/ia64/contrib/openbsm/configure.ac#5 integrate .. //depot/projects/ia64/contrib/openbsm/etc/audit_event#4 integrate .. //depot/projects/ia64/contrib/openbsm/libbsm/au_class.3#2 integrate .. //depot/projects/ia64/contrib/openbsm/libbsm/au_control.3#3 integrate .. //depot/projects/ia64/contrib/openbsm/libbsm/au_event.3#2 integrate .. //depot/projects/ia64/contrib/openbsm/libbsm/au_free_token.3#2 integrate .. //depot/projects/ia64/contrib/openbsm/libbsm/au_io.3#2 integrate .. //depot/projects/ia64/contrib/openbsm/libbsm/au_mask.3#2 integrate .. //depot/projects/ia64/contrib/openbsm/libbsm/au_open.3#3 integrate .. //depot/projects/ia64/contrib/openbsm/libbsm/au_token.3#4 integrate .. //depot/projects/ia64/contrib/openbsm/libbsm/au_user.3#2 integrate .. //depot/projects/ia64/contrib/openbsm/libbsm/audit_submit.3#2 integrate .. //depot/projects/ia64/contrib/openbsm/libbsm/bsm_io.c#4 integrate .. //depot/projects/ia64/contrib/openbsm/libbsm/bsm_notify.c#3 integrate .. //depot/projects/ia64/contrib/openbsm/libbsm/bsm_token.c#5 integrate .. //depot/projects/ia64/contrib/openbsm/libbsm/bsm_wrappers.c#3 integrate .. //depot/projects/ia64/contrib/openbsm/libbsm/libbsm.3#4 integrate .. //depot/projects/ia64/contrib/openbsm/man/audit.2#2 integrate .. //depot/projects/ia64/contrib/openbsm/man/audit.log.5#4 integrate .. //depot/projects/ia64/contrib/openbsm/man/audit_class.5#2 integrate .. //depot/projects/ia64/contrib/openbsm/man/audit_control.5#3 integrate .. //depot/projects/ia64/contrib/openbsm/man/audit_event.5#2 integrate .. //depot/projects/ia64/contrib/openbsm/man/audit_user.5#2 integrate .. //depot/projects/ia64/contrib/openbsm/man/audit_warn.5#2 integrate .. //depot/projects/ia64/contrib/openbsm/man/auditctl.2#3 integrate .. //depot/projects/ia64/contrib/openbsm/man/auditon.2#3 integrate .. //depot/projects/ia64/contrib/openbsm/man/getaudit.2#2 integrate .. //depot/projects/ia64/contrib/openbsm/man/getauid.2#2 integrate .. //depot/projects/ia64/contrib/openbsm/man/setaudit.2#2 integrate .. //depot/projects/ia64/contrib/openbsm/man/setauid.2#2 integrate .. //depot/projects/ia64/contrib/openbsm/test/bsm/generate.c#4 integrate .. //depot/projects/ia64/contrib/openbsm/test/reference/arg32_record#2 integrate .. //depot/projects/ia64/contrib/openbsm/test/reference/data_record#2 integrate .. //depot/projects/ia64/contrib/openbsm/test/reference/file_record#2 integrate .. //depot/projects/ia64/contrib/openbsm/test/reference/in_addr_record#2 integrate .. //depot/projects/ia64/contrib/openbsm/test/reference/ip_record#2 integrate .. //depot/projects/ia64/contrib/openbsm/test/reference/ipc_record#2 integrate .. //depot/projects/ia64/contrib/openbsm/test/reference/iport_record#2 integrate .. //depot/projects/ia64/contrib/openbsm/test/reference/opaque_record#2 integrate .. //depot/projects/ia64/contrib/openbsm/test/reference/path_record#2 integrate .. //depot/projects/ia64/contrib/openbsm/test/reference/process32_record#2 integrate .. //depot/projects/ia64/contrib/openbsm/test/reference/process32ex_record#2 delete .. //depot/projects/ia64/contrib/openbsm/test/reference/process32ex_record-IPv4#1 branch .. //depot/projects/ia64/contrib/openbsm/test/reference/process32ex_record-IPv6#1 branch .. //depot/projects/ia64/contrib/openbsm/test/reference/process32ex_token#2 delete .. //depot/projects/ia64/contrib/openbsm/test/reference/process32ex_token-IPv4#1 branch .. //depot/projects/ia64/contrib/openbsm/test/reference/process32ex_token-IPv6#1 branch .. //depot/projects/ia64/contrib/openbsm/test/reference/process64_record#1 branch .. //depot/projects/ia64/contrib/openbsm/test/reference/process64_token#1 branch .. //depot/projects/ia64/contrib/openbsm/test/reference/process64ex_record-IPv4#1 branch .. //depot/projects/ia64/contrib/openbsm/test/reference/process64ex_record-IPv6#1 branch .. //depot/projects/ia64/contrib/openbsm/test/reference/process64ex_token-IPv4#1 branch .. //depot/projects/ia64/contrib/openbsm/test/reference/process64ex_token-IPv6#1 branch .. //depot/projects/ia64/contrib/openbsm/test/reference/return32_record#2 integrate .. //depot/projects/ia64/contrib/openbsm/test/reference/seq_record#2 integrate .. //depot/projects/ia64/contrib/openbsm/test/reference/subject32_record#2 integrate .. //depot/projects/ia64/contrib/openbsm/test/reference/subject32ex_record#2 integrate .. //depot/projects/ia64/contrib/openbsm/test/reference/subject32ex_token-IPv4#2 integrate .. //depot/projects/ia64/contrib/openbsm/test/reference/subject32ex_token-IPv6#2 integrate .. //depot/projects/ia64/contrib/openbsm/test/reference/text_record#2 integrate .. //depot/projects/ia64/contrib/openbsm/test/reference/zonename_record#1 branch .. //depot/projects/ia64/contrib/openbsm/test/reference/zonename_token#1 branch .. //depot/projects/ia64/contrib/openbsm/tools/audump.c#3 integrate .. //depot/projects/ia64/contrib/openpam/lib/openpam_readline.c#3 integrate .. //depot/projects/ia64/contrib/opensolaris/cmd/zdb/zdb.8#1 branch .. //depot/projects/ia64/contrib/opensolaris/cmd/zdb/zdb.c#1 branch .. //depot/projects/ia64/contrib/opensolaris/cmd/zdb/zdb_il.c#1 branch .. //depot/projects/ia64/contrib/opensolaris/cmd/zfs/zfs.8#1 branch .. //depot/projects/ia64/contrib/opensolaris/cmd/zfs/zfs_iter.c#1 branch .. //depot/projects/ia64/contrib/opensolaris/cmd/zfs/zfs_iter.h#1 branch .. //depot/projects/ia64/contrib/opensolaris/cmd/zfs/zfs_main.c#1 branch .. //depot/projects/ia64/contrib/opensolaris/cmd/zfs/zfs_util.h#1 branch .. //depot/projects/ia64/contrib/opensolaris/cmd/zpool/zpool.8#1 branch .. //depot/projects/ia64/contrib/opensolaris/cmd/zpool/zpool_iter.c#1 branch .. //depot/projects/ia64/contrib/opensolaris/cmd/zpool/zpool_main.c#1 branch .. //depot/projects/ia64/contrib/opensolaris/cmd/zpool/zpool_util.c#1 branch .. //depot/projects/ia64/contrib/opensolaris/cmd/zpool/zpool_util.h#1 branch .. //depot/projects/ia64/contrib/opensolaris/cmd/zpool/zpool_vdev.c#1 branch .. //depot/projects/ia64/contrib/opensolaris/cmd/ztest/ztest.c#1 branch .. //depot/projects/ia64/contrib/opensolaris/head/assert.h#1 branch .. //depot/projects/ia64/contrib/opensolaris/head/atomic.h#1 branch .. //depot/projects/ia64/contrib/opensolaris/head/libintl.h#1 branch .. //depot/projects/ia64/contrib/opensolaris/head/stdio_ext.h#1 branch .. //depot/projects/ia64/contrib/opensolaris/head/synch.h#1 branch .. //depot/projects/ia64/contrib/opensolaris/head/thread.h#1 branch .. //depot/projects/ia64/contrib/opensolaris/lib/libnvpair/libnvpair.c#1 branch .. //depot/projects/ia64/contrib/opensolaris/lib/libnvpair/libnvpair.h#1 branch .. //depot/projects/ia64/contrib/opensolaris/lib/libnvpair/nvpair_alloc_system.c#1 branch .. //depot/projects/ia64/contrib/opensolaris/lib/libuutil/common/libuutil.h#1 branch .. //depot/projects/ia64/contrib/opensolaris/lib/libuutil/common/libuutil_common.h#1 branch .. //depot/projects/ia64/contrib/opensolaris/lib/libuutil/common/libuutil_impl.h#1 branch .. //depot/projects/ia64/contrib/opensolaris/lib/libuutil/common/uu_alloc.c#1 branch .. //depot/projects/ia64/contrib/opensolaris/lib/libuutil/common/uu_avl.c#1 branch .. //depot/projects/ia64/contrib/opensolaris/lib/libuutil/common/uu_dprintf.c#1 branch .. //depot/projects/ia64/contrib/opensolaris/lib/libuutil/common/uu_ident.c#1 branch .. //depot/projects/ia64/contrib/opensolaris/lib/libuutil/common/uu_list.c#1 branch .. //depot/projects/ia64/contrib/opensolaris/lib/libuutil/common/uu_misc.c#1 branch .. //depot/projects/ia64/contrib/opensolaris/lib/libuutil/common/uu_open.c#1 branch .. //depot/projects/ia64/contrib/opensolaris/lib/libuutil/common/uu_pname.c#1 branch .. //depot/projects/ia64/contrib/opensolaris/lib/libuutil/common/uu_strtoint.c#1 branch .. //depot/projects/ia64/contrib/opensolaris/lib/libzfs/common/libzfs.h#1 branch .. //depot/projects/ia64/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#1 branch .. //depot/projects/ia64/contrib/opensolaris/lib/libzfs/common/libzfs_config.c#1 branch .. //depot/projects/ia64/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#1 branch .. //depot/projects/ia64/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c#1 branch .. //depot/projects/ia64/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#1 branch .. //depot/projects/ia64/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#1 branch .. //depot/projects/ia64/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#1 branch .. //depot/projects/ia64/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#1 branch .. //depot/projects/ia64/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#1 branch .. //depot/projects/ia64/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#1 branch .. //depot/projects/ia64/contrib/opensolaris/lib/libzpool/common/kernel.c#1 branch .. //depot/projects/ia64/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#1 branch .. //depot/projects/ia64/contrib/opensolaris/lib/libzpool/common/taskq.c#1 branch .. //depot/projects/ia64/contrib/opensolaris/lib/libzpool/common/util.c#1 branch .. //depot/projects/ia64/contrib/sendmail/FREEBSD-upgrade#25 integrate .. //depot/projects/ia64/contrib/sendmail/KNOWNBUGS#9 integrate .. //depot/projects/ia64/contrib/sendmail/PGPKEYS#11 integrate .. //depot/projects/ia64/contrib/sendmail/RELEASE_NOTES#19 integrate .. //depot/projects/ia64/contrib/sendmail/cf/README#17 integrate .. //depot/projects/ia64/contrib/sendmail/cf/cf/knecht.mc#7 integrate .. //depot/projects/ia64/contrib/sendmail/cf/cf/submit.cf#18 integrate .. //depot/projects/ia64/contrib/sendmail/cf/feature/access_db.m4#7 integrate .. //depot/projects/ia64/contrib/sendmail/cf/feature/badmx.m4#1 branch .. //depot/projects/ia64/contrib/sendmail/cf/feature/block_bad_helo.m4#1 branch .. //depot/projects/ia64/contrib/sendmail/cf/feature/dnsbl.m4#8 integrate .. //depot/projects/ia64/contrib/sendmail/cf/feature/enhdnsbl.m4#6 integrate .. //depot/projects/ia64/contrib/sendmail/cf/feature/require_rdns.m4#1 branch .. //depot/projects/ia64/contrib/sendmail/cf/m4/proto.m4#17 integrate .. //depot/projects/ia64/contrib/sendmail/cf/m4/version.m4#19 integrate .. //depot/projects/ia64/contrib/sendmail/cf/mailer/smtp.m4#5 integrate .. //depot/projects/ia64/contrib/sendmail/contrib/cidrexpand#5 integrate .. //depot/projects/ia64/contrib/sendmail/contrib/qtool.pl#7 integrate .. //depot/projects/ia64/contrib/sendmail/doc/op/op.me#16 integrate .. //depot/projects/ia64/contrib/sendmail/editmap/Makefile.m4#4 integrate .. //depot/projects/ia64/contrib/sendmail/include/libmilter/mfapi.h#12 integrate .. //depot/projects/ia64/contrib/sendmail/include/libmilter/mfdef.h#7 integrate .. //depot/projects/ia64/contrib/sendmail/include/libmilter/milter.h#9 integrate .. //depot/projects/ia64/contrib/sendmail/include/sm/conf.h#15 integrate .. //depot/projects/ia64/contrib/sendmail/include/sm/errstring.h#6 integrate .. //depot/projects/ia64/contrib/sendmail/include/sm/heap.h#4 integrate .. //depot/projects/ia64/contrib/sendmail/include/sm/ldap.h#7 integrate .. //depot/projects/ia64/contrib/sendmail/include/sm/misc.h#1 branch .. //depot/projects/ia64/contrib/sendmail/include/sm/os/sm_os_qnx.h#1 branch .. //depot/projects/ia64/contrib/sendmail/include/sm/sendmail.h#1 branch .. //depot/projects/ia64/contrib/sendmail/include/sm/tailq.h#1 branch .. //depot/projects/ia64/contrib/sendmail/libmilter/Makefile#4 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/Makefile.m4#6 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/README#9 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/comm.c#11 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/api.html#4 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/design.html#4 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/index.html#6 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/installation.html#5 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/other.html#4 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/overview.html#6 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/sample.html#6 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/smfi_addheader.html#5 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/smfi_addrcpt.html#5 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/smfi_addrcpt_par.html#1 branch .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/smfi_chgfrom.html#1 branch .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/smfi_chgheader.html#6 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/smfi_delrcpt.html#5 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/smfi_getpriv.html#4 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/smfi_getsymval.html#5 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/smfi_insheader.html#2 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/smfi_main.html#4 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/smfi_opensocket.html#2 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/smfi_progress.html#2 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/smfi_quarantine.html#2 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/smfi_register.html#5 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/smfi_replacebody.html#4 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/smfi_setbacklog.html#4 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/smfi_setconn.html#5 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/smfi_setdbg.html#2 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/smfi_setmlreply.html#2 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/smfi_setpriv.html#4 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/smfi_setreply.html#8 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/smfi_setsymlist.html#1 branch .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/smfi_settimeout.html#5 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/smfi_stop.html#3 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/smfi_version.html#1 branch .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/xxfi_abort.html#4 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/xxfi_body.html#4 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/xxfi_close.html#4 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/xxfi_connect.html#5 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/xxfi_data.html#1 branch .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/xxfi_envfrom.html#4 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/xxfi_envrcpt.html#5 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/xxfi_eoh.html#4 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/xxfi_eom.html#4 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/xxfi_header.html#5 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/xxfi_helo.html#5 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/xxfi_negotiate.html#1 branch .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/xxfi_unknown.html#1 branch .. //depot/projects/ia64/contrib/sendmail/libmilter/engine.c#13 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/example.c#1 branch .. //depot/projects/ia64/contrib/sendmail/libmilter/handler.c#8 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/libmilter.h#11 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/listener.c#16 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/main.c#11 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/monitor.c#1 branch .. //depot/projects/ia64/contrib/sendmail/libmilter/smfi.c#9 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/worker.c#1 branch .. //depot/projects/ia64/contrib/sendmail/libsm/Makefile#4 integrate .. //depot/projects/ia64/contrib/sendmail/libsm/Makefile.m4#7 integrate .. //depot/projects/ia64/contrib/sendmail/libsm/config.c#7 integrate .. //depot/projects/ia64/contrib/sendmail/libsm/exc.c#6 integrate .. //depot/projects/ia64/contrib/sendmail/libsm/exc.html#4 integrate .. //depot/projects/ia64/contrib/sendmail/libsm/findfp.c#5 integrate .. //depot/projects/ia64/contrib/sendmail/libsm/flags.c#6 integrate .. //depot/projects/ia64/contrib/sendmail/libsm/ldap.c#12 integrate .. //depot/projects/ia64/contrib/sendmail/libsm/local.h#9 integrate .. //depot/projects/ia64/contrib/sendmail/libsm/memstat.c#2 integrate .. //depot/projects/ia64/contrib/sendmail/libsm/snprintf.c#4 integrate .. //depot/projects/ia64/contrib/sendmail/libsm/t-memstat.c#3 integrate .. //depot/projects/ia64/contrib/sendmail/libsm/t-qic.c#1 branch .. //depot/projects/ia64/contrib/sendmail/libsm/t-sem.c#3 integrate .. //depot/projects/ia64/contrib/sendmail/libsm/util.c#1 branch .. //depot/projects/ia64/contrib/sendmail/libsm/vfscanf.c#6 integrate .. //depot/projects/ia64/contrib/sendmail/libsmdb/Makefile.m4#5 integrate .. //depot/projects/ia64/contrib/sendmail/libsmutil/Makefile.m4#5 integrate .. //depot/projects/ia64/contrib/sendmail/mail.local/Makefile.m4#7 integrate .. //depot/projects/ia64/contrib/sendmail/mail.local/mail.local.c#13 integrate .. //depot/projects/ia64/contrib/sendmail/mailstats/Makefile.m4#5 integrate .. //depot/projects/ia64/contrib/sendmail/makemap/Makefile.m4#5 integrate .. //depot/projects/ia64/contrib/sendmail/praliases/Makefile.m4#5 integrate .. //depot/projects/ia64/contrib/sendmail/rmail/Makefile.m4#5 integrate .. //depot/projects/ia64/contrib/sendmail/smrsh/Makefile.m4#6 integrate .. //depot/projects/ia64/contrib/sendmail/src/Makefile#4 integrate .. //depot/projects/ia64/contrib/sendmail/src/Makefile.m4#8 integrate .. //depot/projects/ia64/contrib/sendmail/src/README#17 integrate .. //depot/projects/ia64/contrib/sendmail/src/TRACEFLAGS#11 integrate .. //depot/projects/ia64/contrib/sendmail/src/TUNING#7 integrate .. //depot/projects/ia64/contrib/sendmail/src/alias.c#8 integrate .. //depot/projects/ia64/contrib/sendmail/src/arpadate.c#5 integrate .. //depot/projects/ia64/contrib/sendmail/src/collect.c#15 integrate .. //depot/projects/ia64/contrib/sendmail/src/conf.c#20 integrate .. //depot/projects/ia64/contrib/sendmail/src/conf.h#12 integrate .. //depot/projects/ia64/contrib/sendmail/src/control.c#10 integrate .. //depot/projects/ia64/contrib/sendmail/src/daemon.c#16 integrate .. //depot/projects/ia64/contrib/sendmail/src/daemon.h#1 branch .. //depot/projects/ia64/contrib/sendmail/src/deliver.c#18 integrate .. //depot/projects/ia64/contrib/sendmail/src/domain.c#13 integrate .. //depot/projects/ia64/contrib/sendmail/src/envelope.c#11 integrate .. //depot/projects/ia64/contrib/sendmail/src/err.c#8 integrate .. //depot/projects/ia64/contrib/sendmail/src/headers.c#15 integrate .. //depot/projects/ia64/contrib/sendmail/src/helpfile#9 integrate .. //depot/projects/ia64/contrib/sendmail/src/macro.c#6 integrate .. //depot/projects/ia64/contrib/sendmail/src/mailq.1#9 integrate .. //depot/projects/ia64/contrib/sendmail/src/main.c#17 integrate .. //depot/projects/ia64/contrib/sendmail/src/map.c#15 integrate .. //depot/projects/ia64/contrib/sendmail/src/map.h#1 branch .. //depot/projects/ia64/contrib/sendmail/src/mci.c#16 integrate .. //depot/projects/ia64/contrib/sendmail/src/milter.c#17 integrate .. //depot/projects/ia64/contrib/sendmail/src/mime.c#12 integrate .. //depot/projects/ia64/contrib/sendmail/src/parseaddr.c#18 integrate .. //depot/projects/ia64/contrib/sendmail/src/queue.c#19 integrate .. //depot/projects/ia64/contrib/sendmail/src/ratectrl.c#3 integrate .. //depot/projects/ia64/contrib/sendmail/src/readcf.c#15 integrate .. //depot/projects/ia64/contrib/sendmail/src/recipient.c#10 integrate .. //depot/projects/ia64/contrib/sendmail/src/sasl.c#10 integrate .. //depot/projects/ia64/contrib/sendmail/src/savemail.c#12 integrate .. //depot/projects/ia64/contrib/sendmail/src/sendmail.h#18 integrate .. //depot/projects/ia64/contrib/sendmail/src/sm_resolve.c#8 integrate .. //depot/projects/ia64/contrib/sendmail/src/srvrsmtp.c#19 integrate .. //depot/projects/ia64/contrib/sendmail/src/stab.c#7 integrate .. //depot/projects/ia64/contrib/sendmail/src/stats.c#7 integrate .. //depot/projects/ia64/contrib/sendmail/src/timers.c#6 integrate .. //depot/projects/ia64/contrib/sendmail/src/tls.c#14 integrate .. //depot/projects/ia64/contrib/sendmail/src/udb.c#9 integrate .. //depot/projects/ia64/contrib/sendmail/src/usersmtp.c#14 integrate .. //depot/projects/ia64/contrib/sendmail/src/util.c#14 integrate .. //depot/projects/ia64/contrib/sendmail/src/version.c#19 integrate .. //depot/projects/ia64/contrib/sendmail/test/Makefile#4 integrate .. //depot/projects/ia64/contrib/sendmail/vacation/Makefile.m4#5 integrate .. //depot/projects/ia64/contrib/sendmail/vacation/vacation.c#10 integrate .. //depot/projects/ia64/contrib/tcpdump/print-stp.c#6 integrate .. //depot/projects/ia64/contrib/tcsh/FREEBSD-Xlist#4 integrate .. //depot/projects/ia64/contrib/tcsh/FREEBSD-upgrade#2 integrate .. //depot/projects/ia64/contrib/tcsh/Fixes#5 integrate .. //depot/projects/ia64/contrib/tcsh/Imakefile#5 integrate .. //depot/projects/ia64/contrib/tcsh/MAKEDIFFS#2 integrate .. //depot/projects/ia64/contrib/tcsh/MAKESHAR#2 integrate .. //depot/projects/ia64/contrib/tcsh/Makefile.in#5 integrate .. //depot/projects/ia64/contrib/tcsh/Makefile.std#4 integrate .. //depot/projects/ia64/contrib/tcsh/Makefile.vms#4 integrate .. //depot/projects/ia64/contrib/tcsh/README#5 integrate .. //depot/projects/ia64/contrib/tcsh/complete.tcsh#5 integrate .. //depot/projects/ia64/contrib/tcsh/config.h.in#3 integrate .. //depot/projects/ia64/contrib/tcsh/config/bsd4.4#5 integrate .. //depot/projects/ia64/contrib/tcsh/config_f.h#5 integrate .. //depot/projects/ia64/contrib/tcsh/configure#5 integrate .. //depot/projects/ia64/contrib/tcsh/configure.in#5 integrate .. //depot/projects/ia64/contrib/tcsh/ed.chared.c#4 integrate .. //depot/projects/ia64/contrib/tcsh/ed.decls.h#4 integrate .. //depot/projects/ia64/contrib/tcsh/ed.defns.c#4 integrate .. //depot/projects/ia64/contrib/tcsh/ed.h#4 integrate .. //depot/projects/ia64/contrib/tcsh/ed.init.c#4 integrate .. //depot/projects/ia64/contrib/tcsh/ed.inputl.c#4 integrate .. //depot/projects/ia64/contrib/tcsh/ed.refresh.c#5 integrate .. //depot/projects/ia64/contrib/tcsh/ed.screen.c#5 integrate .. //depot/projects/ia64/contrib/tcsh/ed.term.c#5 integrate .. //depot/projects/ia64/contrib/tcsh/ed.term.h#4 integrate .. //depot/projects/ia64/contrib/tcsh/ed.xmap.c#4 integrate .. //depot/projects/ia64/contrib/tcsh/eight-bit.me#2 integrate .. //depot/projects/ia64/contrib/tcsh/gethost.c#5 integrate .. //depot/projects/ia64/contrib/tcsh/glob.c#5 integrate .. //depot/projects/ia64/contrib/tcsh/glob.h#5 integrate .. //depot/projects/ia64/contrib/tcsh/host.defs#5 integrate .. //depot/projects/ia64/contrib/tcsh/imake.config#2 integrate .. //depot/projects/ia64/contrib/tcsh/ma.setp.c#4 integrate .. //depot/projects/ia64/contrib/tcsh/mi.termios.c#2 integrate .. //depot/projects/ia64/contrib/tcsh/mi.varargs.h#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/C/set1#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/C/set10#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/C/set11#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/C/set12#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/C/set13#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/C/set14#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/C/set15#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/C/set16#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/C/set17#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/C/set18#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/C/set19#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/C/set2#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/C/set20#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/C/set21#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/C/set22#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/C/set23#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/C/set24#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/C/set25#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/C/set26#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/C/set27#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/C/set29#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/C/set3#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/C/set30#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/C/set31#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/C/set4#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/C/set5#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/C/set6#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/C/set7#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/C/set8#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/C/set9#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/Makefile#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/et/set1#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/et/set10#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/et/set11#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/et/set12#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/et/set13#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/et/set14#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/et/set15#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/et/set16#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/et/set17#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/et/set18#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/et/set19#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/et/set2#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/et/set20#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/et/set21#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/et/set22#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/et/set23#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/et/set24#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/et/set25#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/et/set26#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/et/set27#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/et/set29#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/et/set3#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/et/set30#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/et/set31#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/et/set4#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/et/set5#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/et/set6#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/et/set7#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/et/set8#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/et/set9#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/finnish/set1#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/finnish/set10#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/finnish/set11#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/finnish/set12#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/finnish/set13#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/finnish/set14#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/finnish/set15#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/finnish/set16#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/finnish/set17#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/finnish/set18#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/finnish/set19#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/finnish/set2#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/finnish/set20#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/finnish/set21#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/finnish/set22#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/finnish/set23#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/finnish/set24#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/finnish/set25#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/finnish/set26#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/finnish/set27#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/finnish/set29#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/finnish/set3#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/finnish/set30#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/finnish/set31#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/finnish/set4#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/finnish/set5#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/finnish/set6#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/finnish/set7#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/finnish/set8#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/finnish/set9#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/french/set1#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/french/set10#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/french/set11#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/french/set12#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/french/set13#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/french/set14#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/french/set15#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/french/set16#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/french/set17#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/french/set18#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/french/set19#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/french/set2#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/french/set20#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/french/set21#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/french/set22#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/french/set23#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/french/set24#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/french/set25#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/french/set26#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/french/set27#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/french/set29#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/french/set3#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/french/set30#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/french/set31#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/french/set4#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/french/set5#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/french/set6#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/french/set7#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/french/set8#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/french/set9#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/german/set1#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/german/set10#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/german/set11#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/german/set12#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/german/set13#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/german/set14#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/german/set15#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/german/set16#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/german/set17#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/german/set18#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/german/set19#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/german/set2#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/german/set20#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/german/set21#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/german/set22#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/german/set23#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/german/set24#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/german/set25#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/german/set26#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/german/set27#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/german/set29#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/german/set3#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/german/set30#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/german/set31#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/german/set4#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/german/set5#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/german/set6#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/german/set7#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/german/set8#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/german/set9#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/greek/set1#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/greek/set10#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/greek/set11#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/greek/set12#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/greek/set13#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/greek/set14#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/greek/set15#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/greek/set16#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/greek/set17#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/greek/set18#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/greek/set19#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/greek/set2#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/greek/set20#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/greek/set21#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/greek/set22#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/greek/set23#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/greek/set24#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/greek/set25#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/greek/set26#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/greek/set27#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/greek/set29#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/greek/set3#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/greek/set30#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/greek/set31#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/greek/set4#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/greek/set5#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/greek/set6#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/greek/set7#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/greek/set8#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/greek/set9#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/italian/set1#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/italian/set10#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/italian/set11#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/italian/set12#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/italian/set13#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/italian/set14#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/italian/set15#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/italian/set16#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/italian/set17#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/italian/set18#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/italian/set19#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/italian/set2#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/italian/set20#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/italian/set21#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/italian/set22#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/italian/set23#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/italian/set24#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/italian/set25#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/italian/set26#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/italian/set27#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/italian/set29#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/italian/set3#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/italian/set30#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/italian/set31#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/italian/set4#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/italian/set5#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/italian/set6#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/italian/set7#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/italian/set8#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/italian/set9#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ja/set1#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ja/set10#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ja/set11#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ja/set12#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ja/set13#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ja/set15#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ja/set16#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ja/set17#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ja/set18#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ja/set2#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ja/set21#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ja/set24#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ja/set29#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ja/set3#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ja/set30#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ja/set4#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ja/set5#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ja/set6#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ja/set7#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ja/set8#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/pl/set1#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/pl/set10#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/pl/set11#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/pl/set12#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/pl/set13#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/pl/set14#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/pl/set15#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/pl/set16#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/pl/set17#4 integrate .. //depot/projects/ia64/contrib/tcsh/nls/pl/set18#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/pl/set19#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/pl/set2#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/pl/set20#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/pl/set21#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/pl/set22#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/pl/set23#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/pl/set24#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/pl/set25#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/pl/set26#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/pl/set27#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/pl/set29#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/pl/set3#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/pl/set30#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/pl/set31#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/pl/set4#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/pl/set5#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/pl/set6#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/pl/set7#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/pl/set8#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/pl/set9#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/russian/set1#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/russian/set10#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/russian/set11#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/russian/set12#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/russian/set13#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/russian/set14#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/russian/set15#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/russian/set16#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/russian/set17#4 integrate .. //depot/projects/ia64/contrib/tcsh/nls/russian/set18#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/russian/set19#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/russian/set2#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/russian/set20#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/russian/set21#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/russian/set22#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/russian/set23#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/russian/set24#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/russian/set25#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/russian/set26#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/russian/set27#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/russian/set29#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/russian/set3#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/russian/set30#4 integrate .. //depot/projects/ia64/contrib/tcsh/nls/russian/set31#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/russian/set4#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/russian/set5#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/russian/set6#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/russian/set7#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/russian/set8#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/russian/set9#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/spanish/set1#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/spanish/set10#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/spanish/set11#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/spanish/set12#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/spanish/set13#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/spanish/set14#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/spanish/set15#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/spanish/set16#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/spanish/set17#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/spanish/set18#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/spanish/set19#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/spanish/set2#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/spanish/set20#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/spanish/set21#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/spanish/set22#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/spanish/set23#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/spanish/set24#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/spanish/set25#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/spanish/set26#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/spanish/set27#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/spanish/set29#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/spanish/set3#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/spanish/set30#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/spanish/set31#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/spanish/set4#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/spanish/set5#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/spanish/set6#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/spanish/set7#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/spanish/set8#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/spanish/set9#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ukrainian/set1#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ukrainian/set10#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ukrainian/set11#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ukrainian/set12#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ukrainian/set13#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ukrainian/set14#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ukrainian/set15#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ukrainian/set16#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ukrainian/set17#4 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ukrainian/set18#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ukrainian/set19#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ukrainian/set2#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ukrainian/set20#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ukrainian/set21#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ukrainian/set22#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ukrainian/set23#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ukrainian/set24#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ukrainian/set25#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ukrainian/set26#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ukrainian/set27#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ukrainian/set29#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ukrainian/set3#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ukrainian/set30#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ukrainian/set31#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ukrainian/set4#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ukrainian/set5#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ukrainian/set6#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ukrainian/set7#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ukrainian/set8#3 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ukrainian/set9#3 integrate .. //depot/projects/ia64/contrib/tcsh/patchlevel.h#5 integrate .. //depot/projects/ia64/contrib/tcsh/pathnames.h#3 integrate .. //depot/projects/ia64/contrib/tcsh/sh.c#5 integrate .. //depot/projects/ia64/contrib/tcsh/sh.char.c#3 integrate .. //depot/projects/ia64/contrib/tcsh/sh.char.h#4 integrate .. //depot/projects/ia64/contrib/tcsh/sh.decls.h#5 integrate .. //depot/projects/ia64/contrib/tcsh/sh.dir.c#5 integrate .. //depot/projects/ia64/contrib/tcsh/sh.dir.h#3 integrate .. //depot/projects/ia64/contrib/tcsh/sh.dol.c#5 integrate .. //depot/projects/ia64/contrib/tcsh/sh.err.c#4 integrate .. //depot/projects/ia64/contrib/tcsh/sh.exec.c#5 integrate .. //depot/projects/ia64/contrib/tcsh/sh.exp.c#4 integrate .. //depot/projects/ia64/contrib/tcsh/sh.file.c#5 integrate .. //depot/projects/ia64/contrib/tcsh/sh.func.c#5 integrate .. //depot/projects/ia64/contrib/tcsh/sh.glob.c#5 integrate .. //depot/projects/ia64/contrib/tcsh/sh.h#5 integrate .. //depot/projects/ia64/contrib/tcsh/sh.hist.c#4 integrate .. //depot/projects/ia64/contrib/tcsh/sh.init.c#5 integrate .. //depot/projects/ia64/contrib/tcsh/sh.lex.c#5 integrate .. //depot/projects/ia64/contrib/tcsh/sh.misc.c#5 integrate .. //depot/projects/ia64/contrib/tcsh/sh.parse.c#4 integrate .. //depot/projects/ia64/contrib/tcsh/sh.print.c#4 integrate .. //depot/projects/ia64/contrib/tcsh/sh.proc.c#5 integrate .. //depot/projects/ia64/contrib/tcsh/sh.proc.h#4 integrate .. //depot/projects/ia64/contrib/tcsh/sh.sem.c#5 integrate .. //depot/projects/ia64/contrib/tcsh/sh.set.c#6 integrate .. //depot/projects/ia64/contrib/tcsh/sh.time.c#4 integrate .. //depot/projects/ia64/contrib/tcsh/sh.types.h#5 integrate .. //depot/projects/ia64/contrib/tcsh/snames.h#2 integrate .. //depot/projects/ia64/contrib/tcsh/tc.alloc.c#4 integrate .. //depot/projects/ia64/contrib/tcsh/tc.bind.c#4 integrate .. //depot/projects/ia64/contrib/tcsh/tc.const.c#6 integrate .. //depot/projects/ia64/contrib/tcsh/tc.decls.h#5 integrate .. //depot/projects/ia64/contrib/tcsh/tc.disc.c#4 integrate .. //depot/projects/ia64/contrib/tcsh/tc.func.c#5 integrate .. //depot/projects/ia64/contrib/tcsh/tc.h#4 integrate .. //depot/projects/ia64/contrib/tcsh/tc.nls.c#2 integrate .. //depot/projects/ia64/contrib/tcsh/tc.nls.h#2 integrate .. //depot/projects/ia64/contrib/tcsh/tc.os.c#5 integrate .. //depot/projects/ia64/contrib/tcsh/tc.os.h#5 integrate .. //depot/projects/ia64/contrib/tcsh/tc.printf.c#5 integrate .. //depot/projects/ia64/contrib/tcsh/tc.prompt.c#5 integrate .. //depot/projects/ia64/contrib/tcsh/tc.sched.c#4 integrate .. //depot/projects/ia64/contrib/tcsh/tc.sig.c#4 integrate .. //depot/projects/ia64/contrib/tcsh/tc.sig.h#4 integrate .. //depot/projects/ia64/contrib/tcsh/tc.str.c#5 integrate .. //depot/projects/ia64/contrib/tcsh/tc.vers.c#4 integrate .. //depot/projects/ia64/contrib/tcsh/tc.wait.h#4 integrate .. //depot/projects/ia64/contrib/tcsh/tc.who.c#5 integrate .. //depot/projects/ia64/contrib/tcsh/tcsh.man#5 integrate .. //depot/projects/ia64/contrib/tcsh/tcsh.man2html#3 integrate .. //depot/projects/ia64/contrib/tcsh/termcap.vms#2 integrate .. //depot/projects/ia64/contrib/tcsh/tw.color.c#5 integrate .. //depot/projects/ia64/contrib/tcsh/tw.comp.c#5 integrate .. //depot/projects/ia64/contrib/tcsh/tw.decls.h#4 integrate .. //depot/projects/ia64/contrib/tcsh/tw.h#4 integrate .. //depot/projects/ia64/contrib/tcsh/tw.help.c#5 integrate .. //depot/projects/ia64/contrib/tcsh/tw.init.c#4 integrate .. //depot/projects/ia64/contrib/tcsh/tw.parse.c#5 integrate .. //depot/projects/ia64/contrib/tcsh/tw.spell.c#4 integrate .. //depot/projects/ia64/contrib/tcsh/vms.termcap.c#3 integrate .. //depot/projects/ia64/contrib/top/commands.c#7 integrate .. //depot/projects/ia64/contrib/top/machine.h#5 integrate .. //depot/projects/ia64/contrib/top/top.X#9 integrate .. //depot/projects/ia64/contrib/top/top.c#9 integrate .. //depot/projects/ia64/contrib/top/top.h#3 integrate .. //depot/projects/ia64/crypto/openssl/CHANGES#10 integrate .. //depot/projects/ia64/crypto/openssl/Configure#10 integrate .. //depot/projects/ia64/crypto/openssl/FAQ#10 integrate .. //depot/projects/ia64/crypto/openssl/FREEBSD-upgrade#2 integrate .. //depot/projects/ia64/crypto/openssl/INSTALL#7 integrate .. //depot/projects/ia64/crypto/openssl/LICENSE#6 integrate .. //depot/projects/ia64/crypto/openssl/Makefile#3 integrate .. //depot/projects/ia64/crypto/openssl/NEWS#10 integrate .. //depot/projects/ia64/crypto/openssl/README#10 integrate .. //depot/projects/ia64/crypto/openssl/apps/CA.pl#8 integrate .. //depot/projects/ia64/crypto/openssl/apps/Makefile#3 integrate .. //depot/projects/ia64/crypto/openssl/apps/ca.c#9 integrate .. //depot/projects/ia64/crypto/openssl/apps/dgst.c#8 integrate .. //depot/projects/ia64/crypto/openssl/apps/ec.c#2 integrate .. //depot/projects/ia64/crypto/openssl/apps/enc.c#8 integrate .. //depot/projects/ia64/crypto/openssl/apps/ocsp.c#6 integrate .. //depot/projects/ia64/crypto/openssl/apps/pkcs12.c#7 integrate .. //depot/projects/ia64/crypto/openssl/apps/s_client.c#7 integrate .. //depot/projects/ia64/crypto/openssl/apps/s_server.c#6 integrate .. //depot/projects/ia64/crypto/openssl/certs/aol1.pem#1 branch .. //depot/projects/ia64/crypto/openssl/certs/aol2.pem#1 branch .. //depot/projects/ia64/crypto/openssl/certs/aoltw1.pem#1 branch .. //depot/projects/ia64/crypto/openssl/certs/aoltw2.pem#1 branch .. //depot/projects/ia64/crypto/openssl/config#10 integrate .. //depot/projects/ia64/crypto/openssl/crypto/aes/Makefile#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/aes/aes_misc.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/asn1/a_strex.c#7 integrate .. //depot/projects/ia64/crypto/openssl/crypto/asn1/asn1_err.c#5 integrate .. //depot/projects/ia64/crypto/openssl/crypto/asn1/asn1_lib.c#7 integrate .. //depot/projects/ia64/crypto/openssl/crypto/asn1/asn1t.h#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/asn1/t_x509.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/asn1/tasn_dec.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/asn1/x_x509.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/bf/bf_ecb.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/bio/bio.h#8 integrate .. //depot/projects/ia64/crypto/openssl/crypto/bio/bio_err.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/bio/bio_lib.c#5 integrate .. //depot/projects/ia64/crypto/openssl/crypto/bn/bn_err.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/bn/bn_lib.c#5 integrate .. //depot/projects/ia64/crypto/openssl/crypto/bn/bn_print.c#5 integrate .. //depot/projects/ia64/crypto/openssl/crypto/buffer/buf_err.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/camellia/Makefile#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/camellia/camellia.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/camellia/cmll_cbc.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/camellia/cmll_locl.h#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/camellia/cmll_misc.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/cast/c_ecb.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/comp/c_zlib.c#5 integrate .. //depot/projects/ia64/crypto/openssl/crypto/comp/comp_err.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/conf/conf_def.c#7 integrate .. //depot/projects/ia64/crypto/openssl/crypto/conf/conf_err.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/conf/conf_lib.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/cpt_err.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/cryptlib.c#7 integrate .. //depot/projects/ia64/crypto/openssl/crypto/des/INSTALL#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/des/des_ver.h#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/des/ecb_enc.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/dh/dh_err.c#6 integrate .. //depot/projects/ia64/crypto/openssl/crypto/dh/dh_lib.c#5 integrate .. //depot/projects/ia64/crypto/openssl/crypto/dsa/dsa_err.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/dsa/dsa_lib.c#6 integrate .. //depot/projects/ia64/crypto/openssl/crypto/dso/dso_err.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/ec/ec_asn1.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/ec/ec_err.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/ecdh/ech_err.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/ecdh/ech_lib.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/ecdsa/ecdsa.h#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/ecdsa/ecs_err.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/ecdsa/ecs_lib.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/ecdsa/ecs_ossl.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/engine/eng_all.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/engine/eng_err.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/engine/eng_padlock.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/engine/tb_ecdh.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/engine/tb_ecdsa.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/err/err_all.c#6 integrate .. //depot/projects/ia64/crypto/openssl/crypto/evp/bio_md.c#5 integrate .. //depot/projects/ia64/crypto/openssl/crypto/evp/evp.h#8 integrate .. //depot/projects/ia64/crypto/openssl/crypto/evp/evp_enc.c#6 integrate .. //depot/projects/ia64/crypto/openssl/crypto/evp/evp_err.c#5 integrate .. //depot/projects/ia64/crypto/openssl/crypto/evp/evp_lib.c#5 integrate .. //depot/projects/ia64/crypto/openssl/crypto/evp/evp_locl.h#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/idea/i_ecb.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/idea/idea_lcl.h#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/lhash/lhash.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/md2/md2.h#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/md2/md2_dgst.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/md4/md4.h#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/md4/md4_dgst.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/md5/md5.h#5 integrate .. //depot/projects/ia64/crypto/openssl/crypto/md5/md5_dgst.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/objects/obj_dat.h#8 integrate .. //depot/projects/ia64/crypto/openssl/crypto/objects/obj_err.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/objects/obj_mac.h#8 integrate .. //depot/projects/ia64/crypto/openssl/crypto/objects/obj_mac.num#6 integrate .. //depot/projects/ia64/crypto/openssl/crypto/objects/objects.txt#8 integrate .. //depot/projects/ia64/crypto/openssl/crypto/ocsp/ocsp_asn.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/ocsp/ocsp_err.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/ocsp/ocsp_vfy.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/opensslconf.h#6 integrate .. //depot/projects/ia64/crypto/openssl/crypto/opensslv.h#10 integrate .. //depot/projects/ia64/crypto/openssl/crypto/pem/pem.h#5 integrate .. //depot/projects/ia64/crypto/openssl/crypto/pem/pem_err.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/pem/pem_lib.c#6 integrate .. //depot/projects/ia64/crypto/openssl/crypto/pem/pem_pkey.c#5 integrate .. //depot/projects/ia64/crypto/openssl/crypto/pkcs12/pk12err.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/pkcs7/pk7_doit.c#9 integrate .. //depot/projects/ia64/crypto/openssl/crypto/pkcs7/pk7_lib.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/pkcs7/pk7_smime.c#5 integrate .. //depot/projects/ia64/crypto/openssl/crypto/pkcs7/pkcs7err.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/rand/md_rand.c#6 integrate .. //depot/projects/ia64/crypto/openssl/crypto/rand/rand_err.c#5 integrate .. //depot/projects/ia64/crypto/openssl/crypto/rc2/rc2_ecb.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/rc4/rc4_skey.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/ripemd/ripemd.h#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/ripemd/rmd_dgst.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/rsa/rsa_err.c#5 integrate .. //depot/projects/ia64/crypto/openssl/crypto/rsa/rsa_lib.c#7 integrate .. //depot/projects/ia64/crypto/openssl/crypto/sha/sha.h#5 integrate .. //depot/projects/ia64/crypto/openssl/crypto/sha/sha1dgst.c#5 integrate .. //depot/projects/ia64/crypto/openssl/crypto/sha/sha256.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/sha/sha512.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/sha/sha_dgst.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/stack/safestack.h#5 integrate .. //depot/projects/ia64/crypto/openssl/crypto/stack/stack.c#5 integrate .. //depot/projects/ia64/crypto/openssl/crypto/store/str_err.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/txt_db/txt_db.c#5 integrate .. //depot/projects/ia64/crypto/openssl/crypto/ui/ui_err.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/x509/by_dir.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/x509/x509.h#7 integrate .. //depot/projects/ia64/crypto/openssl/crypto/x509/x509_err.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/x509/x509_req.c#5 integrate .. //depot/projects/ia64/crypto/openssl/crypto/x509/x509_txt.c#6 integrate .. //depot/projects/ia64/crypto/openssl/crypto/x509/x509_vfy.c#8 integrate .. //depot/projects/ia64/crypto/openssl/crypto/x509/x509_vfy.h#6 integrate .. //depot/projects/ia64/crypto/openssl/crypto/x509v3/Makefile#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/x509v3/ext_dat.h#6 integrate .. //depot/projects/ia64/crypto/openssl/crypto/x509v3/pcy_tree.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/x509v3/v3_addr.c#1 branch .. //depot/projects/ia64/crypto/openssl/crypto/x509v3/v3_akey.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/x509v3/v3_alt.c#5 integrate .. //depot/projects/ia64/crypto/openssl/crypto/x509v3/v3_asid.c#1 branch .. //depot/projects/ia64/crypto/openssl/crypto/x509v3/v3_bcons.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/x509v3/v3_bitst.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/x509v3/v3_cpols.c#5 integrate .. //depot/projects/ia64/crypto/openssl/crypto/x509v3/v3_crld.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/x509v3/v3_enum.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/x509v3/v3_extku.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/x509v3/v3_ia5.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/x509v3/v3_info.c#5 integrate .. //depot/projects/ia64/crypto/openssl/crypto/x509v3/v3_int.c#5 integrate .. //depot/projects/ia64/crypto/openssl/crypto/x509v3/v3_ncons.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/x509v3/v3_ocsp.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/x509v3/v3_pci.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/x509v3/v3_pcons.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/x509v3/v3_pku.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/x509v3/v3_pmaps.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/x509v3/v3_purp.c#6 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Apr 21 04:19:59 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 B83AE16A40E; Sat, 21 Apr 2007 04:19:59 +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 6E09416A407 for ; Sat, 21 Apr 2007 04:19:59 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 4690F13C483 for ; Sat, 21 Apr 2007 04:19:59 +0000 (UTC) (envelope-from zec@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 l3L4Jxn5022916 for ; Sat, 21 Apr 2007 04:19:59 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3L4Jx8q022898 for perforce@freebsd.org; Sat, 21 Apr 2007 04:19:59 GMT (envelope-from zec@FreeBSD.org) Date: Sat, 21 Apr 2007 04:19:59 GMT Message-Id: <200704210419.l3L4Jx8q022898@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 118511 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: Sat, 21 Apr 2007 04:20:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=118511 Change 118511 by zec@zec_tca51 on 2007/04/21 04:17:11 Do not try to compile INET6 bits if INET6 is not configured. Affected files ... .. //depot/projects/vimage/src/sys/contrib/pf/net/pf.c#5 edit Differences ... ==== //depot/projects/vimage/src/sys/contrib/pf/net/pf.c#5 (text+ko) ==== @@ -6226,7 +6226,9 @@ pf_check_proto_cksum(struct mbuf *m, int off, int len, u_int8_t p, sa_family_t af) { INIT_VNET_INET(curvnet); +#ifdef INET6 INIT_VNET_INET6(curvnet); +#endif u_int16_t sum = 0; int hw_assist = 0; struct ip *ip; From owner-p4-projects@FreeBSD.ORG Sat Apr 21 04:26:07 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 B60AB16A403; Sat, 21 Apr 2007 04:26:07 +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 6E95416A401 for ; Sat, 21 Apr 2007 04:26:07 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5F0E213C448 for ; Sat, 21 Apr 2007 04:26:07 +0000 (UTC) (envelope-from marcel@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 l3L4Q7NC029139 for ; Sat, 21 Apr 2007 04:26:07 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3L4Q7Fb029129 for perforce@freebsd.org; Sat, 21 Apr 2007 04:26:07 GMT (envelope-from marcel@freebsd.org) Date: Sat, 21 Apr 2007 04:26:07 GMT Message-Id: <200704210426.l3L4Q7Fb029129@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 118512 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: Sat, 21 Apr 2007 04:26:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=118512 Change 118512 by marcel@marcel_xcllnt on 2007/04/21 04:25:39 Add OF_start_cpu() to start a CPU. Affected files ... .. //depot/projects/powerpc/sys/powerpc/include/ofw_machdep.h#2 edit .. //depot/projects/powerpc/sys/powerpc/powerpc/locore.S#2 edit .. //depot/projects/powerpc/sys/powerpc/powerpc/mp_machdep.c#10 edit .. //depot/projects/powerpc/sys/powerpc/powerpc/ofw_machdep.c#8 edit Differences ... ==== //depot/projects/powerpc/sys/powerpc/include/ofw_machdep.h#2 (text+ko) ==== @@ -32,5 +32,6 @@ int OF_decode_addr(phandle_t, int, bus_space_tag_t *, bus_space_handle_t *); void OF_getetheraddr(device_t dev, u_char *addr); +void OF_start_cpu(phandle_t, void (*)(void *), void *); #endif /* _MACHINE_OFW_MACHDEP_H_ */ ==== //depot/projects/powerpc/sys/powerpc/powerpc/locore.S#2 (text+ko) ==== @@ -183,6 +183,28 @@ b OF_exit /* + * Kernel entry point for application/auxiliary + * processors (APs). + */ + .globl __start_ap +__start_ap: + li 8,0 + li 9,0x100 + mtctr 9 +1: + dcbf 0,8 + icbi 0,8 + addi 8,8,0x20 + bdnz 1b + + sync + isync + + bl mi_startup +9: + b 9b + +/* * int setfault() * * Similar to setjmp to setup for handling faults on accesses to user memory. ==== //depot/projects/powerpc/sys/powerpc/powerpc/mp_machdep.c#10 (text+ko) ==== @@ -33,9 +33,13 @@ #include #include +#include #include #include +#include + +extern void __start_ap(void *); MALLOC_DEFINE(M_SMP, "smp", "SMP specific datastructures"); @@ -103,11 +107,8 @@ /* Get the p-handle of the BSP. */ chosen = OF_finddevice("/chosen"); - if (chosen != -1) { - res = OF_getprop(chosen, "cpu", &inst, sizeof(inst)); - bsp = (res > 0) ? OF_instance_to_package(inst) : -1; - } else - bsp = -1; + res = OF_getprop(chosen, "cpu", &inst, sizeof(inst)); + bsp = (res > 0) ? OF_instance_to_package(inst) : -1; root = OF_peer(0); dev = OF_child(root); @@ -145,6 +146,11 @@ pc->pc_bsp = 1; } all_cpus |= 1 << cpuid; + if (pc->pc_bsp) + continue; + + /* Start AP */ + OF_start_cpu(dev, __start_ap, pc); } } ==== //depot/projects/powerpc/sys/powerpc/powerpc/ofw_machdep.c#8 (text+ko) ==== @@ -278,6 +278,33 @@ } void +OF_start_cpu(phandle_t cpu, void (*entry)(void *), void *arg) +{ + static struct { + cell_t name; + cell_t nargs; + cell_t nreturns; + cell_t cpu; + cell_t entry; + cell_t arg; + } args = { + (cell_t)"start-cpu", + 3, + 0 + }; + + printf("XXX: %s: cpu=%x, entry=%p, arg=%p...", __func__, cpu, + entry, arg); + + args.cpu = (cell_t)cpu; + args.entry = (cell_t)entry; + args.arg = (cell_t)arg; + openfirmware(&args); + + printf(" ok\n"); +} + +void OF_getetheraddr(device_t dev, u_char *addr) { phandle_t node; From owner-p4-projects@FreeBSD.ORG Sat Apr 21 04:41:37 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 6DE6A16A408; Sat, 21 Apr 2007 04:41:37 +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 176A016A401 for ; Sat, 21 Apr 2007 04:41:37 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 05B1B13C459 for ; Sat, 21 Apr 2007 04:41:37 +0000 (UTC) (envelope-from marcel@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 l3L4fa8s042826 for ; Sat, 21 Apr 2007 04:41:36 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3L4fQD5042663 for perforce@freebsd.org; Sat, 21 Apr 2007 04:41:26 GMT (envelope-from marcel@freebsd.org) Date: Sat, 21 Apr 2007 04:41:26 GMT Message-Id: <200704210441.l3L4fQD5042663@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 118513 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: Sat, 21 Apr 2007 04:41:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=118513 Change 118513 by marcel@marcel_xcllnt on 2007/04/21 04:40:26 IFC @118506 Affected files ... .. //depot/projects/powerpc/Makefile.inc1#5 integrate .. //depot/projects/powerpc/ObsoleteFiles.inc#6 integrate .. //depot/projects/powerpc/UPDATING#7 integrate .. //depot/projects/powerpc/cddl/Makefile#2 integrate .. //depot/projects/powerpc/cddl/Makefile.inc#2 integrate .. //depot/projects/powerpc/cddl/lib/Makefile#2 integrate .. //depot/projects/powerpc/cddl/lib/Makefile.inc#2 integrate .. //depot/projects/powerpc/cddl/lib/libavl/Makefile#2 integrate .. //depot/projects/powerpc/cddl/lib/libnvpair/Makefile#2 integrate .. //depot/projects/powerpc/cddl/lib/libumem/Makefile#2 integrate .. //depot/projects/powerpc/cddl/lib/libuutil/Makefile#2 integrate .. //depot/projects/powerpc/cddl/lib/libzfs/Makefile#2 integrate .. //depot/projects/powerpc/cddl/lib/libzpool/Makefile#2 integrate .. //depot/projects/powerpc/cddl/sbin/Makefile#2 integrate .. //depot/projects/powerpc/cddl/sbin/zfs/Makefile#2 integrate .. //depot/projects/powerpc/cddl/sbin/zpool/Makefile#2 integrate .. //depot/projects/powerpc/cddl/usr.bin/Makefile#2 integrate .. //depot/projects/powerpc/cddl/usr.bin/ztest/Makefile#2 integrate .. //depot/projects/powerpc/cddl/usr.sbin/Makefile#2 integrate .. //depot/projects/powerpc/cddl/usr.sbin/zdb/Makefile#2 integrate .. //depot/projects/powerpc/contrib/openbsm/HISTORY#2 integrate .. //depot/projects/powerpc/contrib/openbsm/README#2 integrate .. //depot/projects/powerpc/contrib/openbsm/TODO#2 integrate .. //depot/projects/powerpc/contrib/openbsm/VERSION#2 integrate .. //depot/projects/powerpc/contrib/openbsm/bin/audit/audit.8#2 integrate .. //depot/projects/powerpc/contrib/openbsm/bin/auditd/auditd.8#2 integrate .. //depot/projects/powerpc/contrib/openbsm/bin/auditd/auditd.c#2 integrate .. //depot/projects/powerpc/contrib/openbsm/bin/auditfilterd/auditfilterd.8#2 integrate .. //depot/projects/powerpc/contrib/openbsm/bin/auditfilterd/auditfilterd.c#2 integrate .. //depot/projects/powerpc/contrib/openbsm/bin/auditreduce/auditreduce.1#2 integrate .. //depot/projects/powerpc/contrib/openbsm/bin/praudit/praudit.1#2 integrate .. //depot/projects/powerpc/contrib/openbsm/bin/praudit/praudit.c#2 integrate .. //depot/projects/powerpc/contrib/openbsm/bsm/libbsm.h#2 integrate .. //depot/projects/powerpc/contrib/openbsm/compat/clock_gettime.h#1 branch .. //depot/projects/powerpc/contrib/openbsm/config/config.h#2 integrate .. //depot/projects/powerpc/contrib/openbsm/configure#2 integrate .. //depot/projects/powerpc/contrib/openbsm/configure.ac#2 integrate .. //depot/projects/powerpc/contrib/openbsm/etc/audit_event#2 integrate .. //depot/projects/powerpc/contrib/openbsm/libbsm/au_class.3#2 integrate .. //depot/projects/powerpc/contrib/openbsm/libbsm/au_control.3#2 integrate .. //depot/projects/powerpc/contrib/openbsm/libbsm/au_event.3#2 integrate .. //depot/projects/powerpc/contrib/openbsm/libbsm/au_free_token.3#2 integrate .. //depot/projects/powerpc/contrib/openbsm/libbsm/au_io.3#2 integrate .. //depot/projects/powerpc/contrib/openbsm/libbsm/au_mask.3#2 integrate .. //depot/projects/powerpc/contrib/openbsm/libbsm/au_open.3#2 integrate .. //depot/projects/powerpc/contrib/openbsm/libbsm/au_token.3#2 integrate .. //depot/projects/powerpc/contrib/openbsm/libbsm/au_user.3#2 integrate .. //depot/projects/powerpc/contrib/openbsm/libbsm/audit_submit.3#2 integrate .. //depot/projects/powerpc/contrib/openbsm/libbsm/bsm_io.c#2 integrate .. //depot/projects/powerpc/contrib/openbsm/libbsm/bsm_notify.c#2 integrate .. //depot/projects/powerpc/contrib/openbsm/libbsm/bsm_token.c#2 integrate .. //depot/projects/powerpc/contrib/openbsm/libbsm/bsm_wrappers.c#2 integrate .. //depot/projects/powerpc/contrib/openbsm/libbsm/libbsm.3#2 integrate .. //depot/projects/powerpc/contrib/openbsm/man/audit.2#2 integrate .. //depot/projects/powerpc/contrib/openbsm/man/audit.log.5#2 integrate .. //depot/projects/powerpc/contrib/openbsm/man/audit_class.5#2 integrate .. //depot/projects/powerpc/contrib/openbsm/man/audit_control.5#2 integrate .. //depot/projects/powerpc/contrib/openbsm/man/audit_event.5#2 integrate .. //depot/projects/powerpc/contrib/openbsm/man/audit_user.5#2 integrate .. //depot/projects/powerpc/contrib/openbsm/man/audit_warn.5#2 integrate .. //depot/projects/powerpc/contrib/openbsm/man/auditctl.2#2 integrate .. //depot/projects/powerpc/contrib/openbsm/man/auditon.2#2 integrate .. //depot/projects/powerpc/contrib/openbsm/man/getaudit.2#2 integrate .. //depot/projects/powerpc/contrib/openbsm/man/getauid.2#2 integrate .. //depot/projects/powerpc/contrib/openbsm/man/setaudit.2#2 integrate .. //depot/projects/powerpc/contrib/openbsm/man/setauid.2#2 integrate .. //depot/projects/powerpc/contrib/openbsm/test/bsm/generate.c#2 integrate .. //depot/projects/powerpc/contrib/openbsm/test/reference/arg32_record#2 integrate .. //depot/projects/powerpc/contrib/openbsm/test/reference/data_record#2 integrate .. //depot/projects/powerpc/contrib/openbsm/test/reference/file_record#2 integrate .. //depot/projects/powerpc/contrib/openbsm/test/reference/in_addr_record#2 integrate .. //depot/projects/powerpc/contrib/openbsm/test/reference/ip_record#2 integrate .. //depot/projects/powerpc/contrib/openbsm/test/reference/ipc_record#2 integrate .. //depot/projects/powerpc/contrib/openbsm/test/reference/iport_record#2 integrate .. //depot/projects/powerpc/contrib/openbsm/test/reference/opaque_record#2 integrate .. //depot/projects/powerpc/contrib/openbsm/test/reference/path_record#2 integrate .. //depot/projects/powerpc/contrib/openbsm/test/reference/process32_record#2 integrate .. //depot/projects/powerpc/contrib/openbsm/test/reference/process32ex_record#2 delete .. //depot/projects/powerpc/contrib/openbsm/test/reference/process32ex_record-IPv4#1 branch .. //depot/projects/powerpc/contrib/openbsm/test/reference/process32ex_record-IPv6#1 branch .. //depot/projects/powerpc/contrib/openbsm/test/reference/process32ex_token#2 delete .. //depot/projects/powerpc/contrib/openbsm/test/reference/process32ex_token-IPv4#1 branch .. //depot/projects/powerpc/contrib/openbsm/test/reference/process32ex_token-IPv6#1 branch .. //depot/projects/powerpc/contrib/openbsm/test/reference/process64_record#1 branch .. //depot/projects/powerpc/contrib/openbsm/test/reference/process64_token#1 branch .. //depot/projects/powerpc/contrib/openbsm/test/reference/process64ex_record-IPv4#1 branch .. //depot/projects/powerpc/contrib/openbsm/test/reference/process64ex_record-IPv6#1 branch .. //depot/projects/powerpc/contrib/openbsm/test/reference/process64ex_token-IPv4#1 branch .. //depot/projects/powerpc/contrib/openbsm/test/reference/process64ex_token-IPv6#1 branch .. //depot/projects/powerpc/contrib/openbsm/test/reference/return32_record#2 integrate .. //depot/projects/powerpc/contrib/openbsm/test/reference/seq_record#2 integrate .. //depot/projects/powerpc/contrib/openbsm/test/reference/subject32_record#2 integrate .. //depot/projects/powerpc/contrib/openbsm/test/reference/subject32ex_record#2 integrate .. //depot/projects/powerpc/contrib/openbsm/test/reference/subject32ex_token-IPv4#2 integrate .. //depot/projects/powerpc/contrib/openbsm/test/reference/subject32ex_token-IPv6#2 integrate .. //depot/projects/powerpc/contrib/openbsm/test/reference/text_record#2 integrate .. //depot/projects/powerpc/contrib/openbsm/test/reference/zonename_record#1 branch .. //depot/projects/powerpc/contrib/openbsm/test/reference/zonename_token#1 branch .. //depot/projects/powerpc/contrib/openbsm/tools/audump.c#2 integrate .. //depot/projects/powerpc/contrib/opensolaris/lib/libzpool/common/kernel.c#2 integrate .. //depot/projects/powerpc/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#2 integrate .. //depot/projects/powerpc/contrib/top/commands.c#2 integrate .. //depot/projects/powerpc/contrib/top/machine.h#2 integrate .. //depot/projects/powerpc/contrib/top/top.X#2 integrate .. //depot/projects/powerpc/contrib/top/top.c#2 integrate .. //depot/projects/powerpc/contrib/top/top.h#2 integrate .. //depot/projects/powerpc/etc/mtree/BSD.include.dist#3 integrate .. //depot/projects/powerpc/etc/rc.d/zfs#2 integrate .. //depot/projects/powerpc/lib/libarchive/Makefile#5 integrate .. //depot/projects/powerpc/lib/libarchive/archive.h.in#6 integrate .. //depot/projects/powerpc/lib/libarchive/archive_entry.c#5 integrate .. //depot/projects/powerpc/lib/libarchive/archive_platform.h#4 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read_extract.c#5 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read_support_format_ar.c#2 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read_support_format_cpio.c#4 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read_support_format_tar.c#6 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read_support_format_zip.c#4 integrate .. //depot/projects/powerpc/lib/libarchive/archive_write_disk.c#3 integrate .. //depot/projects/powerpc/lib/libarchive/archive_write_disk_set_standard_lookup.c#2 integrate .. //depot/projects/powerpc/lib/libarchive/archive_write_set_compression_none.c#4 integrate .. //depot/projects/powerpc/lib/libarchive/archive_write_set_format_ar.c#2 integrate .. //depot/projects/powerpc/lib/libarchive/archive_write_set_format_by_name.c#3 integrate .. //depot/projects/powerpc/lib/libarchive/archive_write_set_format_pax.c#4 integrate .. //depot/projects/powerpc/lib/libarchive/archive_write_set_format_ustar.c#5 integrate .. //depot/projects/powerpc/lib/libarchive/config_freebsd.h#3 integrate .. //depot/projects/powerpc/lib/libarchive/test/Makefile#3 integrate .. //depot/projects/powerpc/lib/libarchive/test/main.c#2 integrate .. //depot/projects/powerpc/lib/libarchive/test/test_acl_basic.c#2 integrate .. //depot/projects/powerpc/lib/libarchive/test/test_acl_pax.c#2 integrate .. //depot/projects/powerpc/lib/libarchive/test/test_read_data_large.c#2 integrate .. //depot/projects/powerpc/lib/libarchive/test/test_read_extract.c#2 integrate .. //depot/projects/powerpc/lib/libarchive/test/test_read_format_ar.c#2 integrate .. //depot/projects/powerpc/lib/libarchive/test/test_read_large.c#2 integrate .. //depot/projects/powerpc/lib/libarchive/test/test_read_position.c#2 integrate .. //depot/projects/powerpc/lib/libarchive/test/test_read_truncated.c#2 integrate .. //depot/projects/powerpc/lib/libarchive/test/test_tar_filenames.c#1 branch .. //depot/projects/powerpc/lib/libarchive/test/test_write_disk_perms.c#2 integrate .. //depot/projects/powerpc/lib/libarchive/test/test_write_disk_secure.c#2 integrate .. //depot/projects/powerpc/lib/libarchive/test/test_write_format_ar.c#2 integrate .. //depot/projects/powerpc/lib/libarchive/test/test_write_format_tar.c#2 integrate .. //depot/projects/powerpc/lib/libarchive/test/test_write_open_memory.c#2 integrate .. //depot/projects/powerpc/lib/libc/gen/sysconf.c#4 integrate .. //depot/projects/powerpc/lib/libc/net/rthdr.c#2 integrate .. //depot/projects/powerpc/lib/libc/stdio/fputs.3#3 integrate .. //depot/projects/powerpc/lib/ncurses/ncurses/Makefile#4 integrate .. //depot/projects/powerpc/libexec/ftpd/ftpcmd.y#2 integrate .. //depot/projects/powerpc/libexec/ftpd/ftpd.8#2 integrate .. //depot/projects/powerpc/libexec/ftpd/ftpd.c#3 integrate .. //depot/projects/powerpc/release/doc/en_US.ISO8859-1/relnotes/article.sgml#7 integrate .. //depot/projects/powerpc/sbin/atm/atmconfig/diag.c#2 integrate .. //depot/projects/powerpc/sbin/dhclient/dhclient-script#3 integrate .. //depot/projects/powerpc/sbin/ifconfig/Makefile#3 integrate .. //depot/projects/powerpc/sbin/ifconfig/ifconfig.8#7 integrate .. //depot/projects/powerpc/sbin/ifconfig/iflagg.c#1 branch .. //depot/projects/powerpc/sbin/ifconfig/iftrunk.c#2 delete .. //depot/projects/powerpc/sbin/ipfw/ipfw2.c#3 integrate .. //depot/projects/powerpc/sbin/mount/mount.c#3 integrate .. //depot/projects/powerpc/sbin/ping6/ping6.c#2 integrate .. //depot/projects/powerpc/share/examples/cvsup/cvs-supfile#2 integrate .. //depot/projects/powerpc/share/examples/cvsup/stable-supfile#2 integrate .. //depot/projects/powerpc/share/examples/cvsup/standard-supfile#2 integrate .. //depot/projects/powerpc/share/man/man4/Makefile#8 integrate .. //depot/projects/powerpc/share/man/man4/lagg.4#1 branch .. //depot/projects/powerpc/share/man/man4/trunk.4#2 delete .. //depot/projects/powerpc/share/man/man4/uftdi.4#2 integrate .. //depot/projects/powerpc/share/man/man7/hier.7#4 integrate .. //depot/projects/powerpc/share/man/man8/nanobsd.8#2 integrate .. //depot/projects/powerpc/share/man/man9/pseudofs.9#2 integrate .. //depot/projects/powerpc/share/misc/organization.dot#1 branch .. //depot/projects/powerpc/sys/Makefile#5 integrate .. //depot/projects/powerpc/sys/amd64/amd64/busdma_machdep.c#3 integrate .. //depot/projects/powerpc/sys/amd64/include/vmparam.h#2 integrate .. //depot/projects/powerpc/sys/amd64/linux32/linux32_dummy.c#4 integrate .. //depot/projects/powerpc/sys/amd64/linux32/linux32_machdep.c#5 integrate .. //depot/projects/powerpc/sys/bsm/audit.h#3 integrate .. //depot/projects/powerpc/sys/bsm/audit_internal.h#3 integrate .. //depot/projects/powerpc/sys/bsm/audit_kevents.h#3 integrate .. //depot/projects/powerpc/sys/bsm/audit_record.h#3 integrate .. //depot/projects/powerpc/sys/cam/cam_ccb.h#4 integrate .. //depot/projects/powerpc/sys/cam/cam_periph.c#4 integrate .. //depot/projects/powerpc/sys/cam/cam_periph.h#4 integrate .. //depot/projects/powerpc/sys/cam/cam_sim.c#4 integrate .. //depot/projects/powerpc/sys/cam/cam_sim.h#4 integrate .. //depot/projects/powerpc/sys/cam/cam_xpt.c#8 integrate .. //depot/projects/powerpc/sys/cam/cam_xpt.h#5 integrate .. //depot/projects/powerpc/sys/cam/cam_xpt_periph.h#4 integrate .. //depot/projects/powerpc/sys/cam/scsi/scsi_cd.c#5 integrate .. //depot/projects/powerpc/sys/cam/scsi/scsi_ch.c#5 integrate .. //depot/projects/powerpc/sys/cam/scsi/scsi_da.c#6 integrate .. //depot/projects/powerpc/sys/cam/scsi/scsi_low.c#4 integrate .. //depot/projects/powerpc/sys/cam/scsi/scsi_pass.c#5 integrate .. //depot/projects/powerpc/sys/cam/scsi/scsi_pt.c#5 integrate .. //depot/projects/powerpc/sys/cam/scsi/scsi_sa.c#5 integrate .. //depot/projects/powerpc/sys/cam/scsi/scsi_ses.c#5 integrate .. //depot/projects/powerpc/sys/cam/scsi/scsi_sg.c#2 integrate .. //depot/projects/powerpc/sys/cam/scsi/scsi_targ_bh.c#4 integrate .. //depot/projects/powerpc/sys/cam/scsi/scsi_target.c#6 integrate .. //depot/projects/powerpc/sys/compat/linprocfs/linprocfs.c#9 integrate .. //depot/projects/powerpc/sys/compat/linux/linux_socket.c#6 integrate .. //depot/projects/powerpc/sys/compat/opensolaris/kern/opensolaris_vfs.c#2 integrate .. //depot/projects/powerpc/sys/conf/NOTES#10 integrate .. //depot/projects/powerpc/sys/conf/files#11 integrate .. //depot/projects/powerpc/sys/conf/options#12 integrate .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/dnlc.c#2 integrate .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/spa.c#2 integrate .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#2 integrate .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#2 integrate .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#2 integrate .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#2 integrate .. //depot/projects/powerpc/sys/contrib/pf/net/if_pfsync.c#4 integrate .. //depot/projects/powerpc/sys/dev/aac/aac_cam.c#4 integrate .. //depot/projects/powerpc/sys/dev/advansys/advansys.c#5 integrate .. //depot/projects/powerpc/sys/dev/advansys/adwcam.c#6 integrate .. //depot/projects/powerpc/sys/dev/aha/aha.c#5 integrate .. //depot/projects/powerpc/sys/dev/ahb/ahb.c#7 integrate .. //depot/projects/powerpc/sys/dev/aic/aic.c#4 integrate .. //depot/projects/powerpc/sys/dev/aic7xxx/aic7770.c#4 integrate .. //depot/projects/powerpc/sys/dev/aic7xxx/aic79xx.c#3 integrate .. //depot/projects/powerpc/sys/dev/aic7xxx/aic79xx.h#4 integrate .. //depot/projects/powerpc/sys/dev/aic7xxx/aic79xx_osm.c#4 integrate .. //depot/projects/powerpc/sys/dev/aic7xxx/aic79xx_osm.h#3 integrate .. //depot/projects/powerpc/sys/dev/aic7xxx/aic79xx_pci.c#4 integrate .. //depot/projects/powerpc/sys/dev/aic7xxx/aic7xxx.c#4 integrate .. //depot/projects/powerpc/sys/dev/aic7xxx/aic7xxx.h#4 integrate .. //depot/projects/powerpc/sys/dev/aic7xxx/aic7xxx_inline.h#4 integrate .. //depot/projects/powerpc/sys/dev/aic7xxx/aic7xxx_osm.c#4 integrate .. //depot/projects/powerpc/sys/dev/aic7xxx/aic7xxx_osm.h#3 integrate .. //depot/projects/powerpc/sys/dev/aic7xxx/aic7xxx_pci.c#4 integrate .. //depot/projects/powerpc/sys/dev/aic7xxx/aic_osm_lib.c#2 integrate .. //depot/projects/powerpc/sys/dev/aic7xxx/aic_osm_lib.h#2 integrate .. //depot/projects/powerpc/sys/dev/amd/amd.c#4 integrate .. //depot/projects/powerpc/sys/dev/amr/amr_cam.c#4 integrate .. //depot/projects/powerpc/sys/dev/arcmsr/arcmsr.c#7 integrate .. //depot/projects/powerpc/sys/dev/asr/asr.c#7 integrate .. //depot/projects/powerpc/sys/dev/ata/atapi-cam.c#3 integrate .. //depot/projects/powerpc/sys/dev/ath/if_ath.c#6 integrate .. //depot/projects/powerpc/sys/dev/buslogic/bt.c#6 integrate .. //depot/projects/powerpc/sys/dev/ciss/ciss.c#4 integrate .. //depot/projects/powerpc/sys/dev/cxgb/cxgb_main.c#3 integrate .. //depot/projects/powerpc/sys/dev/cxgb/cxgb_sge.c#3 integrate .. //depot/projects/powerpc/sys/dev/cxgb/sys/mvec.h#2 integrate .. //depot/projects/powerpc/sys/dev/cxgb/sys/uipc_mvec.c#2 integrate .. //depot/projects/powerpc/sys/dev/dpt/dpt_scsi.c#5 integrate .. //depot/projects/powerpc/sys/dev/esp/ncr53c9x.c#2 integrate .. //depot/projects/powerpc/sys/dev/ex/if_exvar.h#4 integrate .. //depot/projects/powerpc/sys/dev/firewire/fwdma.c#2 integrate .. //depot/projects/powerpc/sys/dev/firewire/sbp.c#3 integrate .. //depot/projects/powerpc/sys/dev/firewire/sbp_targ.c#3 integrate .. //depot/projects/powerpc/sys/dev/hptmv/entry.c#4 integrate .. //depot/projects/powerpc/sys/dev/hwpmc/hwpmc_logging.c#2 integrate .. //depot/projects/powerpc/sys/dev/hwpmc/hwpmc_mod.c#3 integrate .. //depot/projects/powerpc/sys/dev/hwpmc/hwpmc_piv.c#2 integrate .. //depot/projects/powerpc/sys/dev/iicbus/icee.c#2 integrate .. //depot/projects/powerpc/sys/dev/iir/iir.c#3 integrate .. //depot/projects/powerpc/sys/dev/isp/isp_freebsd.c#9 integrate .. //depot/projects/powerpc/sys/dev/mly/mly.c#7 integrate .. //depot/projects/powerpc/sys/dev/mpt/mpt_cam.c#8 integrate .. //depot/projects/powerpc/sys/dev/ppbus/vpo.c#5 integrate .. //depot/projects/powerpc/sys/dev/ral/rt2560.c#4 integrate .. //depot/projects/powerpc/sys/dev/re/if_re.c#6 integrate .. //depot/projects/powerpc/sys/dev/rr232x/osm_bsd.c#3 integrate .. //depot/projects/powerpc/sys/dev/sound/isa/ad1816.c#7 integrate .. //depot/projects/powerpc/sys/dev/sound/isa/ess.c#7 integrate .. //depot/projects/powerpc/sys/dev/sound/isa/mss.c#7 integrate .. //depot/projects/powerpc/sys/dev/sound/isa/sb16.c#7 integrate .. //depot/projects/powerpc/sys/dev/sound/isa/sb8.c#7 integrate .. //depot/projects/powerpc/sys/dev/sound/pci/als4000.c#6 integrate .. //depot/projects/powerpc/sys/dev/sound/pci/atiixp.c#3 integrate .. //depot/projects/powerpc/sys/dev/sound/pci/au88x0.c#3 integrate .. //depot/projects/powerpc/sys/dev/sound/pci/aureal.c#5 integrate .. //depot/projects/powerpc/sys/dev/sound/pci/cmi.c#7 integrate .. //depot/projects/powerpc/sys/dev/sound/pci/cs4281.c#6 integrate .. //depot/projects/powerpc/sys/dev/sound/pci/csapcm.c#5 integrate .. //depot/projects/powerpc/sys/dev/sound/pci/ds1.c#6 integrate .. //depot/projects/powerpc/sys/dev/sound/pci/emu10k1.c#6 integrate .. //depot/projects/powerpc/sys/dev/sound/pci/emu10kx-pcm.c#4 integrate .. //depot/projects/powerpc/sys/dev/sound/pci/envy24.c#5 integrate .. //depot/projects/powerpc/sys/dev/sound/pci/envy24ht.c#5 integrate .. //depot/projects/powerpc/sys/dev/sound/pci/es137x.c#7 integrate .. //depot/projects/powerpc/sys/dev/sound/pci/fm801.c#6 integrate .. //depot/projects/powerpc/sys/dev/sound/pci/hda/hdac.c#8 integrate .. //depot/projects/powerpc/sys/dev/sound/pci/ich.c#7 integrate .. //depot/projects/powerpc/sys/dev/sound/pci/maestro3.c#6 integrate .. //depot/projects/powerpc/sys/dev/sound/pci/solo.c#6 integrate .. //depot/projects/powerpc/sys/dev/sound/pci/t4dwave.c#6 integrate .. //depot/projects/powerpc/sys/dev/sound/pci/via8233.c#4 integrate .. //depot/projects/powerpc/sys/dev/sound/pci/via82c686.c#6 integrate .. //depot/projects/powerpc/sys/dev/sound/pci/vibes.c#6 integrate .. //depot/projects/powerpc/sys/dev/sound/pcm/ac97.c#6 integrate .. //depot/projects/powerpc/sys/dev/sound/pcm/ac97.h#5 integrate .. //depot/projects/powerpc/sys/dev/sound/pcm/ac97_patch.c#3 integrate .. //depot/projects/powerpc/sys/dev/sound/pcm/ac97_patch.h#3 integrate .. //depot/projects/powerpc/sys/dev/sound/pcm/buffer.c#6 integrate .. //depot/projects/powerpc/sys/dev/sound/pcm/buffer.h#5 integrate .. //depot/projects/powerpc/sys/dev/sound/pcm/sound.h#6 integrate .. //depot/projects/powerpc/sys/dev/sound/sbus/cs4231.c#5 integrate .. //depot/projects/powerpc/sys/dev/sym/sym_hipd.c#6 integrate .. //depot/projects/powerpc/sys/dev/trm/trm.c#4 integrate .. //depot/projects/powerpc/sys/dev/twa/tw_osl_cam.c#2 integrate .. //depot/projects/powerpc/sys/dev/usb/if_ural.c#4 integrate .. //depot/projects/powerpc/sys/dev/usb/umass.c#6 integrate .. //depot/projects/powerpc/sys/dev/wds/wd7000.c#6 integrate .. //depot/projects/powerpc/sys/dev/wi/if_wi.c#7 integrate .. //depot/projects/powerpc/sys/fs/devfs/devfs_vnops.c#7 integrate .. //depot/projects/powerpc/sys/fs/procfs/procfs_dbregs.c#5 integrate .. //depot/projects/powerpc/sys/fs/procfs/procfs_fpregs.c#5 integrate .. //depot/projects/powerpc/sys/fs/procfs/procfs_map.c#5 integrate .. //depot/projects/powerpc/sys/fs/procfs/procfs_regs.c#5 integrate .. //depot/projects/powerpc/sys/fs/pseudofs/pseudofs.c#7 integrate .. //depot/projects/powerpc/sys/fs/pseudofs/pseudofs.h#7 integrate .. //depot/projects/powerpc/sys/fs/pseudofs/pseudofs_fileno.c#5 integrate .. //depot/projects/powerpc/sys/fs/pseudofs/pseudofs_internal.h#6 integrate .. //depot/projects/powerpc/sys/fs/pseudofs/pseudofs_vncache.c#8 integrate .. //depot/projects/powerpc/sys/fs/pseudofs/pseudofs_vnops.c#5 integrate .. //depot/projects/powerpc/sys/i386/i386/bios.c#5 integrate .. //depot/projects/powerpc/sys/i386/i386/busdma_machdep.c#5 integrate .. //depot/projects/powerpc/sys/i386/i386/identcpu.c#8 integrate .. //depot/projects/powerpc/sys/i386/include/vmparam.h#5 integrate .. //depot/projects/powerpc/sys/ia64/include/vmparam.h#4 integrate .. //depot/projects/powerpc/sys/isa/isa_common.c#5 integrate .. //depot/projects/powerpc/sys/kern/kern_intr.c#8 integrate .. //depot/projects/powerpc/sys/kern/kern_jail.c#8 integrate .. //depot/projects/powerpc/sys/kern/kern_malloc.c#5 integrate .. //depot/projects/powerpc/sys/kern/sched_ule.c#5 integrate .. //depot/projects/powerpc/sys/kern/subr_rman.c#6 integrate .. //depot/projects/powerpc/sys/kern/subr_witness.c#10 integrate .. //depot/projects/powerpc/sys/kern/uipc_mbuf.c#6 integrate .. //depot/projects/powerpc/sys/kern/uipc_syscalls.c#8 integrate .. //depot/projects/powerpc/sys/kern/vfs_mount.c#7 integrate .. //depot/projects/powerpc/sys/kern/vfs_subr.c#8 integrate .. //depot/projects/powerpc/sys/modules/Makefile#10 integrate .. //depot/projects/powerpc/sys/modules/if_lagg/Makefile#1 branch .. //depot/projects/powerpc/sys/modules/if_trunk/Makefile#2 delete .. //depot/projects/powerpc/sys/net/ieee8023ad_lacp.c#2 integrate .. //depot/projects/powerpc/sys/net/ieee8023ad_lacp.h#2 integrate .. //depot/projects/powerpc/sys/net/if.c#8 integrate .. //depot/projects/powerpc/sys/net/if_ethersubr.c#9 integrate .. //depot/projects/powerpc/sys/net/if_lagg.c#1 branch .. //depot/projects/powerpc/sys/net/if_lagg.h#1 branch .. //depot/projects/powerpc/sys/net/if_trunk.c#2 delete .. //depot/projects/powerpc/sys/net/if_trunk.h#2 delete .. //depot/projects/powerpc/sys/net/if_var.h#7 integrate .. //depot/projects/powerpc/sys/netgraph/ng_ppp.c#6 integrate .. //depot/projects/powerpc/sys/netinet/ip_fw2.c#7 integrate .. //depot/projects/powerpc/sys/netinet/sctp_constants.h#8 integrate .. //depot/projects/powerpc/sys/netinet/sctp_crc32.c#4 integrate .. //depot/projects/powerpc/sys/netinet/sctp_indata.c#8 integrate .. //depot/projects/powerpc/sys/netinet/sctp_input.c#8 integrate .. //depot/projects/powerpc/sys/netinet/sctp_lock_bsd.h#4 integrate .. //depot/projects/powerpc/sys/netinet/sctp_output.c#8 integrate .. //depot/projects/powerpc/sys/netinet/sctp_pcb.c#8 integrate .. //depot/projects/powerpc/sys/netinet/sctp_peeloff.c#6 integrate .. //depot/projects/powerpc/sys/netinet/sctp_structs.h#7 integrate .. //depot/projects/powerpc/sys/netinet/sctp_timer.c#7 integrate .. //depot/projects/powerpc/sys/netinet/sctp_uio.h#8 integrate .. //depot/projects/powerpc/sys/netinet/sctp_usrreq.c#8 integrate .. //depot/projects/powerpc/sys/netinet/sctp_var.h#5 integrate .. //depot/projects/powerpc/sys/netinet/sctputil.c#9 integrate .. //depot/projects/powerpc/sys/netinet/sctputil.h#6 integrate .. //depot/projects/powerpc/sys/netinet/tcp.h#6 integrate .. //depot/projects/powerpc/sys/netinet/tcp_input.c#9 integrate .. //depot/projects/powerpc/sys/netinet/tcp_output.c#8 integrate .. //depot/projects/powerpc/sys/netinet/tcp_subr.c#8 integrate .. //depot/projects/powerpc/sys/netinet/tcp_syncache.c#7 integrate .. //depot/projects/powerpc/sys/netinet/tcp_var.h#8 integrate .. //depot/projects/powerpc/sys/netinet6/sctp6_usrreq.c#8 integrate .. //depot/projects/powerpc/sys/netnatm/natm.h#5 integrate .. //depot/projects/powerpc/sys/nfsserver/nfs_srvsock.c#6 integrate .. //depot/projects/powerpc/sys/pci/if_rlreg.h#5 integrate .. //depot/projects/powerpc/sys/pci/if_vr.c#5 integrate .. //depot/projects/powerpc/sys/pci/if_vrreg.h#4 integrate .. //depot/projects/powerpc/sys/pci/intpm.c#6 integrate .. //depot/projects/powerpc/sys/pci/ncr.c#5 integrate .. //depot/projects/powerpc/sys/powerpc/powerpc/nexus.c#4 integrate .. //depot/projects/powerpc/sys/security/audit/audit_bsm_token.c#4 integrate .. //depot/projects/powerpc/sys/sparc64/include/vmparam.h#5 integrate .. //depot/projects/powerpc/sys/sun4v/include/vmparam.h#2 integrate .. //depot/projects/powerpc/sys/sys/interrupt.h#7 integrate .. //depot/projects/powerpc/sys/sys/mbuf.h#8 integrate .. //depot/projects/powerpc/sys/sys/mount.h#10 integrate .. //depot/projects/powerpc/sys/sys/priv.h#5 integrate .. //depot/projects/powerpc/sys/sys/proc.h#10 integrate .. //depot/projects/powerpc/sys/sys/socket.h#5 integrate .. //depot/projects/powerpc/sys/vm/vm_contig.c#6 integrate .. //depot/projects/powerpc/sys/vm/vm_param.h#5 integrate .. //depot/projects/powerpc/tools/regression/lib/libc/nss/Makefile#1 branch .. //depot/projects/powerpc/tools/regression/lib/libc/nss/README#1 branch .. //depot/projects/powerpc/tools/regression/lib/libc/nss/mach#1 branch .. //depot/projects/powerpc/tools/regression/lib/libc/nss/test-getaddr.c#1 branch .. //depot/projects/powerpc/tools/regression/lib/libc/nss/test-getaddr.t#1 branch .. //depot/projects/powerpc/tools/regression/lib/libc/nss/test-getgr.c#1 branch .. //depot/projects/powerpc/tools/regression/lib/libc/nss/test-getgr.t#1 branch .. //depot/projects/powerpc/tools/regression/lib/libc/nss/test-gethostby.c#1 branch .. //depot/projects/powerpc/tools/regression/lib/libc/nss/test-gethostby.t#1 branch .. //depot/projects/powerpc/tools/regression/lib/libc/nss/test-getproto.c#1 branch .. //depot/projects/powerpc/tools/regression/lib/libc/nss/test-getproto.t#1 branch .. //depot/projects/powerpc/tools/regression/lib/libc/nss/test-getpw.c#1 branch .. //depot/projects/powerpc/tools/regression/lib/libc/nss/test-getpw.t#1 branch .. //depot/projects/powerpc/tools/regression/lib/libc/nss/test-getrpc.c#1 branch .. //depot/projects/powerpc/tools/regression/lib/libc/nss/test-getrpc.t#1 branch .. //depot/projects/powerpc/tools/regression/lib/libc/nss/test-getserv.c#1 branch .. //depot/projects/powerpc/tools/regression/lib/libc/nss/test-getserv.t#1 branch .. //depot/projects/powerpc/tools/regression/lib/libc/nss/test-getusershell.c#1 branch .. //depot/projects/powerpc/tools/regression/lib/libc/nss/test-getusershell.t#1 branch .. //depot/projects/powerpc/tools/regression/lib/libc/nss/testutil.h#1 branch .. //depot/projects/powerpc/tools/regression/sockets/sendfile/Makefile#2 integrate .. //depot/projects/powerpc/tools/regression/sockets/sendfile/sendfile.c#2 integrate .. //depot/projects/powerpc/tools/tools/nanobsd/nanobsd.sh#2 integrate .. //depot/projects/powerpc/usr.bin/lastcomm/lastcomm.1#3 integrate .. //depot/projects/powerpc/usr.bin/lastcomm/lastcomm.c#3 integrate .. //depot/projects/powerpc/usr.bin/make/GNode.h#2 integrate .. //depot/projects/powerpc/usr.bin/make/main.c#3 integrate .. //depot/projects/powerpc/usr.bin/make/make.c#2 integrate .. //depot/projects/powerpc/usr.bin/make/targ.c#2 integrate .. //depot/projects/powerpc/usr.bin/tar/read.c#5 integrate .. //depot/projects/powerpc/usr.bin/tar/test/test-basic.sh#4 integrate .. //depot/projects/powerpc/usr.bin/tar/util.c#4 integrate .. //depot/projects/powerpc/usr.bin/top/machine.c#2 integrate .. //depot/projects/powerpc/usr.bin/whois/whois.c#3 integrate .. //depot/projects/powerpc/usr.sbin/bsnmpd/modules/snmp_bridge/snmp_bridge.3#2 integrate .. //depot/projects/powerpc/usr.sbin/daemon/daemon.c#3 integrate Differences ... ==== //depot/projects/powerpc/Makefile.inc1#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.571 2007/04/06 02:13:29 pjd Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.572 2007/04/17 15:52:36 pjd Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -1016,11 +1016,11 @@ ${_lib_libgssapi} ${_lib_libipx} \ lib/libkiconv lib/libkvm lib/libmd \ lib/ncurses/ncurses lib/ncurses/ncursesw \ - lib/libopie lib/libpam \ + lib/libopie lib/libpam lib/libpthread \ lib/libradius lib/libsbuf lib/libtacplus lib/libutil \ ${_lib_libypclnt} lib/libz lib/msun \ ${_secure_lib_libcrypto} ${_secure_lib_libssh} \ - ${_secure_lib_libssl} lib/libthr + ${_secure_lib_libssl} _generic_libs= ${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib ==== //depot/projects/powerpc/ObsoleteFiles.inc#6 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.78 2007/04/09 19:16:48 pjd Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.79 2007/04/17 01:02:55 thompsa Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,8 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20070417: trunk(4) renamed to lagg(4) +OLD_FILES+=usr/include/net/if_trunk.h # 20070409: uuidgen moved to /bin/ OLD_FILES+=usr/bin/uuidgen # 20070328: bzip2 1.0.4 ==== //depot/projects/powerpc/UPDATING#7 (text+ko) ==== @@ -21,6 +21,15 @@ developers choose to disable these features on build machines to maximize performance. +20070417: + The new trunk(4) driver has been renamed to lagg(4) as it better + reflects its purpose. ifconfig will need to be recompiled. + +20070408: + sendmail(8) has been updated to version 8.14.1. Mail filters + (aka, milters) compiled against the libmilter included in the + base operating system should be recompiled. + 20070302: Firmwares for ipw(4) and iwi(4) are now included in the base tree. In order to use them one must agree to the respective LICENSE in @@ -758,4 +767,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.484 2007/04/03 10:04:54 brueffer Exp $ +$FreeBSD: src/UPDATING,v 1.488 2007/04/19 17:08:54 dds Exp $ ==== //depot/projects/powerpc/cddl/Makefile#2 (text+ko) ==== @@ -1,8 +1,5 @@ -# $FreeBSD: src/cddl/Makefile,v 1.1 2007/04/06 01:08:56 pjd Exp $ +# $FreeBSD: src/cddl/Makefile,v 1.2 2007/04/16 21:20:24 ru Exp $ -SUBDIR= lib -SUBDIR+=sbin -SUBDIR+=usr.bin -SUBDIR+=usr.sbin +SUBDIR= lib sbin usr.bin usr.sbin .include ==== //depot/projects/powerpc/cddl/Makefile.inc#2 (text+ko) ==== @@ -1,3 +1,3 @@ -# $FreeBSD: src/cddl/Makefile.inc,v 1.1 2007/04/06 01:08:56 pjd Exp $ +# $FreeBSD: src/cddl/Makefile.inc,v 1.2 2007/04/16 21:20:24 ru Exp $ -CFLAGS+=-D_SOLARIS_C_SOURCE +CFLAGS+= -D_SOLARIS_C_SOURCE ==== //depot/projects/powerpc/cddl/lib/Makefile#2 (text+ko) ==== @@ -1,18 +1,19 @@ -# $FreeBSD: src/cddl/lib/Makefile,v 1.2 2007/04/07 19:12:09 des Exp $ +# $FreeBSD: src/cddl/lib/Makefile,v 1.3 2007/04/16 21:20:24 ru Exp $ .include -SUBDIR= libavl -SUBDIR+=libnvpair -SUBDIR+=libumem -SUBDIR+=libuutil -.if ${MK_CDDL} != "no" -SUBDIR+=libzfs -SUBDIR+=${_libzpool} -.endif +SUBDIR= libavl \ + libnvpair \ + libumem \ + libuutil \ + ${_libzfs} \ + ${_libzpool} -.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" +.if ${MK_ZFS} != "no" +_libzfs= libzfs +.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" _libzpool= libzpool .endif +.endif .include ==== //depot/projects/powerpc/cddl/lib/Makefile.inc#2 (text+ko) ==== @@ -1,5 +1,6 @@ -# $FreeBSD: src/cddl/lib/Makefile.inc,v 1.1 2007/04/06 01:08:56 pjd Exp $ +# $FreeBSD: src/cddl/lib/Makefile.inc,v 1.2 2007/04/16 21:20:24 ru Exp $ SHLIBDIR?= /lib +SHLIB_MAJOR?= 1 .include "../Makefile.inc" ==== //depot/projects/powerpc/cddl/lib/libavl/Makefile#2 (text+ko) ==== @@ -1,13 +1,10 @@ -# $FreeBSD: src/cddl/lib/libavl/Makefile,v 1.1 2007/04/06 01:08:56 pjd Exp $ +# $FreeBSD: src/cddl/lib/libavl/Makefile,v 1.2 2007/04/16 21:20:24 ru Exp $ -.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/avl +.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/avl LIB= avl -SHLIB_MAJOR?=1 - SRCS= avl.c - -CFLAGS+=-I${.CURDIR}/../../../sys/compat/opensolaris -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common +CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common .include ==== //depot/projects/powerpc/cddl/lib/libnvpair/Makefile#2 (text+ko) ==== @@ -1,18 +1,17 @@ -# $FreeBSD: src/cddl/lib/libnvpair/Makefile,v 1.1 2007/04/06 01:08:56 pjd Exp $ +# $FreeBSD: src/cddl/lib/libnvpair/Makefile,v 1.2 2007/04/16 21:20:25 ru Exp $ -.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair -.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/nvpair +.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair +.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/nvpair LIB= nvpair -SHLIB_MAJOR?=1 -SRCS= libnvpair.c -SRCS+= nvpair_alloc_system.c -SRCS+= nvpair_alloc_fixed.c -SRCS+= nvpair.c +SRCS= libnvpair.c \ + nvpair_alloc_system.c \ + nvpair_alloc_fixed.c \ + nvpair.c -CFLAGS+=-I${.CURDIR}/../../../sys/compat/opensolaris -CFLAGS+=-I${.CURDIR}/../../../include -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common +CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris +CFLAGS+= -I${.CURDIR}/../../../include # XXX +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common .include ==== //depot/projects/powerpc/cddl/lib/libumem/Makefile#2 (text+ko) ==== @@ -1,12 +1,9 @@ -# $FreeBSD: src/cddl/lib/libumem/Makefile,v 1.1 2007/04/06 01:08:56 pjd Exp $ +# $FreeBSD: src/cddl/lib/libumem/Makefile,v 1.2 2007/04/16 21:20:25 ru Exp $ -.PATH: ${.CURDIR}/../../../compat/opensolaris/lib/libumem +.PATH: ${.CURDIR}/../../../compat/opensolaris/lib/libumem LIB= umem -SHLIB_MAJOR?=1 - SRCS= umem.c - -CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/lib/libumem +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem .include ==== //depot/projects/powerpc/cddl/lib/libuutil/Makefile#2 (text+ko) ==== @@ -1,27 +1,25 @@ -# $FreeBSD: src/cddl/lib/libuutil/Makefile,v 1.1 2007/04/06 01:08:57 pjd Exp $ +# $FreeBSD: src/cddl/lib/libuutil/Makefile,v 1.2 2007/04/16 21:20:25 ru Exp $ -.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common -.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/avl +.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common +.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/avl LIB= uutil -SHLIB_MAJOR?=1 +SRCS= avl.c \ + uu_alloc.c \ + uu_avl.c \ + uu_dprintf.c \ + uu_ident.c \ + uu_list.c \ + uu_misc.c \ + uu_open.c \ + uu_pname.c \ + uu_strtoint.c -SRCS= avl.c -SRCS+= uu_alloc.c -SRCS+= uu_avl.c -SRCS+= uu_dprintf.c -SRCS+= uu_ident.c -SRCS+= uu_list.c -SRCS+= uu_misc.c -SRCS+= uu_open.c -SRCS+= uu_pname.c -SRCS+= uu_strtoint.c - -CFLAGS+=-DNATIVE_BUILD -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common -CFLAGS+=-I${.CURDIR}/../../../sys/compat/opensolaris -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common -CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/include -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/head +CFLAGS+= -DNATIVE_BUILD +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common +CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head .include ==== //depot/projects/powerpc/cddl/lib/libzfs/Makefile#2 (text+ko) ==== @@ -1,49 +1,46 @@ -# $FreeBSD: src/cddl/lib/libzfs/Makefile,v 1.1 2007/04/06 01:08:57 pjd Exp $ +# $FreeBSD: src/cddl/lib/libzfs/Makefile,v 1.2 2007/04/16 21:20:25 ru Exp $ -.PATH: ${.CURDIR}/../../../compat/opensolaris/misc -.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs -.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs -.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common +.PATH: ${.CURDIR}/../../../compat/opensolaris/misc +.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs +.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs +.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common LIB= zfs -SHLIB_MAJOR?=1 - DPADD= ${LIBUTIL} LDADD= -lutil -SRCS= mnttab.c -SRCS+= mkdirp.c -SRCS+= zmount.c -SRCS+= fsshare.c -SRCS+= zone.c +SRCS= mnttab.c \ + mkdirp.c \ + zmount.c \ + fsshare.c \ + zone.c -SRCS+= zfs_namecheck.c -SRCS+= zfs_prop.c -SRCS+= libzfs_dataset.c -SRCS+= libzfs_util.c -SRCS+= libzfs_graph.c -SRCS+= libzfs_mount.c -SRCS+= libzfs_pool.c -SRCS+= libzfs_changelist.c -SRCS+= libzfs_config.c -SRCS+= libzfs_import.c -SRCS+= libzfs_status.c +SRCS+= zfs_namecheck.c \ + zfs_prop.c \ + libzfs_dataset.c \ + libzfs_util.c \ + libzfs_graph.c \ + libzfs_mount.c \ + libzfs_pool.c \ + libzfs_changelist.c \ + libzfs_config.c \ + libzfs_import.c \ + libzfs_status.c -CFLAGS+=-DZFS_NO_ACL -CFLAGS+=-I${.CURDIR}/../../../sbin/mount -CFLAGS+=-I${.CURDIR}/../../../cddl/lib/libumem -CFLAGS+=-I${.CURDIR}/../../../sys/compat/opensolaris -CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/include -CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/lib/libumem -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/head -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common -CFLAGS+=-I${.CURDIR}/../../../sys +CFLAGS+= -DZFS_NO_ACL +CFLAGS+= -I${.CURDIR}/../../../sbin/mount +CFLAGS+= -I${.CURDIR}/../../../cddl/lib/libumem +CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common .include ==== //depot/projects/powerpc/cddl/lib/libzpool/Makefile#2 (text+ko) ==== @@ -1,44 +1,43 @@ -# $FreeBSD: src/cddl/lib/libzpool/Makefile,v 1.2 2007/04/07 23:54:53 pjd Exp $ +# $FreeBSD: src/cddl/lib/libzpool/Makefile,v 1.4 2007/04/17 15:52:36 pjd Exp $ .include "${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/Makefile.files" # ZFS_COMMON_SRCS -.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs +.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs # ZFS_SHARED_SRCS -.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs +.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs # KERNEL_SRCS -.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common +.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common # LIST_SRCS -.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/os +.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/os # ATOMIC_SRCS -.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/atomic/${MACHINE_ARCH} +.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/atomic/${MACHINE_ARCH} -LIB= zpool -SHLIB_MAJOR?=1 +LIB= zpool -ZFS_COMMON_SRCS= ${ZFS_COMMON_OBJS:C/.o$/.c/} vdev_file.c -ZFS_SHARED_SRCS= ${ZFS_SHARED_OBJS:C/.o$/.c/} -KERNEL_SRCS= kernel.c taskq.c util.c -LIST_SRCS= list.c -ATOMIC_SRCS= atomic.S +ZFS_COMMON_SRCS= ${ZFS_COMMON_OBJS:C/.o$/.c/} vdev_file.c +ZFS_SHARED_SRCS= ${ZFS_SHARED_OBJS:C/.o$/.c/} +KERNEL_SRCS= kernel.c taskq.c util.c +LIST_SRCS= list.c +ATOMIC_SRCS= atomic.S -SRCS= ${ZFS_COMMON_SRCS} ${ZFS_SHARED_SRCS} ${KERNEL_SRCS} ${LIST_SRCS} ${ATOMIC_SRCS} +SRCS= ${ZFS_COMMON_SRCS} ${ZFS_SHARED_SRCS} \ + ${KERNEL_SRCS} ${LIST_SRCS} ${ATOMIC_SRCS} -CFLAGS+=-I${.CURDIR}/../../../sys/compat/opensolaris -CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/include -CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/lib/libumem -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/head -CFLAGS+=-I${.CURDIR}/../../../cddl/lib/libumem -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair -CFLAGS+=-I${.CURDIR}/../../../sys +CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head +CFLAGS+= -I${.CURDIR}/../../../cddl/lib/libumem +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair -DPADD= ${LIBTHR} ${LIBZ} -LDADD= -lthr -lz +DPADD= ${LIBPTHREAD} ${LIBZ} +LDADD= -lpthread -lz # atomic.S doesn't like profiling. NO_PROFILE= ==== //depot/projects/powerpc/cddl/sbin/Makefile#2 (text+ko) ==== @@ -1,11 +1,12 @@ -# $FreeBSD: src/cddl/sbin/Makefile,v 1.1 2007/04/06 01:08:57 pjd Exp $ +# $FreeBSD: src/cddl/sbin/Makefile,v 1.2 2007/04/16 21:20:25 ru Exp $ .include -SUBDIR= +SUBDIR= ${_zfs} ${_zpool} + .if ${MK_ZFS} != "no" -SUBDIR+=zfs -SUBDIR+=zpool +_zfs= zfs +_zpool= zpool .endif .include ==== //depot/projects/powerpc/cddl/sbin/zfs/Makefile#2 (text+ko) ==== @@ -1,25 +1,23 @@ -# $FreeBSD: src/cddl/sbin/zfs/Makefile,v 1.1 2007/04/06 01:08:57 pjd Exp $ +# $FreeBSD: src/cddl/sbin/zfs/Makefile,v 1.2 2007/04/16 21:20:26 ru Exp $ -.PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zfs +.PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zfs PROG= zfs MAN= zfs.8 -SRCS= zfs_main.c -SRCS+= zfs_iter.c +SRCS= zfs_main.c zfs_iter.c -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common -CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/include -CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/lib/libumem -CFLAGS+=-I${.CURDIR}/../../../sys/compat/opensolaris -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/head -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libumem/common -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys -CFLAGS+=-I${.CURDIR}/../../../sys +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem +CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libumem/common +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBZFS} LDADD= -lgeom -lm -lnvpair -luutil -lzfs ==== //depot/projects/powerpc/cddl/sbin/zpool/Makefile#2 (text+ko) ==== @@ -1,27 +1,23 @@ -# $FreeBSD: src/cddl/sbin/zpool/Makefile,v 1.1 2007/04/06 01:08:57 pjd Exp $ +# $FreeBSD: src/cddl/sbin/zpool/Makefile,v 1.2 2007/04/16 21:20:26 ru Exp $ -.PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zpool +.PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zpool PROG= zpool MAN= zpool.8 -SRCS= zpool_main.c -SRCS+= zpool_vdev.c -SRCS+= zpool_iter.c -SRCS+= zpool_util.c +SRCS= zpool_main.c zpool_vdev.c zpool_iter.c zpool_util.c -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common -CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/include -CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/lib/libumem -CFLAGS+=-I${.CURDIR}/../../../sys/compat/opensolaris -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/head -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libumem/common -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys -CFLAGS+=-I${.CURDIR}/../../../sys +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem +CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libumem/common +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBZFS} LDADD= -lavl -lgeom -lm -lnvpair -luutil -lzfs ==== //depot/projects/powerpc/cddl/usr.bin/Makefile#2 (text+ko) ==== @@ -1,13 +1,13 @@ -# $FreeBSD: src/cddl/usr.bin/Makefile,v 1.2 2007/04/07 19:12:09 des Exp $ +# $FreeBSD: src/cddl/usr.bin/Makefile,v 1.3 2007/04/16 21:20:26 ru Exp $ .include -.if ${MK_ZFS} != "no" SUBDIR= ${_ztest} -.endif -.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" +.if ${MK_ZFS} != "no" +.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" _ztest= ztest .endif +.endif .include ==== //depot/projects/powerpc/cddl/usr.bin/ztest/Makefile#2 (text+ko) ==== @@ -1,23 +1,21 @@ -# $FreeBSD: src/cddl/usr.bin/ztest/Makefile,v 1.1 2007/04/06 01:08:58 pjd Exp $ +# $FreeBSD: src/cddl/usr.bin/ztest/Makefile,v 1.3 2007/04/17 15:52:37 pjd Exp $ -.PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/ztest +.PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/ztest PROG= ztest +NO_MAN= -CFLAGS+=-I${.CURDIR}/../../../sys/compat/opensolaris -CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/include -CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/lib/libumem -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Apr 21 04:52:56 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 CA77416A409; Sat, 21 Apr 2007 04:52:55 +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 69C0B16A400 for ; Sat, 21 Apr 2007 04:52:55 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5847013C45A for ; Sat, 21 Apr 2007 04:52:55 +0000 (UTC) (envelope-from marcel@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 l3L4qtqY058684 for ; Sat, 21 Apr 2007 04:52:55 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3L4qpWx058660 for perforce@freebsd.org; Sat, 21 Apr 2007 04:52:51 GMT (envelope-from marcel@freebsd.org) Date: Sat, 21 Apr 2007 04:52:51 GMT Message-Id: <200704210452.l3L4qpWx058660@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 118514 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: Sat, 21 Apr 2007 04:52:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=118514 Change 118514 by marcel@marcel_xcllnt on 2007/04/21 04:52:24 IFC @118506 Affected files ... .. //depot/projects/uart/Makefile#12 integrate .. //depot/projects/uart/amd64/amd64/busdma_machdep.c#18 integrate .. //depot/projects/uart/amd64/include/vmparam.h#5 integrate .. //depot/projects/uart/amd64/linux32/linux32_dummy.c#8 integrate .. //depot/projects/uart/amd64/linux32/linux32_machdep.c#11 integrate .. //depot/projects/uart/bsm/audit.h#7 integrate .. //depot/projects/uart/bsm/audit_internal.h#5 integrate .. //depot/projects/uart/bsm/audit_kevents.h#7 integrate .. //depot/projects/uart/bsm/audit_record.h#6 integrate .. //depot/projects/uart/cam/cam_ccb.h#10 integrate .. //depot/projects/uart/cam/cam_periph.c#13 integrate .. //depot/projects/uart/cam/cam_periph.h#4 integrate .. //depot/projects/uart/cam/cam_sim.c#4 integrate .. //depot/projects/uart/cam/cam_sim.h#3 integrate .. //depot/projects/uart/cam/cam_xpt.c#17 integrate .. //depot/projects/uart/cam/cam_xpt.h#4 integrate .. //depot/projects/uart/cam/cam_xpt_periph.h#4 integrate .. //depot/projects/uart/cam/scsi/scsi_cd.c#15 integrate .. //depot/projects/uart/cam/scsi/scsi_ch.c#6 integrate .. //depot/projects/uart/cam/scsi/scsi_da.c#23 integrate .. //depot/projects/uart/cam/scsi/scsi_low.c#6 integrate .. //depot/projects/uart/cam/scsi/scsi_pass.c#7 integrate .. //depot/projects/uart/cam/scsi/scsi_pt.c#5 integrate .. //depot/projects/uart/cam/scsi/scsi_sa.c#9 integrate .. //depot/projects/uart/cam/scsi/scsi_ses.c#7 integrate .. //depot/projects/uart/cam/scsi/scsi_sg.c#2 integrate .. //depot/projects/uart/cam/scsi/scsi_targ_bh.c#7 integrate .. //depot/projects/uart/cam/scsi/scsi_target.c#11 integrate .. //depot/projects/uart/compat/linprocfs/linprocfs.c#25 integrate .. //depot/projects/uart/compat/linux/linux_socket.c#16 integrate .. //depot/projects/uart/compat/opensolaris/kern/opensolaris_vfs.c#2 integrate .. //depot/projects/uart/conf/NOTES#51 integrate .. //depot/projects/uart/conf/files#82 integrate .. //depot/projects/uart/conf/options#48 integrate .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/dnlc.c#2 integrate .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/spa.c#2 integrate .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#2 integrate .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#2 integrate .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#2 integrate .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#2 integrate .. //depot/projects/uart/contrib/pf/net/if_pfsync.c#11 integrate .. //depot/projects/uart/dev/aac/aac_cam.c#11 integrate .. //depot/projects/uart/dev/advansys/advansys.c#9 integrate .. //depot/projects/uart/dev/advansys/adwcam.c#9 integrate .. //depot/projects/uart/dev/aha/aha.c#10 integrate .. //depot/projects/uart/dev/ahb/ahb.c#11 integrate .. //depot/projects/uart/dev/aic/aic.c#7 integrate .. //depot/projects/uart/dev/aic7xxx/aic7770.c#5 integrate .. //depot/projects/uart/dev/aic7xxx/aic79xx.c#8 integrate .. //depot/projects/uart/dev/aic7xxx/aic79xx.h#7 integrate .. //depot/projects/uart/dev/aic7xxx/aic79xx_osm.c#10 integrate .. //depot/projects/uart/dev/aic7xxx/aic79xx_osm.h#10 integrate .. //depot/projects/uart/dev/aic7xxx/aic79xx_pci.c#9 integrate .. //depot/projects/uart/dev/aic7xxx/aic7xxx.c#8 integrate .. //depot/projects/uart/dev/aic7xxx/aic7xxx.h#4 integrate .. //depot/projects/uart/dev/aic7xxx/aic7xxx_inline.h#4 integrate .. //depot/projects/uart/dev/aic7xxx/aic7xxx_osm.c#9 integrate .. //depot/projects/uart/dev/aic7xxx/aic7xxx_osm.h#10 integrate .. //depot/projects/uart/dev/aic7xxx/aic7xxx_pci.c#8 integrate .. //depot/projects/uart/dev/aic7xxx/aic_osm_lib.c#3 integrate .. //depot/projects/uart/dev/aic7xxx/aic_osm_lib.h#4 integrate .. //depot/projects/uart/dev/amd/amd.c#12 integrate .. //depot/projects/uart/dev/amr/amr_cam.c#10 integrate .. //depot/projects/uart/dev/arcmsr/arcmsr.c#8 integrate .. //depot/projects/uart/dev/asr/asr.c#15 integrate .. //depot/projects/uart/dev/ata/atapi-cam.c#14 integrate .. //depot/projects/uart/dev/ath/if_ath.c#36 integrate .. //depot/projects/uart/dev/buslogic/bt.c#10 integrate .. //depot/projects/uart/dev/ciss/ciss.c#20 integrate .. //depot/projects/uart/dev/cxgb/cxgb_main.c#4 integrate .. //depot/projects/uart/dev/cxgb/cxgb_sge.c#4 integrate .. //depot/projects/uart/dev/cxgb/sys/mvec.h#2 integrate .. //depot/projects/uart/dev/cxgb/sys/uipc_mvec.c#2 integrate .. //depot/projects/uart/dev/dpt/dpt_scsi.c#11 integrate .. //depot/projects/uart/dev/esp/ncr53c9x.c#7 integrate .. //depot/projects/uart/dev/ex/if_exvar.h#4 integrate .. //depot/projects/uart/dev/firewire/fwdma.c#8 integrate .. //depot/projects/uart/dev/firewire/sbp.c#16 integrate .. //depot/projects/uart/dev/firewire/sbp_targ.c#5 integrate .. //depot/projects/uart/dev/hptmv/entry.c#8 integrate .. //depot/projects/uart/dev/hwpmc/hwpmc_logging.c#5 integrate .. //depot/projects/uart/dev/hwpmc/hwpmc_mod.c#11 integrate .. //depot/projects/uart/dev/hwpmc/hwpmc_piv.c#6 integrate .. //depot/projects/uart/dev/iicbus/icee.c#2 integrate .. //depot/projects/uart/dev/iir/iir.c#11 integrate .. //depot/projects/uart/dev/isp/isp_freebsd.c#22 integrate .. //depot/projects/uart/dev/mly/mly.c#12 integrate .. //depot/projects/uart/dev/mpt/mpt_cam.c#24 integrate .. //depot/projects/uart/dev/ppbus/vpo.c#5 integrate .. //depot/projects/uart/dev/ral/rt2560.c#8 integrate .. //depot/projects/uart/dev/re/if_re.c#23 integrate .. //depot/projects/uart/dev/rr232x/osm_bsd.c#4 integrate .. //depot/projects/uart/dev/sound/isa/ad1816.c#10 integrate .. //depot/projects/uart/dev/sound/isa/ess.c#9 integrate .. //depot/projects/uart/dev/sound/isa/mss.c#11 integrate .. //depot/projects/uart/dev/sound/isa/sb16.c#8 integrate .. //depot/projects/uart/dev/sound/isa/sb8.c#8 integrate .. //depot/projects/uart/dev/sound/pci/als4000.c#11 integrate .. //depot/projects/uart/dev/sound/pci/atiixp.c#9 integrate .. //depot/projects/uart/dev/sound/pci/au88x0.c#9 integrate .. //depot/projects/uart/dev/sound/pci/aureal.c#10 integrate .. //depot/projects/uart/dev/sound/pci/cmi.c#15 integrate .. //depot/projects/uart/dev/sound/pci/cs4281.c#9 integrate .. //depot/projects/uart/dev/sound/pci/csapcm.c#11 integrate .. //depot/projects/uart/dev/sound/pci/ds1.c#11 integrate .. //depot/projects/uart/dev/sound/pci/emu10k1.c#14 integrate .. //depot/projects/uart/dev/sound/pci/emu10kx-pcm.c#4 integrate .. //depot/projects/uart/dev/sound/pci/envy24.c#5 integrate .. //depot/projects/uart/dev/sound/pci/envy24ht.c#3 integrate .. //depot/projects/uart/dev/sound/pci/es137x.c#16 integrate .. //depot/projects/uart/dev/sound/pci/fm801.c#10 integrate .. //depot/projects/uart/dev/sound/pci/hda/hdac.c#5 integrate .. //depot/projects/uart/dev/sound/pci/ich.c#26 integrate .. //depot/projects/uart/dev/sound/pci/maestro3.c#10 integrate .. //depot/projects/uart/dev/sound/pci/solo.c#12 integrate .. //depot/projects/uart/dev/sound/pci/t4dwave.c#10 integrate .. //depot/projects/uart/dev/sound/pci/via8233.c#14 integrate .. //depot/projects/uart/dev/sound/pci/via82c686.c#12 integrate .. //depot/projects/uart/dev/sound/pci/vibes.c#9 integrate .. //depot/projects/uart/dev/sound/pcm/ac97.c#15 integrate .. //depot/projects/uart/dev/sound/pcm/ac97.h#7 integrate .. //depot/projects/uart/dev/sound/pcm/ac97_patch.c#7 integrate .. //depot/projects/uart/dev/sound/pcm/ac97_patch.h#7 integrate .. //depot/projects/uart/dev/sound/pcm/buffer.c#10 integrate .. //depot/projects/uart/dev/sound/pcm/buffer.h#8 integrate .. //depot/projects/uart/dev/sound/pcm/sound.h#14 integrate .. //depot/projects/uart/dev/sound/sbus/cs4231.c#6 integrate .. //depot/projects/uart/dev/sym/sym_hipd.c#14 integrate .. //depot/projects/uart/dev/trm/trm.c#15 integrate .. //depot/projects/uart/dev/twa/tw_osl_cam.c#6 integrate .. //depot/projects/uart/dev/usb/if_ural.c#15 integrate .. //depot/projects/uart/dev/usb/umass.c#22 integrate .. //depot/projects/uart/dev/wds/wd7000.c#7 integrate .. //depot/projects/uart/dev/wi/if_wi.c#21 integrate .. //depot/projects/uart/fs/devfs/devfs_vnops.c#22 integrate .. //depot/projects/uart/fs/procfs/procfs_dbregs.c#5 integrate .. //depot/projects/uart/fs/procfs/procfs_fpregs.c#5 integrate .. //depot/projects/uart/fs/procfs/procfs_map.c#7 integrate .. //depot/projects/uart/fs/procfs/procfs_regs.c#5 integrate .. //depot/projects/uart/fs/pseudofs/pseudofs.c#9 integrate .. //depot/projects/uart/fs/pseudofs/pseudofs.h#8 integrate .. //depot/projects/uart/fs/pseudofs/pseudofs_fileno.c#4 integrate .. //depot/projects/uart/fs/pseudofs/pseudofs_internal.h#4 integrate .. //depot/projects/uart/fs/pseudofs/pseudofs_vncache.c#9 integrate .. //depot/projects/uart/fs/pseudofs/pseudofs_vnops.c#14 integrate .. //depot/projects/uart/i386/i386/bios.c#8 integrate .. //depot/projects/uart/i386/i386/busdma_machdep.c#21 integrate .. //depot/projects/uart/i386/i386/identcpu.c#26 integrate .. //depot/projects/uart/i386/include/vmparam.h#5 integrate .. //depot/projects/uart/ia64/include/vmparam.h#7 integrate .. //depot/projects/uart/isa/isa_common.c#10 integrate .. //depot/projects/uart/kern/kern_intr.c#15 integrate .. //depot/projects/uart/kern/kern_jail.c#12 integrate .. //depot/projects/uart/kern/kern_malloc.c#16 integrate .. //depot/projects/uart/kern/sched_ule.c#22 integrate .. //depot/projects/uart/kern/subr_rman.c#13 integrate .. //depot/projects/uart/kern/subr_witness.c#23 integrate .. //depot/projects/uart/kern/uipc_mbuf.c#17 integrate .. //depot/projects/uart/kern/uipc_syscalls.c#28 integrate .. //depot/projects/uart/kern/vfs_mount.c#33 integrate .. //depot/projects/uart/kern/vfs_subr.c#41 integrate .. //depot/projects/uart/modules/Makefile#48 integrate .. //depot/projects/uart/modules/if_lagg/Makefile#1 branch .. //depot/projects/uart/modules/if_trunk/Makefile#2 delete .. //depot/projects/uart/net/ieee8023ad_lacp.c#2 integrate .. //depot/projects/uart/net/ieee8023ad_lacp.h#2 integrate .. //depot/projects/uart/net/if.c#28 integrate .. //depot/projects/uart/net/if_ethersubr.c#23 integrate .. //depot/projects/uart/net/if_lagg.c#1 branch .. //depot/projects/uart/net/if_lagg.h#1 branch .. //depot/projects/uart/net/if_trunk.c#2 delete .. //depot/projects/uart/net/if_trunk.h#2 delete .. //depot/projects/uart/net/if_var.h#16 integrate .. //depot/projects/uart/netgraph/ng_ppp.c#7 integrate .. //depot/projects/uart/netinet/ip_fw2.c#31 integrate .. //depot/projects/uart/netinet/sctp_constants.h#5 integrate .. //depot/projects/uart/netinet/sctp_crc32.c#3 integrate .. //depot/projects/uart/netinet/sctp_indata.c#5 integrate .. //depot/projects/uart/netinet/sctp_input.c#5 integrate .. //depot/projects/uart/netinet/sctp_lock_bsd.h#3 integrate .. //depot/projects/uart/netinet/sctp_output.c#5 integrate .. //depot/projects/uart/netinet/sctp_pcb.c#5 integrate .. //depot/projects/uart/netinet/sctp_peeloff.c#3 integrate .. //depot/projects/uart/netinet/sctp_structs.h#4 integrate .. //depot/projects/uart/netinet/sctp_timer.c#4 integrate .. //depot/projects/uart/netinet/sctp_uio.h#5 integrate .. //depot/projects/uart/netinet/sctp_usrreq.c#5 integrate .. //depot/projects/uart/netinet/sctp_var.h#3 integrate .. //depot/projects/uart/netinet/sctputil.c#5 integrate .. //depot/projects/uart/netinet/sctputil.h#3 integrate .. //depot/projects/uart/netinet/tcp.h#10 integrate .. //depot/projects/uart/netinet/tcp_input.c#33 integrate .. //depot/projects/uart/netinet/tcp_output.c#15 integrate .. //depot/projects/uart/netinet/tcp_subr.c#28 integrate .. //depot/projects/uart/netinet/tcp_syncache.c#22 integrate .. //depot/projects/uart/netinet/tcp_var.h#18 integrate .. //depot/projects/uart/netinet6/sctp6_usrreq.c#5 integrate .. //depot/projects/uart/netnatm/natm.h#6 integrate .. //depot/projects/uart/nfsserver/nfs_srvsock.c#13 integrate .. //depot/projects/uart/pci/if_rlreg.h#20 integrate .. //depot/projects/uart/pci/if_vr.c#13 integrate .. //depot/projects/uart/pci/if_vrreg.h#8 integrate .. //depot/projects/uart/pci/intpm.c#8 integrate .. //depot/projects/uart/pci/ncr.c#12 integrate .. //depot/projects/uart/powerpc/powerpc/nexus.c#5 integrate .. //depot/projects/uart/security/audit/audit_bsm_token.c#8 integrate .. //depot/projects/uart/sparc64/include/vmparam.h#2 integrate .. //depot/projects/uart/sun4v/include/vmparam.h#2 integrate .. //depot/projects/uart/sys/interrupt.h#8 integrate .. //depot/projects/uart/sys/mbuf.h#19 integrate .. //depot/projects/uart/sys/mount.h#24 integrate .. //depot/projects/uart/sys/priv.h#4 integrate .. //depot/projects/uart/sys/proc.h#29 integrate .. //depot/projects/uart/sys/socket.h#9 integrate .. //depot/projects/uart/vm/vm_contig.c#20 integrate .. //depot/projects/uart/vm/vm_param.h#5 integrate Differences ... ==== //depot/projects/uart/Makefile#12 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/Makefile,v 1.41 2007/03/24 22:21:01 maxim Exp $ +# $FreeBSD: src/sys/Makefile,v 1.42 2007/04/14 16:29:15 maxim Exp $ .include @@ -8,10 +8,10 @@ .endif # Directories to include in cscope name file and TAGS. -CSCOPEDIRS= cam coda compat conf contrib crypto ddb dev fs geom gnu i4b \ - isa kern libkern modules net net80211 netatalk netatm \ +CSCOPEDIRS= bsm cam coda compat conf contrib crypto ddb dev fs geom gnu \ + i4b isa kern libkern modules net net80211 netatalk netatm \ netgraph netinet netinet6 netipx netkey netnatm netncp \ - netsmb nfs nfsclient nfs4client rpc pccard pci sys \ + netsmb nfs nfsclient nfs4client rpc pccard pci security sys \ ufs vm ${ARCHDIR} ARCHDIR ?= ${MACHINE} ==== //depot/projects/uart/amd64/amd64/busdma_machdep.c#18 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.79 2007/03/06 18:28:42 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.80 2007/04/17 21:05:34 jhb Exp $"); #include #include @@ -48,6 +48,7 @@ #include #include #include +#include #define MAX_BPAGES 8192 @@ -522,6 +523,9 @@ } else if ((uintptr_t)*vaddr & (dmat->alignment - 1)) { printf("bus_dmamem_alloc failed to align memory properly.\n"); } + if (flags & BUS_DMA_NOCACHE) + pmap_change_attr((vm_offset_t)*vaddr, dmat->maxsize, + PAT_UNCACHEABLE); CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d", __func__, dmat, dmat->flags, ENOMEM); return (0); @@ -540,6 +544,7 @@ */ if (map != NULL) panic("bus_dmamem_free: Invalid map freed\n"); + pmap_change_attr((vm_offset_t)vaddr, dmat->maxsize, PAT_WRITE_BACK); if ((dmat->maxsize <= PAGE_SIZE) && (dmat->alignment < dmat->maxsize) && dmat->lowaddr >= ptoa((vm_paddr_t)Maxmem)) ==== //depot/projects/uart/amd64/include/vmparam.h#5 (text+ko) ==== @@ -38,7 +38,7 @@ * SUCH DAMAGE. * * from: @(#)vmparam.h 5.9 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/vmparam.h,v 1.45 2004/10/27 17:21:15 peter Exp $ + * $FreeBSD: src/sys/amd64/include/vmparam.h,v 1.46 2007/04/21 01:14:47 sepotvin Exp $ */ @@ -122,7 +122,8 @@ /* * How many physical pages per KVA page allocated. - * min(max(VM_KMEM_SIZE, Physical memory/VM_KMEM_SIZE_SCALE), VM_KMEM_SIZE_MAX) + * min(max(max(VM_KMEM_SIZE, Physical memory/VM_KMEM_SIZE_SCALE), + * VM_KMEM_SIZE_MIN), VM_KMEM_SIZE_MAX) * is the total KVA space allocated for kmem_map. */ #ifndef VM_KMEM_SIZE_SCALE ==== //depot/projects/uart/amd64/linux32/linux32_dummy.c#8 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_dummy.c,v 1.8 2007/03/29 02:11:46 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_dummy.c,v 1.9 2007/04/18 18:08:12 jkim Exp $"); #include #include @@ -64,7 +64,6 @@ DUMMY(mincore); DUMMY(fadvise64); DUMMY(ptrace); -DUMMY(settimeofday); DUMMY(lookup_dcookie); DUMMY(epoll_create); DUMMY(epoll_ctl); ==== //depot/projects/uart/amd64/linux32/linux32_machdep.c#11 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.39 2007/03/30 17:27:13 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.42 2007/04/18 20:12:05 jkim Exp $"); #include #include @@ -252,7 +252,7 @@ if (iovcnt > UIO_MAXIOV) return (EINVAL); iovlen = iovcnt * sizeof(struct iovec); - uio = malloc(iovlen + sizeof *uio, M_IOV, M_WAITOK); + uio = malloc(iovlen + sizeof(*uio), M_IOV, M_WAITOK); iov = (struct iovec *)(uio + 1); for (i = 0; i < iovcnt; i++) { error = copyin(&iovp[i], &iov32, sizeof(struct iovec32)); @@ -526,7 +526,9 @@ td2 = FIRST_THREAD_IN_PROC(p2); - /* make it run */ + /* + * Make this runnable after we are finished with it. + */ mtx_lock_spin(&sched_lock); TD_SET_CAN_RUN(td2); sched_add(td2, SRQ_BORING); @@ -572,8 +574,8 @@ /* * XXX: In Linux, sharing of fs info (chroot/cwd/umask) * and open files is independant. In FreeBSD, its in one - * structure but in reality it does not make any problems - * because both of these flags are set at once usually. + * structure but in reality it does not cause any problems + * because both of these flags are usually set together. */ if (!(args->flags & (LINUX_CLONE_FILES | LINUX_CLONE_FS))) ff |= RFFDG; @@ -660,15 +662,15 @@ if (args->flags & LINUX_CLONE_SETTLS) { struct user_segment_descriptor sd; struct l_user_desc info; - int a[2]; + int a[2]; - error = copyin((void *)td->td_frame->tf_rsi, &info, + error = copyin((void *)td->td_frame->tf_rsi, &info, sizeof(struct l_user_desc)); if (error) { printf(LMSG("copyin failed!")); } else { /* We might copy out the entry_number as GUGS32_SEL. */ - info.entry_number = GUGS32_SEL; + info.entry_number = GUGS32_SEL; error = copyout(&info, (void *)td->td_frame->tf_rsi, sizeof(struct l_user_desc)); if (error) @@ -871,7 +873,7 @@ * * Our mmap with MAP_STACK takes addr as the maximum * downsize limit on BOS, and as len the max size of - * the region. It them maps the top SGROWSIZ bytes, + * the region. It then maps the top SGROWSIZ bytes, * and auto grows the region down, up to the limit * in addr. * @@ -1167,17 +1169,44 @@ microtime(&atv); atv32.tv_sec = atv.tv_sec; atv32.tv_usec = atv.tv_usec; - error = copyout(&atv32, uap->tp, sizeof (atv32)); + error = copyout(&atv32, uap->tp, sizeof(atv32)); } if (error == 0 && uap->tzp != NULL) { rtz.tz_minuteswest = tz_minuteswest; rtz.tz_dsttime = tz_dsttime; - error = copyout(&rtz, uap->tzp, sizeof (rtz)); + error = copyout(&rtz, uap->tzp, sizeof(rtz)); } return (error); } int +linux_settimeofday(struct thread *td, struct linux_settimeofday_args *uap) +{ + l_timeval atv32; + struct timeval atv, *tvp; + struct timezone atz, *tzp; + int error; + + if (uap->tp) { + error = copyin(uap->tp, &atv32, sizeof(atv32)); + if (error) + return (error); + atv.tv_sec = atv32.tv_sec; + atv.tv_usec = atv32.tv_usec; + tvp = &atv; + } else + tvp = NULL; + if (uap->tzp) { + error = copyin(uap->tzp, &atz, sizeof(atz)); + if (error) + return (error); + tzp = &atz; + } else + tzp = NULL; + return (kern_settimeofday(td, tvp, tzp)); +} + +int linux_getrusage(struct thread *td, struct linux_getrusage_args *uap) { struct l_rusage s32; @@ -1242,7 +1271,7 @@ #ifdef DEBUG if (ldebug(set_thread_area)) - printf(ARGS(set_thread_area, "%i, %x, %x, %i, %i, %i, " + printf(ARGS(set_thread_area, "%i, %x, %x, %i, %i, %i, " "%i, %i, %i"), info.entry_number, info.base_addr, info.limit, info.seg_32bit, info.contents, info.read_exec_only, info.limit_in_pages, @@ -1261,9 +1290,10 @@ * The tls_array[] is used only in [gs]et_thread_area() syscalls and * for loading the GDT descriptors. We use just one GDT descriptor * for TLS, so we will load just one. - * XXX: This doesnt work when user-space process tries to use more + * + * XXX: This doesn't work when a user space process tries to use more * than one TLS segment. Comment in the Linux source says wine might - * do that. + * do this. */ /* @@ -1284,8 +1314,9 @@ /* * We have to copy out the GDT entry we use. - * XXX: What if userspace program does not check return value and - * tries to use 6, 7 or 8? + * + * XXX: What if a user space program does not check the return value + * and tries to use 6, 7 or 8? */ error = copyout(&info, args->desc, sizeof(struct l_user_desc)); if (error) ==== //depot/projects/uart/bsm/audit.h#7 (text+ko) ==== @@ -30,8 +30,8 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/uart/bsm/audit.h#6 $ - * $FreeBSD: src/sys/bsm/audit.h,v 1.6 2006/09/21 07:27:02 rwatson Exp $ + * P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#36 + * $FreeBSD: src/sys/bsm/audit.h,v 1.8 2007/04/17 12:27:08 rwatson Exp $ */ #ifndef _BSM_AUDIT_H ==== //depot/projects/uart/bsm/audit_internal.h#5 (text) ==== @@ -34,8 +34,8 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#14 $ - * $FreeBSD: src/sys/bsm/audit_internal.h,v 1.5 2006/09/21 07:27:02 rwatson Exp $ + * P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#16 + * $FreeBSD: src/sys/bsm/audit_internal.h,v 1.7 2007/04/17 12:27:08 rwatson Exp $ */ #ifndef _AUDIT_INTERNAL_H ==== //depot/projects/uart/bsm/audit_kevents.h#7 (text+ko) ==== @@ -30,8 +30,8 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/uart/bsm/audit_kevents.h#6 $ - * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.9 2006/09/25 12:22:07 rwatson Exp $ + * P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#32 + * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.11 2007/04/17 12:27:08 rwatson Exp $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -475,6 +475,28 @@ #define AUE_READDIR 43118 /* Linux. */ #define AUE_IOPL 43119 /* Linux. */ #define AUE_VM86 43120 /* Linux. */ +#define AUE_MAC_GET_PROC 43121 /* FreeBSD. */ +#define AUE_MAC_SET_PROC 43122 /* FreeBSD. */ +#define AUE_MAC_GET_FD 43123 /* FreeBSD. */ +#define AUE_MAC_GET_FILE 43124 /* FreeBSD. */ +#define AUE_MAC_SET_FD 43125 /* FreeBSD. */ +#define AUE_MAC_SET_FILE 43126 /* FreeBSD. */ +#define AUE_MAC_SYSCALL 43127 /* FreeBSD. */ +#define AUE_MAC_GET_PID 43128 /* FreeBSD. */ +#define AUE_MAC_GET_LINK 43129 /* FreeBSD. */ +#define AUE_MAC_SET_LINK 43130 /* FreeBSD. */ +#define AUE_MAC_EXECVE 43131 /* FreeBSD. */ +#define AUE_GETPATH_FROMFD 43132 /* FreeBSD. */ +#define AUE_GETPATH_FROMADDR 43133 /* FreeBSD. */ +#define AUE_MQ_OPEN 43134 /* FreeBSD. */ +#define AUE_MQ_SETATTR 43135 /* FreeBSD. */ +#define AUE_MQ_TIMEDRECEIVE 43136 /* FreeBSD. */ +#define AUE_MQ_TIMEDSEND 43137 /* FreeBSD. */ +#define AUE_MQ_NOTIFY 43138 /* FreeBSD. */ +#define AUE_MQ_UNLINK 43139 /* FreeBSD. */ +#define AUE_LISTEN 43140 /* FreeBSD/Darwin/Linux. */ +#define AUE_MLOCKALL 43141 /* FreeBSD. */ +#define AUE_MUNLOCKALL 43142 /* FreeBSD. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the @@ -572,16 +594,13 @@ #define AUE_GETSOCKOPT AUE_NULL #define AUE_GTSOCKOPT AUE_GETSOCKOPT /* XXX: Typo in Darwin. */ #define AUE_ISSETUGID AUE_NULL -#define AUE_LISTEN AUE_NULL #define AUE_LSTATV AUE_NULL #define AUE_MADVISE AUE_NULL #define AUE_MINCORE AUE_NULL #define AUE_MKCOMPLEX AUE_NULL -#define AUE_MLOCKALL AUE_NULL #define AUE_MODWATCH AUE_NULL #define AUE_MSGCL AUE_NULL #define AUE_MSYNC AUE_NULL -#define AUE_MUNLOCKALL AUE_NULL #define AUE_PREAD AUE_NULL #define AUE_PWRITE AUE_NULL #define AUE_PREADV AUE_NULL ==== //depot/projects/uart/bsm/audit_record.h#6 (text) ==== @@ -30,8 +30,8 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#21 $ - * $FreeBSD: src/sys/bsm/audit_record.h,v 1.6 2006/09/21 07:27:02 rwatson Exp $ + * P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#24 + * $FreeBSD: src/sys/bsm/audit_record.h,v 1.9 2007/04/17 12:27:08 rwatson Exp $ */ #ifndef _BSM_AUDIT_RECORD_H_ @@ -86,6 +86,7 @@ /* XXXRW: Additional X11 tokens not defined? */ #define AUT_CMD 0x51 #define AUT_EXIT 0x52 +#define AUT_ZONENAME 0x60 /* XXXRW: OpenBSM AUT_HOST 0x70? */ #define AUT_ARG64 0x71 #define AUT_RETURN64 0x72 @@ -247,6 +248,8 @@ token_t *au_to_header32_tm(int rec_size, au_event_t e_type, au_emod_t e_mod, struct timeval tm); +token_t *au_to_header64_tm(int rec_size, au_event_t e_type, au_emod_t e_mod, + struct timeval tm); #if !defined(KERNEL) && !defined(_KERNEL) token_t *au_to_header(int rec_size, au_event_t e_type, au_emod_t e_mod); token_t *au_to_header32(int rec_size, au_event_t e_type, au_emod_t e_mod); @@ -329,6 +332,7 @@ token_t *au_to_text(char *text); token_t *au_to_kevent(struct kevent *kev); token_t *au_to_trailer(int rec_size); +token_t *au_to_zonename(char *zonename); __END_DECLS ==== //depot/projects/uart/cam/cam_ccb.h#10 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam_ccb.h,v 1.34 2006/12/03 07:19:28 mjacob Exp $ + * $FreeBSD: src/sys/cam/cam_ccb.h,v 1.35 2007/04/15 08:49:09 scottl Exp $ */ #ifndef _CAM_CAM_CCB_H @@ -242,8 +242,7 @@ typedef union { void *ptr; u_long field; - u_int8_t bytes[sizeof(void *) > sizeof(u_long) - ? sizeof(void *) : sizeof(u_long)]; + u_int8_t bytes[sizeof(uintptr_t)]; } ccb_priv_entry; typedef union { @@ -274,8 +273,12 @@ ccb_ppriv_area periph_priv; ccb_spriv_area sim_priv; u_int32_t timeout; /* Timeout value */ + + /* + * Deprecated, only for use by non-MPSAFE SIMs. All others must + * allocate and initialize their own callout storage. + */ struct callout_handle timeout_ch; - /* Callout handle used for timeouts */ }; /* Get Device Information CCB */ ==== //depot/projects/uart/cam/cam_periph.c#13 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.64 2006/12/05 07:45:27 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.68 2007/04/19 23:34:51 scottl Exp $"); #include #include @@ -51,6 +51,7 @@ #include #include #include +#include #include #include @@ -122,6 +123,7 @@ ac_callback_t *ac_callback, ac_code code, void *arg) { struct periph_driver **p_drv; + struct cam_sim *sim; struct cam_periph *periph; struct cam_periph *cur_periph; path_id_t path_id; @@ -129,7 +131,6 @@ lun_id_t lun_id; cam_status status; u_int init_level; - int s; init_level = 0; /* @@ -163,11 +164,14 @@ init_level++; + xpt_lock_buses(); for (p_drv = periph_drivers; *p_drv != NULL; p_drv++) { if (strcmp((*p_drv)->driver_name, name) == 0) break; } - + xpt_unlock_buses(); + + sim = xpt_path_sim(path); path_id = xpt_path_path_id(path); target_id = xpt_path_target_id(path); lun_id = xpt_path_lun_id(path); @@ -181,6 +185,7 @@ periph->unit_number = camperiphunit(*p_drv, path_id, target_id, lun_id); periph->immediate_priority = CAM_PRIORITY_NONE; periph->refcount = 0; + periph->sim = sim; SLIST_INIT(&periph->ccb_list); status = xpt_create_path(&path, periph, path_id, target_id, lun_id); if (status != CAM_REQ_CMP) @@ -194,7 +199,6 @@ if (status != CAM_REQ_CMP) goto failure; - s = splsoftcam(); cur_periph = TAILQ_FIRST(&(*p_drv)->units); while (cur_periph != NULL && cur_periph->unit_number < periph->unit_number) @@ -207,8 +211,6 @@ (*p_drv)->generation++; } - splx(s); - init_level++; status = periph_ctor(periph, arg); @@ -222,9 +224,7 @@ /* Initialized successfully */ break; case 3: - s = splsoftcam(); TAILQ_REMOVE(&(*p_drv)->units, periph, unit_links); - splx(s); xpt_remove_periph(periph); /* FALLTHROUGH */ case 2: @@ -252,38 +252,38 @@ { struct periph_driver **p_drv; struct cam_periph *periph; - int s; + xpt_lock_buses(); for (p_drv = periph_drivers; *p_drv != NULL; p_drv++) { if (name != NULL && (strcmp((*p_drv)->driver_name, name) != 0)) continue; - s = splsoftcam(); TAILQ_FOREACH(periph, &(*p_drv)->units, unit_links) { if (xpt_path_comp(periph->path, path) == 0) { - splx(s); + xpt_unlock_buses(); return(periph); } } - splx(s); - if (name != NULL) + if (name != NULL) { + xpt_unlock_buses(); return(NULL); + } } + xpt_unlock_buses(); return(NULL); } cam_status cam_periph_acquire(struct cam_periph *periph) { - int s; if (periph == NULL) return(CAM_REQ_CMP_ERR); - s = splsoftcam(); + xpt_lock_buses(); periph->refcount++; - splx(s); + xpt_unlock_buses(); return(CAM_REQ_CMP); } @@ -291,18 +291,66 @@ void cam_periph_release(struct cam_periph *periph) { - int s; if (periph == NULL) return; - s = splsoftcam(); + xpt_lock_buses(); if ((--periph->refcount == 0) && (periph->flags & CAM_PERIPH_INVALID)) { camperiphfree(periph); } - splx(s); + xpt_unlock_buses(); + +} + +int +cam_periph_hold(struct cam_periph *periph, int priority) +{ + struct mtx *mtx; + int error; + + mtx_assert(periph->sim->mtx, MA_OWNED); + + /* + * Increment the reference count on the peripheral + * while we wait for our lock attempt to succeed + * to ensure the peripheral doesn't disappear out + * from user us while we sleep. + */ + + if (cam_periph_acquire(periph) != CAM_REQ_CMP) + return (ENXIO); + + mtx = periph->sim->mtx; + if (mtx == &Giant) + mtx = NULL; + + while ((periph->flags & CAM_PERIPH_LOCKED) != 0) { + periph->flags |= CAM_PERIPH_LOCK_WANTED; + if ((error = msleep(periph, mtx, priority, "caplck", 0)) != 0) { + cam_periph_release(periph); + return (error); + } + } + + periph->flags |= CAM_PERIPH_LOCKED; + return (0); +} + +void +cam_periph_unhold(struct cam_periph *periph) +{ + + mtx_assert(periph->sim->mtx, MA_OWNED); + + periph->flags &= ~CAM_PERIPH_LOCKED; + if ((periph->flags & CAM_PERIPH_LOCK_WANTED) != 0) { + periph->flags &= ~CAM_PERIPH_LOCK_WANTED; + wakeup(periph); + } + cam_periph_release(periph); } /* @@ -319,11 +367,9 @@ { struct cam_periph *periph; char *periph_name; - int s; int i, val, dunit, r; const char *dname, *strval; - s = splsoftcam(); periph_name = p_drv->driver_name; for (;;newunit++) { @@ -369,7 +415,6 @@ if (r != 0) break; } - splx(s); return (newunit); } @@ -424,13 +469,10 @@ void cam_periph_invalidate(struct cam_periph *periph) { - int s; - s = splsoftcam(); /* * We only call this routine the first time a peripheral is - * invalidated. The oninvalidate() routine is always called at - * splsoftcam(). + * invalidated. */ if (((periph->flags & CAM_PERIPH_INVALID) == 0) && (periph->periph_oninval != NULL)) @@ -439,17 +481,17 @@ periph->flags |= CAM_PERIPH_INVALID; periph->flags &= ~CAM_PERIPH_NEW_DEV_FOUND; + xpt_lock_buses(); if (periph->refcount == 0) camperiphfree(periph); else if (periph->refcount < 0) printf("cam_invalidate_periph: refcount < 0!!\n"); - splx(s); + xpt_unlock_buses(); } static void camperiphfree(struct cam_periph *periph) { - int s; struct periph_driver **p_drv; for (p_drv = periph_drivers; *p_drv != NULL; p_drv++) { @@ -460,15 +502,13 @@ printf("camperiphfree: attempt to free non-existant periph\n"); return; } - - if (periph->periph_dtor != NULL) - periph->periph_dtor(periph); - - s = splsoftcam(); + TAILQ_REMOVE(&(*p_drv)->units, periph, unit_links); (*p_drv)->generation++; - splx(s); + xpt_unlock_buses(); + if (periph->periph_dtor != NULL) + periph->periph_dtor(periph); xpt_remove_periph(periph); if (periph->flags & CAM_PERIPH_NEW_DEV_FOUND) { @@ -497,53 +537,10 @@ } xpt_free_path(periph->path); free(periph, M_CAMPERIPH); + xpt_lock_buses(); } /* - * Wait interruptibly for an exclusive lock. - */ -int -cam_periph_lock(struct cam_periph *periph, int priority) -{ - int error; - - /* - * Increment the reference count on the peripheral - * while we wait for our lock attempt to succeed - * to ensure the peripheral doesn't disappear out - * from under us while we sleep. - */ - if (cam_periph_acquire(periph) != CAM_REQ_CMP) - return(ENXIO); - - while ((periph->flags & CAM_PERIPH_LOCKED) != 0) { - periph->flags |= CAM_PERIPH_LOCK_WANTED; - if ((error = tsleep(periph, priority, "caplck", 0)) != 0) { - cam_periph_release(periph); - return error; - } - } - - periph->flags |= CAM_PERIPH_LOCKED; - return 0; -} - -/* - * Unlock and wake up any waiters. - */ -void -cam_periph_unlock(struct cam_periph *periph) -{ - periph->flags &= ~CAM_PERIPH_LOCKED; - if ((periph->flags & CAM_PERIPH_LOCK_WANTED) != 0) { - periph->flags &= ~CAM_PERIPH_LOCK_WANTED; - wakeup(periph); - } - - cam_periph_release(periph); -} - -/* * Map user virtual pointers into kernel virtual address space, so we can * access the memory. This won't work on physical pointers, for now it's * up to the caller to check for that. (XXX KDM -- should we do that here @@ -752,12 +749,11 @@ cam_periph_getccb(struct cam_periph *periph, u_int32_t priority) { struct ccb_hdr *ccb_h; - int s; + struct mtx *mtx; + mtx_assert(periph->sim->mtx, MA_OWNED); CAM_DEBUG(periph->path, CAM_DEBUG_TRACE, ("entering cdgetccb\n")); - s = splsoftcam(); - while (SLIST_FIRST(&periph->ccb_list) == NULL) { if (periph->immediate_priority > priority) periph->immediate_priority = priority; @@ -765,26 +761,33 @@ if ((SLIST_FIRST(&periph->ccb_list) != NULL) && (SLIST_FIRST(&periph->ccb_list)->pinfo.priority == priority)) break; - tsleep(&periph->ccb_list, PRIBIO, "cgticb", 0); + mtx_assert(periph->sim->mtx, MA_OWNED); + if (periph->sim->mtx == &Giant) + mtx = NULL; + else >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Apr 21 05:02:12 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 4627E16A407; Sat, 21 Apr 2007 05:02:12 +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 CBED916A400 for ; Sat, 21 Apr 2007 05:02:11 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id BA67E13C44B for ; Sat, 21 Apr 2007 05:02:11 +0000 (UTC) (envelope-from marcel@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 l3L52BYg060232 for ; Sat, 21 Apr 2007 05:02:11 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3L529h9060228 for perforce@freebsd.org; Sat, 21 Apr 2007 05:02:09 GMT (envelope-from marcel@freebsd.org) Date: Sat, 21 Apr 2007 05:02:09 GMT Message-Id: <200704210502.l3L529h9060228@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 118516 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: Sat, 21 Apr 2007 05:02:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=118516 Change 118516 by marcel@marcel_xcllnt on 2007/04/21 05:01:16 IFC @118506 Affected files ... .. //depot/projects/tty/UPDATING#34 integrate .. //depot/projects/tty/contrib/top/top.c#8 integrate .. //depot/projects/tty/etc/mtree/BSD.include.dist#21 integrate .. //depot/projects/tty/lib/libarchive/archive_write_disk_set_standard_lookup.c#2 integrate .. //depot/projects/tty/lib/libc/net/rthdr.c#4 integrate .. //depot/projects/tty/lib/libc/stdio/fputs.3#3 integrate .. //depot/projects/tty/libexec/ftpd/ftpcmd.y#8 integrate .. //depot/projects/tty/libexec/ftpd/ftpd.8#12 integrate .. //depot/projects/tty/libexec/ftpd/ftpd.c#12 integrate .. //depot/projects/tty/release/doc/en_US.ISO8859-1/relnotes/article.sgml#2 integrate .. //depot/projects/tty/sbin/ping6/ping6.c#7 integrate .. //depot/projects/tty/share/man/man7/hier.7#15 integrate .. //depot/projects/tty/share/man/man8/nanobsd.8#3 integrate .. //depot/projects/tty/share/man/man9/pseudofs.9#3 integrate .. //depot/projects/tty/sys/amd64/include/vmparam.h#8 integrate .. //depot/projects/tty/sys/amd64/linux32/linux32_machdep.c#8 integrate .. //depot/projects/tty/sys/bsm/audit.h#6 integrate .. //depot/projects/tty/sys/bsm/audit_internal.h#4 integrate .. //depot/projects/tty/sys/bsm/audit_kevents.h#7 integrate .. //depot/projects/tty/sys/bsm/audit_record.h#6 integrate .. //depot/projects/tty/sys/cam/cam_periph.c#16 integrate .. //depot/projects/tty/sys/cam/cam_periph.h#6 integrate .. //depot/projects/tty/sys/cam/cam_sim.c#7 integrate .. //depot/projects/tty/sys/cam/cam_sim.h#4 integrate .. //depot/projects/tty/sys/cam/cam_xpt.c#20 integrate .. //depot/projects/tty/sys/cam/scsi/scsi_da.c#20 integrate .. //depot/projects/tty/sys/cam/scsi/scsi_pt.c#10 integrate .. //depot/projects/tty/sys/cam/scsi/scsi_sa.c#15 integrate .. //depot/projects/tty/sys/dev/aic7xxx/aic79xx.c#14 integrate .. //depot/projects/tty/sys/dev/aic7xxx/aic79xx.h#11 integrate .. //depot/projects/tty/sys/dev/aic7xxx/aic7xxx.c#10 integrate .. //depot/projects/tty/sys/dev/aic7xxx/aic7xxx.h#9 integrate .. //depot/projects/tty/sys/dev/aic7xxx/aic7xxx_inline.h#6 integrate .. //depot/projects/tty/sys/dev/ath/if_ath.c#22 integrate .. //depot/projects/tty/sys/dev/cxgb/cxgb_sge.c#2 integrate .. //depot/projects/tty/sys/dev/cxgb/sys/uipc_mvec.c#2 integrate .. //depot/projects/tty/sys/dev/hwpmc/hwpmc_logging.c#5 integrate .. //depot/projects/tty/sys/dev/hwpmc/hwpmc_mod.c#10 integrate .. //depot/projects/tty/sys/dev/hwpmc/hwpmc_piv.c#10 integrate .. //depot/projects/tty/sys/dev/ral/rt2560.c#6 integrate .. //depot/projects/tty/sys/dev/sound/pci/envy24.c#4 integrate .. //depot/projects/tty/sys/dev/sound/pci/envy24ht.c#3 integrate .. //depot/projects/tty/sys/dev/sound/pcm/ac97.c#18 integrate .. //depot/projects/tty/sys/dev/sound/pcm/ac97.h#6 integrate .. //depot/projects/tty/sys/dev/sound/pcm/ac97_patch.c#7 integrate .. //depot/projects/tty/sys/dev/sound/pcm/ac97_patch.h#7 integrate .. //depot/projects/tty/sys/dev/usb/if_ural.c#14 integrate .. //depot/projects/tty/sys/dev/wi/if_wi.c#21 integrate .. //depot/projects/tty/sys/fs/devfs/devfs_vnops.c#20 integrate .. //depot/projects/tty/sys/i386/i386/bios.c#13 integrate .. //depot/projects/tty/sys/i386/include/vmparam.h#8 integrate .. //depot/projects/tty/sys/ia64/include/vmparam.h#9 integrate .. //depot/projects/tty/sys/kern/kern_intr.c#20 integrate .. //depot/projects/tty/sys/kern/kern_malloc.c#23 integrate .. //depot/projects/tty/sys/kern/sched_ule.c#21 integrate .. //depot/projects/tty/sys/kern/subr_witness.c#23 integrate .. //depot/projects/tty/sys/kern/uipc_syscalls.c#24 integrate .. //depot/projects/tty/sys/netgraph/ng_ppp.c#10 integrate .. //depot/projects/tty/sys/netinet/sctp_indata.c#2 integrate .. //depot/projects/tty/sys/netinet/sctp_input.c#2 integrate .. //depot/projects/tty/sys/netinet/sctp_lock_bsd.h#2 integrate .. //depot/projects/tty/sys/netinet/sctp_output.c#2 integrate .. //depot/projects/tty/sys/netinet/sctp_pcb.c#2 integrate .. //depot/projects/tty/sys/netinet/sctp_structs.h#2 integrate .. //depot/projects/tty/sys/netinet/sctp_uio.h#2 integrate .. //depot/projects/tty/sys/netinet/sctp_usrreq.c#2 integrate .. //depot/projects/tty/sys/netinet/sctp_var.h#2 integrate .. //depot/projects/tty/sys/netinet/sctputil.c#2 integrate .. //depot/projects/tty/sys/netinet/sctputil.h#2 integrate .. //depot/projects/tty/sys/netinet/tcp.h#9 integrate .. //depot/projects/tty/sys/netinet/tcp_input.c#29 integrate .. //depot/projects/tty/sys/netinet/tcp_output.c#17 integrate .. //depot/projects/tty/sys/netinet/tcp_syncache.c#21 integrate .. //depot/projects/tty/sys/netinet/tcp_var.h#23 integrate .. //depot/projects/tty/sys/pci/intpm.c#9 integrate .. //depot/projects/tty/sys/powerpc/powerpc/nexus.c#7 integrate .. //depot/projects/tty/sys/sparc64/include/vmparam.h#2 integrate .. //depot/projects/tty/sys/sun4v/include/vmparam.h#2 integrate .. //depot/projects/tty/sys/sys/interrupt.h#11 integrate .. //depot/projects/tty/sys/sys/socket.h#12 integrate .. //depot/projects/tty/sys/vm/vm_contig.c#14 integrate .. //depot/projects/tty/sys/vm/vm_param.h#5 integrate .. //depot/projects/tty/tools/regression/sockets/sendfile/Makefile#3 integrate .. //depot/projects/tty/tools/regression/sockets/sendfile/sendfile.c#2 integrate .. //depot/projects/tty/tools/tools/nanobsd/nanobsd.sh#7 integrate .. //depot/projects/tty/usr.bin/lastcomm/lastcomm.1#4 integrate .. //depot/projects/tty/usr.bin/lastcomm/lastcomm.c#6 integrate .. //depot/projects/tty/usr.bin/make/GNode.h#4 integrate .. //depot/projects/tty/usr.bin/make/main.c#20 integrate .. //depot/projects/tty/usr.bin/make/make.c#6 integrate .. //depot/projects/tty/usr.bin/make/targ.c#6 integrate .. //depot/projects/tty/usr.bin/tar/test/test-basic.sh#2 integrate .. //depot/projects/tty/usr.bin/tar/util.c#6 integrate .. //depot/projects/tty/usr.sbin/daemon/daemon.c#6 integrate Differences ... ==== //depot/projects/tty/UPDATING#34 (text+ko) ==== @@ -767,4 +767,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.486 2007/04/17 00:41:59 thompsa Exp $ +$FreeBSD: src/UPDATING,v 1.488 2007/04/19 17:08:54 dds Exp $ ==== //depot/projects/tty/contrib/top/top.c#8 (text+ko) ==== @@ -13,7 +13,7 @@ * Copyright (c) 1994, 1995, William LeFebvre, Argonne National Laboratory * Copyright (c) 1996, William LeFebvre, Group sys Consulting * - * $FreeBSD: src/contrib/top/top.c,v 1.21 2007/04/17 03:12:39 rafan Exp $ + * $FreeBSD: src/contrib/top/top.c,v 1.22 2007/04/19 14:24:54 rafan Exp $ */ /* @@ -410,7 +410,7 @@ default: fprintf(stderr, "Top version %s\n" -"Usage: %s [-bCHIinqStuv] [-d count] [-m io | cpu] [-o field] [-s time]\n" +"Usage: %s [-abCHIijnqStuv] [-d count] [-m io | cpu] [-o field] [-s time]\n" " [-U username] [number]\n", version_string(), myname); exit(1); ==== //depot/projects/tty/etc/mtree/BSD.include.dist#21 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.111 2007/02/27 04:01:57 mjacob Exp $ +# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.112 2007/04/18 10:16:42 trhodes Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -209,8 +209,6 @@ .. pccard .. - posix4 - .. protocols .. readline ==== //depot/projects/tty/lib/libarchive/archive_write_disk_set_standard_lookup.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk_set_standard_lookup.c,v 1.1 2007/03/03 07:37:36 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk_set_standard_lookup.c,v 1.2 2007/04/20 15:32:13 kientzle Exp $"); #ifdef HAVE_SYS_TYPES_H #include @@ -72,6 +72,7 @@ id_t id; }; +static const size_t cache_size = 127; static unsigned int hash(const char *); static gid_t lookup_gid(void *, const char *uname, gid_t); static uid_t lookup_uid(void *, const char *uname, uid_t); @@ -99,10 +100,10 @@ int archive_write_disk_set_standard_lookup(struct archive *a) { - struct bucket *ucache = malloc(sizeof(struct bucket[127])); - struct bucket *gcache = malloc(sizeof(struct bucket[127])); - memset(ucache, 0, sizeof(struct bucket[127])); - memset(gcache, 0, sizeof(struct bucket[127])); + struct bucket *ucache = malloc(sizeof(struct bucket[cache_size])); + struct bucket *gcache = malloc(sizeof(struct bucket[cache_size])); + memset(ucache, 0, sizeof(struct bucket[cache_size])); + memset(gcache, 0, sizeof(struct bucket[cache_size])); archive_write_disk_set_group_lookup(a, gcache, lookup_gid, cleanup); archive_write_disk_set_user_lookup(a, ucache, lookup_uid, cleanup); return (ARCHIVE_OK); @@ -113,11 +114,8 @@ { int h; struct bucket *b; - int cache_size; struct bucket *gcache = (struct bucket *)private_data; - cache_size = 127; - /* If no gname, just use the gid provided. */ if (gname == NULL || *gname == '\0') return (gid); @@ -153,11 +151,8 @@ { int h; struct bucket *b; - int cache_size; struct bucket *ucache = (struct bucket *)private_data; - cache_size = 127; - /* If no uname, just use the uid provided. */ if (uname == NULL || *uname == '\0') return (uid); @@ -191,7 +186,12 @@ static void cleanup(void *private) { - free(private); + size_t i; + struct bucket *cache = (struct bucket *)private; + + for (i = 0; i < cache_size; i++) + free(cache[i].name); + free(cache); } ==== //depot/projects/tty/lib/libc/net/rthdr.c#4 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/rthdr.c,v 1.8 2005/07/19 18:13:58 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/rthdr.c,v 1.9 2007/04/19 15:48:16 mtm Exp $"); #include #include @@ -292,7 +292,9 @@ { switch (type) { case IPV6_RTHDR_TYPE_0: - return (((segments * 2) + 1) << 3); + if ((segments >= 0) && (segments <= 127)) + return (((segments * 2) + 1) << 3); + /* FALLTHROUGH */ default: return (0); /* type not suppported */ } @@ -309,6 +311,9 @@ /* length validation */ if (bp_len < inet6_rth_space(IPV6_RTHDR_TYPE_0, segments)) return (NULL); + /* segment validation */ + if ((segments < 0) || (segments > 127)) + return (NULL); memset(bp, 0, bp_len); rth0 = (struct ip6_rthdr0 *)rth; @@ -334,6 +339,9 @@ switch (rth->ip6r_type) { case IPV6_RTHDR_TYPE_0: rth0 = (struct ip6_rthdr0 *)rth; + /* Don't exceed the number of stated segments */ + if (rth0->ip6r0_segleft == (rth0->ip6r0_len / 2)) + return (-1); nextaddr = (struct in6_addr *)(rth0 + 1) + rth0->ip6r0_segleft; *nextaddr = *addr; rth0->ip6r0_segleft++; ==== //depot/projects/tty/lib/libc/stdio/fputs.3#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)fputs.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/stdio/fputs.3,v 1.12 2007/01/09 00:28:06 imp Exp $ +.\" $FreeBSD: src/lib/libc/stdio/fputs.3,v 1.14 2007/04/19 14:01:04 phk Exp $ .\" .Dd June 4, 1993 .Dt FPUTS 3 @@ -66,14 +66,11 @@ to the stream .Dv stdout . .Sh RETURN VALUES -The +The functions .Fn fputs -function -returns 0 on success and -.Dv EOF -on error; +and .Fn puts -returns a nonnegative integer on success and +return a nonnegative integer on success and .Dv EOF on error. .Sh ERRORS ==== //depot/projects/tty/libexec/ftpd/ftpcmd.y#8 (text+ko) ==== @@ -47,7 +47,7 @@ #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/libexec/ftpd/ftpcmd.y,v 1.65 2006/06/05 15:50:34 yar Exp $"); +__FBSDID("$FreeBSD: src/libexec/ftpd/ftpcmd.y,v 1.66 2007/04/18 22:43:39 yar Exp $"); #include #include @@ -95,6 +95,7 @@ extern int usedefault; extern char tmpline[]; extern int readonly; +extern int assumeutf8; extern int noepsv; extern int noretr; extern int noguestretr; @@ -135,7 +136,7 @@ ABOR DELE CWD LIST NLST SITE STAT HELP NOOP MKD RMD PWD CDUP STOU SMNT SYST SIZE MDTM - LPRT LPSV EPRT EPSV + LPRT LPSV EPRT EPSV FEAT UMASK IDLE CHMOD MDFIVE @@ -687,6 +688,25 @@ if ($4 != NULL) free($4); } + | FEAT CRLF + { + lreply(211, "Extensions supported:"); +#if 0 + /* XXX these two keywords are non-standard */ + printf(" EPRT\r\n"); + if (!noepsv) + printf(" EPSV\r\n"); +#endif + printf(" MDTM\r\n"); + printf(" REST STREAM\r\n"); + printf(" SIZE\r\n"); + if (assumeutf8) { + /* TVFS requires UTF8, see RFC 3659 */ + printf(" TVFS\r\n"); + printf(" UTF8\r\n"); + } + reply(211, "End."); + } | SYST check_login CRLF { if ($2) { @@ -1112,6 +1132,7 @@ { "NLST", NLST, OSTR, 1, "[ path-name ]" }, { "SITE", SITE, SITECMD, 1, "site-cmd [ arguments ]" }, { "SYST", SYST, ARGS, 1, "(get type of operating system)" }, + { "FEAT", FEAT, ARGS, 1, "(get extended features)" }, { "STAT", STAT, OSTR, 1, "[ path-name ]" }, { "HELP", HELP, OSTR, 1, "[ ]" }, { "NOOP", NOOP, ARGS, 1, "" }, ==== //depot/projects/tty/libexec/ftpd/ftpd.8#12 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)ftpd.8 8.2 (Berkeley) 4/19/94 -.\" $FreeBSD: src/libexec/ftpd/ftpd.8,v 1.71 2006/01/29 13:10:38 yar Exp $ +.\" $FreeBSD: src/libexec/ftpd/ftpd.8,v 1.74 2007/04/20 09:08:20 trhodes Exp $ .\" -.Dd January 21, 2006 +.Dd April 20, 2007 .Dt FTPD 8 .Os .Sh NAME @@ -40,7 +40,7 @@ .Nd Internet File Transfer Protocol server .Sh SYNOPSIS .Nm -.Op Fl 46ADdEhMmOoRrSUvW +.Op Fl 468ADdEhMmOoRrSUvW .Op Fl l Op Fl l .Op Fl a Ar address .Op Fl P Ar port @@ -78,6 +78,20 @@ is specified, accept connections via .Dv AF_INET6 socket. +.It Fl 8 +Enable transparent UTF-8 mode. +RFC\ 2640 compliant clients will be told that the character encoding +used by the server is UTF-8, which is the only effect of the option. +.Pp +This option does not enable any encoding conversion for server file names; +it implies instead that the names of files on the server are encoded +in UTF-8. +As for files uploaded via FTP, it is the duty of the RFC\ 2640 compliant +client to convert their names from the client's local encoding to UTF-8. +FTP command names and own +.Nm +messages are always encoded in ASCII, which is a subset of UTF-8. +Hence no need for server-side conversion at all. .It Fl A Allow only anonymous ftp access. .It Fl a @@ -250,6 +264,7 @@ .It DELE Ta "delete a file [RW]" .It EPRT Ta "specify data connection port, multiprotocol" .It EPSV Ta "prepare for server-to-server transfer, multiprotocol" +.It FEAT Ta "give information on extended features of server" .It HELP Ta "give help information" .It LIST Ta "give list files in a directory" Pq Dq Li "ls -lgA" .It LPRT Ta "specify data connection port, multiprotocol" @@ -340,16 +355,15 @@ and not have a null password. In this case a password must be provided by the client before any file operations may be performed. -If the user has an S/Key key, the response from a successful USER -command will include an S/Key challenge. +If the user has an OPIE key, the response from a successful USER +command will include an OPIE challenge. The client may choose to respond with a PASS command giving either -a standard password or an S/Key one-time password. +a standard password or an OPIE one-time password. The server will automatically determine which type of password it has been given and attempt to authenticate accordingly. See -.Xr key 1 -for more information on S/Key authentication. -S/Key is a Trademark of Bellcore. +.Xr opie 4 +for more information on OPIE authentication. .It The login name must not appear in the file .Pa /etc/ftpusers . @@ -543,9 +557,9 @@ .El .Sh SEE ALSO .Xr ftp 1 , -.Xr key 1 , .Xr umask 2 , .Xr getusershell 3 , +.Xr opie 4 , .Xr ftpchroot 5 , .Xr login.conf 5 , .Xr inetd 8 , ==== //depot/projects/tty/libexec/ftpd/ftpd.c#12 (text+ko) ==== @@ -46,7 +46,7 @@ #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/libexec/ftpd/ftpd.c,v 1.211 2007/02/09 17:18:39 yar Exp $"); +__FBSDID("$FreeBSD: src/libexec/ftpd/ftpd.c,v 1.212 2007/04/18 22:43:39 yar Exp $"); /* * FTP server. @@ -128,6 +128,7 @@ int restricted_data_ports = 1; int paranoid = 1; /* be extra careful about security */ int anon_only = 0; /* Only anonymous ftp allowed */ +int assumeutf8 = 0; /* Assume that server file names are in UTF-8 */ int guest; int dochroot; char *chrootdir; @@ -308,7 +309,7 @@ openlog("ftpd", LOG_PID | LOG_NDELAY, LOG_FTP); while ((ch = getopt(argc, argv, - "46a:AdDEhlmMoOp:P:rRSt:T:u:UvW")) != -1) { + "468a:AdDEhlmMoOp:P:rRSt:T:u:UvW")) != -1) { switch (ch) { case '4': family = (family == AF_INET6) ? AF_UNSPEC : AF_INET; @@ -318,6 +319,10 @@ family = (family == AF_INET) ? AF_UNSPEC : AF_INET6; break; + case '8': + assumeutf8 = 1; + break; + case 'a': bindname = optarg; break; ==== //depot/projects/tty/release/doc/en_US.ISO8859-1/relnotes/article.sgml#2 (text+ko) ==== @@ -30,7 +30,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1018 2007/04/17 07:01:45 brueffer Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1020 2007/04/20 16:12:31 brueffer Exp $ 2000 @@ -499,6 +499,9 @@ [&arch.pc98;] A bootable CDROM loader has been implemented for the pc98 platform. &merged; + [&arch.pc98;] The IPLware support + in boot0.5 has been enhanced to support version 3.33. + [&arch.i386;] A bug in the i386 boot loader, which could cause file system corruption if a nextboot.conf file was used and landed @@ -978,6 +981,10 @@ IPv6 support, it should be used instead. Please note that some rules might need to be adjusted. + The &man.lagg.4; driver, ported from OpenBSD and NetBSD, + has been added to support a variety of protocols and algorithms + for link aggregation, failover, and fault tolerance. + The &man.natm.4;, Native Mode ATM protocol layer is now MPSAFE. A new &man.ng.deflate.4; Netgraph node type has been @@ -1103,10 +1110,6 @@ devices will marked up upon creation. &merged; - The &man.lagg.4; driver, ported from OpenBSD and NetBSD, - has been added to support a variety of protocols and algorithms - for link aggregation, failover, and fault tolerance. - Support for &man.kqueue.2; operations has been added to the &man.tun.4; driver. &merged; @@ -1133,6 +1136,10 @@ The &man.arcmsr.4; driver has been updated to version 1.20.00.13. &merged; + The &man.ahc.4; driver is now MPSAFE. + + The &man.ahd.4; driver is now MPSAFE. + The &man.ata.4; driver now supports a workaround for some controllers whose DMA does not work properly in 48bit mode. For affected controllers, @@ -1158,6 +1165,8 @@ The &man.ataraid.4; driver now supports JMicron ATA RAID metadata. &merged; + The CAM subsystem is now MPSAFE. + The GEOM_LABEL class now supports Ext2FS, NTFS, and ReiserFS. &merged; @@ -1295,8 +1304,9 @@ A part of the FreeBSD NFS subsystem (the interface with the protocol stack and callouts, the NFS client side) is now MPSAFE. - Initial (read-only) support for SGI's XFS file system has been - added. + The &man.pseudofs.9; pseudo file system construction kit and + all of its consumers (&man.procfs.5;, &man.linprocfs.5; and + &man.linsysfs.5;), are now MPSAFE. The unionfs file system has been re-implemented. This version solves many crashing and locking issues compared to @@ -1312,6 +1322,8 @@ on the OpenSolaris ZFS page. + Initial (read-only) support for SGI's XFS file system has been + added. @@ -1424,6 +1436,12 @@ /var/run/ftpd.pid even when no option is specified. &merged; + The &man.ftpd.8; utility now has support for RFC2389 (FEAT) + and rudimentary support for RFC2640 (UTF8). The RFC2640 support + is optional and can be enabled using the new + flag. More information can be found in the &man.ftpd.8; manual + page. + The &man.gbde.8; utility now supports and options to specify a key file in addition to a passphrase. @@ -1520,6 +1538,9 @@ This allows one to use kgdb on /dev/mem and be able to patch memory on a live system. + The &man.lastcomm.1; utility now supports a + flag to export accounting data in a text format. + The &man.libarchive.3; library now supports POSIX.1e-style Extended Attributes. @@ -1992,7 +2013,7 @@ 0.9.7e to 0.9.8e. ncurses has been updated from - 5.2-20010512 to 5.6-20061217. ncurses now also has wide + 5.2-20020615 to 5.6-20061217. ncurses now also has wide character support. &merged; hostapd @@ -2000,7 +2021,9 @@ &merged; sendmail has been updated from - 8.13.4 to 8.14.1. &merged; + 8.13.4 to 8.14.1. This upgrade includes a new libmilter + library which requires all dynamically linked milters to be + recompiled. &merged; tcpdump has been updated from 3.9.1 to 3.9.4. &merged; @@ -2013,12 +2036,12 @@ snapshot from OpenBSD as of 20060831. TrustedBSD OpenBSM, - version 1.0 alpha 12, an implementation of the documented Sun Basic + version 1.0 alpha 14, an implementation of the documented Sun Basic Security Module (BSM) Audit API and file format, as well as local extensions to support the Mac OS X and &os; operating systems has been added. This also includes command line tools for audit - trail reduction and conversion to text, as well as documentation - of the commands, file format, and APIs. + trail reduction and conversion to text and XML, as well as + documentation of the commands, file format, and APIs. For this functionality, the AUDIT kernel option, /var/audit directory, and audit group have been added. &merged; ==== //depot/projects/tty/sbin/ping6/ping6.c#7 (text+ko) ==== @@ -78,7 +78,7 @@ static char sccsid[] = "@(#)ping.c 8.1 (Berkeley) 6/5/93"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/ping6/ping6.c,v 1.29 2005/02/10 09:19:32 ru Exp $"; + "$FreeBSD: src/sbin/ping6/ping6.c,v 1.30 2007/04/19 15:41:00 mtm Exp $"; #endif /* not lint */ /* @@ -150,6 +150,7 @@ #define ICMP6ECHOLEN 8 /* icmp echo header len excluding time */ #define ICMP6ECHOTMLEN sizeof(struct tv32) #define ICMP6_NIQLEN (ICMP6ECHOLEN + 8) +# define CONTROLLEN 10240 /* ancillary data buffer size RFC3542 20.1 */ /* FQDN case, 64 bits of nonce + 32 bits ttl */ #define ICMP6_NIRLEN (ICMP6ECHOLEN + 12) #define EXTRA 256 /* for AH and various other headers. weird. */ @@ -269,8 +270,8 @@ char *, size_t); void pr_pack(u_char *, int, struct msghdr *); void pr_exthdrs(struct msghdr *); -void pr_ip6opt(void *); -void pr_rthdr(void *); +void pr_ip6opt(void *, size_t); +void pr_rthdr(void *, size_t); int pr_bitrange(u_int32_t, int, int); void pr_retip(struct ip6_hdr *, u_char *); void summary(void); @@ -307,6 +308,7 @@ char *e, *target, *ifname = NULL, *gateway = NULL; int ip6optlen = 0; struct cmsghdr *scmsgp = NULL; + struct cmsghdr *cm; #if defined(SO_SNDBUF) && defined(SO_RCVBUF) u_long lsockbufsize; int sockbufsize = 0; @@ -1057,10 +1059,13 @@ seeninfo = 0; #endif + /* For control (ancillary) data received from recvmsg() */ + cm = (struct cmsghdr *)malloc(CONTROLLEN); + if (cm == NULL) + err(1, "malloc"); + for (;;) { struct msghdr m; - struct cmsghdr *cm; - u_char buf[1024]; struct iovec iov[2]; /* signal handling */ @@ -1127,9 +1132,9 @@ iov[0].iov_len = packlen; m.msg_iov = iov; m.msg_iovlen = 1; - cm = (struct cmsghdr *)buf; - m.msg_control = (caddr_t)buf; - m.msg_controllen = sizeof(buf); + memset(cm, 0, CONTROLLEN); + m.msg_control = (void *)cm; + m.msg_controllen = CONTROLLEN; cc = recvmsg(s, &m, 0); if (cc < 0) { @@ -1493,6 +1498,9 @@ pr_addr(from, fromlen)); return; } + if (((mhdr->msg_flags & MSG_CTRUNC) != 0) && + (options & F_VERBOSE) != 0) + warnx("some control data discarded, insufficient buffer size"); icp = (struct icmp6_hdr *)buf; ni = (struct icmp6_nodeinfo *)buf; off = 0; @@ -1735,28 +1743,35 @@ pr_exthdrs(mhdr) struct msghdr *mhdr; { + ssize_t bufsize; + void *bufp; struct cmsghdr *cm; + bufsize = 0; + bufp = mhdr->msg_control; for (cm = (struct cmsghdr *)CMSG_FIRSTHDR(mhdr); cm; cm = (struct cmsghdr *)CMSG_NXTHDR(mhdr, cm)) { if (cm->cmsg_level != IPPROTO_IPV6) continue; + bufsize = CONTROLLEN - ((caddr_t)CMSG_DATA(cm) - (caddr_t)bufp); + if (bufsize <= 0) + continue; switch (cm->cmsg_type) { case IPV6_HOPOPTS: printf(" HbH Options: "); - pr_ip6opt(CMSG_DATA(cm)); + pr_ip6opt(CMSG_DATA(cm), (size_t)bufsize); break; case IPV6_DSTOPTS: #ifdef IPV6_RTHDRDSTOPTS case IPV6_RTHDRDSTOPTS: #endif printf(" Dst Options: "); - pr_ip6opt(CMSG_DATA(cm)); + pr_ip6opt(CMSG_DATA(cm), (size_t)bufsize); break; case IPV6_RTHDR: printf(" Routing: "); - pr_rthdr(CMSG_DATA(cm)); + pr_rthdr(CMSG_DATA(cm), (size_t)bufsize); break; } } @@ -1764,12 +1779,12 @@ #ifdef USE_RFC2292BIS void -pr_ip6opt(void *extbuf) +pr_ip6opt(void *extbuf, size_t bufsize) { struct ip6_hbh *ext; int currentlen; u_int8_t type; - socklen_t extlen, len; + socklen_t extlen, len, origextlen; void *databuf; size_t offset; u_int16_t value2; @@ -1780,6 +1795,18 @@ printf("nxt %u, len %u (%lu bytes)\n", ext->ip6h_nxt, (unsigned int)ext->ip6h_len, (unsigned long)extlen); + /* + * Bounds checking on the ancillary data buffer: + * subtract the size of a cmsg structure from the buffer size. + */ + if (bufsize < (extlen + CMSG_SPACE(0))) { + origextlen = extlen; + extlen = bufsize - CMSG_SPACE(0); + warnx("options truncated, showing only %u (total=%u)", + (unsigned int)(extlen / 8 - 1), + (unsigned int)(ext->ip6h_len)); + } + currentlen = 0; while (1) { currentlen = inet6_opt_next(extbuf, extlen, currentlen, @@ -1816,7 +1843,7 @@ #else /* !USE_RFC2292BIS */ /* ARGSUSED */ void -pr_ip6opt(void *extbuf) +pr_ip6opt(void *extbuf, size_t bufsize __unused) { putchar('\n'); return; @@ -1825,21 +1852,43 @@ #ifdef USE_RFC2292BIS void -pr_rthdr(void *extbuf) +pr_rthdr(void *extbuf, size_t bufsize) { struct in6_addr *in6; char ntopbuf[INET6_ADDRSTRLEN]; struct ip6_rthdr *rh = (struct ip6_rthdr *)extbuf; - int i, segments; + int i, segments, origsegs, rthsize, size0, size1; /* print fixed part of the header */ printf("nxt %u, len %u (%d bytes), type %u, ", rh->ip6r_nxt, rh->ip6r_len, (rh->ip6r_len + 1) << 3, rh->ip6r_type); - if ((segments = inet6_rth_segments(extbuf)) >= 0) + if ((segments = inet6_rth_segments(extbuf)) >= 0) { printf("%d segments, ", segments); - else + printf("%d left\n", rh->ip6r_segleft); + } else { printf("segments unknown, "); - printf("%d left\n", rh->ip6r_segleft); + printf("%d left\n", rh->ip6r_segleft); + return; + } + + /* + * Bounds checking on the ancillary data buffer. When calculating + * the number of items to show keep in mind: + * - The size of the cmsg structure + * - The size of one segment (the size of a Type 0 routing header) + * - When dividing add a fudge factor of one in case the + * dividend is not evenly divisible by the divisor + */ + rthsize = (rh->ip6r_len + 1) * 8; + if (bufsize < (rthsize + CMSG_SPACE(0))) { + origsegs = segments; + size0 = inet6_rth_space(IPV6_RTHDR_TYPE_0, 0); + size1 = inet6_rth_space(IPV6_RTHDR_TYPE_0, 1); + segments -= (rthsize - (bufsize - CMSG_SPACE(0))) / + (size1 - size0) + 1; + warnx("segments truncated, showing only %d (total=%d)", + segments, origsegs); + } for (i = 0; i < segments; i++) { in6 = inet6_rth_getaddr(extbuf, i); @@ -1860,7 +1909,7 @@ #else /* !USE_RFC2292BIS */ /* ARGSUSED */ void -pr_rthdr(void *extbuf) +pr_rthdr(void *extbuf, size_t bufsize __unused) { putchar('\n'); return; ==== //depot/projects/tty/share/man/man7/hier.7#15 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)hier.7 8.1 (Berkeley) 6/5/93 -.\" $FreeBSD: src/share/man/man7/hier.7,v 1.125 2007/04/04 00:14:36 chinsan Exp $ +.\" $FreeBSD: src/share/man/man7/hier.7,v 1.126 2007/04/18 10:16:43 trhodes Exp $ .\" -.Dd April 3, 2007 +.Dd April 18, 2007 .Dt HIER 7 .Os .Sh NAME @@ -349,10 +349,6 @@ OpenSSL (Cryptography/SSL toolkit) headers .It Pa pccard/ PC-CARD controllers -.It Pa posix4/ -POSIX real-time extensions includes; -see -.Xr p1003_1b 9 .It Pa protocols/ C include files for Berkeley service protocols .It Pa readline/ ==== //depot/projects/tty/share/man/man8/nanobsd.8#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man8/nanobsd.8,v 1.2 2006/11/05 20:08:58 danger Exp $ +.\" $FreeBSD: src/share/man/man8/nanobsd.8,v 1.3 2007/04/20 07:21:08 adrian Exp $ .\" .Dd August 28, 2006 .Dt NANOBSD 8 @@ -197,6 +197,18 @@ Path to the source tree used to build the image. .It Va NANO_KERNEL Name of the kernel configuration file used to build the kernel. +.It Va NANO_BOOT0CFG +Controls the options passed to +.Xr boot0cfg 8 +; these dictate boot0's behaviour. +.It Va NANO_BOOTLOADER +The boot0 loader to use relative to the ${NANO_WORLDDIR} variable. +This defaults to +.Pa boot/boot0sio +and should be overridden to +.Pa boot/boot0 +to provide a VGA +console. .It Va CONF_BUILD Options passed to the .Cm buildworld @@ -293,6 +305,8 @@ .Ed .Sh SEE ALSO .Xr make.conf 5 , +.Xr boot 8 , +.Xr boot0cfg 8 , .Xr picobsd 8 .Sh HISTORY The ==== //depot/projects/tty/share/man/man9/pseudofs.9#3 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/pseudofs.9,v 1.5 2004/07/03 18:29:24 ru Exp $ +.\" $FreeBSD: src/share/man/man9/pseudofs.9,v 1.6 2007/04/20 15:38:06 brueffer Exp $ .\" -.Dd September 30, 2001 +.Dd April 20, 2007 .Dt PSEUDOFS 9 .Os .Sh NAME @@ -54,6 +54,7 @@ .\" Insert more info here .Sh SEE ALSO .Xr linprocfs 5 , +.Xr linsysfs 5 , .Xr procfs 5 , .Xr sbuf 9 , .Xr vnode 9 ==== //depot/projects/tty/sys/amd64/include/vmparam.h#8 (text+ko) ==== @@ -38,7 +38,7 @@ * SUCH DAMAGE. * * from: @(#)vmparam.h 5.9 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/vmparam.h,v 1.45 2004/10/27 17:21:15 peter Exp $ + * $FreeBSD: src/sys/amd64/include/vmparam.h,v 1.46 2007/04/21 01:14:47 sepotvin Exp $ */ @@ -122,7 +122,8 @@ /* * How many physical pages per KVA page allocated. - * min(max(VM_KMEM_SIZE, Physical memory/VM_KMEM_SIZE_SCALE), VM_KMEM_SIZE_MAX) + * min(max(max(VM_KMEM_SIZE, Physical memory/VM_KMEM_SIZE_SCALE), + * VM_KMEM_SIZE_MIN), VM_KMEM_SIZE_MAX) * is the total KVA space allocated for kmem_map. */ #ifndef VM_KMEM_SIZE_SCALE ==== //depot/projects/tty/sys/amd64/linux32/linux32_machdep.c#8 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.41 2007/04/18 18:11:32 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.42 2007/04/18 20:12:05 jkim Exp $"); #include #include @@ -526,7 +526,9 @@ td2 = FIRST_THREAD_IN_PROC(p2); - /* make it run */ + /* + * Make this runnable after we are finished with it. + */ mtx_lock_spin(&sched_lock); TD_SET_CAN_RUN(td2); sched_add(td2, SRQ_BORING); @@ -572,8 +574,8 @@ /* * XXX: In Linux, sharing of fs info (chroot/cwd/umask) * and open files is independant. In FreeBSD, its in one - * structure but in reality it does not make any problems - * because both of these flags are set at once usually. + * structure but in reality it does not cause any problems + * because both of these flags are usually set together. */ if (!(args->flags & (LINUX_CLONE_FILES | LINUX_CLONE_FS))) ff |= RFFDG; @@ -660,15 +662,15 @@ if (args->flags & LINUX_CLONE_SETTLS) { struct user_segment_descriptor sd; struct l_user_desc info; - int a[2]; + int a[2]; - error = copyin((void *)td->td_frame->tf_rsi, &info, >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Apr 21 07:23:38 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 B0AA816A407; Sat, 21 Apr 2007 07:23:37 +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 5D7FB16A400 for ; Sat, 21 Apr 2007 07:23:37 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 4CDDA13C457 for ; Sat, 21 Apr 2007 07:23:37 +0000 (UTC) (envelope-from zec@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 l3L7NbsF085584 for ; Sat, 21 Apr 2007 07:23:37 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3L7NAaj085548 for perforce@freebsd.org; Sat, 21 Apr 2007 07:23:10 GMT (envelope-from zec@FreeBSD.org) Date: Sat, 21 Apr 2007 07:23:10 GMT Message-Id: <200704210723.l3L7NAaj085548@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 118519 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: Sat, 21 Apr 2007 07:23:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=118519 Change 118519 by zec@zec_tca51 on 2007/04/21 07:22:56 IFC @ 118508 Affected files ... .. //depot/projects/vimage/src/sys/Makefile#3 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/busdma_machdep.c#3 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/pmap.c#4 integrate .. //depot/projects/vimage/src/sys/amd64/conf/GENERIC#5 integrate .. //depot/projects/vimage/src/sys/amd64/include/vmparam.h#2 integrate .. //depot/projects/vimage/src/sys/amd64/linux32/linux32_dummy.c#4 integrate .. //depot/projects/vimage/src/sys/amd64/linux32/linux32_machdep.c#7 integrate .. //depot/projects/vimage/src/sys/boot/forth/loader.conf#5 integrate .. //depot/projects/vimage/src/sys/boot/pc98/boot0.5/Makefile#2 integrate .. //depot/projects/vimage/src/sys/boot/pc98/boot0.5/boot0.5.s#3 integrate .. //depot/projects/vimage/src/sys/boot/pc98/boot0.5/ldscript#1 branch .. //depot/projects/vimage/src/sys/boot/pc98/boot0.5/putssjis.s#1 branch .. //depot/projects/vimage/src/sys/boot/pc98/boot0.5/selector.s#2 integrate .. //depot/projects/vimage/src/sys/boot/pc98/boot0.5/start.s#2 integrate .. //depot/projects/vimage/src/sys/boot/pc98/boot2/boot.c#2 integrate .. //depot/projects/vimage/src/sys/bsm/audit.h#3 integrate .. //depot/projects/vimage/src/sys/bsm/audit_internal.h#3 integrate .. //depot/projects/vimage/src/sys/bsm/audit_kevents.h#3 integrate .. //depot/projects/vimage/src/sys/bsm/audit_record.h#3 integrate .. //depot/projects/vimage/src/sys/cam/cam_ccb.h#3 integrate .. //depot/projects/vimage/src/sys/cam/cam_periph.c#3 integrate .. //depot/projects/vimage/src/sys/cam/cam_periph.h#2 integrate .. //depot/projects/vimage/src/sys/cam/cam_sim.c#2 integrate .. //depot/projects/vimage/src/sys/cam/cam_sim.h#2 integrate .. //depot/projects/vimage/src/sys/cam/cam_xpt.c#5 integrate .. //depot/projects/vimage/src/sys/cam/cam_xpt.h#4 integrate .. //depot/projects/vimage/src/sys/cam/cam_xpt_periph.h#2 integrate .. //depot/projects/vimage/src/sys/cam/scsi/scsi_cd.c#3 integrate .. //depot/projects/vimage/src/sys/cam/scsi/scsi_ch.c#3 integrate .. //depot/projects/vimage/src/sys/cam/scsi/scsi_da.c#5 integrate .. //depot/projects/vimage/src/sys/cam/scsi/scsi_low.c#2 integrate .. //depot/projects/vimage/src/sys/cam/scsi/scsi_pass.c#3 integrate .. //depot/projects/vimage/src/sys/cam/scsi/scsi_pt.c#3 integrate .. //depot/projects/vimage/src/sys/cam/scsi/scsi_sa.c#3 integrate .. //depot/projects/vimage/src/sys/cam/scsi/scsi_ses.c#3 integrate .. //depot/projects/vimage/src/sys/cam/scsi/scsi_sg.c#1 branch .. //depot/projects/vimage/src/sys/cam/scsi/scsi_sg.h#1 branch .. //depot/projects/vimage/src/sys/cam/scsi/scsi_targ_bh.c#3 integrate .. //depot/projects/vimage/src/sys/cam/scsi/scsi_target.c#4 integrate .. //depot/projects/vimage/src/sys/compat/linprocfs/linprocfs.c#6 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_file.c#4 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_ioctl.c#4 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_ioctl.h#2 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_socket.c#3 integrate .. //depot/projects/vimage/src/sys/compat/ndis/kern_ndis.c#3 integrate .. //depot/projects/vimage/src/sys/compat/ndis/ndis_var.h#2 integrate .. //depot/projects/vimage/src/sys/compat/ndis/subr_ndis.c#2 integrate .. //depot/projects/vimage/src/sys/compat/ndis/subr_pe.c#2 integrate .. //depot/projects/vimage/src/sys/compat/opensolaris/kern/opensolaris_kmem.c#1 branch .. //depot/projects/vimage/src/sys/compat/opensolaris/kern/opensolaris_kobj.c#1 branch .. //depot/projects/vimage/src/sys/compat/opensolaris/kern/opensolaris_kstat.c#1 branch .. //depot/projects/vimage/src/sys/compat/opensolaris/kern/opensolaris_misc.c#1 branch .. //depot/projects/vimage/src/sys/compat/opensolaris/kern/opensolaris_policy.c#1 branch .. //depot/projects/vimage/src/sys/compat/opensolaris/kern/opensolaris_string.c#1 branch .. //depot/projects/vimage/src/sys/compat/opensolaris/kern/opensolaris_vfs.c#1 branch .. //depot/projects/vimage/src/sys/compat/opensolaris/kern/opensolaris_zone.c#1 branch .. //depot/projects/vimage/src/sys/compat/opensolaris/machine/endian.h#1 branch .. //depot/projects/vimage/src/sys/compat/opensolaris/rpc/xdr.h#1 branch .. //depot/projects/vimage/src/sys/compat/opensolaris/sys/acl.h#1 branch .. //depot/projects/vimage/src/sys/compat/opensolaris/sys/byteorder.h#1 branch .. //depot/projects/vimage/src/sys/compat/opensolaris/sys/callb.h#1 branch .. //depot/projects/vimage/src/sys/compat/opensolaris/sys/cmn_err.h#1 branch .. //depot/projects/vimage/src/sys/compat/opensolaris/sys/cred.h#1 branch .. //depot/projects/vimage/src/sys/compat/opensolaris/sys/debug.h#1 branch .. //depot/projects/vimage/src/sys/compat/opensolaris/sys/dirent.h#1 branch .. //depot/projects/vimage/src/sys/compat/opensolaris/sys/dkio.h#1 branch .. //depot/projects/vimage/src/sys/compat/opensolaris/sys/kcondvar.h#1 branch .. //depot/projects/vimage/src/sys/compat/opensolaris/sys/kmem.h#1 branch .. //depot/projects/vimage/src/sys/compat/opensolaris/sys/kobj.h#1 branch .. //depot/projects/vimage/src/sys/compat/opensolaris/sys/kstat.h#1 branch .. //depot/projects/vimage/src/sys/compat/opensolaris/sys/lock.h#1 branch .. //depot/projects/vimage/src/sys/compat/opensolaris/sys/misc.h#1 branch .. //depot/projects/vimage/src/sys/compat/opensolaris/sys/mntent.h#1 branch .. //depot/projects/vimage/src/sys/compat/opensolaris/sys/mnttab.h#1 branch .. //depot/projects/vimage/src/sys/compat/opensolaris/sys/mount.h#1 branch .. //depot/projects/vimage/src/sys/compat/opensolaris/sys/mutex.h#1 branch .. //depot/projects/vimage/src/sys/compat/opensolaris/sys/policy.h#1 branch .. //depot/projects/vimage/src/sys/compat/opensolaris/sys/proc.h#1 branch .. //depot/projects/vimage/src/sys/compat/opensolaris/sys/random.h#1 branch .. //depot/projects/vimage/src/sys/compat/opensolaris/sys/rwlock.h#1 branch .. //depot/projects/vimage/src/sys/compat/opensolaris/sys/sdt.h#1 branch .. //depot/projects/vimage/src/sys/compat/opensolaris/sys/string.h#1 branch .. //depot/projects/vimage/src/sys/compat/opensolaris/sys/sysmacros.h#1 branch .. //depot/projects/vimage/src/sys/compat/opensolaris/sys/systm.h#1 branch .. //depot/projects/vimage/src/sys/compat/opensolaris/sys/taskq.h#1 branch .. //depot/projects/vimage/src/sys/compat/opensolaris/sys/taskq_impl.h#1 branch .. //depot/projects/vimage/src/sys/compat/opensolaris/sys/time.h#1 branch .. //depot/projects/vimage/src/sys/compat/opensolaris/sys/types.h#1 branch .. //depot/projects/vimage/src/sys/compat/opensolaris/sys/uio.h#1 branch .. //depot/projects/vimage/src/sys/compat/opensolaris/sys/varargs.h#1 branch .. //depot/projects/vimage/src/sys/compat/opensolaris/sys/vfs.h#1 branch .. //depot/projects/vimage/src/sys/compat/opensolaris/sys/vnode.h#1 branch .. //depot/projects/vimage/src/sys/compat/opensolaris/sys/zone.h#1 branch .. //depot/projects/vimage/src/sys/compat/svr4/svr4_filio.c#2 integrate .. //depot/projects/vimage/src/sys/conf/NOTES#7 integrate .. //depot/projects/vimage/src/sys/conf/files#7 integrate .. //depot/projects/vimage/src/sys/conf/files.amd64#3 integrate .. //depot/projects/vimage/src/sys/conf/files.i386#3 integrate .. //depot/projects/vimage/src/sys/conf/files.ia64#2 integrate .. //depot/projects/vimage/src/sys/conf/files.pc98#3 integrate .. //depot/projects/vimage/src/sys/conf/files.powerpc#4 integrate .. //depot/projects/vimage/src/sys/conf/options#9 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/utmisc.c#3 integrate .. //depot/projects/vimage/src/sys/contrib/opensolaris/common/acl/acl_common.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/common/acl/acl_common.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/common/atomic/amd64/atomic.S#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/common/atomic/i386/atomic.S#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/common/avl/avl.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/common/nvpair/nvpair.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/common/zfs/zfs_namecheck.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/common/zfs/zfs_namecheck.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/common/zfs/zfs_prop.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/common/zfs/zfs_prop.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/Makefile.files#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/dnlc.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/gfs.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/bplist.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/dnode.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/gzip.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/lzjb.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/refcount.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sha256.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/space_map.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_file.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_rlock.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/txg.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/uberblock.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/unique.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs.conf#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zil.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/os/callb.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/os/list.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/os/nvpair_alloc_system.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/os/taskq.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/rpc/xdr.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/rpc/xdr.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/rpc/xdr_array.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/rpc/xdr_mem.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/asm_linkage.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/atomic.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/avl.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/avl_impl.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/bitmap.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/byteorder.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/callb.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/ccompile.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/compress.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/cred.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/debug.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/dkio.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/dklabel.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/dnlc.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/errorq.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/feature_tests.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/fm/protocol.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/fm/util.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/fs/zfs.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/gfs.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/isa_defs.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/list.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/list_impl.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/note.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/nvpair.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/nvpair_impl.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/processor.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/procset.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/sdt.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/synch.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/sysevent.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/sysmacros.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/vfs.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/vmem.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/zmod.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/zmod/adler32.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/zmod/crc32.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/zmod/crc32.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/zmod/deflate.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/zmod/deflate.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/zmod/inffast.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/zmod/inffast.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/zmod/inffixed.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/zmod/inflate.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/zmod/inflate.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/zmod/inftrees.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/zmod/inftrees.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/zmod/trees.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/zmod/zconf.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/zmod/zlib.h#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/zmod/zmod.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/zmod/zmod_subr.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/zmod/zutil.c#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/zmod/zutil.h#1 branch .. //depot/projects/vimage/src/sys/contrib/pf/net/if_pfsync.c#5 integrate .. //depot/projects/vimage/src/sys/dev/aac/aac_cam.c#3 integrate .. //depot/projects/vimage/src/sys/dev/advansys/advansys.c#3 integrate .. //depot/projects/vimage/src/sys/dev/advansys/adwcam.c#4 integrate .. //depot/projects/vimage/src/sys/dev/aha/aha.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ahb/ahb.c#4 integrate .. //depot/projects/vimage/src/sys/dev/aic/aic.c#2 integrate .. //depot/projects/vimage/src/sys/dev/aic7xxx/aic7770.c#2 integrate .. //depot/projects/vimage/src/sys/dev/aic7xxx/aic79xx.c#2 integrate .. //depot/projects/vimage/src/sys/dev/aic7xxx/aic79xx.h#3 integrate .. //depot/projects/vimage/src/sys/dev/aic7xxx/aic79xx_osm.c#3 integrate .. //depot/projects/vimage/src/sys/dev/aic7xxx/aic79xx_osm.h#2 integrate .. //depot/projects/vimage/src/sys/dev/aic7xxx/aic79xx_pci.c#3 integrate .. //depot/projects/vimage/src/sys/dev/aic7xxx/aic7xxx.c#2 integrate .. //depot/projects/vimage/src/sys/dev/aic7xxx/aic7xxx.h#2 integrate .. //depot/projects/vimage/src/sys/dev/aic7xxx/aic7xxx_inline.h#2 integrate .. //depot/projects/vimage/src/sys/dev/aic7xxx/aic7xxx_osm.c#3 integrate .. //depot/projects/vimage/src/sys/dev/aic7xxx/aic7xxx_osm.h#2 integrate .. //depot/projects/vimage/src/sys/dev/aic7xxx/aic7xxx_pci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/aic7xxx/aic_osm_lib.c#2 integrate .. //depot/projects/vimage/src/sys/dev/aic7xxx/aic_osm_lib.h#2 integrate .. //depot/projects/vimage/src/sys/dev/amd/amd.c#4 integrate .. //depot/projects/vimage/src/sys/dev/amr/amr_cam.c#2 integrate .. //depot/projects/vimage/src/sys/dev/arcmsr/arcmsr.c#5 integrate .. //depot/projects/vimage/src/sys/dev/asr/asr.c#4 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-all.h#3 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-chipset.c#4 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-dma.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-lowlevel.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata_if.m#2 integrate .. //depot/projects/vimage/src/sys/dev/ata/atapi-cam.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ath/ah_osdep.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ath/if_ath.c#7 integrate .. //depot/projects/vimage/src/sys/dev/buslogic/bt.c#4 integrate .. //depot/projects/vimage/src/sys/dev/ciss/ciss.c#3 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_adapter.h#2 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_lro.c#2 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_main.c#2 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_osdep.h#2 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_sge.c#2 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/sys/mvec.h#1 branch .. //depot/projects/vimage/src/sys/dev/cxgb/sys/uipc_mvec.c#1 branch .. //depot/projects/vimage/src/sys/dev/dpt/dpt_scsi.c#3 integrate .. //depot/projects/vimage/src/sys/dev/esp/ncr53c9x.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ex/if_exvar.h#2 integrate .. //depot/projects/vimage/src/sys/dev/firewire/fwdma.c#2 integrate .. //depot/projects/vimage/src/sys/dev/firewire/sbp.c#3 integrate .. //depot/projects/vimage/src/sys/dev/firewire/sbp_targ.c#3 integrate .. //depot/projects/vimage/src/sys/dev/hptmv/entry.c#4 integrate .. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_logging.c#2 integrate .. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_mod.c#3 integrate .. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_piv.c#2 integrate .. //depot/projects/vimage/src/sys/dev/if_ndis/if_ndis_pccard.c#2 integrate .. //depot/projects/vimage/src/sys/dev/iicbus/icee.c#2 integrate .. //depot/projects/vimage/src/sys/dev/iir/iir.c#2 integrate .. //depot/projects/vimage/src/sys/dev/isp/isp_freebsd.c#6 integrate .. //depot/projects/vimage/src/sys/dev/mii/brgphy.c#7 integrate .. //depot/projects/vimage/src/sys/dev/mii/miidevs#6 integrate .. //depot/projects/vimage/src/sys/dev/mly/mly.c#4 integrate .. //depot/projects/vimage/src/sys/dev/mpt/mpt_cam.c#6 integrate .. //depot/projects/vimage/src/sys/dev/msk/if_msk.c#5 integrate .. //depot/projects/vimage/src/sys/dev/ppbus/vpo.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ral/rt2560.c#5 integrate .. //depot/projects/vimage/src/sys/dev/re/if_re.c#6 integrate .. //depot/projects/vimage/src/sys/dev/rr232x/osm_bsd.c#3 integrate .. //depot/projects/vimage/src/sys/dev/sound/isa/ad1816.c#3 integrate .. //depot/projects/vimage/src/sys/dev/sound/isa/ess.c#3 integrate .. //depot/projects/vimage/src/sys/dev/sound/isa/mss.c#3 integrate .. //depot/projects/vimage/src/sys/dev/sound/isa/sb16.c#3 integrate .. //depot/projects/vimage/src/sys/dev/sound/isa/sb8.c#3 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/als4000.c#3 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/atiixp.c#3 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/au88x0.c#3 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/aureal.c#3 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/cmi.c#3 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/cs4281.c#3 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/csapcm.c#3 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/ds1.c#3 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/emu10k1.c#3 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/emu10kx-pcm.c#4 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/envy24.c#4 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/envy24ht.c#4 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/es137x.c#4 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/fm801.c#3 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/hda/hdac.c#7 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/ich.c#4 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/maestro3.c#3 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/solo.c#3 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/t4dwave.c#3 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/via8233.c#3 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/via82c686.c#3 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/vibes.c#3 integrate .. //depot/projects/vimage/src/sys/dev/sound/pcm/ac97.c#3 integrate .. //depot/projects/vimage/src/sys/dev/sound/pcm/ac97.h#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/pcm/ac97_patch.c#3 integrate .. //depot/projects/vimage/src/sys/dev/sound/pcm/ac97_patch.h#3 integrate .. //depot/projects/vimage/src/sys/dev/sound/pcm/buffer.c#3 integrate .. //depot/projects/vimage/src/sys/dev/sound/pcm/buffer.h#3 integrate .. //depot/projects/vimage/src/sys/dev/sound/pcm/sound.h#3 integrate .. //depot/projects/vimage/src/sys/dev/sound/sbus/cs4231.c#4 integrate .. //depot/projects/vimage/src/sys/dev/streams/streams.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sym/sym_hipd.c#4 integrate .. //depot/projects/vimage/src/sys/dev/trm/trm.c#4 integrate .. //depot/projects/vimage/src/sys/dev/twa/tw_osl_cam.c#2 integrate .. //depot/projects/vimage/src/sys/dev/uart/uart_bus_pci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/if_ural.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/umass.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/usbdevs#3 integrate .. //depot/projects/vimage/src/sys/dev/wds/wd7000.c#4 integrate .. //depot/projects/vimage/src/sys/dev/wi/if_wi.c#4 integrate .. //depot/projects/vimage/src/sys/fs/devfs/devfs_vnops.c#3 integrate .. //depot/projects/vimage/src/sys/fs/fdescfs/fdesc_vfsops.c#2 integrate .. //depot/projects/vimage/src/sys/fs/fdescfs/fdesc_vnops.c#3 integrate .. //depot/projects/vimage/src/sys/fs/fifofs/fifo_vnops.c#3 integrate .. //depot/projects/vimage/src/sys/fs/procfs/procfs_dbregs.c#2 integrate .. //depot/projects/vimage/src/sys/fs/procfs/procfs_fpregs.c#2 integrate .. //depot/projects/vimage/src/sys/fs/procfs/procfs_map.c#2 integrate .. //depot/projects/vimage/src/sys/fs/procfs/procfs_regs.c#2 integrate .. //depot/projects/vimage/src/sys/fs/pseudofs/pseudofs.c#3 integrate .. //depot/projects/vimage/src/sys/fs/pseudofs/pseudofs.h#3 integrate .. //depot/projects/vimage/src/sys/fs/pseudofs/pseudofs_fileno.c#2 integrate .. //depot/projects/vimage/src/sys/fs/pseudofs/pseudofs_internal.h#2 integrate .. //depot/projects/vimage/src/sys/fs/pseudofs/pseudofs_vncache.c#4 integrate .. //depot/projects/vimage/src/sys/fs/pseudofs/pseudofs_vnops.c#2 integrate .. //depot/projects/vimage/src/sys/fs/unionfs/union_subr.c#5 integrate .. //depot/projects/vimage/src/sys/geom/eli/g_eli.c#3 integrate .. //depot/projects/vimage/src/sys/geom/journal/g_journal.c#4 integrate .. //depot/projects/vimage/src/sys/geom/uzip/g_uzip.c#2 integrate .. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum.h#2 integrate .. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_rm.c#2 integrate .. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_share.c#2 integrate .. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_subr.c#2 integrate .. //depot/projects/vimage/src/sys/i386/conf/GENERIC#7 integrate .. //depot/projects/vimage/src/sys/i386/i386/bios.c#2 integrate .. //depot/projects/vimage/src/sys/i386/i386/busdma_machdep.c#3 integrate .. //depot/projects/vimage/src/sys/i386/i386/identcpu.c#4 integrate .. //depot/projects/vimage/src/sys/i386/i386/initcpu.c#2 integrate .. //depot/projects/vimage/src/sys/i386/i386/minidump_machdep.c#2 integrate .. //depot/projects/vimage/src/sys/i386/i386/mp_machdep.c#4 integrate .. //depot/projects/vimage/src/sys/i386/i386/pmap.c#4 integrate .. //depot/projects/vimage/src/sys/i386/i386/trap.c#4 integrate .. //depot/projects/vimage/src/sys/i386/include/pmap.h#3 integrate .. //depot/projects/vimage/src/sys/i386/include/specialreg.h#4 integrate .. //depot/projects/vimage/src/sys/i386/include/vmparam.h#2 integrate .. //depot/projects/vimage/src/sys/ia64/conf/GENERIC#3 integrate .. //depot/projects/vimage/src/sys/ia64/include/vmparam.h#2 integrate .. //depot/projects/vimage/src/sys/isa/isa_common.c#2 integrate .. //depot/projects/vimage/src/sys/kern/kern_descrip.c#5 integrate .. //depot/projects/vimage/src/sys/kern/kern_event.c#3 integrate .. //depot/projects/vimage/src/sys/kern/kern_fork.c#6 integrate .. //depot/projects/vimage/src/sys/kern/kern_intr.c#5 integrate .. //depot/projects/vimage/src/sys/kern/kern_jail.c#3 integrate .. //depot/projects/vimage/src/sys/kern/kern_malloc.c#2 integrate .. //depot/projects/vimage/src/sys/kern/kern_mbuf.c#3 integrate .. //depot/projects/vimage/src/sys/kern/kern_mib.c#2 integrate .. //depot/projects/vimage/src/sys/kern/kern_mutex.c#4 integrate .. //depot/projects/vimage/src/sys/kern/kern_prot.c#3 integrate .. //depot/projects/vimage/src/sys/kern/kern_sx.c#3 integrate .. //depot/projects/vimage/src/sys/kern/sched_ule.c#6 integrate .. //depot/projects/vimage/src/sys/kern/subr_lock.c#4 integrate .. //depot/projects/vimage/src/sys/kern/subr_rman.c#4 integrate .. //depot/projects/vimage/src/sys/kern/subr_witness.c#4 integrate .. //depot/projects/vimage/src/sys/kern/sys_generic.c#3 integrate .. //depot/projects/vimage/src/sys/kern/uipc_mbuf.c#4 integrate .. //depot/projects/vimage/src/sys/kern/uipc_mqueue.c#3 integrate .. //depot/projects/vimage/src/sys/kern/uipc_syscalls.c#7 integrate .. //depot/projects/vimage/src/sys/kern/uipc_usrreq.c#5 integrate .. //depot/projects/vimage/src/sys/kern/vfs_cache.c#3 integrate .. //depot/projects/vimage/src/sys/kern/vfs_lookup.c#4 integrate .. //depot/projects/vimage/src/sys/kern/vfs_mount.c#4 integrate .. //depot/projects/vimage/src/sys/kern/vfs_subr.c#3 integrate .. //depot/projects/vimage/src/sys/kern/vfs_syscalls.c#4 integrate .. //depot/projects/vimage/src/sys/libkern/index.c#2 integrate .. //depot/projects/vimage/src/sys/libkern/memset.c#1 branch .. //depot/projects/vimage/src/sys/libkern/rindex.c#2 integrate .. //depot/projects/vimage/src/sys/modules/Makefile#5 integrate .. //depot/projects/vimage/src/sys/modules/cam/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/cxgb/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/dpt/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/if_lagg/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/libalias/libalias/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/zfs/Makefile#1 branch .. //depot/projects/vimage/src/sys/net/ieee8023ad_lacp.c#1 branch .. //depot/projects/vimage/src/sys/net/ieee8023ad_lacp.h#1 branch .. //depot/projects/vimage/src/sys/net/if.c#10 integrate .. //depot/projects/vimage/src/sys/net/if_ethersubr.c#9 integrate .. //depot/projects/vimage/src/sys/net/if_lagg.c#1 branch .. //depot/projects/vimage/src/sys/net/if_lagg.h#1 branch .. //depot/projects/vimage/src/sys/net/if_var.h#7 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_ppp.c#5 integrate .. //depot/projects/vimage/src/sys/netinet/in_pcb.c#8 integrate .. //depot/projects/vimage/src/sys/netinet/in_pcb.h#6 integrate .. //depot/projects/vimage/src/sys/netinet/ip_fw2.c#12 integrate .. //depot/projects/vimage/src/sys/netinet/ip_var.h#4 integrate .. //depot/projects/vimage/src/sys/netinet/libalias/alias_db.c#3 integrate .. //depot/projects/vimage/src/sys/netinet/libalias/alias_ftp.c#2 integrate .. //depot/projects/vimage/src/sys/netinet/libalias/alias_irc.c#2 integrate .. //depot/projects/vimage/src/sys/netinet/libalias/alias_proxy.c#3 integrate .. //depot/projects/vimage/src/sys/netinet/libalias/alias_skinny.c#2 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_constants.h#6 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_crc32.c#4 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_indata.c#7 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_input.c#7 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_lock_bsd.h#4 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_output.c#7 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_pcb.c#7 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_peeloff.c#5 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_structs.h#7 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_timer.c#6 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_uio.h#5 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_usrreq.c#7 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_var.h#6 integrate .. //depot/projects/vimage/src/sys/netinet/sctputil.c#7 integrate .. //depot/projects/vimage/src/sys/netinet/sctputil.h#6 integrate .. //depot/projects/vimage/src/sys/netinet/tcp.h#3 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_input.c#9 edit .. //depot/projects/vimage/src/sys/netinet/tcp_output.c#7 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_sack.c#6 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#13 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_syncache.c#8 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_timer.c#9 edit .. //depot/projects/vimage/src/sys/netinet/tcp_timer.h#3 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_usrreq.c#7 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_var.h#7 integrate .. //depot/projects/vimage/src/sys/netinet6/ipsec.c#3 integrate .. //depot/projects/vimage/src/sys/netinet6/sctp6_usrreq.c#7 integrate .. //depot/projects/vimage/src/sys/netipsec/ipsec_osdep.h#2 integrate .. //depot/projects/vimage/src/sys/netnatm/natm.h#3 integrate .. //depot/projects/vimage/src/sys/netsmb/smb_dev.c#3 integrate .. //depot/projects/vimage/src/sys/nfsserver/nfs_srvsock.c#3 integrate .. //depot/projects/vimage/src/sys/opencrypto/cryptodev.c#3 integrate .. //depot/projects/vimage/src/sys/pc98/conf/GENERIC#3 integrate .. //depot/projects/vimage/src/sys/pci/if_rlreg.h#4 integrate .. //depot/projects/vimage/src/sys/pci/if_vr.c#3 integrate .. //depot/projects/vimage/src/sys/pci/if_vrreg.h#2 integrate .. //depot/projects/vimage/src/sys/pci/intpm.c#5 integrate .. //depot/projects/vimage/src/sys/pci/ncr.c#3 integrate .. //depot/projects/vimage/src/sys/powerpc/conf/GENERIC#3 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/nexus.c#3 integrate .. //depot/projects/vimage/src/sys/rpc/types.h#1 branch .. //depot/projects/vimage/src/sys/security/audit/audit.c#4 integrate .. //depot/projects/vimage/src/sys/security/audit/audit.h#2 integrate .. //depot/projects/vimage/src/sys/security/audit/audit_arg.c#4 integrate .. //depot/projects/vimage/src/sys/security/audit/audit_bsm.c#2 integrate .. //depot/projects/vimage/src/sys/security/audit/audit_bsm_klib.c#3 integrate .. //depot/projects/vimage/src/sys/security/audit/audit_bsm_token.c#3 integrate .. //depot/projects/vimage/src/sys/security/audit/audit_private.h#2 integrate .. //depot/projects/vimage/src/sys/security/audit/audit_syscalls.c#4 integrate .. //depot/projects/vimage/src/sys/sparc64/conf/GENERIC#3 integrate .. //depot/projects/vimage/src/sys/sparc64/include/vmparam.h#2 integrate .. //depot/projects/vimage/src/sys/sun4v/conf/GENERIC#4 integrate .. //depot/projects/vimage/src/sys/sun4v/include/smp.h#4 integrate .. //depot/projects/vimage/src/sys/sun4v/include/vmparam.h#2 integrate .. //depot/projects/vimage/src/sys/sys/eventhandler.h#3 integrate .. //depot/projects/vimage/src/sys/sys/filedesc.h#2 integrate .. //depot/projects/vimage/src/sys/sys/filio.h#2 integrate .. //depot/projects/vimage/src/sys/sys/hash.h#2 integrate .. //depot/projects/vimage/src/sys/sys/interrupt.h#4 integrate .. //depot/projects/vimage/src/sys/sys/jail.h#2 integrate .. //depot/projects/vimage/src/sys/sys/kernel.h#4 integrate .. //depot/projects/vimage/src/sys/sys/libkern.h#2 integrate .. //depot/projects/vimage/src/sys/sys/link_elf.h#2 integrate .. //depot/projects/vimage/src/sys/sys/lock.h#3 integrate .. //depot/projects/vimage/src/sys/sys/lock_profile.h#4 integrate .. //depot/projects/vimage/src/sys/sys/mbuf.h#3 integrate .. //depot/projects/vimage/src/sys/sys/mount.h#4 integrate .. //depot/projects/vimage/src/sys/sys/mutex.h#4 integrate .. //depot/projects/vimage/src/sys/sys/param.h#4 integrate .. //depot/projects/vimage/src/sys/sys/priv.h#3 integrate .. //depot/projects/vimage/src/sys/sys/proc.h#8 integrate .. //depot/projects/vimage/src/sys/sys/socket.h#2 integrate .. //depot/projects/vimage/src/sys/sys/sx.h#3 integrate .. //depot/projects/vimage/src/sys/sys/sysctl.h#5 integrate .. //depot/projects/vimage/src/sys/sys/systm.h#5 integrate .. //depot/projects/vimage/src/sys/sys/unistd.h#2 integrate .. //depot/projects/vimage/src/sys/ufs/ffs/ffs_snapshot.c#4 integrate .. //depot/projects/vimage/src/sys/ufs/ffs/ffs_softdep.c#3 integrate .. //depot/projects/vimage/src/sys/ufs/ffs/ffs_vfsops.c#3 integrate .. //depot/projects/vimage/src/sys/ufs/ffs/ffs_vnops.c#3 integrate .. //depot/projects/vimage/src/sys/vm/phys_pager.c#3 integrate .. //depot/projects/vimage/src/sys/vm/vm_contig.c#3 integrate .. //depot/projects/vimage/src/sys/vm/vm_fault.c#3 integrate .. //depot/projects/vimage/src/sys/vm/vm_kern.c#4 integrate .. //depot/projects/vimage/src/sys/vm/vm_param.h#2 integrate Differences ... ==== //depot/projects/vimage/src/sys/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/Makefile,v 1.41 2007/03/24 22:21:01 maxim Exp $ +# $FreeBSD: src/sys/Makefile,v 1.42 2007/04/14 16:29:15 maxim Exp $ .include @@ -8,10 +8,10 @@ .endif # Directories to include in cscope name file and TAGS. -CSCOPEDIRS= cam coda compat conf contrib crypto ddb dev fs geom gnu i4b \ - isa kern libkern modules net net80211 netatalk netatm \ +CSCOPEDIRS= bsm cam coda compat conf contrib crypto ddb dev fs geom gnu \ + i4b isa kern libkern modules net net80211 netatalk netatm \ netgraph netinet netinet6 netipx netkey netnatm netncp \ - netsmb nfs nfsclient nfs4client rpc pccard pci sys \ + netsmb nfs nfsclient nfs4client rpc pccard pci security sys \ ufs vm ${ARCHDIR} ARCHDIR ?= ${MACHINE} ==== //depot/projects/vimage/src/sys/amd64/amd64/busdma_machdep.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.79 2007/03/06 18:28:42 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.80 2007/04/17 21:05:34 jhb Exp $"); #include #include @@ -48,6 +48,7 @@ #include #include #include +#include #define MAX_BPAGES 8192 @@ -522,6 +523,9 @@ } else if ((uintptr_t)*vaddr & (dmat->alignment - 1)) { printf("bus_dmamem_alloc failed to align memory properly.\n"); } + if (flags & BUS_DMA_NOCACHE) + pmap_change_attr((vm_offset_t)*vaddr, dmat->maxsize, + PAT_UNCACHEABLE); CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d", __func__, dmat, dmat->flags, ENOMEM); return (0); @@ -540,6 +544,7 @@ */ if (map != NULL) panic("bus_dmamem_free: Invalid map freed\n"); + pmap_change_attr((vm_offset_t)vaddr, dmat->maxsize, PAT_WRITE_BACK); if ((dmat->maxsize <= PAGE_SIZE) && (dmat->alignment < dmat->maxsize) && dmat->lowaddr >= ptoa((vm_paddr_t)Maxmem)) ==== //depot/projects/vimage/src/sys/amd64/amd64/pmap.c#4 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.581 2007/03/10 20:26:43 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.582 2007/04/13 16:07:29 alc Exp $"); /* * Manages physical address maps. @@ -3261,7 +3261,7 @@ pd_entry_t *pde; pt_entry_t *pte; - base = va & PG_FRAME; + base = trunc_page(va); offset = va & PAGE_MASK; size = roundup(offset + size, PAGE_SIZE); ==== //depot/projects/vimage/src/sys/amd64/conf/GENERIC#5 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.473 2007/02/09 19:03:17 brooks Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.475 2007/04/10 21:40:12 pjd Exp $ cpu HAMMER ident GENERIC @@ -34,6 +34,7 @@ options SOFTUPDATES # Enable FFS soft updates support options UFS_ACL # Support for access control lists options UFS_DIRHASH # Improve performance on big directories +options UFS_GJOURNAL # Enable gjournal-based UFS journaling options MD_ROOT # MD is a potential root device options NFSCLIENT # Network Filesystem Client options NFSSERVER # Network Filesystem Server ==== //depot/projects/vimage/src/sys/amd64/include/vmparam.h#2 (text+ko) ==== @@ -38,7 +38,7 @@ * SUCH DAMAGE. * * from: @(#)vmparam.h 5.9 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/vmparam.h,v 1.45 2004/10/27 17:21:15 peter Exp $ + * $FreeBSD: src/sys/amd64/include/vmparam.h,v 1.46 2007/04/21 01:14:47 sepotvin Exp $ */ @@ -122,7 +122,8 @@ /* * How many physical pages per KVA page allocated. - * min(max(VM_KMEM_SIZE, Physical memory/VM_KMEM_SIZE_SCALE), VM_KMEM_SIZE_MAX) + * min(max(max(VM_KMEM_SIZE, Physical memory/VM_KMEM_SIZE_SCALE), + * VM_KMEM_SIZE_MIN), VM_KMEM_SIZE_MAX) * is the total KVA space allocated for kmem_map. */ #ifndef VM_KMEM_SIZE_SCALE ==== //depot/projects/vimage/src/sys/amd64/linux32/linux32_dummy.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_dummy.c,v 1.8 2007/03/29 02:11:46 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_dummy.c,v 1.9 2007/04/18 18:08:12 jkim Exp $"); #include #include @@ -64,7 +64,6 @@ DUMMY(mincore); DUMMY(fadvise64); DUMMY(ptrace); -DUMMY(settimeofday); DUMMY(lookup_dcookie); DUMMY(epoll_create); DUMMY(epoll_ctl); ==== //depot/projects/vimage/src/sys/amd64/linux32/linux32_machdep.c#7 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.39 2007/03/30 17:27:13 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.42 2007/04/18 20:12:05 jkim Exp $"); #include #include @@ -252,7 +252,7 @@ if (iovcnt > UIO_MAXIOV) return (EINVAL); iovlen = iovcnt * sizeof(struct iovec); - uio = malloc(iovlen + sizeof *uio, M_IOV, M_WAITOK); + uio = malloc(iovlen + sizeof(*uio), M_IOV, M_WAITOK); iov = (struct iovec *)(uio + 1); for (i = 0; i < iovcnt; i++) { error = copyin(&iovp[i], &iov32, sizeof(struct iovec32)); @@ -526,7 +526,9 @@ td2 = FIRST_THREAD_IN_PROC(p2); - /* make it run */ + /* + * Make this runnable after we are finished with it. + */ mtx_lock_spin(&sched_lock); TD_SET_CAN_RUN(td2); sched_add(td2, SRQ_BORING); @@ -572,8 +574,8 @@ /* * XXX: In Linux, sharing of fs info (chroot/cwd/umask) * and open files is independant. In FreeBSD, its in one - * structure but in reality it does not make any problems - * because both of these flags are set at once usually. + * structure but in reality it does not cause any problems + * because both of these flags are usually set together. */ if (!(args->flags & (LINUX_CLONE_FILES | LINUX_CLONE_FS))) ff |= RFFDG; @@ -660,15 +662,15 @@ if (args->flags & LINUX_CLONE_SETTLS) { struct user_segment_descriptor sd; struct l_user_desc info; - int a[2]; + int a[2]; - error = copyin((void *)td->td_frame->tf_rsi, &info, + error = copyin((void *)td->td_frame->tf_rsi, &info, sizeof(struct l_user_desc)); if (error) { printf(LMSG("copyin failed!")); } else { /* We might copy out the entry_number as GUGS32_SEL. */ - info.entry_number = GUGS32_SEL; + info.entry_number = GUGS32_SEL; error = copyout(&info, (void *)td->td_frame->tf_rsi, sizeof(struct l_user_desc)); if (error) @@ -871,7 +873,7 @@ * * Our mmap with MAP_STACK takes addr as the maximum * downsize limit on BOS, and as len the max size of - * the region. It them maps the top SGROWSIZ bytes, + * the region. It then maps the top SGROWSIZ bytes, * and auto grows the region down, up to the limit * in addr. * @@ -1167,17 +1169,44 @@ microtime(&atv); atv32.tv_sec = atv.tv_sec; atv32.tv_usec = atv.tv_usec; - error = copyout(&atv32, uap->tp, sizeof (atv32)); + error = copyout(&atv32, uap->tp, sizeof(atv32)); } if (error == 0 && uap->tzp != NULL) { rtz.tz_minuteswest = tz_minuteswest; rtz.tz_dsttime = tz_dsttime; - error = copyout(&rtz, uap->tzp, sizeof (rtz)); + error = copyout(&rtz, uap->tzp, sizeof(rtz)); } return (error); } int +linux_settimeofday(struct thread *td, struct linux_settimeofday_args *uap) +{ + l_timeval atv32; + struct timeval atv, *tvp; + struct timezone atz, *tzp; + int error; + + if (uap->tp) { + error = copyin(uap->tp, &atv32, sizeof(atv32)); + if (error) + return (error); + atv.tv_sec = atv32.tv_sec; + atv.tv_usec = atv32.tv_usec; + tvp = &atv; + } else + tvp = NULL; + if (uap->tzp) { + error = copyin(uap->tzp, &atz, sizeof(atz)); + if (error) + return (error); + tzp = &atz; + } else + tzp = NULL; + return (kern_settimeofday(td, tvp, tzp)); +} + +int linux_getrusage(struct thread *td, struct linux_getrusage_args *uap) { struct l_rusage s32; @@ -1242,7 +1271,7 @@ #ifdef DEBUG if (ldebug(set_thread_area)) - printf(ARGS(set_thread_area, "%i, %x, %x, %i, %i, %i, " + printf(ARGS(set_thread_area, "%i, %x, %x, %i, %i, %i, " "%i, %i, %i"), info.entry_number, info.base_addr, info.limit, info.seg_32bit, info.contents, info.read_exec_only, info.limit_in_pages, @@ -1261,9 +1290,10 @@ * The tls_array[] is used only in [gs]et_thread_area() syscalls and * for loading the GDT descriptors. We use just one GDT descriptor * for TLS, so we will load just one. - * XXX: This doesnt work when user-space process tries to use more + * + * XXX: This doesn't work when a user space process tries to use more * than one TLS segment. Comment in the Linux source says wine might - * do that. + * do this. */ /* @@ -1284,8 +1314,9 @@ /* * We have to copy out the GDT entry we use. - * XXX: What if userspace program does not check return value and - * tries to use 6, 7 or 8? + * + * XXX: What if a user space program does not check the return value + * and tries to use 6, 7 or 8? */ error = copyout(&info, args->desc, sizeof(struct l_user_desc)); if (error) ==== //depot/projects/vimage/src/sys/boot/forth/loader.conf#5 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.118 2007/02/04 06:35:10 imp Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.120 2007/04/09 22:09:09 pjd Exp $ ############################################################## ### Basic configuration options ############################ @@ -138,6 +138,7 @@ #umapfs_load="NO" # User-id map filesystem unionfs_load="NO" # Union filesystem xfs_load="NO" # XFS +zfs_load="NO" # ZFS # Related stuff @@ -418,3 +419,10 @@ #module_after="cmd" # executes "cmd" after loading the module #module_error="cmd" # executes "cmd" if load fails +############################################################## +### Always try to load ZFS pool cache file ################# +############################################################## + +zpool_cache_load="YES" +zpool_cache_type="/boot/zfs/zpool.cache" +zpool_cache_name="/boot/zfs/zpool.cache" ==== //depot/projects/vimage/src/sys/boot/pc98/boot0.5/Makefile#2 (text+ko) ==== @@ -1,10 +1,11 @@ -# $FreeBSD: src/sys/boot/pc98/boot0.5/Makefile,v 1.4 2004/12/21 08:47:16 ru Exp $ +# $FreeBSD: src/sys/boot/pc98/boot0.5/Makefile,v 1.6 2007/04/07 13:37:45 nyan Exp $ PROG= ${BOOT}.out INTERNALPROG= FILES= ${BOOT} NO_MAN= -SRCS= start.s boot.s boot0.5.s disk.s selector.s support.s syscons.s +SRCS= start.s boot.s boot0.5.s disk.s selector.s support.s syscons.s \ + putssjis.s CLEANFILES= ${BOOT} ${BOOT}.bin BOOT= boot0.5 @@ -13,7 +14,7 @@ # unless you are glutton for punishment. BOOT_BOOT0_ORG?= 0x0000 -LDFLAGS=-N -e start -Ttext ${BOOT_BOOT0_ORG} +LDFLAGS=-N -e start -Ttext ${BOOT_BOOT0_ORG} -Wl,-T,${.CURDIR}/ldscript # The size of boot0.5 must be 7168 bytes ${BOOT}: ${BOOT}.bin ==== //depot/projects/vimage/src/sys/boot/pc98/boot0.5/boot0.5.s#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# Copyright (c) KATO Takenori, 1999, 2000. +# Copyright (c) KATO Takenori, 1999, 2000, 2007. # # All rights reserved. Unpublished rights reserved under the copyright # laws of Japan. @@ -25,7 +25,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# $FreeBSD: src/sys/boot/pc98/boot0.5/boot0.5.s,v 1.3 2007/03/17 05:30:03 kato Exp $ +# $FreeBSD: src/sys/boot/pc98/boot0.5/boot0.5.s,v 1.4 2007/04/07 08:37:04 kato Exp $ # .global main .code16 @@ -261,8 +261,8 @@ .global ishireso ishireso: .byte 0 -title: .asciz "PC98 Boot Selector Version 1.1" -copyright: .ascii "(C)Copyright 1999, 2000 KATO Takenori. " +title: .asciz "PC98 Boot Selector Version 1.2" +copyright: .ascii "(C)Copyright 1999-2007 KATO Takenori. " .asciz "All rights reserved." msg_device: .asciz "Device" msg_sasi: .asciz "SASI/IDE unit " ==== //depot/projects/vimage/src/sys/boot/pc98/boot0.5/selector.s#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# Copyright (c) KATO Takenori, 1999, 2000. +# Copyright (c) KATO Takenori, 1999, 2000, 2007. # # All rights reserved. Unpublished rights reserved under the copyright # laws of Japan. @@ -25,7 +25,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# $FreeBSD: src/sys/boot/pc98/boot0.5/selector.s,v 1.2 2000/08/06 14:35:37 kato Exp $ +# $FreeBSD: src/sys/boot/pc98/boot0.5/selector.s,v 1.3 2007/04/07 08:37:04 kato Exp $ # .code16 @@ -299,6 +299,11 @@ jne dev_right movw $3, mode # N88-BASIC ret + + # XXX + .space 5, 0x90 + ret # Dummy ret @0x9ab + dev_up: cmpw $0, curdevice je devmode_loop ==== //depot/projects/vimage/src/sys/boot/pc98/boot0.5/start.s#2 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Apr 21 19:08:21 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 DB67516A4F3; Sat, 21 Apr 2007 19:08:20 +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 9772816A4D6 for ; Sat, 21 Apr 2007 19:08:20 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 88E7D13C4C5 for ; Sat, 21 Apr 2007 19:08:20 +0000 (UTC) (envelope-from rpaulo@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 l3LJ8K95045563 for ; Sat, 21 Apr 2007 19:08:20 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3LJ8Jn0045560 for perforce@freebsd.org; Sat, 21 Apr 2007 19:08:19 GMT (envelope-from rpaulo@FreeBSD.org) Date: Sat, 21 Apr 2007 19:08:19 GMT Message-Id: <200704211908.l3LJ8Jn0045560@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 118538 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: Sat, 21 Apr 2007 19:08:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=118538 Change 118538 by rpaulo@rpaulo_epsilon on 2007/04/21 19:07:22 Apple's Mighty Mouse modifications that I submitted in PR usb/110357. Affected files ... .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/ums.c#2 edit Differences ... ==== //depot/projects/soc2007/rpaulo-macbook/dev/usb/ums.c#2 (text+ko) ==== @@ -104,7 +104,7 @@ u_char *sc_ibuf; u_int8_t sc_iid; int sc_isize; - struct hid_location sc_loc_x, sc_loc_y, sc_loc_z, sc_loc_t; + struct hid_location sc_loc_x, sc_loc_y, sc_loc_z, sc_loc_t, sc_loc_w; struct hid_location *sc_loc_btn; usb_callout_t callout_handle; /* for spurious button ups */ @@ -116,6 +116,7 @@ #define UMS_Z 0x01 /* z direction available */ #define UMS_SPUR_BUT_UP 0x02 /* spurious button up events */ #define UMS_T 0x04 /* aa direction available (tilt) */ +#define UMS_REVZ 0x08 /* Z-axis is reversed */ int nbuttons; #define MAX_BUTTONS 31 /* chosen because sc_buttons is int */ @@ -209,7 +210,7 @@ usbd_status err; char devinfo[1024]; u_int32_t flags; - int i; + int i, wheel; struct hid_location loc_btn; sc->sc_disconnected = 1; @@ -266,13 +267,41 @@ USB_ATTACH_ERROR_RETURN; } - /* try to guess the Z activator: first check Z, then WHEEL */ - if (hid_locate(desc, size, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_Z), - hid_input, &sc->sc_loc_z, &flags) || - hid_locate(desc, size, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_WHEEL), - hid_input, &sc->sc_loc_z, &flags) || - hid_locate(desc, size, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_TWHEEL), - hid_input, &sc->sc_loc_z, &flags)) { + /* Try the wheel first as the Z activator since it's tradition. */ + wheel = hid_locate(desc, size, HID_USAGE2(HUP_GENERIC_DESKTOP, + HUG_WHEEL), + hid_input, &sc->sc_loc_z, &flags); + + if (wheel) { + if ((flags & MOUSE_FLAGS_MASK) != MOUSE_FLAGS) { + printf("\n%s: Wheel report 0x%04x not supported\n", + device_get_nameunit(sc->sc_dev), flags); + sc->sc_loc_z.size = 0; /* Bad Z coord, ignore it */ + } else { + sc->flags |= UMS_Z; + if (usbd_get_quirks(uaa->device)->uq_flags & + UQ_MS_REVZ) { + /* Some wheels need the Z axis reversed. */ + sc->flags |= UMS_REVZ; + } + + } + /* + * We might have both a wheel and Z direction, if so put + * put the Z on the W coordinate. + */ + if (hid_locate(desc, size, HID_USAGE2(HUP_GENERIC_DESKTOP, + HUG_Z), + hid_input, &sc->sc_loc_w, &flags)) { + if ((flags & MOUSE_FLAGS_MASK) != MOUSE_FLAGS) { + printf("\n%s: Z report 0x%04x not supported\n", + device_get_nameunit(sc->sc_dev), flags); + sc->sc_loc_w.size = 0; /* Bad Z, ignore */ + } + } + } else if (hid_locate(desc, size, HID_USAGE2(HUP_GENERIC_DESKTOP, + HUG_Z), + hid_input, &sc->sc_loc_z, &flags)) { if ((flags & MOUSE_FLAGS_MASK) != MOUSE_FLAGS) { sc->sc_loc_z.size = 0; /* Bad Z coord, ignore it */ } else { @@ -424,7 +453,7 @@ { struct ums_softc *sc = addr; u_char *ibuf; - int dx, dy, dz, dt; + int dx, dy, dz, dt, dw; int buttons = 0; int i; @@ -474,6 +503,9 @@ dx = hid_get_data(ibuf, &sc->sc_loc_x); dy = -hid_get_data(ibuf, &sc->sc_loc_y); dz = -hid_get_data(ibuf, &sc->sc_loc_z); + dw = hid_get_data(ibuf, &sc->sc_loc_w); + if (sc->flags & UMS_REVZ) + dz = -dz; if (sc->flags & UMS_T) dt = -hid_get_data(ibuf, &sc->sc_loc_t); else @@ -482,17 +514,18 @@ if (hid_get_data(ibuf, &sc->sc_loc_btn[i])) buttons |= (1 << UMS_BUT(i)); - if (dx || dy || dz || dt || (sc->flags & UMS_Z) + if (dx || dy || dz || dt || dw || (sc->flags & UMS_Z) || buttons != sc->status.button) { - DPRINTFN(5, ("ums_intr: x:%d y:%d z:%d t:%d buttons:0x%x\n", - dx, dy, dz, dt, buttons)); + DPRINTFN(5, ("ums_intr: x:%d y:%d z:%d t:%d w:%w buttons:0x%x\n", + dx, dy, dz, dt, dw, buttons)); sc->status.button = buttons; sc->status.dx += dx; sc->status.dy += dy; sc->status.dz += dz; /* sc->status.dt += dt;*/ /* no way to export this yet */ - + /* sc->status.dw += dw; */ /* idem */ + /* Discard data in case of full buffer */ if (sc->qcount == sizeof(sc->qbuf)) { DPRINTF(("Buffer full, discarded packet")); From owner-p4-projects@FreeBSD.ORG Sat Apr 21 19:12:26 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 82A4216A409; Sat, 21 Apr 2007 19:12:26 +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 5A1E416A407 for ; Sat, 21 Apr 2007 19:12:26 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 4C06213C45E for ; Sat, 21 Apr 2007 19:12:26 +0000 (UTC) (envelope-from rpaulo@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 l3LJCQ68046554 for ; Sat, 21 Apr 2007 19:12:26 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3LJCPLj046551 for perforce@freebsd.org; Sat, 21 Apr 2007 19:12:25 GMT (envelope-from rpaulo@FreeBSD.org) Date: Sat, 21 Apr 2007 19:12:25 GMT Message-Id: <200704211912.l3LJCPLj046551@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 118539 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: Sat, 21 Apr 2007 19:12:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=118539 Change 118539 by rpaulo@rpaulo_epsilon on 2007/04/21 19:11:43 Use proper tabs. Affected files ... .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/ums.c#3 edit Differences ... ==== //depot/projects/soc2007/rpaulo-macbook/dev/usb/ums.c#3 (text+ko) ==== @@ -267,7 +267,7 @@ USB_ATTACH_ERROR_RETURN; } - /* Try the wheel first as the Z activator since it's tradition. */ + /* Try the wheel first as the Z activator since it's tradition. */ wheel = hid_locate(desc, size, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_WHEEL), hid_input, &sc->sc_loc_z, &flags); @@ -503,9 +503,9 @@ dx = hid_get_data(ibuf, &sc->sc_loc_x); dy = -hid_get_data(ibuf, &sc->sc_loc_y); dz = -hid_get_data(ibuf, &sc->sc_loc_z); - dw = hid_get_data(ibuf, &sc->sc_loc_w); - if (sc->flags & UMS_REVZ) - dz = -dz; + dw = hid_get_data(ibuf, &sc->sc_loc_w); + if (sc->flags & UMS_REVZ) + dz = -dz; if (sc->flags & UMS_T) dt = -hid_get_data(ibuf, &sc->sc_loc_t); else From owner-p4-projects@FreeBSD.ORG Sat Apr 21 20:07:24 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 2770F16A406; Sat, 21 Apr 2007 20:07:24 +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 CCD1B16A404 for ; Sat, 21 Apr 2007 20:07:23 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id BAF0713C448 for ; Sat, 21 Apr 2007 20:07:23 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3LK7NZx063916 for ; Sat, 21 Apr 2007 20:07:23 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3LK47OQ060336 for perforce@freebsd.org; Sat, 21 Apr 2007 20:04:07 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 21 Apr 2007 20:04:07 GMT Message-Id: <200704212004.l3LK47OQ060336@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 118541 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: Sat, 21 Apr 2007 20:07:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=118541 Change 118541 by rwatson@rwatson_zoo on 2007/04/21 20:02:08 Integrate TrustedBSD MAC branch from TrustedBSD base branch. Affected files ... .. //depot/projects/trustedbsd/mac/MAINTAINERS#37 integrate .. //depot/projects/trustedbsd/mac/Makefile#42 integrate .. //depot/projects/trustedbsd/mac/Makefile.inc1#70 integrate .. //depot/projects/trustedbsd/mac/ObsoleteFiles.inc#11 integrate .. //depot/projects/trustedbsd/mac/UPDATING#60 integrate .. //depot/projects/trustedbsd/mac/bin/csh/config.h#8 integrate .. //depot/projects/trustedbsd/mac/bin/csh/config_p.h#3 integrate .. //depot/projects/trustedbsd/mac/bin/df/df.1#10 integrate .. //depot/projects/trustedbsd/mac/bin/df/df.c#23 integrate .. //depot/projects/trustedbsd/mac/bin/expr/expr.1#10 integrate .. //depot/projects/trustedbsd/mac/bin/expr/expr.y#9 integrate .. //depot/projects/trustedbsd/mac/bin/kill/kill.1#7 integrate .. //depot/projects/trustedbsd/mac/bin/rcp/rcp.1#8 integrate .. //depot/projects/trustedbsd/mac/bin/setfacl/setfacl.c#10 integrate .. //depot/projects/trustedbsd/mac/bin/sh/exec.c#14 integrate .. //depot/projects/trustedbsd/mac/cddl/Makefile#1 branch .. //depot/projects/trustedbsd/mac/cddl/Makefile.inc#1 branch .. //depot/projects/trustedbsd/mac/cddl/lib/Makefile#1 branch .. //depot/projects/trustedbsd/mac/cddl/lib/Makefile.inc#1 branch .. //depot/projects/trustedbsd/mac/cddl/lib/libavl/Makefile#1 branch .. //depot/projects/trustedbsd/mac/cddl/lib/libnvpair/Makefile#1 branch .. //depot/projects/trustedbsd/mac/cddl/lib/libumem/Makefile#1 branch .. //depot/projects/trustedbsd/mac/cddl/lib/libuutil/Makefile#1 branch .. //depot/projects/trustedbsd/mac/cddl/lib/libzfs/Makefile#1 branch .. //depot/projects/trustedbsd/mac/cddl/lib/libzpool/Makefile#1 branch .. //depot/projects/trustedbsd/mac/cddl/sbin/Makefile#1 branch .. //depot/projects/trustedbsd/mac/cddl/sbin/Makefile.inc#1 branch .. //depot/projects/trustedbsd/mac/cddl/sbin/zfs/Makefile#1 branch .. //depot/projects/trustedbsd/mac/cddl/sbin/zpool/Makefile#1 branch .. //depot/projects/trustedbsd/mac/cddl/usr.bin/Makefile#1 branch .. //depot/projects/trustedbsd/mac/cddl/usr.bin/Makefile.inc#1 branch .. //depot/projects/trustedbsd/mac/cddl/usr.bin/ztest/Makefile#1 branch .. //depot/projects/trustedbsd/mac/cddl/usr.sbin/Makefile#1 branch .. //depot/projects/trustedbsd/mac/cddl/usr.sbin/Makefile.inc#1 branch .. //depot/projects/trustedbsd/mac/cddl/usr.sbin/zdb/Makefile#1 branch .. //depot/projects/trustedbsd/mac/compat/opensolaris/include/devid.h#1 branch .. //depot/projects/trustedbsd/mac/compat/opensolaris/include/fsshare.h#1 branch .. //depot/projects/trustedbsd/mac/compat/opensolaris/include/libintl.h#1 branch .. //depot/projects/trustedbsd/mac/compat/opensolaris/include/mnttab.h#1 branch .. //depot/projects/trustedbsd/mac/compat/opensolaris/include/priv.h#1 branch .. //depot/projects/trustedbsd/mac/compat/opensolaris/include/solaris.h#1 branch .. //depot/projects/trustedbsd/mac/compat/opensolaris/include/zone.h#1 branch .. //depot/projects/trustedbsd/mac/compat/opensolaris/lib/libumem/umem.c#1 branch .. //depot/projects/trustedbsd/mac/compat/opensolaris/lib/libumem/umem.h#1 branch .. //depot/projects/trustedbsd/mac/compat/opensolaris/misc/fsshare.c#1 branch .. //depot/projects/trustedbsd/mac/compat/opensolaris/misc/mkdirp.c#1 branch .. //depot/projects/trustedbsd/mac/compat/opensolaris/misc/mnttab.c#1 branch .. //depot/projects/trustedbsd/mac/compat/opensolaris/misc/zmount.c#1 branch .. //depot/projects/trustedbsd/mac/compat/opensolaris/misc/zone.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/hlfsd/hlfsd.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/CHANGES#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/FAQ#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/FAQ.xml#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/README#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/api#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/include/dns/validator.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/resolver.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/validator.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/version#6 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/gas/as.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/gas/tc.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/CHANGES#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/FREEBSD-upgrade#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/LICENSE#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/Makefile-libbz2_so#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/README#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/README.COMPILATION.PROBLEMS#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/Y2K_INFO#3 delete .. //depot/projects/trustedbsd/mac/contrib/bzip2/blocksort.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/bzip2.1#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/bzip2.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/bzip2recover.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/bzlib.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/bzlib.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/bzlib_private.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/compress.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/crctable.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/decompress.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/dlltest.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/huffman.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/manual.texi#4 delete .. //depot/projects/trustedbsd/mac/contrib/bzip2/randtable.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/sample1.bz2.uu#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/sample1.ref.gz.uu#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/sample2.bz2.uu#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/sample2.ref.gz.uu#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/sample3.bz2.uu#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/sample3.ref.gz.uu#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/spewG.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/unzcrash.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/words0#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/words2#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/words3#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap-bpf.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/FREEBSD-upgrade#8 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/display.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ANNOUNCE#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/AUTHORS#1 branch .. //depot/projects/trustedbsd/mac/contrib/ncurses/FREEBSD-Xlist#1 branch .. //depot/projects/trustedbsd/mac/contrib/ncurses/FREEBSD-upgrade#1 branch .. //depot/projects/trustedbsd/mac/contrib/ncurses/INSTALL#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/MANIFEST#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/Makefile.glibc#4 delete .. //depot/projects/trustedbsd/mac/contrib/ncurses/Makefile.in#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/Makefile.os2#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/NEWS#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/README#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/README.emx#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/README.glibc#3 delete .. //depot/projects/trustedbsd/mac/contrib/ncurses/TO-DO#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/aclocal.m4#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/announce.html.in#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/c++/Makefile.in#4 delete .. //depot/projects/trustedbsd/mac/contrib/ncurses/c++/NEWS#3 delete .. //depot/projects/trustedbsd/mac/contrib/ncurses/c++/PROBLEMS#3 delete .. //depot/projects/trustedbsd/mac/contrib/ncurses/c++/README-first#3 delete .. //depot/projects/trustedbsd/mac/contrib/ncurses/c++/cursesapp.cc#3 delete .. //depot/projects/trustedbsd/mac/contrib/ncurses/c++/cursesapp.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/ncurses/c++/cursesf.cc#4 delete .. //depot/projects/trustedbsd/mac/contrib/ncurses/c++/cursesf.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/ncurses/c++/cursesm.cc#4 delete .. //depot/projects/trustedbsd/mac/contrib/ncurses/c++/cursesm.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/ncurses/c++/cursesmain.cc#4 delete .. //depot/projects/trustedbsd/mac/contrib/ncurses/c++/cursesp.cc#4 delete .. //depot/projects/trustedbsd/mac/contrib/ncurses/c++/cursesp.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/ncurses/c++/cursespad.cc#3 delete .. //depot/projects/trustedbsd/mac/contrib/ncurses/c++/cursesw.cc#4 delete .. //depot/projects/trustedbsd/mac/contrib/ncurses/c++/cursesw.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/ncurses/c++/cursslk.cc#3 delete .. //depot/projects/trustedbsd/mac/contrib/ncurses/c++/cursslk.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/ncurses/c++/demo.cc#4 delete .. //depot/projects/trustedbsd/mac/contrib/ncurses/c++/edit_cfg.sh#4 delete .. //depot/projects/trustedbsd/mac/contrib/ncurses/c++/etip.h.in#4 delete .. //depot/projects/trustedbsd/mac/contrib/ncurses/c++/headers#3 delete .. //depot/projects/trustedbsd/mac/contrib/ncurses/c++/internal.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/ncurses/c++/modules#3 delete .. //depot/projects/trustedbsd/mac/contrib/ncurses/config.guess#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/config.sub#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/configure#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/configure.in#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/convert_configure.pl#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/dist.mk#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/doc/hackguide.doc#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/doc/html/NCURSES-Programming-HOWTO.html#1 branch .. //depot/projects/trustedbsd/mac/contrib/ncurses/doc/html/announce.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/doc/html/hackguide.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/doc/html/ncurses-intro.html#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/doc/ncurses-intro.doc#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/form/Makefile.in#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/form/READ.ME#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/form/f_trace.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ncurses/form/fld_arg.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/form/fld_attr.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/form/fld_current.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/form/fld_def.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/form/fld_dup.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/form/fld_ftchoice.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/form/fld_ftlink.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/form/fld_info.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/form/fld_just.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/form/fld_link.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/form/fld_max.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/form/fld_move.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/form/fld_newftyp.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/form/fld_opts.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/form/fld_pad.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/form/fld_page.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/form/fld_stat.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/form/fld_type.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/form/fld_user.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/form/form.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/form/form.priv.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/form/frm_cursor.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/form/frm_data.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/form/frm_def.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/form/frm_driver.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/form/frm_hook.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/form/frm_opts.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/form/frm_page.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/form/frm_post.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/form/frm_req_name.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/form/frm_scale.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/form/frm_sub.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/form/frm_user.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/form/frm_win.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/form/fty_alnum.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/form/fty_alpha.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/form/fty_enum.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/form/fty_int.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/form/fty_ipv4.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/form/fty_num.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/form/fty_regex.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/form/llib-lform#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/form/llib-lformw#1 branch .. //depot/projects/trustedbsd/mac/contrib/ncurses/form/modules#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/include/Caps#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/include/Caps.aix4#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/include/Caps.hpux11#1 branch .. //depot/projects/trustedbsd/mac/contrib/ncurses/include/Caps.keys#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/include/Caps.osf1r5#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/include/Caps.uwin#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/include/MKhashsize.sh#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/include/MKkey_defs.sh#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/include/MKncurses_def.sh#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/include/MKparametrized.sh#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/include/MKterm.h.awk.in#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/include/curses.h.in#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/include/curses.tail#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/include/curses.wide#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/include/hashed_db.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/ncurses/include/nc_alloc.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/include/nc_tparm.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/ncurses/include/ncurses_cfg.hin#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/include/ncurses_defs#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/include/ncurses_dll.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/include/term_entry.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/include/tic.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/install-sh#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/Makefile.in#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/captoinfo.1m#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/clear.1#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/curs_add_wch.3x#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/curs_add_wchstr.3x#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/curs_addch.3x#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/curs_addchstr.3x#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/curs_addstr.3x#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/curs_addwstr.3x#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/curs_attr.3x#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/curs_beep.3x#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/curs_bkgd.3x#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/curs_bkgrnd.3x#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/curs_border.3x#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/curs_border_set.3x#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/curs_clear.3x#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/curs_color.3x#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/curs_delch.3x#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/curs_deleteln.3x#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/curs_extend.3x#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/curs_get_wch.3x#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/curs_get_wstr.3x#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/curs_getcchar.3x#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/curs_getch.3x#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/curs_getstr.3x#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/curs_getyx.3x#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/curs_in_wch.3x#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/curs_in_wchstr.3x#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/curs_inch.3x#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/curs_inchstr.3x#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/curs_initscr.3x#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/curs_inopts.3x#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/curs_ins_wch.3x#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/curs_ins_wstr.3x#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/curs_insch.3x#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/curs_insstr.3x#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/curs_instr.3x#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/curs_inwstr.3x#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/curs_kernel.3x#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/curs_mouse.3x#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/curs_move.3x#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/curs_outopts.3x#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/curs_overlay.3x#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/curs_pad.3x#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/curs_print.3x#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/curs_printw.3x#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/curs_refresh.3x#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/curs_scanw.3x#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/curs_scr_dump.3x#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/curs_scroll.3x#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/curs_slk.3x#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/curs_termattrs.3x#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/curs_termcap.3x#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/curs_terminfo.3x#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/curs_touch.3x#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/curs_trace.3x#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/curs_util.3x#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/curs_window.3x#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/default_colors.3x#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/define_key.3x#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/form.3x#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/form_cursor.3x#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/form_data.3x#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/form_driver.3x#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/form_field.3x#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/form_field_attributes.3x#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/form_field_buffer.3x#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/form_field_info.3x#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/form_field_just.3x#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/form_field_new.3x#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/form_field_opts.3x#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/form_field_userptr.3x#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/form_field_validation.3x#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/form_fieldtype.3x#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/form_hook.3x#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/form_new.3x#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/form_new_page.3x#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/form_opts.3x#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/form_page.3x#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/form_post.3x#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/form_requestname.3x#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/form_userptr.3x#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/form_win.3x#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/infocmp.1m#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/infotocap.1m#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/key_defined.3x#1 branch .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/keybound.3x#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/keyok.3x#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/legacy_coding.3x#1 branch .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/make_sed.sh#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/man_db.renames#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/manlinks.sed#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/menu.3x#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/menu_attributes.3x#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/menu_cursor.3x#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/menu_driver.3x#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/menu_format.3x#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/menu_hook.3x#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/menu_items.3x#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/menu_mark.3x#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/menu_new.3x#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/menu_opts.3x#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/menu_pattern.3x#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/menu_post.3x#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/menu_requestname.3x#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/menu_spacing.3x#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/menu_userptr.3x#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/menu_win.3x#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/mitem_current.3x#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/mitem_name.3x#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/mitem_new.3x#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/mitem_opts.3x#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/mitem_userptr.3x#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/mitem_value.3x#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/ncurses.3x#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/panel.3x#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/resizeterm.3x#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/term.5#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/term.7#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/terminfo.head#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/terminfo.tail#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/tic.1m#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/toe.1m#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/tput.1#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/tset.1#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/wresize.3x#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/menu/Makefile.in#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/menu/READ.ME#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/menu/eti.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/menu/llib-lmenu#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/menu/llib-lmenuw#1 branch .. //depot/projects/trustedbsd/mac/contrib/ncurses/menu/m_attribs.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/menu/m_cursor.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/menu/m_driver.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/menu/m_format.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/menu/m_global.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/menu/m_hook.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/menu/m_item_cur.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/menu/m_item_nam.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/menu/m_item_new.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/menu/m_item_opt.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/menu/m_item_top.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/menu/m_item_use.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/menu/m_item_val.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/menu/m_item_vis.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/menu/m_items.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/menu/m_new.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/menu/m_opts.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/menu/m_pad.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/menu/m_pattern.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/menu/m_post.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/menu/m_req_name.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/menu/m_scale.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/menu/m_spacing.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/menu/m_sub.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/menu/m_trace.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ncurses/menu/m_userptr.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/menu/m_win.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/menu/menu.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/menu/menu.priv.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/menu/mf_common.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/menu/modules#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/misc/Makefile.in#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/misc/chkdef.cmd#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/misc/cleantic.cmd#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/misc/cmpdef.cmd#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/misc/csort#1 branch .. //depot/projects/trustedbsd/mac/contrib/ncurses/misc/emx.src#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/misc/gen_edit.sh#1 branch .. //depot/projects/trustedbsd/mac/contrib/ncurses/misc/indent.pro#3 delete .. //depot/projects/trustedbsd/mac/contrib/ncurses/misc/jpf-indent#1 branch .. //depot/projects/trustedbsd/mac/contrib/ncurses/misc/makedef.cmd#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/misc/ncu-indent#1 branch .. //depot/projects/trustedbsd/mac/contrib/ncurses/misc/ncurses-config.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/ncurses/misc/run_tic.in#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/misc/shlib#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/misc/terminfo.src#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/mk-0th.awk#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/mk-1st.awk#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/mk-2nd.awk#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/mkinstalldirs#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/Makefile.in#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/README#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/README.IZ#1 branch .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/SigAction.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/base/MKkeyname.awk#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/base/MKlib_gen.sh#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/base/MKunctrl.awk#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/base/README#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/base/define_key.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/base/key_defined.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/base/keybound.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/base/keyok.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/base/legacy_coding.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/base/lib_addch.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/base/lib_addstr.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/base/lib_beep.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/base/lib_bkgd.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/base/lib_box.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/base/lib_chgat.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/base/lib_clrbot.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/base/lib_color.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/base/lib_colorset.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/base/lib_dft_fgbg.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/base/lib_erase.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/base/lib_freeall.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/base/lib_getch.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/base/lib_getstr.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/base/lib_hline.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/base/lib_initscr.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/base/lib_insch.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/base/lib_insdel.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/base/lib_insnstr.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/base/lib_insstr.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/base/lib_instr.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/base/lib_mouse.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/base/lib_move.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/base/lib_mvwin.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/base/lib_newterm.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/base/lib_newwin.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/base/lib_overlay.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/base/lib_pad.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/base/lib_printw.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/base/lib_redrawln.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/base/lib_refresh.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/base/lib_restart.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/base/lib_screen.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/base/lib_scroll.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/base/lib_set_term.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/base/lib_slk.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/base/lib_slkatr_set.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/base/lib_slkatrof.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/base/lib_slkatron.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/base/lib_slkatrset.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/base/lib_slkattr.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/base/lib_slkclear.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/base/lib_slkcolor.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/base/lib_slklab.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/base/lib_slkrefr.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/base/lib_slkset.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/base/lib_ungetch.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/base/lib_vline.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/base/lib_wattroff.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/base/lib_wattron.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/base/lib_window.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/base/resizeterm.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/base/safe_sprintf.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/base/sigaction.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/base/tries.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/base/version.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/base/vsscanf.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/base/wresize.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/curses.priv.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/llib-lncurses#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/llib-lncursesw#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/modules#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/tinfo/MKcaptab.awk#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/tinfo/MKfallback.sh#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/tinfo/MKkeys_list.sh#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/tinfo/MKnames.awk#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/tinfo/README#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/tinfo/access.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/tinfo/add_tries.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/tinfo/alloc_entry.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/tinfo/alloc_ttype.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/tinfo/captoinfo.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/tinfo/comp_error.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/tinfo/comp_expand.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/tinfo/comp_hash.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/tinfo/comp_parse.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/tinfo/comp_scan.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/tinfo/db_iterator.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/tinfo/doalloc.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/tinfo/free_ttype.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/tinfo/hashed_db.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/tinfo/home_terminfo.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/tinfo/init_keytry.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/tinfo/lib_acs.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/tinfo/lib_cur_term.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/tinfo/lib_data.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/tinfo/lib_has_cap.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/tinfo/lib_kernel.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/tinfo/lib_napms.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/tinfo/lib_options.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/tinfo/lib_print.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/tinfo/lib_raw.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/tinfo/lib_setup.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/tinfo/lib_termcap.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/tinfo/lib_termname.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/tinfo/lib_tgoto.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/tinfo/lib_ti.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/tinfo/lib_tparm.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/tinfo/lib_tputs.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/tinfo/lib_ttyflags.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/tinfo/make_keys.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/tinfo/name_match.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/tinfo/parse_entry.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/tinfo/read_entry.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/tinfo/read_termcap.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/tinfo/setbuf.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/tinfo/strings.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/tinfo/trim_sgr0.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/tinfo/write_entry.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/trace/README#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/trace/lib_trace.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/trace/lib_traceatr.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/trace/lib_tracebits.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/trace/lib_tracechr.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/trace/lib_tracedmp.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/trace/lib_tracemse.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/trace/trace_buf.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/trace/varargs.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/trace/visbuf.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/tty/MKexpanded.sh#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/tty/hashmap.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/tty/lib_mvcur.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/tty/lib_tstp.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/tty/lib_twait.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/tty/lib_vidattr.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/tty/tty_display.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/tty/tty_update.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/widechar/charable.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/widechar/lib_add_wch.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/widechar/lib_box_set.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/widechar/lib_cchar.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/widechar/lib_get_wch.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/widechar/lib_get_wstr.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/widechar/lib_in_wch.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/widechar/lib_in_wchnstr.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/widechar/lib_ins_nwstr.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/widechar/lib_ins_wch.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/widechar/lib_inwstr.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/widechar/lib_pecho_wchar.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/widechar/lib_slk_wset.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/widechar/lib_unget_wch.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/widechar/lib_vid_attr.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/widechar/lib_wacs.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/widechar/lib_wunctrl.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/panel/Makefile.in#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/panel/llib-lpanel#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/panel/llib-lpanelw#1 branch .. //depot/projects/trustedbsd/mac/contrib/ncurses/panel/p_above.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/panel/p_below.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/panel/p_bottom.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/panel/p_delete.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/panel/p_hidden.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/panel/p_hide.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/panel/p_move.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/panel/p_new.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/panel/p_replace.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/panel/p_show.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/panel/p_top.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/panel/p_update.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/panel/p_user.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/panel/p_win.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/panel/panel.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/panel/panel.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/panel/panel.priv.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/progs/MKtermsort.sh#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/progs/Makefile.in#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/progs/capconvert#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/progs/clear.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/progs/clear.sh#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/progs/dump_entry.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/progs/dump_entry.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/progs/infocmp.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/progs/modules#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/progs/progs.priv.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/progs/tic.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/progs/toe.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/progs/tput.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/progs/tset.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/tack/COPYING#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/tack/HISTORY#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/tack/Makefile.in#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/tack/ansi.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/tack/charset.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/tack/color.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/tack/control.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/tack/crum.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/tack/edit.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/tack/fun.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/tack/init.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/tack/menu.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/tack/modes.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/tack/modules#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/tack/output.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/tack/pad.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/tack/scan.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/tack/sync.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/tack/sysdep.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/tack/tack.1#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/tack/tack.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/tack/tack.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/tar-copy.sh#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/test/Makefile.in#3 delete .. //depot/projects/trustedbsd/mac/contrib/ncurses/test/README#2 delete .. //depot/projects/trustedbsd/mac/contrib/ncurses/test/blue.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/ncurses/test/bs.6#2 delete .. //depot/projects/trustedbsd/mac/contrib/ncurses/test/bs.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/ncurses/test/cardfile.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/ncurses/test/cardfile.dat#2 delete .. //depot/projects/trustedbsd/mac/contrib/ncurses/test/configure#3 delete .. //depot/projects/trustedbsd/mac/contrib/ncurses/test/configure.in#3 delete .. //depot/projects/trustedbsd/mac/contrib/ncurses/test/ditto.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/ncurses/test/dots.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/ncurses/test/filter.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/ncurses/test/firework.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/ncurses/test/firstlast.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/ncurses/test/gdc.6#2 delete .. //depot/projects/trustedbsd/mac/contrib/ncurses/test/gdc.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/ncurses/test/hanoi.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/ncurses/test/hashtest.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/ncurses/test/keynames.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/ncurses/test/knight.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/ncurses/test/lrtest.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/ncurses/test/modules#2 delete .. //depot/projects/trustedbsd/mac/contrib/ncurses/test/ncurses.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/ncurses/test/ncurses_tst.hin#2 delete .. //depot/projects/trustedbsd/mac/contrib/ncurses/test/newdemo.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/ncurses/test/railroad.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/ncurses/test/rain.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/ncurses/test/tclock.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/ncurses/test/test.priv.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/ncurses/test/testaddch.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/ncurses/test/testcurs.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/ncurses/test/testscanw.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/ncurses/test/tracemunch#2 delete .. //depot/projects/trustedbsd/mac/contrib/ncurses/test/view.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/ncurses/test/worm.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/ncurses/test/xmas.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/netcat/nc.1#5 integrate .. //depot/projects/trustedbsd/mac/contrib/netcat/netcat.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/netcat/socks.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/HISTORY#4 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/README#6 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/TODO#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/VERSION#4 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/audit/audit.8#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/auditd/auditd.8#3 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/auditd/auditd.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/auditfilterd/auditfilterd.8#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/auditfilterd/auditfilterd.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/auditreduce/auditreduce.1#3 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/praudit/praudit.1#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/praudit/praudit.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/bsm/libbsm.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/compat/clock_gettime.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/config/config.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/configure#4 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/configure.ac#4 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/etc/audit_event#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/au_class.3#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/au_control.3#3 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/au_event.3#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/au_free_token.3#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/au_io.3#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/au_mask.3#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/au_open.3#3 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/au_token.3#4 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/au_user.3#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/audit_submit.3#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/bsm_io.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/bsm_notify.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/bsm_token.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/bsm_wrappers.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/libbsm.3#4 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/man/audit.2#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/man/audit.log.5#4 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/man/audit_class.5#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/man/audit_control.5#3 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/man/audit_event.5#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/man/audit_user.5#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/man/audit_warn.5#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/man/auditctl.2#3 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/man/auditon.2#3 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/man/getaudit.2#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/man/getauid.2#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/man/setaudit.2#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/man/setauid.2#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/test/bsm/generate.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/test/reference/arg32_record#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/test/reference/data_record#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/test/reference/file_record#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/test/reference/in_addr_record#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/test/reference/ip_record#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/test/reference/ipc_record#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/test/reference/iport_record#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/test/reference/opaque_record#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/test/reference/path_record#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/test/reference/process32_record#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/test/reference/process32ex_record#2 delete .. //depot/projects/trustedbsd/mac/contrib/openbsm/test/reference/process32ex_record-IPv4#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/test/reference/process32ex_record-IPv6#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/test/reference/process32ex_token#2 delete .. //depot/projects/trustedbsd/mac/contrib/openbsm/test/reference/process32ex_token-IPv4#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/test/reference/process32ex_token-IPv6#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/test/reference/process64_record#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/test/reference/process64_token#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/test/reference/process64ex_record-IPv4#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/test/reference/process64ex_record-IPv6#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/test/reference/process64ex_token-IPv4#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/test/reference/process64ex_token-IPv6#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/test/reference/return32_record#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/test/reference/seq_record#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/test/reference/subject32_record#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/test/reference/subject32ex_record#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/test/reference/subject32ex_token-IPv4#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/test/reference/subject32ex_token-IPv6#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/test/reference/text_record#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/test/reference/zonename_record#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/test/reference/zonename_token#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/tools/audump.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_readline.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/opensolaris/cmd/zdb/zdb.8#1 branch .. //depot/projects/trustedbsd/mac/contrib/opensolaris/cmd/zdb/zdb.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/opensolaris/cmd/zdb/zdb_il.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/opensolaris/cmd/zfs/zfs.8#1 branch .. //depot/projects/trustedbsd/mac/contrib/opensolaris/cmd/zfs/zfs_iter.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/opensolaris/cmd/zfs/zfs_iter.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/opensolaris/cmd/zfs/zfs_main.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/opensolaris/cmd/zfs/zfs_util.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/opensolaris/cmd/zpool/zpool.8#1 branch .. //depot/projects/trustedbsd/mac/contrib/opensolaris/cmd/zpool/zpool_iter.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/opensolaris/cmd/zpool/zpool_main.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/opensolaris/cmd/zpool/zpool_util.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/opensolaris/cmd/zpool/zpool_util.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/opensolaris/cmd/zpool/zpool_vdev.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/opensolaris/cmd/ztest/ztest.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/opensolaris/head/assert.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/opensolaris/head/atomic.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/opensolaris/head/libintl.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/opensolaris/head/stdio_ext.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/opensolaris/head/synch.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/opensolaris/head/thread.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/opensolaris/lib/libnvpair/libnvpair.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/opensolaris/lib/libnvpair/libnvpair.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/opensolaris/lib/libnvpair/nvpair_alloc_system.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/opensolaris/lib/libuutil/common/libuutil.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/opensolaris/lib/libuutil/common/libuutil_common.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/opensolaris/lib/libuutil/common/libuutil_impl.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/opensolaris/lib/libuutil/common/uu_alloc.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/opensolaris/lib/libuutil/common/uu_avl.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/opensolaris/lib/libuutil/common/uu_dprintf.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/opensolaris/lib/libuutil/common/uu_ident.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/opensolaris/lib/libuutil/common/uu_list.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/opensolaris/lib/libuutil/common/uu_misc.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/opensolaris/lib/libuutil/common/uu_open.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/opensolaris/lib/libuutil/common/uu_pname.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/opensolaris/lib/libuutil/common/uu_strtoint.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/opensolaris/lib/libzfs/common/libzfs.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/opensolaris/lib/libzfs/common/libzfs_config.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/opensolaris/lib/libzpool/common/kernel.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/opensolaris/lib/libzpool/common/taskq.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/opensolaris/lib/libzpool/common/util.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/sendmail/FREEBSD-upgrade#21 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/KNOWNBUGS#9 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/PGPKEYS#11 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/RELEASE_NOTES#19 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/README#17 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/cf/knecht.mc#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/cf/submit.cf#18 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/feature/access_db.m4#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/feature/badmx.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/feature/block_bad_helo.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/feature/dnsbl.m4#8 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/feature/enhdnsbl.m4#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/feature/require_rdns.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/m4/proto.m4#16 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/m4/version.m4#19 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/mailer/smtp.m4#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/contrib/cidrexpand#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/contrib/qtool.pl#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/doc/op/op.me#16 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/editmap/Makefile.m4#4 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/include/libmilter/mfapi.h#12 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/include/libmilter/mfdef.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/include/libmilter/milter.h#9 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/conf.h#15 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/errstring.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/heap.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/ldap.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/misc.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/os/sm_os_qnx.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/sendmail.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/tailq.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/Makefile.m4#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/README#9 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/comm.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/api.html#4 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/design.html#4 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/index.html#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/installation.html#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/other.html#4 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/overview.html#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/sample.html#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/smfi_addheader.html#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/smfi_addrcpt.html#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/smfi_addrcpt_par.html#1 branch .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/smfi_chgfrom.html#1 branch .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/smfi_chgheader.html#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/smfi_delrcpt.html#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/smfi_getpriv.html#4 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/smfi_getsymval.html#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/smfi_insheader.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/smfi_main.html#4 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/smfi_opensocket.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/smfi_progress.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/smfi_quarantine.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/smfi_register.html#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/smfi_replacebody.html#4 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/smfi_setbacklog.html#4 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/smfi_setconn.html#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/smfi_setdbg.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/smfi_setmlreply.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/smfi_setpriv.html#4 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/smfi_setreply.html#8 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/smfi_setsymlist.html#1 branch .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/smfi_settimeout.html#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/smfi_stop.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/smfi_version.html#1 branch .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/xxfi_abort.html#4 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/xxfi_body.html#4 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/xxfi_close.html#4 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/xxfi_connect.html#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/xxfi_data.html#1 branch .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/xxfi_envfrom.html#4 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/xxfi_envrcpt.html#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/xxfi_eoh.html#4 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/xxfi_eom.html#4 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/xxfi_header.html#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/xxfi_helo.html#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/xxfi_negotiate.html#1 branch .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/xxfi_unknown.html#1 branch .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/engine.c#13 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/example.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/handler.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/libmilter.h#11 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/listener.c#14 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/main.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/monitor.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/smfi.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/worker.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/Makefile.m4#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/config.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/exc.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/exc.html#4 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/findfp.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/flags.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/ldap.c#12 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/local.h#9 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/memstat.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/snprintf.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/t-memstat.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/t-qic.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/t-sem.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/util.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/vfscanf.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsmdb/Makefile.m4#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsmutil/Makefile.m4#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/mail.local/Makefile.m4#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/mail.local/mail.local.c#13 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/mailstats/Makefile.m4#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/makemap/Makefile.m4#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/praliases/Makefile.m4#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/rmail/Makefile.m4#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/smrsh/Makefile.m4#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/Makefile.m4#8 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/README#17 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/TRACEFLAGS#11 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/TUNING#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/alias.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/arpadate.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/collect.c#15 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/conf.c#19 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/conf.h#12 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/control.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/daemon.c#16 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/daemon.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/deliver.c#22 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/domain.c#13 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/envelope.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/err.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/headers.c#14 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/helpfile#9 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/macro.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/mailq.1#9 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/main.c#17 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/map.c#15 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/map.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/mci.c#15 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/milter.c#17 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/mime.c#12 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/parseaddr.c#17 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/queue.c#19 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/ratectrl.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/readcf.c#15 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/recipient.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/sasl.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/savemail.c#12 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/sendmail.h#18 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/sm_resolve.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/srvrsmtp.c#19 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/stab.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/stats.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/timers.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/tls.c#14 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/udb.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/usersmtp.c#14 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/util.c#14 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/version.c#19 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/test/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/vacation/Makefile.m4#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/vacation/vacation.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-stp.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/FREEBSD-Xlist#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/FREEBSD-upgrade#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/Fixes#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/Imakefile#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/MAKEDIFFS#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/MAKESHAR#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/Makefile.in#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/Makefile.std#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/Makefile.vms#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/README#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/complete.tcsh#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/config.h.in#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/config/bsd4.4#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/config_f.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/configure#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/configure.in#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/ed.chared.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/ed.decls.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/ed.defns.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/ed.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/ed.init.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/ed.inputl.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/ed.refresh.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/ed.screen.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/ed.term.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/ed.term.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/ed.xmap.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/eight-bit.me#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/gethost.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/glob.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/glob.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/host.defs#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/imake.config#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/ma.setp.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/mi.termios.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/mi.varargs.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/C/set1#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/C/set10#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/C/set11#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/C/set12#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/C/set13#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/C/set14#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/C/set15#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/C/set16#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/C/set17#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/C/set18#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/C/set19#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Apr 21 23:30:48 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 6801F16A406; Sat, 21 Apr 2007 23:30:48 +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 32D1816A401 for ; Sat, 21 Apr 2007 23:30:48 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 23E8513C484 for ; Sat, 21 Apr 2007 23:30:48 +0000 (UTC) (envelope-from zec@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 l3LNUmcN039906 for ; Sat, 21 Apr 2007 23:30:48 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3LNUlq9039903 for perforce@freebsd.org; Sat, 21 Apr 2007 23:30:47 GMT (envelope-from zec@FreeBSD.org) Date: Sat, 21 Apr 2007 23:30:47 GMT Message-Id: <200704212330.l3LNUlq9039903@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 118550 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: Sat, 21 Apr 2007 23:30:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=118550 Change 118550 by zec@zec_tca51 on 2007/04/21 23:30:22 Make sure that uma_zcreate() and uma_zdestroy() for various global pools used by pf are called only once in pf_load() / pf_unload() call graph, and not once for each stack instance in iattach() / idetach() routines. This seems to have fixed kldloading / kldunloading of pf when multiple stack instances are active. Affected files ... .. //depot/projects/vimage/src/sys/contrib/pf/net/pf_ioctl.c#6 edit Differences ... ==== //depot/projects/vimage/src/sys/contrib/pf/net/pf_ioctl.c#6 (text+ko) ==== @@ -256,7 +256,6 @@ }; #endif -static volatile int pf_pfil_hooked = 0; struct mtx pf_task_mtx; pflog_packet_t *pflog_packet_ptr = NULL; @@ -341,8 +340,10 @@ if ( (error = pf_osfp_initialize()) ) { #ifdef VIMAGE if (curvnet == &vnet_0) + cleanup_pf_zone(); +#else + cleanup_pf_zone(); #endif - cleanup_pf_zone(); pf_osfp_cleanup(); return (error); } @@ -405,7 +406,6 @@ if (curvnet == &vnet_0) { #endif pf_normalize_init(); - pf_pfil_hooked = 0; #ifdef VIMAGE } #endif @@ -1469,16 +1469,6 @@ if (V_pf_status.running) error = EEXIST; else { -#ifdef __FreeBSD__ - PF_UNLOCK(); - error = hook_pf(); - PF_LOCK(); - if (error) { - DPFPRINTF(PF_DEBUG_MISC, - ("pf: pfil registeration fail\n")); - break; - } -#endif V_pf_status.running = 1; V_pf_status.since = time_second; if (V_pf_status.stateid == 0) { @@ -1494,16 +1484,6 @@ error = ENOENT; else { V_pf_status.running = 0; -#ifdef __FreeBSD__ - PF_UNLOCK(); - error = dehook_pf(); - PF_LOCK(); - if (error) { - V_pf_status.running = 1; - DPFPRINTF(PF_DEBUG_MISC, - ("pf: pfil unregisteration failed\n")); - } -#endif V_pf_status.since = time_second; DPFPRINTF(PF_DEBUG_MISC, ("pf: stopped\n")); } @@ -3546,9 +3526,6 @@ PF_ASSERT(MA_NOTOWNED); - if (pf_pfil_hooked) - return (0); - pfh_inet = pfil_head_get(PFIL_TYPE_AF, AF_INET); if (pfh_inet == NULL) return (ESRCH); /* XXX */ @@ -3567,7 +3544,6 @@ pfil_add_hook(pf_check6_out, NULL, PFIL_OUT | PFIL_WAITOK, pfh_inet6); #endif - pf_pfil_hooked = 1; return (0); } @@ -3581,9 +3557,6 @@ PF_ASSERT(MA_NOTOWNED); - if (pf_pfil_hooked == 0) - return (0); - pfh_inet = pfil_head_get(PFIL_TYPE_AF, AF_INET); if (pfh_inet == NULL) return (ESRCH); /* XXX */ @@ -3601,7 +3574,6 @@ pfh_inet6); #endif - pf_pfil_hooked = 0; return (0); } @@ -3624,18 +3596,29 @@ static int pf_load(void) { + int error = 0; + init_zone_var(); init_pf_mutex(); pf_dev = make_dev(&pf_cdevsw, 0, 0, 0, 0600, PF_NAME); + error = hook_pf(); + if (error) { + printf("%s : pfil registeration failed\n", __FUNCTION__); + destroy_dev(pf_dev); + destroy_pf_mutex(); + return error; + } #ifdef VIMAGE vnet_mod_register(&vnet_pf_modinfo); #else - if (vnet_pf_iattach()) { + error = vnet_pf_iattach(); + if (error) { + dehook_pf(); destroy_dev(pf_dev); destroy_pf_mutex(); } #endif - return (0); + return (error); } static int vnet_pf_idetach(void) @@ -3647,8 +3630,6 @@ shutdown_pf(); pfi_cleanup(); pf_osfp_flush(); - pf_osfp_cleanup(); - cleanup_pf_zone(); PF_UNLOCK(); #ifdef VIMAGE @@ -3668,6 +3649,8 @@ #else vnet_pf_idetach(); #endif + pf_osfp_cleanup(); + cleanup_pf_zone(); error = dehook_pf(); if (error) { /*