From owner-p4-projects@FreeBSD.ORG Mon Oct 10 03:23:45 2005 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 AB0E316A421; Mon, 10 Oct 2005 03:23:44 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6B0EE16A41F for ; Mon, 10 Oct 2005 03:23:44 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 419E943D46 for ; Mon, 10 Oct 2005 03:23:33 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9A3NXMD061523 for ; Mon, 10 Oct 2005 03:23:33 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9A3NVKD061520 for perforce@freebsd.org; Mon, 10 Oct 2005 03:23:31 GMT (envelope-from scottl@freebsd.org) Date: Mon, 10 Oct 2005 03:23:31 GMT Message-Id: <200510100323.j9A3NVKD061520@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 85063 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, 10 Oct 2005 03:23:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=85063 Change 85063 by scottl@scottl-junior on 2005/10/10 03:22:38 IFC Affected files ... .. //depot/projects/soc2005/ufsj/src/ObsoleteFiles.inc#2 integrate .. //depot/projects/soc2005/ufsj/src/UPDATING#3 integrate .. //depot/projects/soc2005/ufsj/src/bin/rm/rm.1#2 integrate .. //depot/projects/soc2005/ufsj/src/bin/rm/rm.c#2 integrate .. //depot/projects/soc2005/ufsj/src/contrib/bc/bc/main.c#2 integrate .. //depot/projects/soc2005/ufsj/src/contrib/bsnmp/FREEBSD-Xlist#2 integrate .. //depot/projects/soc2005/ufsj/src/contrib/bsnmp/NEWS#2 integrate .. //depot/projects/soc2005/ufsj/src/contrib/bsnmp/VERSION#2 integrate .. //depot/projects/soc2005/ufsj/src/contrib/bsnmp/gensnmpdef/gensnmpdef.1#2 integrate .. //depot/projects/soc2005/ufsj/src/contrib/bsnmp/gensnmptree/gensnmptree.1#2 integrate .. //depot/projects/soc2005/ufsj/src/contrib/bsnmp/gensnmptree/gensnmptree.c#2 integrate .. //depot/projects/soc2005/ufsj/src/contrib/bsnmp/lib/asn1.3#2 integrate .. //depot/projects/soc2005/ufsj/src/contrib/bsnmp/lib/asn1.c#2 integrate .. //depot/projects/soc2005/ufsj/src/contrib/bsnmp/lib/asn1.h#2 integrate .. //depot/projects/soc2005/ufsj/src/contrib/bsnmp/lib/bsnmpagent.3#2 integrate .. //depot/projects/soc2005/ufsj/src/contrib/bsnmp/lib/bsnmpclient.3#2 integrate .. //depot/projects/soc2005/ufsj/src/contrib/bsnmp/lib/bsnmplib.3#2 integrate .. //depot/projects/soc2005/ufsj/src/contrib/bsnmp/lib/snmp.c#2 integrate .. //depot/projects/soc2005/ufsj/src/contrib/bsnmp/lib/snmpagent.c#2 integrate .. //depot/projects/soc2005/ufsj/src/contrib/bsnmp/lib/snmpclient.c#2 integrate .. //depot/projects/soc2005/ufsj/src/contrib/bsnmp/snmp_mibII/mibII.c#2 integrate .. //depot/projects/soc2005/ufsj/src/contrib/bsnmp/snmp_mibII/mibII.h#2 integrate .. //depot/projects/soc2005/ufsj/src/contrib/bsnmp/snmp_mibII/mibII_ipaddr.c#2 integrate .. //depot/projects/soc2005/ufsj/src/contrib/bsnmp/snmp_mibII/mibII_route.c#2 integrate .. //depot/projects/soc2005/ufsj/src/contrib/bsnmp/snmp_mibII/snmp_mibII.3#2 integrate .. //depot/projects/soc2005/ufsj/src/contrib/bsnmp/snmp_ntp/BEGEMOT-NTP-MIB.txt#2 integrate .. //depot/projects/soc2005/ufsj/src/contrib/bsnmp/snmp_ntp/snmp_ntp.c#2 integrate .. //depot/projects/soc2005/ufsj/src/contrib/bsnmp/snmpd/.gdbinit#2 delete .. //depot/projects/soc2005/ufsj/src/contrib/bsnmp/snmpd/bsnmpd.1#2 integrate .. //depot/projects/soc2005/ufsj/src/contrib/bsnmp/snmpd/config.c#2 integrate .. //depot/projects/soc2005/ufsj/src/contrib/bsnmp/snmpd/main.c#2 integrate .. //depot/projects/soc2005/ufsj/src/contrib/bsnmp/snmpd/snmpmod.3#2 integrate .. //depot/projects/soc2005/ufsj/src/contrib/bsnmp/snmpd/snmpmod.h#2 integrate .. //depot/projects/soc2005/ufsj/src/contrib/bsnmp/snmpd/trans_udp.c#2 integrate .. //depot/projects/soc2005/ufsj/src/contrib/bsnmp/snmpd/trap.c#2 integrate .. //depot/projects/soc2005/ufsj/src/contrib/cpio/ABOUT-NLS#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/AUTHORS#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/COPYING#2 integrate .. //depot/projects/soc2005/ufsj/src/contrib/cpio/COPYING.LIB#2 delete .. //depot/projects/soc2005/ufsj/src/contrib/cpio/ChangeLog#2 integrate .. //depot/projects/soc2005/ufsj/src/contrib/cpio/FREEBSD-upgrade#2 integrate .. //depot/projects/soc2005/ufsj/src/contrib/cpio/INSTALL#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/NEWS#2 integrate .. //depot/projects/soc2005/ufsj/src/contrib/cpio/README#2 integrate .. //depot/projects/soc2005/ufsj/src/contrib/cpio/THANKS#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/TODO#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/alloca.c#2 delete .. //depot/projects/soc2005/ufsj/src/contrib/cpio/copyin.c#2 delete .. //depot/projects/soc2005/ufsj/src/contrib/cpio/copyout.c#2 delete .. //depot/projects/soc2005/ufsj/src/contrib/cpio/copypass.c#2 delete .. //depot/projects/soc2005/ufsj/src/contrib/cpio/cpio.1#2 delete .. //depot/projects/soc2005/ufsj/src/contrib/cpio/cpio.h#2 delete .. //depot/projects/soc2005/ufsj/src/contrib/cpio/cpio.texi#2 delete .. //depot/projects/soc2005/ufsj/src/contrib/cpio/cpiohdr.h#2 delete .. //depot/projects/soc2005/ufsj/src/contrib/cpio/defer.c#2 delete .. //depot/projects/soc2005/ufsj/src/contrib/cpio/defer.h#2 delete .. //depot/projects/soc2005/ufsj/src/contrib/cpio/dirname.c#2 delete .. //depot/projects/soc2005/ufsj/src/contrib/cpio/doc/cpio.1#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/doc/cpio.texi#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/dstring.c#2 delete .. //depot/projects/soc2005/ufsj/src/contrib/cpio/dstring.h#2 delete .. //depot/projects/soc2005/ufsj/src/contrib/cpio/error.c#2 delete .. //depot/projects/soc2005/ufsj/src/contrib/cpio/extern.h#2 delete .. //depot/projects/soc2005/ufsj/src/contrib/cpio/filemode.c#2 delete .. //depot/projects/soc2005/ufsj/src/contrib/cpio/filetypes.h#2 delete .. //depot/projects/soc2005/ufsj/src/contrib/cpio/global.c#2 delete .. //depot/projects/soc2005/ufsj/src/contrib/cpio/idcache.c#2 delete .. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/alloca_.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/argp-ba.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/argp-eexst.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/argp-fmtstream.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/argp-fmtstream.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/argp-fs-xinl.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/argp-help.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/argp-namefrob.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/argp-parse.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/argp-pv.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/argp-pvh.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/argp-xinl.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/argp.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/basename.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/dirname.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/dirname.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/error.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/error.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/exit.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/exitfail.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/exitfail.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/full-write.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/full-write.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/getopt.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/getopt1.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/getopt_.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/getopt_int.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/gettext.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/localedir.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/mempcpy.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/mempcpy.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/rmt.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/rtapelib.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/safe-read.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/safe-read.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/safe-write.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/safe-write.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/savedir.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/savedir.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/strcase.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/strchrnul.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/strchrnul.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/stripslash.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/strndup.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/strndup.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/strnlen.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/system.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/unlocked-io.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/xalloc-die.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/xalloc.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/xmalloc.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/main.c#2 delete .. //depot/projects/soc2005/ufsj/src/contrib/cpio/makepath.c#2 delete .. //depot/projects/soc2005/ufsj/src/contrib/cpio/rmt.h#2 delete .. //depot/projects/soc2005/ufsj/src/contrib/cpio/rtapelib.c#2 delete .. //depot/projects/soc2005/ufsj/src/contrib/cpio/safe-stat.h#2 delete .. //depot/projects/soc2005/ufsj/src/contrib/cpio/src/copyin.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/src/copyout.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/src/copypass.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/src/cpio.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/src/cpiohdr.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/src/defer.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/src/defer.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/src/dstring.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/src/dstring.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/src/extern.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/src/filemode.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/src/filetypes.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/src/global.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/src/idcache.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/src/main.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/src/makepath.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/src/safe-stat.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/src/tar.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/src/tar.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/src/tarhdr.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/src/userspec.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/src/util.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/cpio/stripslash.c#2 delete .. //depot/projects/soc2005/ufsj/src/contrib/cpio/system.h#2 delete .. //depot/projects/soc2005/ufsj/src/contrib/cpio/tar.c#2 delete .. //depot/projects/soc2005/ufsj/src/contrib/cpio/tar.h#2 delete .. //depot/projects/soc2005/ufsj/src/contrib/cpio/tarhdr.h#2 delete .. //depot/projects/soc2005/ufsj/src/contrib/cpio/userspec.c#2 delete .. //depot/projects/soc2005/ufsj/src/contrib/cpio/util.c#2 delete .. //depot/projects/soc2005/ufsj/src/contrib/cpio/version.c#2 delete .. //depot/projects/soc2005/ufsj/src/contrib/cpio/xmalloc.c#2 delete .. //depot/projects/soc2005/ufsj/src/contrib/cpio/xstrdup.c#2 delete .. //depot/projects/soc2005/ufsj/src/contrib/pf/man/pf.4#2 integrate .. //depot/projects/soc2005/ufsj/src/contrib/pf/man/pf.conf.5#2 integrate .. //depot/projects/soc2005/ufsj/src/contrib/pf/man/pfsync.4#3 integrate .. //depot/projects/soc2005/ufsj/src/contrib/smbfs/include/netsmb/nb_lib.h#2 integrate .. //depot/projects/soc2005/ufsj/src/contrib/smbfs/include/netsmb/smb_lib.h#3 integrate .. //depot/projects/soc2005/ufsj/src/contrib/smbfs/lib/smb/ctx.c#3 integrate .. //depot/projects/soc2005/ufsj/src/contrib/smbfs/lib/smb/nb.c#2 integrate .. //depot/projects/soc2005/ufsj/src/contrib/smbfs/lib/smb/nb_net.c#2 integrate .. //depot/projects/soc2005/ufsj/src/contrib/smbfs/lib/smb/nbns_rq.c#2 integrate .. //depot/projects/soc2005/ufsj/src/contrib/smbfs/mount_smbfs/mount_smbfs.8#2 integrate .. //depot/projects/soc2005/ufsj/src/etc/defaults/rc.conf#4 integrate .. //depot/projects/soc2005/ufsj/src/etc/mtree/BSD.include.dist#3 integrate .. //depot/projects/soc2005/ufsj/src/etc/pccard_ether#3 integrate .. //depot/projects/soc2005/ufsj/src/etc/rc.d/Makefile#4 integrate .. //depot/projects/soc2005/ufsj/src/etc/rc.d/archdep#2 integrate .. //depot/projects/soc2005/ufsj/src/etc/rc.d/pf#3 integrate .. //depot/projects/soc2005/ufsj/src/etc/rc.d/pflog#3 integrate .. //depot/projects/soc2005/ufsj/src/etc/rc.d/pfsync#1 branch .. //depot/projects/soc2005/ufsj/src/etc/rc.d/ugidfw#2 integrate .. //depot/projects/soc2005/ufsj/src/etc/rc.firewall6#2 integrate .. //depot/projects/soc2005/ufsj/src/etc/rc.subr#3 integrate .. //depot/projects/soc2005/ufsj/src/games/fortune/datfiles/limerick#2 integrate .. //depot/projects/soc2005/ufsj/src/gnu/usr.bin/cpio/Makefile#2 integrate .. //depot/projects/soc2005/ufsj/src/gnu/usr.bin/cpio/config.h#1 branch .. //depot/projects/soc2005/ufsj/src/gnu/usr.bin/cpio/doc/Makefile#2 integrate .. //depot/projects/soc2005/ufsj/src/gnu/usr.bin/gdb/kgdb/trgt_amd64.c#3 integrate .. //depot/projects/soc2005/ufsj/src/include/Makefile#3 integrate .. //depot/projects/soc2005/ufsj/src/include/pthread_np.h#2 integrate .. //depot/projects/soc2005/ufsj/src/lib/csu/amd64/crt1.c#2 integrate .. //depot/projects/soc2005/ufsj/src/lib/csu/i386-elf/crt1.c#2 integrate .. //depot/projects/soc2005/ufsj/src/lib/libbsnmp/libbsnmp/Makefile#2 integrate .. //depot/projects/soc2005/ufsj/src/lib/libc/arm/string/Makefile.inc#2 integrate .. //depot/projects/soc2005/ufsj/src/lib/libc/arm/string/strlen.S#1 branch .. //depot/projects/soc2005/ufsj/src/lib/libdevstat/devstat.c#2 integrate .. //depot/projects/soc2005/ufsj/src/lib/libedit/editline.3#3 integrate .. //depot/projects/soc2005/ufsj/src/lib/libedit/el.c#3 integrate .. //depot/projects/soc2005/ufsj/src/lib/libedit/makelist#3 integrate .. //depot/projects/soc2005/ufsj/src/lib/libedit/map.c#3 integrate .. //depot/projects/soc2005/ufsj/src/lib/libkvm/kvm_arm.c#2 integrate .. //depot/projects/soc2005/ufsj/src/lib/libpam/modules/pam_ssh/Makefile#3 integrate .. //depot/projects/soc2005/ufsj/src/lib/libthr/pthread.map#3 integrate .. //depot/projects/soc2005/ufsj/src/lib/libthr/thread/thr_join.c#2 integrate .. //depot/projects/soc2005/ufsj/src/lib/libutil/trimdomain.c#2 integrate .. //depot/projects/soc2005/ufsj/src/lib/msun/src/e_rem_pio2f.c#2 integrate .. //depot/projects/soc2005/ufsj/src/lib/msun/src/k_cosf.c#2 integrate .. //depot/projects/soc2005/ufsj/src/release/Makefile#3 integrate .. //depot/projects/soc2005/ufsj/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#3 integrate .. //depot/projects/soc2005/ufsj/src/release/pc98/boot_crunch.conf#2 integrate .. //depot/projects/soc2005/ufsj/src/release/picobsd/bridge/PICOBSD#2 integrate .. //depot/projects/soc2005/ufsj/src/release/picobsd/tinyware/ns/ns.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sbin/Makefile#2 integrate .. //depot/projects/soc2005/ufsj/src/sbin/devd/devd.cc#3 integrate .. //depot/projects/soc2005/ufsj/src/sbin/geom/class/mirror/gmirror.8#2 integrate .. //depot/projects/soc2005/ufsj/src/sbin/ifconfig/ifbridge.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sbin/ifconfig/ifconfig.8#4 integrate .. //depot/projects/soc2005/ufsj/src/sbin/ifconfig/ifconfig.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sbin/ifconfig/ifieee80211.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sbin/ifconfig/ifvlan.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sbin/ipfw/ipfw.8#3 integrate .. //depot/projects/soc2005/ufsj/src/sbin/mount/Makefile#2 integrate .. //depot/projects/soc2005/ufsj/src/sbin/mount/extern.h#2 integrate .. //depot/projects/soc2005/ufsj/src/sbin/mount/getmntopts.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sbin/mount/mount.c#4 integrate .. //depot/projects/soc2005/ufsj/src/sbin/mount/mount_ufs.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sbin/mount_cd9660/mount_cd9660.8#2 integrate .. //depot/projects/soc2005/ufsj/src/sbin/reboot/boot_i386.8#3 integrate .. //depot/projects/soc2005/ufsj/src/sbin/route/keywords#2 integrate .. //depot/projects/soc2005/ufsj/src/sbin/route/route.8#2 integrate .. //depot/projects/soc2005/ufsj/src/sbin/route/route.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sbin/savecore/savecore.c#3 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man4/Makefile#3 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man4/an.4#3 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man4/ath.4#3 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man4/aue.4#3 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man4/awi.4#3 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man4/axe.4#3 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man4/bfe.4#3 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man4/bge.4#3 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man4/bridge.4#2 delete .. //depot/projects/soc2005/ufsj/src/share/man/man4/cardbus.4#2 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man4/cdce.4#4 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man4/cm.4#3 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man4/cue.4#3 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man4/dc.4#3 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man4/dcons.4#2 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man4/de.4#3 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man4/dummynet.4#2 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man4/ed.4#4 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man4/em.4#3 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man4/en.4#3 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man4/fwe.4#3 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man4/fwip.4#3 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man4/fxp.4#3 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man4/hme.4#3 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man4/hwpmc.4#3 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man4/ipw.4#3 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man4/iwi.4#3 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man4/kue.4#3 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man4/lge.4#3 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man4/lmc.4#1 branch .. //depot/projects/soc2005/ufsj/src/share/man/man4/mac_seeotheruids.4#2 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man4/man4.i386/arl.4#3 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man4/man4.i386/cp.4#3 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man4/man4.i386/cs.4#3 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man4/man4.i386/cx.4#3 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man4/man4.i386/ep.4#3 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man4/man4.i386/ex.4#3 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man4/man4.i386/fe.4#4 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man4/man4.i386/ie.4#3 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man4/man4.i386/lnc.4#4 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man4/man4.i386/ray.4#3 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man4/man4.i386/vx.4#3 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man4/my.4#3 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man4/ng_bridge.4#2 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man4/nge.4#3 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man4/nve.4#3 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man4/pccard.4#2 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man4/pccbb.4#2 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man4/pcn.4#3 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man4/polling.4#2 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man4/ral.4#3 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man4/re.4#3 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man4/rl.4#3 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man4/rue.4#3 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man4/sf.4#3 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man4/sis.4#3 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man4/sk.4#3 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man4/sn.4#4 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man4/ste.4#3 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man4/ti.4#3 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man4/tl.4#3 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man4/tx.4#3 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man4/txp.4#3 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man4/udav.4#3 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man4/ural.4#4 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man4/vge.4#3 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man4/vlan.4#3 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man4/vr.4#4 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man4/wb.4#3 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man4/wi.4#3 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man4/xe.4#3 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man4/xl.4#3 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man5/Makefile#3 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man5/rc.conf.5#4 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man9/Makefile#4 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man9/atomic.9#2 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man9/critical_enter.9#2 integrate .. //depot/projects/soc2005/ufsj/src/share/man/man9/pfil.9#2 integrate .. //depot/projects/soc2005/ufsj/src/share/mk/sys.mk#2 integrate .. //depot/projects/soc2005/ufsj/src/share/msgdef/Makefile#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/alpha/alpha/interrupt.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/alpha/alpha/trap.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/alpha/include/atomic.h#4 integrate .. //depot/projects/soc2005/ufsj/src/sys/alpha/osf1/osf1_ioctl.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/alpha/osf1/osf1_misc.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/alpha/osf1/osf1_signal.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/amd64/amd64/cpu_switch.S#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/amd64/amd64/elf_machdep.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/amd64/amd64/gdb_machdep.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/amd64/amd64/genassym.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/amd64/amd64/machdep.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/amd64/amd64/support.S#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/amd64/amd64/trap.c#4 integrate .. //depot/projects/soc2005/ufsj/src/sys/amd64/amd64/vm_machdep.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/amd64/conf/NOTES#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/amd64/ia32/ia32_reg.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/amd64/ia32/ia32_signal.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/amd64/include/atomic.h#4 integrate .. //depot/projects/soc2005/ufsj/src/sys/amd64/include/pcb.h#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/arm/arm/bcopy_page.S#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/arm/arm/bcopyinout.S#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/arm/arm/bcopyinout_xscale.S#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/arm/arm/busdma_machdep.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/arm/arm/dump_machdep.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/arm/arm/elf_trampoline.c#1 branch .. //depot/projects/soc2005/ufsj/src/sys/arm/arm/genassym.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/arm/arm/in_cksum.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/arm/arm/in_cksum_arm.S#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/arm/arm/inckern.S#1 branch .. //depot/projects/soc2005/ufsj/src/sys/arm/arm/intr.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/arm/arm/locore.S#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/arm/arm/machdep.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/arm/arm/mem.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/arm/arm/pmap.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/arm/arm/support.S#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/arm/arm/swtch.S#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/arm/arm/vm_machdep.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/arm/conf/IQ31244#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/arm/conf/SIMICS#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/arm/include/atomic.h#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/arm/include/in_cksum.h#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/arm/include/md_var.h#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/arm/include/pmap.h#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/arm/sa11x0/assabet_machdep.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/arm/xscale/i80321/files.i80321#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/arm/xscale/i80321/i80321_aau.c#1 branch .. //depot/projects/soc2005/ufsj/src/sys/arm/xscale/i80321/i80321_dma.c#1 branch .. //depot/projects/soc2005/ufsj/src/sys/arm/xscale/i80321/i80321_timer.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/arm/xscale/i80321/iq31244_machdep.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/arm/xscale/i80321/iq80321.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/boot/pc98/loader/main.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/compat/freebsd32/freebsd32_misc.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/compat/freebsd32/freebsd32_proto.h#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/compat/freebsd32/freebsd32_syscall.h#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/compat/freebsd32/freebsd32_syscalls.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/compat/freebsd32/freebsd32_sysent.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/compat/freebsd32/syscalls.master#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/compat/linux/linux_socket.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/compat/svr4/svr4_fcntl.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/compat/svr4/svr4_ioctl.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/compat/svr4/svr4_ipc.c#4 integrate .. //depot/projects/soc2005/ufsj/src/sys/compat/svr4/svr4_misc.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/compat/svr4/svr4_signal.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/compat/svr4/svr4_stat.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/compat/svr4/svr4_stream.c#4 integrate .. //depot/projects/soc2005/ufsj/src/sys/compat/svr4/svr4_termios.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/compat/svr4/svr4_ttold.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/compat/svr4/svr4_util.h#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/conf/Makefile.arm#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/conf/NOTES#4 integrate .. //depot/projects/soc2005/ufsj/src/sys/conf/files#5 integrate .. //depot/projects/soc2005/ufsj/src/sys/conf/files.arm#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/conf/kern.pre.mk#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/conf/kmod.mk#4 integrate .. //depot/projects/soc2005/ufsj/src/sys/conf/options#5 integrate .. //depot/projects/soc2005/ufsj/src/sys/ddb/db_command.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/ddb/db_output.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/aac/aac.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/aac/aac_cam.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/aac/aac_debug.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/aac/aac_pci.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/aac/aac_tables.h#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/aac/aacreg.h#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/aac/aacvar.h#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/ata/ata-all.h#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/ata/ata-chipset.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/ata/ata-dma.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/ata/atapi-cd.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/bge/if_bge.c#4 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/cardbus/cardbus.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/cp/if_cp.c#4 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/ctau/if_ct.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/cx/if_cx.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/ed/ax88x90reg.h#1 branch .. //depot/projects/soc2005/ufsj/src/sys/dev/ed/dl100xxreg.h#1 branch .. //depot/projects/soc2005/ufsj/src/sys/dev/ed/if_ed_isa.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/ed/if_ed_pccard.c#4 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/ed/if_ed_pci.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/ed/if_ed_rtl80x9.c#1 branch .. //depot/projects/soc2005/ufsj/src/sys/dev/ed/if_edreg.h#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/ed/if_edvar.h#4 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/ed/rtl80x9reg.h#1 branch .. //depot/projects/soc2005/ufsj/src/sys/dev/ed/tc5299jreg.h#1 branch .. //depot/projects/soc2005/ufsj/src/sys/dev/em/if_em.c#4 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/em/if_em.h#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/en/if_en_pci.c#4 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/fb/creator.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/fb/fbreg.h#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/fb/gfb.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/fb/machfb.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/fb/s3_pci.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/fb/tga.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/fb/vga.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/firewire/00README#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/firewire/if_fwe.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/firewire/if_fwip.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/fxp/if_fxp.c#4 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/fxp/if_fxpvar.h#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/if_ndis/if_ndis.c#4 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/ips/ips_commands.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/iwi/if_iwi.c#5 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/iwi/if_iwireg.h#4 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/ixgb/README#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/ixgb/if_ixgb.c#4 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/ixgb/if_ixgb.h#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/lge/if_lge.c#4 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/lge/if_lgereg.h#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/lmc/if_lmc.c#1 branch .. //depot/projects/soc2005/ufsj/src/sys/dev/lmc/if_lmc.h#1 branch .. //depot/projects/soc2005/ufsj/src/sys/dev/md/md.c#4 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/mii/acphy.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/mii/amphy.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/mii/brgphy.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/mii/ciphy.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/mii/dcphy.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/mii/exphy.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/mii/lxtphy.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/mii/mii_physubr.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/mii/miivar.h#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/mii/nsgphy.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/mii/nsphy.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/mii/pnaphy.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/mii/pnphy.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/mii/qsphy.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/mii/rgephy.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/mii/rlphy.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/mii/tdkphy.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/mii/tlphy.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/mii/ukphy.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/mii/xmphy.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/mpt/mpt.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/nge/if_nge.c#4 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/pccbb/pccbb.c#4 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/pccbb/pccbb_pci.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/pccbb/pccbbdevid.h#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/pccbb/pccbbvar.h#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/pci/isa_pci.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/pci/pci.c#4 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/puc/puc.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/re/if_re.c#4 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/sound/pci/als4000.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/sound/pci/es137x.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/sound/pci/ich.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/sound/pci/via8233.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/sound/pci/via82c686.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/sound/pcm/ac97.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/sound/pcm/ac97.h#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/sound/pcm/ac97_patch.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/sound/pcm/ac97_patch.h#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/sound/pcm/channel.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/sound/pcm/dsp.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/sound/pcm/feeder_volume.c#1 branch .. //depot/projects/soc2005/ufsj/src/sys/dev/sound/pcm/mixer.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/sound/pcm/sndstat.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/sound/pcm/sound.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/sound/pcm/sound.h#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/sound/usb/uaudio_pcm.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/syscons/scgfbrndr.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/syscons/scmouse.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/syscons/scvgarndr.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/syscons/scvidctl.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/syscons/syscons.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/syscons/syscons.h#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/txp/if_txpreg.h#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/usb/if_cdce.c#4 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/usb/usbdevs#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/vge/if_vge.c#4 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/vx/if_vx.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/vx/if_vx_eisa.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/vx/if_vx_pci.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/vx/if_vxvar.h#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/watchdog/watchdog.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/wi/if_wi.c#4 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/wi/if_wivar.h#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/xe/if_xereg.h#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/fs/fifofs/fifo_vnops.c#4 integrate .. //depot/projects/soc2005/ufsj/src/sys/fs/msdosfs/bootsect.h#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/fs/msdosfs/msdosfs_vfsops.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/fs/nwfs/nwfs_vfsops.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/fs/udf/udf_vfsops.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/geom/geom_disk.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/geom/geom_gpt.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/geom/uzip/g_uzip.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/gnu/fs/ext2fs/ext2_alloc.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/i386/conf/NOTES#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/i386/i386/apic_vector.s#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/i386/i386/local_apic.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/i386/i386/mp_machdep.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/i386/i386/trap.c#4 integrate .. //depot/projects/soc2005/ufsj/src/sys/i386/i386/vm86.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/i386/include/atomic.h#4 integrate .. //depot/projects/soc2005/ufsj/src/sys/i386/include/smptests.h#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/i386/isa/vesa.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/ia64/ia32/ia32_signal.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/ia64/ia64/nexus.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/ia64/ia64/unaligned.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/ia64/include/atomic.h#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/isa/pnp.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/kern/imgact_elf.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/kern/init_sysent.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/kern/kern_clock.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/kern/kern_conf.c#4 integrate .. //depot/projects/soc2005/ufsj/src/sys/kern/kern_cpu.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/kern/kern_descrip.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/kern/kern_exec.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/kern/kern_jail.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/kern/kern_kse.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/kern/kern_lock.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/kern/kern_mac.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/kern/kern_mbuf.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/kern/kern_poll.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/kern/kern_proc.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/kern/kern_prot.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/kern/kern_resource.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/kern/kern_thread.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/kern/kern_uuid.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/kern/subr_bus.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/kern/subr_kdb.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/kern/subr_rman.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/kern/subr_turnstile.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/kern/syscalls.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/kern/syscalls.master#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/kern/sysv_shm.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/kern/vfs_bio.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/kern/vfs_export.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/kern/vfs_subr.c#4 integrate .. //depot/projects/soc2005/ufsj/src/sys/modules/Makefile#4 integrate .. //depot/projects/soc2005/ufsj/src/sys/modules/agp/Makefile#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/modules/ath/Makefile#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/modules/ath_rate_amrr/Makefile#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/modules/ath_rate_onoe/Makefile#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/modules/ath_rate_sample/Makefile#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/modules/aue/Makefile#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/modules/axe/Makefile#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/modules/bfe/Makefile#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/modules/bge/Makefile#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/modules/bridge/Makefile#2 delete .. //depot/projects/soc2005/ufsj/src/sys/modules/cdce/Makefile#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/modules/cue/Makefile#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/modules/dc/Makefile#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/modules/de/Makefile#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/modules/dummynet/Makefile#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/modules/ed/Makefile#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/modules/em/Makefile#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/modules/fxp/Makefile#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/modules/geom/geom_uzip/Makefile#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/modules/hifn/Makefile#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/modules/if_ndis/Makefile#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/modules/ipw/Makefile#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/modules/iwi/Makefile#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/modules/ixgb/Makefile#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/modules/kue/Makefile#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/modules/lge/Makefile#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/modules/lmc/Makefile#1 branch .. //depot/projects/soc2005/ufsj/src/sys/modules/mii/Makefile#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/modules/ncv/Makefile#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/modules/ndis/Makefile#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/modules/nge/Makefile#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/modules/nsp/Makefile#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/modules/pcn/Makefile#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/modules/ral/Makefile#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/modules/re/Makefile#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/modules/rl/Makefile#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/modules/rue/Makefile#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/modules/safe/Makefile#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/modules/sf/Makefile#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/modules/sis/Makefile#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/modules/sk/Makefile#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/modules/snc/Makefile#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/modules/sound/sound/Makefile#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/modules/ste/Makefile#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/modules/stg/Makefile#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/modules/ti/Makefile#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/modules/tl/Makefile#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/modules/tx/Makefile#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/modules/txp/Makefile#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/modules/ubsec/Makefile#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/modules/udav/Makefile#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/modules/ural/Makefile#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/modules/vge/Makefile#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/modules/vr/Makefile#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/modules/vx/Makefile#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/modules/wb/Makefile#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/modules/xl/Makefile#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/net/bpf.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/net/bridge.c#3 delete .. //depot/projects/soc2005/ufsj/src/sys/net/bridge.h#2 delete .. //depot/projects/soc2005/ufsj/src/sys/net/if.c#4 integrate .. //depot/projects/soc2005/ufsj/src/sys/net/if.h#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/net/if_bridge.c#4 integrate .. //depot/projects/soc2005/ufsj/src/sys/net/if_ethersubr.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/net/if_fwsubr.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/net/if_var.h#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/net/if_vlan.c#4 integrate .. //depot/projects/soc2005/ufsj/src/sys/net/netisr.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/netgraph/ng_ether.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/netgraph/ng_tty.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/netinet/if_ether.c#4 integrate .. //depot/projects/soc2005/ufsj/src/sys/netinet/in.c#4 integrate .. //depot/projects/soc2005/ufsj/src/sys/netinet/ip_dummynet.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/netinet/ip_dummynet.h#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/netinet/ip_fw2.c#4 integrate .. //depot/projects/soc2005/ufsj/src/sys/netinet/raw_ip.c#4 integrate .. //depot/projects/soc2005/ufsj/src/sys/netinet/tcp_subr.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/netsmb/netbios.h#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/nfsclient/nfs_diskless.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/nfsserver/nfs_srvsock.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/nfsserver/nfs_srvsubs.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/pc98/cbus/sio.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/pc98/conf/GENERIC#4 integrate .. //depot/projects/soc2005/ufsj/src/sys/pc98/conf/GENERIC.hints#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/pc98/conf/NOTES#4 integrate .. //depot/projects/soc2005/ufsj/src/sys/pci/agp_amd64.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/pci/agpreg.h#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/pci/if_dc.c#4 integrate .. //depot/projects/soc2005/ufsj/src/sys/pci/if_rl.c#4 integrate .. //depot/projects/soc2005/ufsj/src/sys/pci/if_rlreg.h#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/pci/if_sf.c#4 integrate .. //depot/projects/soc2005/ufsj/src/sys/pci/if_sis.c#4 integrate .. //depot/projects/soc2005/ufsj/src/sys/pci/if_ste.c#4 integrate .. //depot/projects/soc2005/ufsj/src/sys/pci/if_ti.c#4 integrate .. //depot/projects/soc2005/ufsj/src/sys/pci/if_tireg.h#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/pci/if_vr.c#4 integrate .. //depot/projects/soc2005/ufsj/src/sys/pci/if_wb.c#4 integrate .. //depot/projects/soc2005/ufsj/src/sys/pci/if_xl.c#4 integrate .. //depot/projects/soc2005/ufsj/src/sys/powerpc/include/atomic.h#4 integrate .. //depot/projects/soc2005/ufsj/src/sys/powerpc/ofw/ofw_syscons.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/security/mac/mac_process.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/security/mac_seeotheruids/mac_seeotheruids.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/sparc64/include/atomic.h#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/sys/buf.h#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/sys/cdefs.h#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/sys/kerneldump.h#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/sys/libkern.h#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/sys/mac.h#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/sys/mac_policy.h#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/sys/param.h#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/sys/proc.h#4 integrate .. //depot/projects/soc2005/ufsj/src/sys/sys/refcount.h#1 branch .. //depot/projects/soc2005/ufsj/src/sys/sys/resourcevar.h#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/sys/rman.h#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/sys/syscall.h#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/sys/syscall.mk#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/sys/sysproto.h#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/sys/ucred.h#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/sys/uuid.h#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/ufs/ffs/ffs_alloc.c#5 integrate .. //depot/projects/soc2005/ufsj/src/sys/ufs/ffs/ffs_snapshot.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/ufs/ffs/ffs_softdep.c#4 integrate .. //depot/projects/soc2005/ufsj/src/sys/ufs/ffs/ffs_vfsops.c#6 integrate .. //depot/projects/soc2005/ufsj/src/sys/ufs/ffs/ffs_vnops.c#4 integrate .. //depot/projects/soc2005/ufsj/src/sys/ufs/ufs/ufs_vnops.c#6 integrate .. //depot/projects/soc2005/ufsj/src/sys/vm/uma.h#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/vm/uma_core.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/vm/vm_mmap.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/vm/vm_page.c#3 integrate .. //depot/projects/soc2005/ufsj/src/sys/vm/vm_zeroidle.c#2 integrate .. //depot/projects/soc2005/ufsj/src/tools/regression/geom_gpt/gctl.t#2 integrate .. //depot/projects/soc2005/ufsj/src/tools/regression/geom_uzip/Makefile#2 integrate .. //depot/projects/soc2005/ufsj/src/tools/regression/geom_uzip/test-1.img.gz.uue#2 delete .. //depot/projects/soc2005/ufsj/src/tools/regression/geom_uzip/test-1.img.uzip.uue#1 branch .. //depot/projects/soc2005/ufsj/src/tools/regression/geom_uzip/test-1.sh#2 integrate .. //depot/projects/soc2005/ufsj/src/tools/regression/geom_uzip/test-2.sh#2 integrate .. //depot/projects/soc2005/ufsj/src/tools/regression/lib/libutil/Makefile#1 branch .. //depot/projects/soc2005/ufsj/src/tools/regression/lib/libutil/test-trimdomain-nodomain.c#1 branch .. //depot/projects/soc2005/ufsj/src/tools/regression/lib/libutil/test-trimdomain-nodomain.t#1 branch .. //depot/projects/soc2005/ufsj/src/tools/regression/lib/libutil/test-trimdomain.c#1 branch .. //depot/projects/soc2005/ufsj/src/tools/regression/lib/libutil/test-trimdomain.t#1 branch .. //depot/projects/soc2005/ufsj/src/tools/tools/README#4 integrate .. //depot/projects/soc2005/ufsj/src/tools/tools/iwi/Makefile#1 branch .. //depot/projects/soc2005/ufsj/src/tools/tools/iwi/iwistats.c#1 branch .. //depot/projects/soc2005/ufsj/src/tools/tools/nanobsd/nanobsd.sh#3 integrate .. //depot/projects/soc2005/ufsj/src/tools/tools/netrate/http/Makefile#1 branch .. //depot/projects/soc2005/ufsj/src/tools/tools/netrate/http/http.c#1 branch .. //depot/projects/soc2005/ufsj/src/tools/tools/netrate/httpd/Makefile#1 branch .. //depot/projects/soc2005/ufsj/src/tools/tools/netrate/httpd/httpd.c#1 branch .. //depot/projects/soc2005/ufsj/src/tools/tools/netrate/tcpconnect/Makefile#1 branch .. //depot/projects/soc2005/ufsj/src/tools/tools/netrate/tcpconnect/tcpconnect.c#1 branch .. //depot/projects/soc2005/ufsj/src/tools/tools/netrate/tcpreceive/Makefile#1 branch .. //depot/projects/soc2005/ufsj/src/tools/tools/netrate/tcpreceive/tcpreceive.c#1 branch .. //depot/projects/soc2005/ufsj/src/tools/tools/tinderbox/etc/releng_6.rc#2 integrate .. //depot/projects/soc2005/ufsj/src/tools/tools/tinderbox/etc/update_releng_6.rc#2 integrate .. //depot/projects/soc2005/ufsj/src/usr.bin/calendar/calendars/calendar.freebsd#4 integrate .. //depot/projects/soc2005/ufsj/src/usr.bin/gprof/gprof.1#2 integrate .. //depot/projects/soc2005/ufsj/src/usr.bin/gprof/printgprof.c#2 integrate .. //depot/projects/soc2005/ufsj/src/usr.bin/lockf/lockf.c#2 integrate .. //depot/projects/soc2005/ufsj/src/usr.bin/lorder/Makefile#2 integrate .. //depot/projects/soc2005/ufsj/src/usr.bin/mail/mail.1#2 integrate .. //depot/projects/soc2005/ufsj/src/usr.bin/mail/main.c#2 integrate .. //depot/projects/soc2005/ufsj/src/usr.bin/make/job.c#3 integrate .. //depot/projects/soc2005/ufsj/src/usr.bin/make/make.1#4 integrate .. //depot/projects/soc2005/ufsj/src/usr.bin/mt/mt.1#2 integrate .. //depot/projects/soc2005/ufsj/src/usr.bin/netstat/if.c#3 integrate .. //depot/projects/soc2005/ufsj/src/usr.bin/netstat/main.c#3 integrate .. //depot/projects/soc2005/ufsj/src/usr.bin/netstat/netstat.1#3 integrate .. //depot/projects/soc2005/ufsj/src/usr.bin/netstat/netstat.h#3 integrate .. //depot/projects/soc2005/ufsj/src/usr.sbin/Makefile#4 integrate .. //depot/projects/soc2005/ufsj/src/usr.sbin/bsnmpd/bsnmpd/Makefile#2 integrate .. //depot/projects/soc2005/ufsj/src/usr.sbin/bsnmpd/gensnmptree/Makefile#2 integrate .. //depot/projects/soc2005/ufsj/src/usr.sbin/bsnmpd/modules/Makefile.inc#3 integrate .. //depot/projects/soc2005/ufsj/src/usr.sbin/lmcconfig/Makefile#1 branch .. //depot/projects/soc2005/ufsj/src/usr.sbin/lmcconfig/lmcconfig.8#1 branch .. //depot/projects/soc2005/ufsj/src/usr.sbin/lmcconfig/lmcconfig.c#1 branch .. //depot/projects/soc2005/ufsj/src/usr.sbin/ntp/ntptrace/Makefile#2 integrate .. //depot/projects/soc2005/ufsj/src/usr.sbin/pccard/Makefile#2 integrate .. //depot/projects/soc2005/ufsj/src/usr.sbin/pmccontrol/pmccontrol.c#2 integrate .. //depot/projects/soc2005/ufsj/src/usr.sbin/sysinstall/Makefile#2 integrate .. //depot/projects/soc2005/ufsj/src/usr.sbin/sysinstall/devices.c#3 integrate .. //depot/projects/soc2005/ufsj/src/usr.sbin/sysinstall/sysinstall.h#2 integrate .. //depot/projects/soc2005/ufsj/src/usr.sbin/syslogd/syslogd.c#3 integrate .. //depot/projects/soc2005/ufsj/src/usr.sbin/watchdogd/watchdogd.c#4 integrate Differences ... ==== //depot/projects/soc2005/ufsj/src/ObsoleteFiles.inc#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.15 2005/09/11 18:19:42 netchild Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.18 2005/10/08 22:51:47 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. # +# 20050927: bridge(4) replaced by if_bridge(4) +OLD_FILES+=usr/include/net/bridge.h # 20050831: not implemented OLD_FILES+=usr/share/man/man3/getino.3.gz OLD_FILES+=usr/share/man/man3/putino.3.gz ==== //depot/projects/soc2005/ufsj/src/UPDATING#3 (text+ko) ==== @@ -21,6 +21,14 @@ developers choose to disable these features on build machines to maximize performance. +20051001: + kern.polling.enable sysctl MIB is now deprecated. Use ifconfig(8) + to turn polling(4) on your interfaces. + +20050927: + The old bridge(4) implementation was retired. The new + if_bridge(4) serves as a full functional replacement. + 20050722: The ai_addrlen of a struct addrinfo was changed to a socklen_t to conform to POSIX-2001. This change broke an ABI @@ -411,4 +419,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.420 2005/09/09 15:59:17 obrien Exp $ +$FreeBSD: src/UPDATING,v 1.422 2005/10/01 20:53:51 glebius Exp $ ==== //depot/projects/soc2005/ufsj/src/bin/rm/rm.1#2 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)rm.1 8.5 (Berkeley) 12/5/94 -.\" $FreeBSD: src/bin/rm/rm.1,v 1.36 2005/02/09 17:37:39 ru Exp $ +.\" $FreeBSD: src/bin/rm/rm.1,v 1.38 2005/09/30 02:12:15 dougb Exp $ .\" -.Dd October 28, 2004 +.Dd September 29, 2005 .Dt RM 1 .Os .Sh NAME @@ -88,6 +88,10 @@ Overwrite regular files before deleting them. Files are overwritten three times, first with the byte pattern 0xff, then 0x00, and then 0xff again, before they are deleted. +Specifying this flag for a read only file will cause +.Nm +to generate an error message and exit. +The file wil not be removed or overwritten. .It Fl R Attempt to remove the file hierarchy rooted in each file argument. The ==== //depot/projects/soc2005/ufsj/src/bin/rm/rm.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.52 2004/11/13 04:07:01 jkh Exp $"); +__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.53 2005/09/29 20:40:29 dougb Exp $"); #include #include @@ -452,11 +452,8 @@ * talking to a terminal, ask. Symbolic links are excluded * because their permissions are meaningless. Check stdin_ok * first because we may not have stat'ed the file. - * Also skip this check if the -P option was specified because - * we will not be able to overwrite file contents and will - * barf later. */ - if (!stdin_ok || S_ISLNK(sp->st_mode) || Pflag || + if (!stdin_ok || S_ISLNK(sp->st_mode) || (!access(name, W_OK) && !(sp->st_flags & (SF_APPEND|SF_IMMUTABLE)) && (!(sp->st_flags & (UF_APPEND|UF_IMMUTABLE)) || !uid))) @@ -464,6 +461,10 @@ strmode(sp->st_mode, modep); if ((flagsp = fflagstostr(sp->st_flags)) == NULL) err(1, "fflagstostr"); + if (Pflag) + errx(1, + "%s: -P was specified, but file is not writable", + path); (void)fprintf(stderr, "override %s%s%s/%s %s%sfor %s? ", modep + 1, modep[9] == ' ' ? "" : " ", user_from_uid(sp->st_uid, 0), ==== //depot/projects/soc2005/ufsj/src/contrib/bc/bc/main.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ Western Washington University Bellingham, WA 98226-9062 -$FreeBSD: src/contrib/bc/bc/main.c,v 1.6 2004/02/17 00:53:50 ache Exp $ +$FreeBSD: src/contrib/bc/bc/main.c,v 1.7 2005/09/27 18:52:17 brooks Exp $ *************************************************************************/ @@ -65,7 +65,7 @@ printf ("usage: %s [options] [file ...]\n%s%s%s%s%s%s%s", progname, " -h --help print this usage and exit\n", " -i --interactive force interactive mode\n", - " -l --mathlib use the predefine math routnes\n", + " -l --mathlib use the predefine math routines\n", " -q --quiet don't print initial banner\n", " -s --standard non-standard bc constructs are errors\n", " -w --warn warn about non-standard bc constructs\n", ==== //depot/projects/soc2005/ufsj/src/contrib/bsnmp/FREEBSD-Xlist#2 (text+ko) ==== @@ -1,4 +1,4 @@ -#$FreeBSD: src/contrib/bsnmp/FREEBSD-Xlist,v 1.3 2005/02/28 17:29:10 harti Exp $ +#$FreeBSD: src/contrib/bsnmp/FREEBSD-Xlist,v 1.4 2005/10/04 14:53:06 harti Exp $ */Makefile.in */acinclude.m4 */aclocal.m4 @@ -10,5 +10,6 @@ */gensnmptree/Makefile.in */lib/Makefile.in */snmp_mibII/Makefile.in +*/snmp_ntp/Makefile.in */snmpd/Makefile.in */snmpd/.gdbinit ==== //depot/projects/soc2005/ufsj/src/contrib/bsnmp/NEWS#2 (text+ko) ==== @@ -1,3 +1,25 @@ +1.11 Make the Mib2 routing table use red-black tree. This vastly + reduces loading and access time. Load the table only every 10 + minutes. In the meantime process message from the routing socket + to update the table. + + Lot of man-page fixes from ru@freebsd.org. + + Fixes to command line macros and macro redefinition. + + Trap variables for ntp (still need trap definition and code). + + Periodic timers from Victor Cruceru. + + Man-page fixes from Christian Brueffer. + + Lots of spelling fixes from Giorgios Keramidas. + + A number of changes to facilitate building on FreeBSD-4 from + Andrey Elsukov. + + Add repeatable timers. + 1.10 Change all the tick handling in the daemon from 32-bit to 64-bit. Bump the modules' major version number to 3. @@ -34,7 +56,7 @@ Maxim Konovalov) 1.7 - snmpd: Move event library initialisation before reading of + snmpd: Move event library initialization before reading of config file (thanks to phk). gensnmptree: can now read more than one tree and merge them. ==== //depot/projects/soc2005/ufsj/src/contrib/bsnmp/VERSION#2 (text+ko) ==== @@ -1,1 +1,1 @@ -1.10 +1.11 ==== //depot/projects/soc2005/ufsj/src/contrib/bsnmp/gensnmpdef/gensnmpdef.1#2 (text+ko) ==== @@ -1,5 +1,5 @@ .\" -.\" Copyright (C) 2004 +.\" Copyright (C) 2004-2005 .\" Hartmut Brandt. .\" All rights reserved. .\" @@ -26,9 +26,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Begemot: bsnmp/gensnmpdef/gensnmpdef.1,v 1.3 2005/02/25 11:55:54 brandt_h Exp $ +.\" $Begemot: bsnmp/gensnmpdef/gensnmpdef.1,v 1.5 2005/10/04 08:46:46 brandt_h Exp $ .\" -.Dd April 14, 2004 +.Dd June 14, 2005 .Dt GENSNMPDEF 1 .Os .Sh NAME @@ -43,7 +43,8 @@ The .Nm utility is used to create an initial MIB description file from -one or more MIBs. The description file must be edited to be actually useful +one or more MIBs. +The description file must be edited to be actually useful for feeding it into .Xr gensnmptree 1 . .Pp @@ -57,13 +58,13 @@ .Pp .Nm does no attempt on sorting the OID tree so in case of complex and -non-standard MIBs it is necessay to sort the tree in the resulting definition +non-standard MIBs it is necessary to sort the tree in the resulting definition file by hand. .Sh SEE ALSO .Xr snmpd 1 +.Sh AUTHORS +.An Hartmut Brandt Aq harti@freebsd.org .Sh BUGS The utility is by no means bullet-proof and may fail for complex or non-standard MIBs. Its output is expected to be edited by hand. -.Sh AUTHORS -.An Hartmut Brandt Aq harti@freebsd.org ==== //depot/projects/soc2005/ufsj/src/contrib/bsnmp/gensnmptree/gensnmptree.1#2 (text+ko) ==== @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 2001-2003 +.\" Copyright (c) 2001-2005 .\" Fraunhofer Institute for Open Communication Systems (FhG Fokus). .\" All rights reserved. .\" @@ -26,9 +26,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Begemot: bsnmp/gensnmptree/gensnmptree.1,v 1.4 2005/02/25 11:55:56 brandt_h Exp $ +.\" $Begemot: bsnmp/gensnmptree/gensnmptree.1,v 1.5 2005/06/15 11:31:25 brandt_h Exp $ .\" -.Dd October 7, 2003 +.Dd June 14, 2005 .Dt GENSNMPTREE 1 .Os >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Oct 10 04:43:27 2005 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 912A016A426; Mon, 10 Oct 2005 04:43:26 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4228F16A41F for ; Mon, 10 Oct 2005 04:43:26 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5C14743D68 for ; Mon, 10 Oct 2005 04:43:09 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9A4h9LL064935 for ; Mon, 10 Oct 2005 04:43:09 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9A4h9Qs064932 for perforce@freebsd.org; Mon, 10 Oct 2005 04:43:09 GMT (envelope-from soc-andrew@freebsd.org) Date: Mon, 10 Oct 2005 04:43:09 GMT Message-Id: <200510100443.j9A4h9Qs064932@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 85065 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, 10 Oct 2005 04:43:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=85065 Change 85065 by soc-andrew@soc-andrew_serv on 2005/10/10 04:42:35 Remove the lua bindings for libarchive Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/lib/lua/archive/Makefile#2 delete .. //depot/projects/soc2005/bsdinstaller/src/lib/lua/archive/archive.c#3 delete .. //depot/projects/soc2005/bsdinstaller/src/lib/lua/archive/archive.lua#4 delete Differences ... From owner-p4-projects@FreeBSD.ORG Mon Oct 10 04:47:15 2005 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 6A56416A422; Mon, 10 Oct 2005 04:47:15 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 27B4016A41F for ; Mon, 10 Oct 2005 04:47:15 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DBF2343D4C for ; Mon, 10 Oct 2005 04:47:14 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9A4lEdS071265 for ; Mon, 10 Oct 2005 04:47:14 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9A4lE5L071133 for perforce@freebsd.org; Mon, 10 Oct 2005 04:47:14 GMT (envelope-from soc-andrew@freebsd.org) Date: Mon, 10 Oct 2005 04:47:14 GMT Message-Id: <200510100447.j9A4lE5L071133@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 85066 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, 10 Oct 2005 04:47:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=85066 Change 85066 by soc-andrew@soc-andrew_serv on 2005/10/10 04:47:10 Bring the lua backend up to the point of BERINSTALLER-BETA-1. It can install the binary dists, no src, no ports, no packages. Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/install/500_install_os.lua#3 edit .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/lib/target_system.lua#3 edit .. //depot/projects/soc2005/bsdinstaller/src/lib/lua/Makefile#4 edit .. //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/conf/FreeBSD.lua#1 add .. //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/inst/Makefile#4 edit .. //depot/projects/soc2005/bsdinstaller/src/release/bsdinstaller/bsdinstaller_shell.sh#4 edit Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/install/500_install_os.lua#3 (text+ko) ==== @@ -176,13 +176,13 @@ if App.state.sel_part:get_subpart_by_mountpoint("/usr") then cmds:add( "${root}${RM} -rf ${root}${base}/home", - "${root}${MKDIR} ${root}${base}/usr/home", + "${root}${MKDIR} -p ${root}${base}/usr/home", "${root}${LN} -s /usr/home ${root}${base}/home" ) elseif App.state.sel_part:get_subpart_by_mountpoint("/var") then cmds:add( "${root}${RM} -rf ${root}${base}/home", - "${root}${MKDIR} ${root}${base}/var/home", + "${root}${MKDIR} -p ${root}${base}/var/home", "${root}${LN} -s /var/home ${root}${base}/home" ) end @@ -206,7 +206,7 @@ -- Create missing directories. -- cmds:add( - "${root}${MKDIR} ${root}${base}/mnt" + "${root}${MKDIR} -p ${root}${base}/mnt" ) -- ==== //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/lib/target_system.lua#3 (text+ko) ==== @@ -405,6 +405,22 @@ log_mode = CmdChain.LOG_QUIET -- don't spam log } end + elseif App.conf.use_tar then + add_copy_command = function(src, dest) + cmds:add{ + cmdline = "${root}${TAR} " .. + "-x -C ${root}${base}${dest} -f " .. + "${root}usr/${uname}/${src}/${src}.${dist_suffix}", + replacements = { + base = base, + src = src, + dest = dest, + dist_suffix = App.conf.dist_suffix, + uname = posix.uname("%r") + }, + log_mode = CmdChain.LOG_QUIET -- don't spam log + } + end end local src, dest @@ -518,7 +534,7 @@ } cmds:add("${root}${ECHO} '${device}\t\t\t${mountpoint}\t\t" .. "${fstype}\t${access}\t\t0\t0' >>${root}${base}/${filename}") - cmds:add("${root}${MKDIR} ${root}${base}/${mountpoint}") + cmds:add("${root}${MKDIR} -p ${root}${base}/${mountpoint}") end end ==== //depot/projects/soc2005/bsdinstaller/src/lib/lua/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ SUBDIR= lua lualib -SUBDIR+= archive compat51 mime posix socket +SUBDIR+= compat51 mime posix socket .include ==== //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/inst/Makefile#4 (text+ko) ==== @@ -9,6 +9,9 @@ 490_confirm_install_os.lua 500_install_os.lua 800_finished.lua \ 900_reboot.lua main.lua +# Local scripts +FILES+= 430_select_dists.lua + FILESDIR= ${INST_DIR}/install .include "../Makefile.inc1" ==== //depot/projects/soc2005/bsdinstaller/src/release/bsdinstaller/bsdinstaller_shell.sh#4 (text+ko) ==== @@ -13,7 +13,7 @@ /usr/sbin/bsd_installer_ncurses elif [ ${TTY} = "/dev/ttyv1" ] then - LUA_PATH="/usr/lib/lua/?.lua;/usr/libexec/bsdinstaller/lib/?.lua" LUA_CPATH="/usr/lib/lua/?.so" LUA_SOPATH=/usr/lib/lua/ bsd_lua -lcompat-5.1 /usr/libexec/bsdinstaller/main.lua /usr/libexec/bsdinstaller/conf/BSDInstaller.lua dir.root=/usr/R booted_from_install_media=true + LUA_PATH="/usr/lib/lua/?.lua;/usr/libexec/bsdinstaller/lib/?.lua" LUA_CPATH=/usr/lib/lua/?.so LUA_SOPATH=/usr/lib/lua/ bsd_lua -lcompat-5.1 /usr/libexec/bsdinstaller/main.lua /usr/libexec/bsdinstaller/conf/BSDInstaller.lua /usr/libexec/bsdinstaller/conf/FreeBSD.lua dir.root=/ booted_from_install_media=true 2>&1 | tee /var/log/bas_installer.log #/usr/sbin/bsd_installer_be if [ $? -eq 5 ] then From owner-p4-projects@FreeBSD.ORG Mon Oct 10 04:51:21 2005 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 32F7A16A41F; Mon, 10 Oct 2005 04:51:21 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D1CE716A41F for ; Mon, 10 Oct 2005 04:51:20 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9E26643D45 for ; Mon, 10 Oct 2005 04:51:20 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9A4pKqw072482 for ; Mon, 10 Oct 2005 04:51:20 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9A4pKPD072479 for perforce@freebsd.org; Mon, 10 Oct 2005 04:51:20 GMT (envelope-from soc-andrew@freebsd.org) Date: Mon, 10 Oct 2005 04:51:20 GMT Message-Id: <200510100451.j9A4pKPD072479@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 85067 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, 10 Oct 2005 04:51:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=85067 Change 85067 by soc-andrew@soc-andrew_serv on 2005/10/10 04:50:21 Spell bsd correctly Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/release/bsdinstaller/bsdinstaller_shell.sh#5 edit Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/release/bsdinstaller/bsdinstaller_shell.sh#5 (text+ko) ==== @@ -13,7 +13,7 @@ /usr/sbin/bsd_installer_ncurses elif [ ${TTY} = "/dev/ttyv1" ] then - LUA_PATH="/usr/lib/lua/?.lua;/usr/libexec/bsdinstaller/lib/?.lua" LUA_CPATH=/usr/lib/lua/?.so LUA_SOPATH=/usr/lib/lua/ bsd_lua -lcompat-5.1 /usr/libexec/bsdinstaller/main.lua /usr/libexec/bsdinstaller/conf/BSDInstaller.lua /usr/libexec/bsdinstaller/conf/FreeBSD.lua dir.root=/ booted_from_install_media=true 2>&1 | tee /var/log/bas_installer.log + LUA_PATH="/usr/lib/lua/?.lua;/usr/libexec/bsdinstaller/lib/?.lua" LUA_CPATH=/usr/lib/lua/?.so LUA_SOPATH=/usr/lib/lua/ bsd_lua -lcompat-5.1 /usr/libexec/bsdinstaller/main.lua /usr/libexec/bsdinstaller/conf/BSDInstaller.lua /usr/libexec/bsdinstaller/conf/FreeBSD.lua dir.root=/ booted_from_install_media=true 2>&1 | tee /var/log/bsd_installer.log #/usr/sbin/bsd_installer_be if [ $? -eq 5 ] then From owner-p4-projects@FreeBSD.ORG Mon Oct 10 10:05:06 2005 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 C969316A422; Mon, 10 Oct 2005 10:05:05 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7EA5616A420 for ; Mon, 10 Oct 2005 10:05:05 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7135F43D5E for ; Mon, 10 Oct 2005 10:05:04 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9AA54nG094730 for ; Mon, 10 Oct 2005 10:05:04 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9AA54wi094727 for perforce@freebsd.org; Mon, 10 Oct 2005 10:05:04 GMT (envelope-from soc-andrew@freebsd.org) Date: Mon, 10 Oct 2005 10:05:04 GMT Message-Id: <200510101005.j9AA54wi094727@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 85079 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, 10 Oct 2005 10:05:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=85079 Change 85079 by soc-andrew@soc-andrew_serv on 2005/10/10 10:04:04 Allow the installation of the source dists. Get reboot working again Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/lib/target_system.lua#4 edit .. //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/conf/FreeBSD.lua#2 edit .. //depot/projects/soc2005/bsdinstaller/src/release/bsdinstaller/bsdinstaller_shell.sh#6 edit Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/lib/target_system.lua#4 (text+ko) ==== @@ -407,13 +407,19 @@ end elseif App.conf.use_tar then add_copy_command = function(src, dest) + if (string.sub(src, 0, 1) == "s") then + dir = "src" + else + dir = src + end cmds:add{ cmdline = "${root}${TAR} " .. "-x -C ${root}${base}${dest} -f " .. - "${root}usr/${uname}/${src}/${src}.${dist_suffix}", + "${root}usr/${uname}/${dir}/${src}.${dist_suffix}", replacements = { base = base, src = src, + dir = dir, dest = dest, dist_suffix = App.conf.dist_suffix, uname = posix.uname("%r") ==== //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/conf/FreeBSD.lua#2 (text+ko) ==== @@ -24,7 +24,27 @@ { src = "compat21", dest = "/" }, { src = "compat22", dest = "/" }, { src = "compat3x", dest = "/" }, - { src = "compat4x", dest = "/" } + { src = "compat4x", dest = "/" }, + { src = "sbase", dest = "/usr/src" }, + { src = "scrypto", dest = "/usr/src" }, + { src = "setc", dest = "/usr/src" }, + { src = "sgames", dest = "/usr/src" }, + { src = "sbin", dest = "/usr/src" }, + { src = "scontrib", dest = "/usr/src" }, + { src = "skrb5", dest = "/usr/src" }, + { src = "slib", dest = "/usr/src" }, + { src = "slibexec", dest = "/usr/src" }, + { src = "sgnu", dest = "/usr/src" }, + { src = "sinclude", dest = "/usr/src" }, + { src = "ssbin", dest = "/usr/src" }, + { src = "ssecure", dest = "/usr/src" }, + { src = "sshare", dest = "/usr/src" }, + { src = "srelease", dest = "/usr/src" }, + { src = "srescue", dest = "/usr/src" }, + { src = "subin", dest = "/usr/src" }, + { src = "susbin", dest = "/usr/src" }, + { src = "ssys", dest = "/usr/src" }, + { src = "stools", dest = "/usr/src" } } cmd_names = cmd_names + { ==== //depot/projects/soc2005/bsdinstaller/src/release/bsdinstaller/bsdinstaller_shell.sh#6 (text+ko) ==== @@ -13,7 +13,7 @@ /usr/sbin/bsd_installer_ncurses elif [ ${TTY} = "/dev/ttyv1" ] then - LUA_PATH="/usr/lib/lua/?.lua;/usr/libexec/bsdinstaller/lib/?.lua" LUA_CPATH=/usr/lib/lua/?.so LUA_SOPATH=/usr/lib/lua/ bsd_lua -lcompat-5.1 /usr/libexec/bsdinstaller/main.lua /usr/libexec/bsdinstaller/conf/BSDInstaller.lua /usr/libexec/bsdinstaller/conf/FreeBSD.lua dir.root=/ booted_from_install_media=true 2>&1 | tee /var/log/bsd_installer.log + LUA_PATH="/usr/lib/lua/?.lua;/usr/libexec/bsdinstaller/lib/?.lua" LUA_CPATH=/usr/lib/lua/?.so LUA_SOPATH=/usr/lib/lua/ bsd_lua -lcompat-5.1 /usr/libexec/bsdinstaller/main.lua /usr/libexec/bsdinstaller/conf/BSDInstaller.lua /usr/libexec/bsdinstaller/conf/FreeBSD.lua dir.root=/ booted_from_install_media=true #/usr/sbin/bsd_installer_be if [ $? -eq 5 ] then From owner-p4-projects@FreeBSD.ORG Tue Oct 11 20:24:10 2005 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 07F6216A421; Tue, 11 Oct 2005 20:24:10 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CDF6716A41F for ; Tue, 11 Oct 2005 20:24:09 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 56EB343D70 for ; Tue, 11 Oct 2005 20:23:47 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9BKNlPY060687 for ; Tue, 11 Oct 2005 20:23:47 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9BKNkeZ060684 for perforce@freebsd.org; Tue, 11 Oct 2005 20:23:46 GMT (envelope-from peter@freebsd.org) Date: Tue, 11 Oct 2005 20:23:46 GMT Message-Id: <200510112023.j9BKNkeZ060684@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 85136 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, 11 Oct 2005 20:24:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=85136 Change 85136 by peter@peter_daintree on 2005/10/11 20:22:56 IFC @85135 Affected files ... .. //depot/projects/hammer/ObsoleteFiles.inc#8 integrate .. //depot/projects/hammer/contrib/bsnmp/lib/asn1.c#5 integrate .. //depot/projects/hammer/contrib/bsnmp/lib/asn1.h#5 integrate .. //depot/projects/hammer/contrib/bsnmp/lib/snmpclient.c#6 integrate .. //depot/projects/hammer/contrib/bsnmp/snmp_ntp/snmp_ntp.c#4 integrate .. //depot/projects/hammer/contrib/bsnmp/snmpd/main.c#9 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/FREEBSD-Xlist#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/driver_ndis.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/driver_ndis.h#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/driver_ndis_.c#1 branch .. //depot/projects/hammer/crypto/openssl/ssl/s23_srvr.c#3 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#62 integrate .. //depot/projects/hammer/etc/rc.d/hcsecd#1 branch .. //depot/projects/hammer/etc/rc.d/sdpd#1 branch .. //depot/projects/hammer/etc/rc.firewall6#6 integrate .. //depot/projects/hammer/gnu/usr.bin/cpio/Makefile#4 integrate .. //depot/projects/hammer/lib/csu/amd64/crt1.c#6 integrate .. //depot/projects/hammer/lib/csu/i386-elf/crt1.c#6 integrate .. //depot/projects/hammer/lib/libdevstat/devstat.c#9 integrate .. //depot/projects/hammer/lib/libedit/editline.3#7 integrate .. //depot/projects/hammer/lib/libedit/el.c#3 integrate .. //depot/projects/hammer/lib/libedit/makelist#4 integrate .. //depot/projects/hammer/lib/libedit/map.c#3 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_create.c#18 integrate .. //depot/projects/hammer/lib/libutil/trimdomain.c#3 integrate .. //depot/projects/hammer/lib/msun/src/e_rem_pio2f.c#2 integrate .. //depot/projects/hammer/lib/msun/src/k_cosf.c#2 integrate .. //depot/projects/hammer/lib/msun/src/k_rem_pio2f.c#3 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#81 integrate .. //depot/projects/hammer/release/doc/share/misc/dev.archlist.txt#31 integrate .. //depot/projects/hammer/sbin/devd/devd.cc#14 integrate .. //depot/projects/hammer/sbin/ifconfig/ifbridge.c#2 integrate .. //depot/projects/hammer/sbin/ifconfig/ifvlan.c#6 integrate .. //depot/projects/hammer/sbin/mount/Makefile#5 integrate .. //depot/projects/hammer/sbin/mount/extern.h#2 integrate .. //depot/projects/hammer/sbin/mount/getmntopts.c#6 integrate .. //depot/projects/hammer/sbin/mount/mount.c#18 integrate .. //depot/projects/hammer/sbin/mount/mount_ufs.c#5 integrate .. //depot/projects/hammer/sbin/reboot/boot_i386.8#14 integrate .. //depot/projects/hammer/sbin/setkey/Makefile#1 branch .. //depot/projects/hammer/sbin/setkey/parse.y#1 branch .. //depot/projects/hammer/sbin/setkey/sample.cf#1 branch .. //depot/projects/hammer/sbin/setkey/scriptdump.pl#1 branch .. //depot/projects/hammer/sbin/setkey/setkey.8#1 branch .. //depot/projects/hammer/sbin/setkey/setkey.c#1 branch .. //depot/projects/hammer/sbin/setkey/test-pfkey.c#1 branch .. //depot/projects/hammer/sbin/setkey/test-policy.c#1 branch .. //depot/projects/hammer/sbin/setkey/token.l#1 branch .. //depot/projects/hammer/sbin/setkey/vchar.h#1 branch .. //depot/projects/hammer/share/man/man4/Makefile#77 integrate .. //depot/projects/hammer/share/man/man4/altq.4#10 integrate .. //depot/projects/hammer/share/man/man4/an.4#7 integrate .. //depot/projects/hammer/share/man/man4/ath.4#28 integrate .. //depot/projects/hammer/share/man/man4/aue.4#10 integrate .. //depot/projects/hammer/share/man/man4/awi.4#10 integrate .. //depot/projects/hammer/share/man/man4/axe.4#10 integrate .. //depot/projects/hammer/share/man/man4/bfe.4#5 integrate .. //depot/projects/hammer/share/man/man4/bge.4#16 integrate .. //depot/projects/hammer/share/man/man4/cdce.4#6 integrate .. //depot/projects/hammer/share/man/man4/cm.4#6 integrate .. //depot/projects/hammer/share/man/man4/cue.4#8 integrate .. //depot/projects/hammer/share/man/man4/dc.4#18 integrate .. //depot/projects/hammer/share/man/man4/dcons.4#5 integrate .. //depot/projects/hammer/share/man/man4/de.4#9 integrate .. //depot/projects/hammer/share/man/man4/ed.4#12 integrate .. //depot/projects/hammer/share/man/man4/em.4#12 integrate .. //depot/projects/hammer/share/man/man4/en.4#7 integrate .. //depot/projects/hammer/share/man/man4/fwe.4#7 integrate .. //depot/projects/hammer/share/man/man4/fwip.4#5 integrate .. //depot/projects/hammer/share/man/man4/fxp.4#12 integrate .. //depot/projects/hammer/share/man/man4/hme.4#6 integrate .. //depot/projects/hammer/share/man/man4/ipw.4#5 integrate .. //depot/projects/hammer/share/man/man4/iwi.4#6 integrate .. //depot/projects/hammer/share/man/man4/kue.4#9 integrate .. //depot/projects/hammer/share/man/man4/lge.4#6 integrate .. //depot/projects/hammer/share/man/man4/mac_seeotheruids.4#7 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/arl.4#7 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/cp.4#7 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/cs.4#5 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/cx.4#14 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/ep.4#16 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/ex.4#7 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/fe.4#12 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/ie.4#5 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/lnc.4#8 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/ray.4#6 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/vx.4#7 integrate .. //depot/projects/hammer/share/man/man4/my.4#6 integrate .. //depot/projects/hammer/share/man/man4/ng_iface.4#5 integrate .. //depot/projects/hammer/share/man/man4/nge.4#8 integrate .. //depot/projects/hammer/share/man/man4/nve.4#5 integrate .. //depot/projects/hammer/share/man/man4/pcm.4#14 integrate .. //depot/projects/hammer/share/man/man4/pcn.4#7 integrate .. //depot/projects/hammer/share/man/man4/ral.4#4 integrate .. //depot/projects/hammer/share/man/man4/re.4#15 integrate .. //depot/projects/hammer/share/man/man4/rl.4#16 integrate .. //depot/projects/hammer/share/man/man4/rue.4#10 integrate .. //depot/projects/hammer/share/man/man4/sf.4#6 integrate .. //depot/projects/hammer/share/man/man4/sis.4#9 integrate .. //depot/projects/hammer/share/man/man4/sk.4#11 integrate .. //depot/projects/hammer/share/man/man4/sn.4#9 integrate .. //depot/projects/hammer/share/man/man4/snd_mss.4#1 branch .. //depot/projects/hammer/share/man/man4/ste.4#11 integrate .. //depot/projects/hammer/share/man/man4/ti.4#11 integrate .. //depot/projects/hammer/share/man/man4/tl.4#7 integrate .. //depot/projects/hammer/share/man/man4/tx.4#6 integrate .. //depot/projects/hammer/share/man/man4/txp.4#9 integrate .. //depot/projects/hammer/share/man/man4/udav.4#5 integrate .. //depot/projects/hammer/share/man/man4/ural.4#5 integrate .. //depot/projects/hammer/share/man/man4/vge.4#6 integrate .. //depot/projects/hammer/share/man/man4/vlan.4#13 integrate .. //depot/projects/hammer/share/man/man4/vr.4#12 integrate .. //depot/projects/hammer/share/man/man4/wb.4#6 integrate .. //depot/projects/hammer/share/man/man4/wi.4#24 integrate .. //depot/projects/hammer/share/man/man4/xe.4#9 integrate .. //depot/projects/hammer/share/man/man4/xl.4#14 integrate .. //depot/projects/hammer/share/man/man5/make.conf.5#38 integrate .. //depot/projects/hammer/share/man/man5/style.Makefile.5#9 integrate .. //depot/projects/hammer/share/man/man7/build.7#11 integrate .. //depot/projects/hammer/share/man/man7/development.7#8 integrate .. //depot/projects/hammer/share/man/man7/release.7#28 integrate .. //depot/projects/hammer/share/man/man8/diskless.8#11 integrate .. //depot/projects/hammer/share/man/man9/EVENTHANDLER.9#3 integrate .. //depot/projects/hammer/share/man/man9/Makefile#58 integrate .. //depot/projects/hammer/share/man/man9/critical_enter.9#2 integrate .. //depot/projects/hammer/sys/amd64/conf/NOTES#81 integrate .. //depot/projects/hammer/sys/amd64/ia32/ia32_reg.c#9 integrate .. //depot/projects/hammer/sys/arm/arm/bcopy_page.S#4 integrate .. //depot/projects/hammer/sys/arm/arm/genassym.c#6 integrate .. //depot/projects/hammer/sys/compat/ndis/kern_ndis.c#35 integrate .. //depot/projects/hammer/sys/compat/ndis/kern_windrv.c#9 integrate .. //depot/projects/hammer/sys/compat/ndis/ndis_var.h#22 integrate .. //depot/projects/hammer/sys/compat/ndis/ntoskrnl_var.h#20 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_hal.c#15 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ndis.c#33 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ntoskrnl.c#33 integrate .. //depot/projects/hammer/sys/compat/ndis/winx32_wrap.S#2 integrate .. //depot/projects/hammer/sys/conf/NOTES#100 integrate .. //depot/projects/hammer/sys/conf/files#126 integrate .. //depot/projects/hammer/sys/conf/kern.pre.mk#40 integrate .. //depot/projects/hammer/sys/conf/kmod.mk#50 integrate .. //depot/projects/hammer/sys/conf/options#86 integrate .. //depot/projects/hammer/sys/dev/aac/aac.c#32 integrate .. //depot/projects/hammer/sys/dev/aac/aac_cam.c#14 integrate .. //depot/projects/hammer/sys/dev/aac/aac_debug.c#9 integrate .. //depot/projects/hammer/sys/dev/aac/aac_pci.c#24 integrate .. //depot/projects/hammer/sys/dev/aac/aac_tables.h#3 integrate .. //depot/projects/hammer/sys/dev/aac/aacreg.h#10 integrate .. //depot/projects/hammer/sys/dev/aac/aacvar.h#13 integrate .. //depot/projects/hammer/sys/dev/ata/ata-all.h#33 integrate .. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#61 integrate .. //depot/projects/hammer/sys/dev/ata/ata-dma.c#22 integrate .. //depot/projects/hammer/sys/dev/ata/atapi-cd.c#30 integrate .. //depot/projects/hammer/sys/dev/dc/dcphy.c#1 branch .. //depot/projects/hammer/sys/dev/dc/if_dc.c#1 branch .. //depot/projects/hammer/sys/dev/dc/if_dcreg.h#1 branch .. //depot/projects/hammer/sys/dev/dc/pnphy.c#1 branch .. //depot/projects/hammer/sys/dev/ed/ax88x90reg.h#1 branch .. //depot/projects/hammer/sys/dev/ed/dl100xxreg.h#1 branch .. //depot/projects/hammer/sys/dev/ed/if_ed_isa.c#11 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed_pccard.c#30 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed_pci.c#13 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed_rtl80x9.c#1 branch .. //depot/projects/hammer/sys/dev/ed/if_edreg.h#6 integrate .. //depot/projects/hammer/sys/dev/ed/if_edvar.h#12 integrate .. //depot/projects/hammer/sys/dev/ed/rtl80x9reg.h#1 branch .. //depot/projects/hammer/sys/dev/ed/tc5299jreg.h#1 branch .. //depot/projects/hammer/sys/dev/em/if_em.c#47 integrate .. //depot/projects/hammer/sys/dev/firewire/if_fwe.c#25 integrate .. //depot/projects/hammer/sys/dev/firewire/if_fwip.c#9 integrate .. //depot/projects/hammer/sys/dev/fxp/if_fxp.c#53 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_piv.c#6 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#41 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndisvar.h#17 integrate .. //depot/projects/hammer/sys/dev/iwi/if_iwi.c#11 integrate .. //depot/projects/hammer/sys/dev/iwi/if_iwireg.h#5 integrate .. //depot/projects/hammer/sys/dev/ixgb/if_ixgb.c#14 integrate .. //depot/projects/hammer/sys/dev/md/md.c#53 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt.c#10 integrate .. //depot/projects/hammer/sys/dev/nge/if_nge.c#33 integrate .. //depot/projects/hammer/sys/dev/pccard/pccarddevs#42 integrate .. //depot/projects/hammer/sys/dev/pccbb/pccbb.c#37 integrate .. //depot/projects/hammer/sys/dev/pccbb/pccbb_pci.c#12 integrate .. //depot/projects/hammer/sys/dev/pccbb/pccbbvar.h#10 integrate .. //depot/projects/hammer/sys/dev/re/if_re.c#33 integrate .. //depot/projects/hammer/sys/dev/sound/pci/als4000.c#11 integrate .. //depot/projects/hammer/sys/dev/sound/pci/ich.c#22 integrate .. //depot/projects/hammer/sys/dev/sound/pci/via8233.c#15 integrate .. //depot/projects/hammer/sys/dev/sound/pci/via82c686.c#15 integrate .. //depot/projects/hammer/sys/dev/vge/if_vge.c#12 integrate .. //depot/projects/hammer/sys/dev/vx/if_vx.c#21 integrate .. //depot/projects/hammer/sys/dev/vx/if_vx_eisa.c#10 integrate .. //depot/projects/hammer/sys/dev/vx/if_vx_pci.c#12 integrate .. //depot/projects/hammer/sys/dev/vx/if_vxvar.h#6 integrate .. //depot/projects/hammer/sys/dev/xe/if_xereg.h#3 integrate .. //depot/projects/hammer/sys/fs/udf/udf_vfsops.c#22 integrate .. //depot/projects/hammer/sys/geom/geom_gpt.c#22 integrate .. //depot/projects/hammer/sys/i386/conf/NOTES#75 integrate .. //depot/projects/hammer/sys/ia64/ia64/nexus.c#8 integrate .. //depot/projects/hammer/sys/kern/kern_clock.c#29 integrate .. //depot/projects/hammer/sys/kern/kern_poll.c#14 integrate .. //depot/projects/hammer/sys/kern/kern_uuid.c#9 integrate .. //depot/projects/hammer/sys/kern/subr_bus.c#45 integrate .. //depot/projects/hammer/sys/kern/subr_rman.c#18 integrate .. //depot/projects/hammer/sys/kern/vfs_bio.c#60 integrate .. //depot/projects/hammer/sys/modules/ed/Makefile#6 integrate .. //depot/projects/hammer/sys/modules/lmc/Makefile#3 integrate .. //depot/projects/hammer/sys/net/bridgestp.c#5 integrate .. //depot/projects/hammer/sys/net/if_ethersubr.c#48 integrate .. //depot/projects/hammer/sys/net/if_fwsubr.c#11 integrate .. //depot/projects/hammer/sys/net/netisr.c#12 integrate .. //depot/projects/hammer/sys/netgraph/ng_base.c#37 integrate .. //depot/projects/hammer/sys/netgraph/ng_ether.c#22 integrate .. //depot/projects/hammer/sys/netgraph/ng_iface.c#22 integrate .. //depot/projects/hammer/sys/netgraph/ng_tty.c#12 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_diskless.c#11 integrate .. //depot/projects/hammer/sys/pc98/conf/NOTES#50 integrate .. //depot/projects/hammer/sys/pci/if_dc.c#51 integrate .. //depot/projects/hammer/sys/pci/if_rl.c#49 integrate .. //depot/projects/hammer/sys/pci/if_sf.c#36 integrate .. //depot/projects/hammer/sys/pci/if_sis.c#42 integrate .. //depot/projects/hammer/sys/pci/if_ste.c#40 integrate .. //depot/projects/hammer/sys/pci/if_vr.c#36 integrate .. //depot/projects/hammer/sys/pci/if_xl.c#59 integrate .. //depot/projects/hammer/sys/security/mac/mac_process.c#8 integrate .. //depot/projects/hammer/sys/sys/cdefs.h#21 integrate .. //depot/projects/hammer/sys/sys/libkern.h#13 integrate .. //depot/projects/hammer/sys/sys/param.h#67 integrate .. //depot/projects/hammer/sys/sys/rman.h#12 integrate .. //depot/projects/hammer/sys/sys/uuid.h#6 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_alloc.c#24 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_snapshot.c#38 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#53 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vnops.c#36 integrate .. //depot/projects/hammer/sys/vm/uma.h#14 integrate .. //depot/projects/hammer/sys/vm/uma_core.c#44 integrate .. //depot/projects/hammer/sys/vm/vm_page.c#43 integrate .. //depot/projects/hammer/tools/regression/geom_gpt/gctl.t#2 integrate .. //depot/projects/hammer/tools/regression/lib/libutil/Makefile#1 branch .. //depot/projects/hammer/tools/regression/lib/libutil/test-trimdomain-nodomain.c#1 branch .. //depot/projects/hammer/tools/regression/lib/libutil/test-trimdomain-nodomain.t#1 branch .. //depot/projects/hammer/tools/regression/lib/libutil/test-trimdomain.c#1 branch .. //depot/projects/hammer/tools/regression/lib/libutil/test-trimdomain.t#1 branch .. //depot/projects/hammer/tools/tools/README#18 integrate .. //depot/projects/hammer/tools/tools/iwi/Makefile#1 branch .. //depot/projects/hammer/tools/tools/iwi/iwistats.c#1 branch .. //depot/projects/hammer/tools/tools/netrate/http/Makefile#1 branch .. //depot/projects/hammer/tools/tools/netrate/http/http.c#1 branch .. //depot/projects/hammer/tools/tools/netrate/httpd/Makefile#1 branch .. //depot/projects/hammer/tools/tools/netrate/httpd/httpd.c#1 branch .. //depot/projects/hammer/tools/tools/netrate/tcpconnect/Makefile#1 branch .. //depot/projects/hammer/tools/tools/netrate/tcpconnect/tcpconnect.c#1 branch .. //depot/projects/hammer/tools/tools/netrate/tcpreceive/Makefile#1 branch .. //depot/projects/hammer/tools/tools/netrate/tcpreceive/tcpreceive.c#1 branch .. //depot/projects/hammer/tools/tools/tinderbox/etc/releng_6.rc#2 integrate .. //depot/projects/hammer/tools/tools/tinderbox/etc/update_releng_6.rc#2 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.freebsd#40 integrate .. //depot/projects/hammer/usr.bin/gprof/gprof.1#7 integrate .. //depot/projects/hammer/usr.bin/gprof/printgprof.c#4 integrate .. //depot/projects/hammer/usr.bin/lockf/lockf.c#3 integrate .. //depot/projects/hammer/usr.bin/mail/mail.1#6 integrate .. //depot/projects/hammer/usr.bin/mail/main.c#3 integrate .. //depot/projects/hammer/usr.bin/make/job.c#29 integrate .. //depot/projects/hammer/usr.bin/make/make.1#26 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/delete/main.c#3 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/info/main.c#7 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/version/perform.c#9 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/version/test-pkg_version.sh#3 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/devices.c#17 integrate .. //depot/projects/hammer/usr.sbin/wpa/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/wpa/ndis_events/Makefile#1 branch .. //depot/projects/hammer/usr.sbin/wpa/ndis_events/ndis_events.8#1 branch .. //depot/projects/hammer/usr.sbin/wpa/ndis_events/ndis_events.c#1 branch .. //depot/projects/hammer/usr.sbin/wpa/wpa_supplicant/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/wpa/wpa_supplicant/Packet32.c#1 branch .. //depot/projects/hammer/usr.sbin/wpa/wpa_supplicant/Packet32.h#1 branch .. //depot/projects/hammer/usr.sbin/wpa/wpa_supplicant/ntddndis.h#1 branch Differences ... ==== //depot/projects/hammer/ObsoleteFiles.inc#8 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.17 2005/09/28 09:19:17 mlaier Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.18 2005/10/08 22:51:47 thompsa Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -16,7 +16,6 @@ # 20050927: bridge(4) replaced by if_bridge(4) OLD_FILES+=usr/include/net/bridge.h -OLD_FILES+=usr/share/man/man4/bridge.4.gz # 20050831: not implemented OLD_FILES+=usr/share/man/man3/getino.3.gz OLD_FILES+=usr/share/man/man3/putino.3.gz ==== //depot/projects/hammer/contrib/bsnmp/lib/asn1.c#5 (text+ko) ==== @@ -43,6 +43,16 @@ #include #include "asn1.h" +#if !defined(INT32_MIN) +#define INT32_MIN (-0x7fffffff-1) +#endif +#if !defined(INT32_MAX) +#define INT32_MAX (0x7fffffff) +#endif +#if !defined(UINT32_MAX) +#define UINT32_MAX (0xffffffff) +#endif + static void asn_error_func(const struct asn_buf *, const char *, ...); void (*asn_error)(const struct asn_buf *, const char *, ...) = asn_error_func; ==== //depot/projects/hammer/contrib/bsnmp/lib/asn1.h#5 (text+ko) ==== @@ -179,14 +179,4 @@ ASN_EXCEPT_ENDOFMIBVIEW = 0x02, }; -#if !defined(INT32_MIN) -#define INT32_MIN (-0x7fffffff-1) -#endif -#if !defined(INT32_MAX) -#define INT32_MAX (0x7fffffff) -#endif -#if !defined(UINT32_MAX) -#define UINT32_MAX (0xffffffff) -#endif - #endif ==== //depot/projects/hammer/contrib/bsnmp/lib/snmpclient.c#6 (text+ko) ==== @@ -64,6 +64,14 @@ #include "snmpclient.h" #include "snmppriv.h" +#if !defined(INT32_MAX) +#define INT32_MAX (0x7fffffff) +#endif +#if !defined(UINT32_MAX) +#define UINT32_MAX (0xffffffff) +#endif + + /* global context */ struct snmp_client snmp_client; ==== //depot/projects/hammer/contrib/bsnmp/snmp_ntp/snmp_ntp.c#4 (text+ko) ==== @@ -55,6 +55,16 @@ #include "ntp_tree.h" #include "ntp_oid.h" +#if !defined(INT32_MIN) +#define INT32_MIN (-0x7fffffff-1) +#endif +#if !defined(INT32_MAX) +#define INT32_MAX (0x7fffffff) +#endif +#if !defined(UINT32_MAX) +#define UINT32_MAX (0xffffffff) +#endif + #define NTPC_MAX 576 #define NTPC_VERSION 3 #define NTPC_MODE 6 ==== //depot/projects/hammer/contrib/bsnmp/snmpd/main.c#9 (text+ko) ==== @@ -57,6 +57,10 @@ #include "tree.h" #include "oid.h" +#if !defined(INT32_MAX) +#define INT32_MAX (0x7fffffff) +#endif + #define PATH_PID "/var/run/%s.pid" #define PATH_CONFIG "/etc/%s.config" ==== //depot/projects/hammer/contrib/wpa_supplicant/FREEBSD-Xlist#2 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/contrib/wpa_supplicant/FREEBSD-Xlist,v 1.1 2005/06/05 20:55:01 sam Exp $ +$FreeBSD: src/contrib/wpa_supplicant/FREEBSD-Xlist,v 1.2 2005/10/10 17:48:01 wpaul Exp $ .cvsignore README-Windows.txt driver_atmel.c @@ -7,9 +7,6 @@ driver_hostap.c driver_ipw.c driver_madwifi.c -driver_ndis.c -driver_ndis.h -driver_ndis_.c driver_ndiswrapper.c driver_prism54.c driver_test.c ==== //depot/projects/hammer/crypto/openssl/ssl/s23_srvr.c#3 (text+ko) ==== @@ -268,9 +268,6 @@ int n=0,j; int type=0; int v[2]; -#ifndef OPENSSL_NO_RSA - int use_sslv2_strong=0; -#endif if (s->state == SSL23_ST_SR_CLNT_HELLO_A) { @@ -519,9 +516,7 @@ } s->state=SSL2_ST_GET_CLIENT_HELLO_A; - if ((s->options & SSL_OP_MSIE_SSLV2_RSA_PADDING) || - use_sslv2_strong || - (s->options & SSL_OP_NO_TLSv1 && s->options & SSL_OP_NO_SSLv3)) + if (s->options & SSL_OP_NO_TLSv1 && s->options & SSL_OP_NO_SSLv3) s->s2->ssl2_rollback=0; else /* reject SSL 2.0 session if client supports SSL 3.0 or TLS 1.0 ==== //depot/projects/hammer/etc/defaults/rc.conf#62 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.261 2005/10/02 18:59:01 yar Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.262 2005/10/11 19:16:47 emax Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -309,6 +309,15 @@ isdn_trace="NO" # Enable the ISDN trace subsystem (or NO). isdn_traceflags="-f /var/tmp/isdntrace0" # Flags for isdntrace +### Bluetooth ### +hcsecd_enable="NO" # Enable hcsecd(8) (or NO) +hcsecd_config="/etc/bluetooth/hcsecd.conf" # hcsecd(8) configuration file + +sdpd_enable="NO" # Enable sdpd(8) (or NO) +sdpd_control="/var/run/sdp" # sdpd(8) control socket +sdpd_group="nobody" # set spdp(8) user/group to run as after +sdpd_user="nobody" # it initializes + ### Miscellaneous network options: ### icmp_bmcastecho="NO" # respond to broadcast ping packets ==== //depot/projects/hammer/etc/rc.firewall6#6 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh - ############ # Setup system for IPv6 firewall service. -# $FreeBSD: src/etc/rc.firewall6,v 1.15 2004/08/03 08:58:34 ume Exp $ +# $FreeBSD: src/etc/rc.firewall6,v 1.16 2005/10/05 07:00:42 ume Exp $ # Suck in the configuration variables. if [ -z "${source_rc_confs_defined}" ]; then @@ -188,6 +188,10 @@ ${fw6cmd} add deny all from ${inet}/${iprefixlen} to any in via ${oif} ${fw6cmd} add deny all from ${onet}/${oprefixlen} to any in via ${iif} + # Stop unique local unicast address on the outside interface + ${fw6cmd} add deny all from fc00::/7 to any via ${oif} + ${fw6cmd} add deny all from any to fc00::/7 via ${oif} + # Stop site-local on the outside interface ${fw6cmd} add deny all from fec0::/10 to any via ${oif} ${fw6cmd} add deny all from any to fec0::/10 via ${oif} ==== //depot/projects/hammer/gnu/usr.bin/cpio/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/cpio/Makefile,v 1.11 2005/10/01 06:35:58 tjr Exp $ +# $FreeBSD: src/gnu/usr.bin/cpio/Makefile,v 1.12 2005/10/06 09:49:37 tjr Exp $ CPIODIR= ${.CURDIR}/../../../contrib/cpio .PATH: ${CPIODIR}/lib ${CPIODIR}/src ${CPIODIR}/doc @@ -57,6 +57,6 @@ ln -fs ${.ALLSRC} ${.TARGET} CFLAGS+=-I${.OBJDIR} -I${.CURDIR} -I${CPIODIR}/lib -DHAVE_CONFIG_H \ - -DHAVE_MKFIFO -DHAVE_SETLOCALE + -DHAVE_MKFIFO -DHAVE_SETLOCALE -DHAVE_LSTAT .include ==== //depot/projects/hammer/lib/csu/amd64/crt1.c#6 (text+ko) ==== @@ -86,15 +86,10 @@ atexit(_fini); #ifdef GCRT monstartup(&eprol, &etext); +__asm__("eprol:"); #endif _init(); exit( main(argc, argv, env) ); } -#ifdef GCRT -__asm__(".text"); -__asm__("eprol:"); -__asm__(".previous"); -#endif - -__asm__(".ident\t\"$FreeBSD: src/lib/csu/amd64/crt1.c,v 1.14 2004/08/15 16:18:51 dfr Exp $\""); +__asm__(".ident\t\"$FreeBSD: src/lib/csu/amd64/crt1.c,v 1.15 2005/10/07 22:13:17 bde Exp $\""); ==== //depot/projects/hammer/lib/csu/i386-elf/crt1.c#6 (text+ko) ==== @@ -104,15 +104,10 @@ atexit(_fini); #ifdef GCRT monstartup(&eprol, &etext); +__asm__("eprol:"); #endif _init(); exit( main(argc, argv, env) ); } -#ifdef GCRT -__asm__(".text"); -__asm__("eprol:"); -__asm__(".previous"); -#endif - -__asm__(".ident\t\"$FreeBSD: src/lib/csu/i386-elf/crt1.c,v 1.14 2005/05/19 07:36:07 dfr Exp $\""); +__asm__(".ident\t\"$FreeBSD: src/lib/csu/i386-elf/crt1.c,v 1.15 2005/10/07 22:13:17 bde Exp $\""); ==== //depot/projects/hammer/lib/libdevstat/devstat.c#9 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libdevstat/devstat.c,v 1.28 2005/04/26 15:02:01 mux Exp $"); +__FBSDID("$FreeBSD: src/lib/libdevstat/devstat.c,v 1.29 2005/10/04 22:00:35 stefanf Exp $"); #include #include @@ -1582,7 +1582,7 @@ static char * get_devstat_kvm(kvm_t *kd) { - int error, i, wp; + int i, wp; long gen; struct devstat *nds; struct devstat ds; @@ -1592,7 +1592,6 @@ if ((num_devs = devstat_getnumdevs(kd)) <= 0) return(NULL); - error = 0; if (KREADNL(kd, X_DEVICE_STATQ, dhead) == -1) return(NULL); ==== //depot/projects/hammer/lib/libedit/editline.3#7 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $NetBSD: editline.3,v 1.48 2005/07/14 15:02:37 wiz Exp $ +.\" $NetBSD: editline.3,v 1.49 2005/09/09 22:32:56 wiz Exp $ .\" .\" Copyright (c) 1997-2003 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -33,9 +33,9 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libedit/editline.3,v 1.25 2005/08/09 13:35:48 stefanf Exp $ +.\" $FreeBSD: src/lib/libedit/editline.3,v 1.26 2005/10/04 21:51:26 stefanf Exp $ .\" -.Dd July 14, 2005 +.Dd October 4, 2005 .Os .Dt EDITLINE 3 .Sh NAME @@ -631,11 +631,11 @@ Save the history list to .Fa file . .It Dv H_SETUNIQUE , Fa "int unique" -Set if the adjacent identical event strings should not be entered into -the history. +Set flag that adjacent identical event strings should not be entered +into the history. .It Dv H_GETUNIQUE -Retrieve the current setting if if adjacent elements should be entered into -the history. +Retrieve the current setting if adjacent identical elements should +be entered into the history. .It Dv H_DEL , Fa "int num" Delete the event numbered .Fa e . ==== //depot/projects/hammer/lib/libedit/el.c#3 (text+ko) ==== @@ -29,14 +29,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $NetBSD: el.c,v 1.40 2005/08/01 23:00:15 christos Exp $ + * $NetBSD: el.c,v 1.41 2005/08/19 04:21:47 christos Exp $ */ #if !defined(lint) && !defined(SCCSID) static char sccsid[] = "@(#)el.c 8.2 (Berkeley) 1/3/94"; #endif /* not lint && not SCCSID */ #include -__FBSDID("$FreeBSD: src/lib/libedit/el.c,v 1.12 2005/08/07 20:51:52 stefanf Exp $"); +__FBSDID("$FreeBSD: src/lib/libedit/el.c,v 1.13 2005/10/04 21:45:42 stefanf Exp $"); /* * el.c: EditLine interface functions @@ -301,11 +301,11 @@ switch (op) { case EL_PROMPT: case EL_RPROMPT: - rv = prompt_get(el, (void *) &ret, op); + rv = prompt_get(el, (el_pfunc_t *) ret, op); break; case EL_EDITOR: - rv = map_get_editor(el, (void *) &ret); + rv = map_get_editor(el, (const char **)ret); break; case EL_SIGNAL: ==== //depot/projects/hammer/lib/libedit/makelist#4 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh - -# $NetBSD: makelist,v 1.9 2005/05/16 13:14:43 lukem Exp $ -# $FreeBSD: src/lib/libedit/makelist,v 1.9 2005/08/07 20:51:52 stefanf Exp $ +# $NetBSD: makelist,v 1.10 2005/08/08 14:04:49 christos Exp $ +# $FreeBSD: src/lib/libedit/makelist,v 1.10 2005/10/04 21:59:29 stefanf Exp $ # # Copyright (c) 1992, 1993 # The Regents of the University of California. All rights reserved. @@ -119,7 +119,6 @@ } } END { - printf(" { NULL, 0, NULL }\n"); printf("};\n"); printf("\nprotected const el_bindings_t* help__get()"); printf("{ return el_func_help; }\n"); ==== //depot/projects/hammer/lib/libedit/map.c#3 (text+ko) ==== @@ -29,14 +29,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $NetBSD: map.c,v 1.20 2004/08/13 12:10:39 mycroft Exp $ + * $NetBSD: map.c,v 1.22 2005/08/09 13:58:44 christos Exp $ */ #if !defined(lint) && !defined(SCCSID) static char sccsid[] = "@(#)map.c 8.1 (Berkeley) 6/4/93"; #endif /* not lint && not SCCSID */ #include -__FBSDID("$FreeBSD: src/lib/libedit/map.c,v 1.11 2005/08/08 07:03:50 stefanf Exp $"); +__FBSDID("$FreeBSD: src/lib/libedit/map.c,v 1.12 2005/10/04 21:59:29 stefanf Exp $"); /* * map.c: Editor function definitions @@ -913,11 +913,11 @@ el->el_map.vic = el_map_vi_command; el->el_map.vii = el_map_vi_insert; el->el_map.help = (el_bindings_t *) el_malloc(sizeof(el_bindings_t) * - (EL_NUM_FCNS + 1)); + EL_NUM_FCNS); if (el->el_map.help == NULL) return (-1); (void) memcpy(el->el_map.help, help__get(), - sizeof(el_bindings_t) * (EL_NUM_FCNS + 1)); + sizeof(el_bindings_t) * EL_NUM_FCNS); el->el_map.func = (el_func_t *)el_malloc(sizeof(el_func_t) * EL_NUM_FCNS); if (el->el_map.func == NULL) @@ -1123,11 +1123,12 @@ map_print_key(EditLine *el, el_action_t *map, const char *in) { char outbuf[EL_BUFSIZ]; - el_bindings_t *bp; + el_bindings_t *bp, *ep; if (in[0] == '\0' || in[1] == '\0') { (void) key__decode_str(in, outbuf, ""); - for (bp = el->el_map.help; bp->name != NULL; bp++) + ep = &el->el_map.help[el->el_map.nfunc]; + for (bp = el->el_map.help; bp < ep; bp++) if (bp->func == map[(unsigned char) *in]) { (void) fprintf(el->el_outfile, "%s\t->\t%s\n", outbuf, bp->name); @@ -1144,7 +1145,7 @@ private void map_print_some_keys(EditLine *el, el_action_t *map, int first, int last) { - el_bindings_t *bp; + el_bindings_t *bp, *ep; char firstbuf[2], lastbuf[2]; char unparsbuf[EL_BUFSIZ], extrabuf[EL_BUFSIZ]; @@ -1159,7 +1160,8 @@ key__decode_str(firstbuf, unparsbuf, STRQQ)); return; } - for (bp = el->el_map.help; bp->name != NULL; bp++) { + ep = &el->el_map.help[el->el_map.nfunc]; + for (bp = el->el_map.help; bp < ep; bp++) { if (bp->func == map[first]) { if (first == last) { (void) fprintf(el->el_outfile, "%-15s-> %s\n", @@ -1242,7 +1244,7 @@ char outbuf[EL_BUFSIZ]; const char *in = NULL; char *out = NULL; - el_bindings_t *bp; + el_bindings_t *bp, *ep; int cmd; int key; @@ -1284,8 +1286,8 @@ return (0); case 'l': - for (bp = el->el_map.help; bp->name != NULL; - bp++) + ep = &el->el_map.help[el->el_map.nfunc]; + for (bp = el->el_map.help; bp < ep; bp++) (void) fprintf(el->el_outfile, "%s\n\t%s\n", bp->name, bp->description); @@ -1386,7 +1388,7 @@ map_addfunc(EditLine *el, const char *name, const char *help, el_func_t func) { void *p; - int nf = el->el_map.nfunc + 2; + int nf = el->el_map.nfunc + 1; if (name == NULL || help == NULL || func == NULL) return (-1); @@ -1405,7 +1407,6 @@ el->el_map.help[nf].name = name; el->el_map.help[nf].func = nf; el->el_map.help[nf].description = help; - el->el_map.help[++nf].name = NULL; el->el_map.nfunc++; return (0); ==== //depot/projects/hammer/lib/libthr/thread/thr_create.c#18 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_create.c,v 1.23 2005/09/01 15:21:23 stefanf Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_create.c,v 1.24 2005/10/10 12:15:07 davidxu Exp $ */ #include @@ -140,7 +140,7 @@ /* Initialise hooks in the thread structure: */ if (new_thread->attr.suspend == THR_CREATE_SUSPENDED) - new_thread->flags = THR_FLAGS_SUSPENDED; + new_thread->flags = THR_FLAGS_NEED_SUSPEND; new_thread->state = PS_RUNNING; /* Add the new thread. */ ==== //depot/projects/hammer/lib/libutil/trimdomain.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libutil/trimdomain.c,v 1.5 2003/10/18 10:04:16 markm Exp $"); +__FBSDID("$FreeBSD: src/lib/libutil/trimdomain.c,v 1.6 2005/10/05 04:42:20 brooks Exp $"); #include @@ -75,18 +75,16 @@ s = fullhost; end = s + hostsize + 1; - for (; (s = memchr(s, '.', (size_t)(end - s))) != NULL; s++) { + if ((s = memchr(s, '.', (size_t)(end - s))) != NULL) { if (strncasecmp(s + 1, domain, dlen) == 0) { if (s[dlen + 1] == '\0') { /* Found -- lose the domain. */ *s = '\0'; - break; } else if (s[dlen + 1] == ':' && isDISP(s + dlen + 2) && (len = strlen(s + dlen + 1)) < (size_t)(end - s)) { /* Found -- shuffle the DISPLAY back. */ memmove(s, s + dlen + 1, len + 1); - break; } } } ==== //depot/projects/hammer/lib/msun/src/e_rem_pio2f.c#2 (text+ko) ==== @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_rem_pio2f.c,v 1.7 2002/05/28 17:51:46 alfred Exp $"; +static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_rem_pio2f.c,v 1.11 2005/10/10 20:02:02 bde Exp $"; #endif /* __ieee754_rem_pio2f(x,y) @@ -54,8 +54,23 @@ 0x73, 0xA8, 0xC9, 0x60, 0xE2, 0x7B, 0xC0, 0x8C, 0x6B, }; -/* This array is like the one in e_rem_pio2.c, but the numbers are - single precision and the last 8 bits are forced to 0. */ +/* + * This array is like the one in e_rem_pio2.c, but the numbers are + * single precision and the last few bits (8 here) are ignored by + * masking them off in the float word instead of by omitting the low + * word. + * + * Masking off 8 bits is not enough, but we defer further masking to + * runtime so that the mask is easy to change. We now mask off 21 + * bits, which is the smallest number that makes the "quick check no + * cancellation" detect all cancellations for cases that it is used. + * It doesn't detect all non-cancellations, especiallly for small + * multiples of pi/2, but then the non-quick code selects the best + * approximation of pi/2 to use. The result is that arg reduction is + * always done with between 8 or 9 and 17 bits of extra precision in + * the medium-multiple case. With only 8 bits masked of we had + * negative extra precision in some cases starting near +-13*pi/2. + */ static const int32_t npio2_hw[] = { 0x3fc90f00, 0x40490f00, 0x4096cb00, 0x40c90f00, 0x40fb5300, 0x4116cb00, 0x412fed00, 0x41490f00, 0x41623100, 0x417b5300, 0x418a3a00, 0x4196cb00, @@ -100,10 +115,10 @@ if(ix<0x4016cbe4) { /* |x| < 3pi/4, special case with n=+-1 */ if(hx>0) { z = x - pio2_1; - if((ix&0xfffffff0)!=0x3fc90fd0) { /* 24+24 bit pi OK */ + if((ix&0xfffe0000)!=0x3fc80000) { /* 17+24 bit pi OK */ y[0] = z - pio2_1t; y[1] = (z-y[0])-pio2_1t; - } else { /* near pi/2, use 24+24+24 bit pi */ + } else { /* near pi/2, use 17+17+24 bit pi */ z -= pio2_2; y[0] = z - pio2_2t; y[1] = (z-y[0])-pio2_2t; @@ -111,10 +126,10 @@ return 1; } else { /* negative x */ z = x + pio2_1; - if((ix&0xfffffff0)!=0x3fc90fd0) { /* 24+24 bit pi OK */ + if((ix&0xfffe0000)!=0x3fc80000) { /* 17+24 bit pi OK */ y[0] = z + pio2_1t; y[1] = (z-y[0])+pio2_1t; - } else { /* near pi/2, use 24+24+24 bit pi */ + } else { /* near pi/2, use 17+17+24 bit pi */ z += pio2_2; y[0] = z + pio2_2t; y[1] = (z-y[0])+pio2_2t; @@ -128,7 +143,7 @@ fn = (float)n; r = t-fn*pio2_1; w = fn*pio2_1t; /* 1st round good to 40 bit */ - if(n<32&&(ix&0xffffff00)!=npio2_hw[n-1]) { + if(n<32&&(ix&0xffe00000)!=(npio2_hw[n-1]&0xffe00000)) { y[0] = r-w; /* quick check no cancellation */ } else { u_int32_t high; ==== //depot/projects/hammer/lib/msun/src/k_cosf.c#2 (text+ko) ==== @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$FreeBSD: src/lib/msun/src/k_cosf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $"; +static char rcsid[] = "$FreeBSD: src/lib/msun/src/k_cosf.c,v 1.8 2005/10/09 21:07:23 bde Exp $"; #endif #include "math.h" @@ -44,10 +44,21 @@ if(ix < 0x3e99999a) /* if |x| < 0.3 */ return one - ((float)0.5*z - (z*r - x*y)); else { + /* + * qx is an approximation to x*x/2 such that 1-qx and x*x/2-qx + * are both exact. Its implementation is optimized for + * efficiency in preference to accuracy. We use x*x/2 ~ x/4 for + * x near 0.5 and mask off just enough low bits (3) for both of + * the above differences to be exact. We use a constant for + * x > 0.78125 to keep using the same algorithm as k_cos.c, + * although this gives only a small improvement in accuracy, at + * least here. Using x*x/2 to approximate itself (masking off + * 3 low bits again) would give better accuracy. + */ if(ix > 0x3f480000) { /* x > 0.78125 */ qx = (float)0.28125; } else { - SET_FLOAT_WORD(qx,ix-0x01000000); /* x/4 */ + SET_FLOAT_WORD(qx,(ix-0x01000000)&0xfffffff8); } hz = (float)0.5*z-qx; a = one-qx; ==== //depot/projects/hammer/lib/msun/src/k_rem_pio2f.c#3 (text+ko) ==== @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$FreeBSD: src/lib/msun/src/k_rem_pio2f.c,v 1.7 2005/04/05 23:27:47 das Exp $"; +static char rcsid[] = "$FreeBSD: src/lib/msun/src/k_rem_pio2f.c,v 1.8 2005/10/11 07:56:05 bde Exp $"; #endif #include "math.h" @@ -169,6 +169,7 @@ case 2: fw = 0.0; for (i=jz;i>=0;i--) fw += fq[i]; + fw = *(volatile float *)&fw; /* clip any extra precision */ y[0] = (ih==0)? fw: -fw; fw = fq[0]-fw; for (i=1;i<=jz;i++) fw += fq[i]; ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#81 (text+ko) ==== @@ -29,7 +29,7 @@ - $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.289 2005/09/18 16:22:20 brueffer Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.290 2005/10/10 18:01:18 joel Exp $ Supported Devices @@ -691,6 +691,8 @@ &hwlist.snd.maestro3; + &hwlist.snd.mss; + &hwlist.snd.neomagic; &hwlist.snd.sbc; ==== //depot/projects/hammer/release/doc/share/misc/dev.archlist.txt#31 (text+ko) ==== @@ -23,7 +23,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.68 2005/09/18 16:22:20 brueffer Exp $ +# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.69 2005/10/10 18:01:18 joel Exp $ # # @@ -119,6 +119,7 @@ snd_ich i386,amd64 snd_maestro i386,alpha,amd64 snd_maestro3 i386,alpha,amd64 +snd_mss i386 snd_neomagic i386,amd64 snd_sbc i386,alpha,amd64 snd_solo i386,amd64 ==== //depot/projects/hammer/sbin/devd/devd.cc#14 (text+ko) ==== @@ -34,7 +34,7 @@ // - devd.conf needs more details on the supported statements. #include >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Oct 13 04:37:33 2005 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 5645916A421; Thu, 13 Oct 2005 04:37:33 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E949016A41F for ; Thu, 13 Oct 2005 04:37:32 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3CC2343D60 for ; Thu, 13 Oct 2005 04:37:28 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9D4bS1P004863 for ; Thu, 13 Oct 2005 04:37:28 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9D4bRRj004860 for perforce@freebsd.org; Thu, 13 Oct 2005 04:37:27 GMT (envelope-from soc-andrew@freebsd.org) Date: Thu, 13 Oct 2005 04:37:27 GMT Message-Id: <200510130437.j9D4bRRj004860@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 85198 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, 13 Oct 2005 04:37:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=85198 Change 85198 by soc-andrew@soc-andrew_serv on 2005/10/13 04:36:44 Update to a newer snapshot of the BSD Installer Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/conf/BSDInstaller.lua#2 edit .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/install/220_format_disk.lua#2 edit .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/install/250_partition_disk.lua#3 edit .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/lib/storage.lua#3 edit Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/conf/BSDInstaller.lua#2 (text+ko) ==== @@ -1,6 +1,6 @@ -- -- conf/BSDInstaller.lua --- $Id: BSDInstaller.lua,v 1.12 2005/09/12 23:38:35 cpressey Exp $ +-- $Id: BSDInstaller.lua,v 1.13 2005/10/05 21:29:03 cpressey Exp $ -- -- The monolithic default configuration file for the BSD Installer. -- @@ -381,12 +381,12 @@ -- ui_nav_control = { - ["*/install/format_disk"] = "ignore", -- do not do the "Format - -- Disk" step on install ["*/install/select_packages"] = "ignore", -- do not do the "Select -- Packages" step on install -- -- examples follow: +-- ["*/install/format_disk"] = "ignore", -- do not do the "Format +-- -- Disk" step on install -- ["*/welcome"] = "ignore", -- no "welcome" items at all -- ["*/install/partition_disk"] = "ignore", -- Don't show the Partition ==== //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/install/220_format_disk.lua#2 (text+ko) ==== @@ -1,13 +1,7 @@ --- $Id: 220_format_disk.lua,v 1.12 2005/08/26 04:25:24 cpressey Exp $ +-- $Id: 220_format_disk.lua,v 1.13 2005/10/05 21:29:03 cpressey Exp $ -- --- Format the selected disk. --- --- This step is, by default, ignored (see conf/uinavctl.lua.) --- However, it can be configured to be used for embedded and other --- installs where the operating system is intended to "take over" --- an entire disk anyway, and there is no point letting the user --- partition or select a partition on a disk. +-- Allow the user to format the selected disk, if they so desire. -- local format_disk = function(step, dd) @@ -18,7 +12,7 @@ local confirm = function() local response = App.ui:present{ id = "confirm_alter_disk", - name = _("Format this Disk?"), + name = _("ABOUT TO FORMAT! Proceed?"), short_desc = _( "WARNING! ALL data in ALL partitions " .. "on the disk\n\n" .. @@ -32,7 +26,7 @@ actions = { { id = "ok", - name = _("Format this Disk") + name = _("Format %s", dd:get_name()) }, { id = "cancel", @@ -94,14 +88,49 @@ name = _("Format Disk"), req_state = { "storage", "sel_disk" }, effect = function(step) - if format_disk(step, App.state.sel_disk) then - -- - -- Success. Select the (only!) partition on the disk. - -- - App.state.sel_part = App.state.sel_disk:get_part_by_number(1) + local response = App.ui:present{ + id = "format_disk", + name = _("Format this Disk?"), + short_desc = _( + "Would you like to format this disk?\n\n" .. + "You should format the disk if it is new, " .. + "or if you wish to start from a clean " .. + "slate. You should NOT format the disk " .. + "if it contains information that you " .. + "want to keep." + ), + + actions = { + { + id = "ok", + name = _("Format this Disk") + }, + { + id = "skip", + name = _("Skip this step") + }, + { + id = "cancel", + accelerator = "ESC", + name = _("Return to %s", step:get_prev_name()) + } + } + } + if response.action_id == "cancel" then + return step:prev() + elseif response.action_id == "skip" then return step:next() - else - return step:prev() + elseif response.action_id == "ok" then + if format_disk(step, App.state.sel_disk) then + -- + -- Success. Select the (only!) partition on the disk. + -- + App.state.sel_part = + App.state.sel_disk:get_part_by_number(1) + return step:next() + else + return step:prev() + end end end } ==== //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/install/250_partition_disk.lua#3 (text+ko) ==== @@ -1,4 +1,4 @@ --- $Id: 250_partition_disk.lua,v 1.78 2005/08/26 04:25:24 cpressey Exp $ +-- $Id: 250_partition_disk.lua,v 1.79 2005/10/05 21:29:03 cpressey Exp $ -- -- Partition editor. @@ -697,7 +697,8 @@ short_desc = _( "No changes appear to have been made to the " .. "partition table layout.\n\n" .. - "Do you want to partition the disk anyway?" + "Do you want to execute the commands to " .. + "partition the disk anyway?" ), actions = { @@ -707,6 +708,10 @@ App.state.sel_disk:get_name()) }, { + id = "skip", + name = _("No, Skip to Next Step") + }, + { id = "cancel", accelerator = "ESC", name = _("No, Return to Edit Partitions") @@ -715,6 +720,8 @@ } if response.action_id == "cancel" then return step + elseif response.action_id == "skip" then + return step:next() end end @@ -737,9 +744,11 @@ name = _("Partition Disk"), req_state = { "storage", "sel_disk" }, effect = function(step) + --[[-- if App.state.sel_disk:has_been_touched() then return let_user_edit_partitions(step, populate_from_disk) end + --]]-- if App.state.sel_disk:is_mounted() then local response = App.ui:present{ @@ -806,14 +815,14 @@ short_desc = _( "You may now partition this disk if you desire." .. "\n\n" .. - "If this is a brand new disk, you should do this. If you " .. - "would like to place multiple operating systems on this disk, " .. - "you should create multiple partitions, one for each operating ".. - "system." .. + "If you formatted this disk, and would now like to install " .. + "multiple operating systems on it, you can reserve a part " .. + "of the disk for each of them here. Create multiple " .. + "partitions, one for each operating system." .. "\n\n" .. "If this disk already has operating systems on it that you " .. "wish to keep, you should be careful not to change the " .. - "partitions that they are on, when doing this." .. + "partitions that they are on, if you choose to partition." .. "\n\n" .. "Partition this disk?" ), ==== //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/lib/storage.lua#3 (text+ko) ==== @@ -1,4 +1,4 @@ --- $Id: storage.lua,v 1.176 2005/09/02 03:01:15 cpressey Exp $ +-- $Id: storage.lua,v 1.177 2005/10/05 20:27:40 cpressey Exp $ -- Storage Descriptors (a la libinstaller) in Lua. -- @@ -345,7 +345,7 @@ if not disk then table.insert(ret, false) else - part = disk:find_part_by_number(obj[2]) + part = disk:get_part_by_number(obj[2]) table.insert(ret, part or false) end end From owner-p4-projects@FreeBSD.ORG Thu Oct 13 04:39:32 2005 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 B1C2D16A421; Thu, 13 Oct 2005 04:39:31 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8B0E516A41F for ; Thu, 13 Oct 2005 04:39:31 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2CE3243D45 for ; Thu, 13 Oct 2005 04:39:31 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9D4dV1X004924 for ; Thu, 13 Oct 2005 04:39:31 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9D4dUio004921 for perforce@freebsd.org; Thu, 13 Oct 2005 04:39:30 GMT (envelope-from soc-andrew@freebsd.org) Date: Thu, 13 Oct 2005 04:39:30 GMT Message-Id: <200510130439.j9D4dUio004921@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 85199 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, 13 Oct 2005 04:39:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=85199 Change 85199 by soc-andrew@soc-andrew_serv on 2005/10/13 04:38:55 IFC Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#3 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#7 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/share/misc/dev.archlist.txt#3 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/Makefile#2 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/early-adopter/Makefile#2 delete .. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/early-adopter/article.sgml#2 delete .. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/errata/article.sgml#2 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/hardware/amd64/proc-amd64.sgml#2 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/hardware/common/artheader.sgml#2 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#3 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/hardware/common/intro.sgml#2 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/installation/common/artheader.sgml#2 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/installation/common/trouble.sgml#2 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/installation/common/upgrade.sgml#2 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/readme/article.sgml#2 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#2 integrate .. //depot/projects/soc2005/bsdinstaller/src/usr.sbin/Makefile#9 integrate Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#3 (text+ko) ==== @@ -29,7 +29,7 @@ - $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.289 2005/09/18 16:22:20 brueffer Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.290 2005/10/10 18:01:18 joel Exp $ Supported Devices @@ -691,6 +691,8 @@ &hwlist.snd.maestro3; + &hwlist.snd.mss; + &hwlist.snd.neomagic; &hwlist.snd.sbc; ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#7 (text+ko) ==== @@ -3,7 +3,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.893 2005/10/03 17:24:20 hrs Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.894 2005/10/12 12:24:37 joel Exp $ 2000 @@ -528,7 +528,7 @@ Documentation of existing functionality has been improved by the addition of the following manual pages: - &man.acpi.sony.4;, &man.snd.t4dwave.4;. + &man.acpi.sony.4;, &man.snd.mss.4;, &man.snd.t4dwave.4;. ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/share/misc/dev.archlist.txt#3 (text+ko) ==== @@ -23,7 +23,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.68 2005/09/18 16:22:20 brueffer Exp $ +# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.69 2005/10/10 18:01:18 joel Exp $ # # @@ -119,6 +119,7 @@ snd_ich i386,amd64 snd_maestro i386,alpha,amd64 snd_maestro3 i386,alpha,amd64 +snd_mss i386 snd_neomagic i386,amd64 snd_sbc i386,alpha,amd64 snd_solo i386,amd64 ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/Makefile#2 (text+ko) ==== @@ -1,14 +1,13 @@ # The FreeBSD Simplified Chinese Project # -# Original Revision: 1.3 -# $FreeBSD: src/release/doc/zh_CN.GB2312/Makefile,v 1.1 2004/10/15 06:43:44 delphij Exp $ +# Original Revision: 1.7 +# $FreeBSD: src/release/doc/zh_CN.GB2312/Makefile,v 1.2 2005/10/12 20:30:38 delphij Exp $ RELN_ROOT?= ${.CURDIR}/.. -SUBDIR = early-adopter +SUBDIR = relnotes SUBDIR+= hardware SUBDIR+= readme -SUBDIR+= relnotes SUBDIR+= errata SUBDIR+= installation ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/errata/article.sgml#2 (text+ko) ==== @@ -10,7 +10,7 @@ The FreeBSD Simplified Chinese Project - Original Revision: 1.72 + Original Revision: 1.73.2.1 --> %release; + ]>
- &os; -<![ %release.type.current [ - &release.current; -]]> -<![ %release.type.snapshot [ - &release.prev; -]]> -<![ %release.type.release [ - &release.current; -]]> - ·¢Ðа濱Îó + &os; &release.bugfix; ·¢Ðа濱Îó The &os; Project - $FreeBSD: src/release/doc/zh_CN.GB2312/errata/article.sgml,v 1.2 2005/04/02 14:08:24 delphij Exp $ + $FreeBSD: src/release/doc/zh_CN.GB2312/errata/article.sgml,v 1.3 2005/10/12 20:30:38 delphij Exp $ 2000 @@ -60,51 +51,24 @@ - Õâ·ÝÎĵµÁгöÁË &os; - - - - µÄ¿±ÎóÄÚÈÝ£¬ ÆäÖаüÀ¨ÔÚ·¢Ðа淢²¼Ö®ºó·¢ÏÖµÄÖØ´óÎÊÌ⣬ + Õâ·ÝÎĵµÁгöÁË &os; &release.bugfix; µÄ¿±ÎóÄÚÈÝ£¬ + ÆäÖаüÀ¨ÔÚ·¢Ðа淢²¼Ö®ºó·¢ÏÖµÄÖØ´óÎÊÌ⣬ ÒÔ¼°ÔÚ·¢ÐаæµÄ½»¸¶¹¤³ÌºóÆÚ±¾Ó¦Ð´½ø·¢ÐаæÎĵµ£¬ ¶øûÓÐÀ´µÃ¼°¼ÓÈëµÄÖØÒªÐÅÏ¢¡£ ÕâЩÐÅÏ¢¿ÉÄÜ°üÀ¨°²È«¹«¸æ£¬ ÒÔ¼°¹ØÓÚ¿ÉÄÜÓ°ÏìÈí¼þºÍÎĵµµÄ²Ù×÷»ò¿ÉÓÃÐÔµÄÐÂÎÅ¡£ ÔÚ°²×°´Ë°æ±¾µÄ &os; ֮ǰ£¬ Ó¦Ê×ÏÈÔĶÁ´ËÎĵµµÄ×îа汾¡£ - Õâ·Ý &os; - - - - µÄ¿±ÎóÎĵµ½«±»³ÖÐøµØά»¤£¬ - Ö±µ½ &os; µÄ &release.next; ·¢²¼ÎªÖ¹¡£ + Õâ·Ý &os; &release.bugfix; µÄ¿±ÎóÎĵµ½«³ÖÐøµØά»¤£¬ + Ö±µ½ &os; &release.next; ·¢²¼ÎªÖ¹¡£ ½éÉÜ - Õâ·Ý¿±ÎóÎĵµ°üº¬Á˹ØÓÚ &os; - - - + Õâ·Ý¿±ÎóÎĵµ°üº¬Á˹ØÓÚ &os; &release.bugfix; µÄ ×îÐÂÖØ´óÐÂÎÅ¡£ ÔÚ°²×°ÕâÒ»°æ±¾Ö®Ç°£¬ - ²Î¿¼Õâ·ÝÎĵµÒÔÁ˽âÔÚ·¢²¼Ö®ºóÒѾ­·¢ÏÖ²¢ÐÞÕýÁËÄÄЩÎÊÌâ·Ç³£ÖØÒª¡£ + ͨ¹ý²Î¿¼Õâ·ÝÎĵµÀ´Á˽âÔÚ·¢²¼Ö®ºó£¬ + ¿ÉÄÜÒѾ­·¢ÏÖ²¢ÐÞÕýµÄÎÊÌâ·Ç³£ÖØÒª¡£ Ëæ·¢Ðа汾¶ø·¢²¼µÄÕâ·ÝÎĵµ (ÀýÈ磬 ÔÚ CDROM Éϸ½´øµÄ) Ò»°ãÀ´ËµÒѾ­¹ýʱÁË£¬ µ«ÔÚ Internet ÉϵÄÆäËû¸±±¾»á±»³ÖÐø¸üУ¬ @@ -122,54 +86,40 @@ + + ¸üÐÂÏûÏ¢ + + ÔÝʱûÓÐÏà¹ØÏûÏ¢¡£ + + °²È«¹«¸æ -ÔÝʱ»¹Ã»ÓÐÐµİ²È«¹«¸æ¡£ -]]> - -ÔÝʱ»¹Ã»ÓÐÐµİ²È«¹«¸æ¡£ -]]> - -ÔÝʱ»¹Ã»ÓÐÐµİ²È«¹«¸æ¡£ -]]> - - - ´æÔÚµÄÎÊÌâ + + ÒÑÖªÎÊÌâºÍ½â¾ö°ì·¨ -ÔÝʱ»¹Ã»ÓÐеÄÒÑÖªÎÊÌâ¡£ -]]> + (2005/10/3) + ÔÚ»úÆ÷ûÓÐÖ¡»º´æʱ£¬ Òýµ¼Ê± &os;/sparc64 GENERIC + Äں˿ÉÄÜ»áÊä³öÏÂÁÐÏûÏ¢£º -ÔÝʱ»¹Ã»ÓÐеÄÒÑÖªÎÊÌâ¡£ -]]> + Aug 26 19:31:27 hostname getty[429]: open /dev/ttyv1: No such file or directory -ÔÝʱ»¹Ã»ÓÐеÄÒÑÖªÎÊÌâ¡£ -]]> + ÕâÊÇÓÉÓÚ¼ÆËã»úûÓпÉÒÔ±» &man.syscons.4; ʶ±ðµÄͼÐÎÓ²¼þÉ豸£¬ Òò´Ë + /dev/ttyv* É豸½ÚµãÒ²¾Í²»»á×Ô¶¯´´½¨¡£ + ÕâÊÇÒ»¸öÎÞº¦µÄ´íÎóÌáʾ£¬ Äú¿ÉÒÔͨ¹ý½ûÓà + /etc/ttys ÖÐµÄ + /dev/ttyv* ÏîÀ´ÆÁ±ÎËü¡£ - + (2005/10/3) + ÔÚÄڴ泬¹ý 4GB µÄÔËÐÐ &os;/sparc64 µÄ¼ÆËã»úÉÏ£¬ ÎÞ·¨¼ÓÔغÍʹÓÃÄÚºËÄ£¿é¡£ + ĿǰûÓа취ÈƹýÕâ¸öÎÊÌ⣬ ÄúÖ»Äܽ«ÕâЩģ¿é¾²Ì¬Áª±àµ½¶¨ÖƵÄÄں˲ÅÐС£ - - ÖØ´óÐÂÎÅ - -ÔÝʱ»¹Ã»ÓÐÐÂÎÅ¡£ -]]> - -ÔÝʱ»¹Ã»ÓÐÐÂÎÅ¡£ -]]> - -ÔÝʱ»¹Ã»ÓÐÐÂÎÅ¡£ -]]> + (2005/10/3) + &man.kgdb.1; ¹¤¾ßÎÞ·¨ÔÚ &os;/sparc64 ÓÃÓÚµ÷ÊÔ°üº¬ trap µÄ panic¡£ + Èƹý´ËÎÊÌâµÄÁÙʱ·½·¨ÊÇʹÓà devel/gdb53¡£
==== //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/hardware/amd64/proc-amd64.sgml#2 (text+ko) ==== @@ -1,8 +1,8 @@ Ö§³ÖµÄ´¦ÀíÆ÷ºÍÖ÷°å ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/hardware/common/artheader.sgml#2 (text+ko) ==== @@ -1,14 +1,14 @@ &os;/&arch; &release.current; ¼æÈÝÓ²¼þ˵Ã÷ - The FreeBSD Documentation Project + The &os; Documentation Project 2000 @@ -17,6 +17,6 @@ 2003 2004 2005 - The FreeBSD Documentation Project + The &os; Documentation Project ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#3 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -18,7 +18,7 @@ ¹ØÓÚ &os;/&arch; µÄ¸ü¶àÐÅÏ¢¿ÉÒÔÔÚ - &os;/&arch; + &os;/&arch; Project ÉÏÕÒµ½¡£ ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/installation/common/artheader.sgml#2 (text+ko) ==== @@ -1,8 +1,8 @@ @@ -18,6 +18,7 @@ 2002 2003 2004 - The FreeBSD Documentation Project + 2005 + The &os; Documentation Project ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/installation/common/trouble.sgml#2 (text+ko) ==== @@ -1,8 +1,8 @@ @@ -66,7 +66,8 @@ »òÕß°²×°Ê±ÐÐΪÒì³££¬ »òÕßÈíÇýûÓмì²âµ½¡£ - &os; 5.0 ÒÔ¼°¸ü¸ß°æ±¾´óÁ¿µØʹÓÃÁË i386 ƽ̨ÉϵÄϵͳ ACPI + &os; 5.0 ÒÔ¼°¸ü¸ß°æ±¾´óÁ¿µØʹÓÃÁË i386¡¢ amd64 + ÒÔ¼° ia64 ƽ̨ÉϵÄϵͳ ACPI ·þÎñÒÔ°ïÖú¼ì²âϵͳÔÚÆô¶¯¹ý³ÌÖмì²âµ½µÄÉ豸¡£ ²»ÐÒµÄÊÇ£¬ ACPI Çý¶¯³ÌÐòÒÔ¼°Ö÷°å¼°Æä BIOS ÈÔÈ»´æÔÚһЩ bug¡£ ACPI ¿ÉÒÔͨ¹ýÔÚÆô¶¯¼ÓÔصĵÚÈý½×¶Îͨ¹ýÉèÖà @@ -96,7 +97,7 @@ - + ÏÈÇ°°æ±¾µÄ &os; Äܹ»Ê¶±ðÎҵľÉʽ ISA É豸£¬ ¶øа汾²»ÄÜÁË¡£ ·¢ÉúÁËʲôÎÊÌ⣿ @@ -202,7 +203,7 @@ - + &man.mcd.4; Çý¶¯×ÜÊÇÈÏΪËü·¢ÏÖÁËÒ»¸öÉ豸£¬ ¶øÕâµ¼ÖÂÎÒµÄ Intel EtherExpress Íø¿¨ÎÞ·¨Õý³£¹¤×÷¡£ @@ -237,7 +238,7 @@ Äú¾Í²»Ó¦Ê¹Óà IRQ 2 »ò 9¡£ - + ÎÒ´ÓÈíÅÌÒýµ¼°²×°ÎÒµÄ IBM ThinkPad (tm)Ï¥ÉÏÐ͵çÄÔ£¬ ¼üÅ̵ÄÊäÈëÒ»ÍÅÔã¡£ @@ -249,7 +250,7 @@ hint hint.atkbd.0.flags="4" Ó¦¸ÃÄÜÈÃÆäÕý³£¹¤×÷¡£ - + ÎÒµÄϵͳÕÒ²»µ½ÎÒµÄ Intel EtherExpress 16 ¿¨¡£ @@ -259,7 +260,7 @@ ³ÌÐò½øÐÐÉèÖ㬠ÈÃʹӳÉäºóµÄÄÚ´æ´óСΪ 32K - + ÔÚ EISA HP Netserver ÉÏ°²×°Ê±£¬ÎÒµÄ AIC-7xxx SCSI ¿ØÖÆÆ÷¼ì²â²»µ½¡£ @@ -270,7 +271,7 @@ ÐèÒªÔÚ¼ÓÔØÆ÷µÚÈý½×¶ÎÉèÖà hint hw.eisa_slots="12"¡£ - + ÎÒÓÐһ̨ Panasonic AL-N1 »ò Rios Chandler Pentium »úÆ÷£¬ ÎÒ·¢ÏÖÿµ±½øÈ밲װʱϵͳ¶¼»á¹Ò»ú¡£ @@ -290,7 +291,7 @@ &os; ²»Ö§³ÖÕâÖÖ¿ØÖÆÆ÷¡£ - + ÔÚһ̨ Compaq Aero ±Ê¼Ç±¾ÉÏ£¬ µ±³¢ÊÔ´ÓÈíÅÌ°²×°Ê±£¬ Ìáʾ No floppy devices found! Please check ...¡£ @@ -302,7 +303,7 @@ ÕâÑùÇý¶¯³ÌÐò½«ÈÏΪµÚÒ»¸öÈíÇý´æÔÚ£¬ ¶ø²»È¥²éѯ CMOS¡£ - + ÔÚ°²×°Ò»Ì¨ Dell Poweredge XE ʱ£¬ ÎÞ·¨Ê¶±ð Dell ×ÔÓÐµÄ RAID ¿ØÖÆÆ÷ DSA (Dell SCSI Array)¡£ @@ -329,7 +330,7 @@ ΨһµÄ½â¾ö°ì·¨ÊÇ°²×°Ò»¸ö²»Í¬Æ·ÅƵÄÍø¿¨¡£ - + µ±ÎÒÔÚÅäÖÃÍøÂç·þÎñÆڼ䰲װÁËÒ»¸ö IBM Netfinity 3500£¬ ϵͳֹͣÁËÏìÓ¦¡£ ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/installation/common/upgrade.sgml#2 (text+ko) ==== @@ -1,8 +1,8 @@ @@ -18,7 +18,7 @@ The &os; Project - $FreeBSD: src/release/doc/zh_CN.GB2312/readme/article.sgml,v 1.1 2004/10/15 06:43:47 delphij Exp $ + $FreeBSD: src/release/doc/zh_CN.GB2312/readme/article.sgml,v 1.2 2005/10/12 20:30:39 delphij Exp $ 2000 @@ -26,6 +26,7 @@ 2002 2003 2004 + 2005 The &os; Documentation Project @@ -106,6 +107,25 @@ ]]> +Õâ¸ö &release.type; Ö÷ÒªÕë¶Ô×·Çó×îй¦ÄÜ£¬ + ÒÔ¼°Ï£Íû²ÎÓëÕýÔÚ½øÐÐµÄ &os; ¿ª·¢»î¶¯µÄÓû§¡£ ¾¡¹Ü &os; + µÄ¿ª·¢ÍŶӻᾡ×î´óŬÁ¦È·±£Ã¿Ò»¸ö &release.type; + ¶¼Äܹ»ÈçÐû´«µÄÄÇÑù¹¤×÷£¬ µ« &release.branch; ÈÔÈ»ÊÇÒ»¸ö¿ª·¢ÖеķÖÖ§¡£ + + ʹÓÃÕâ¸ö &release.type; µÄ»ù±¾ÒªÇóÊÇ¶Ô &os; ¼¼ÊõµÄÊìÁ·ÐÔ£¬ + ÒÔ¼°¶ÔÕýÔÚ½øÐÐµÄ &os; &release.branch; ¿ª·¢¹ý³ÌµÄÀí½â (ÕâЩ£¬ + ¶¼»áÔÚ &a.current; ÖнøÐÐÌÖÂÛ)¡£ + + ¶ÔÓÚÄÇЩϣÍûÓà &os; À´´¦ÀíÈÕ³£ÒµÎñ£¬ + ¶ø²»Êdz¢ÊÔ×îР&os; ¼¼ÊõµÄÓû§À´Ëµ£¬ ÕýʽµÄ·¢Ðа汾 + (ÀýÈç &release.prev.stable;) ͨ³£¸üΪºÏÊÊ¡£ + ·¢Ðа汾¾­¹ýÁËÒ»¶Îʱ¼äµÄ²âÊÔºÍÖÊÁ¿±£Õϼì²ì£¬ + ÒÔÈ·±£Æä¸ß¿É¿¿ÐÔ¡£ + +]]> + &release.type; Ö÷ҪĿ±êÊÇÓÐðÏÕ¾«ÉñµÄ£¬ @@ -278,16 +298,9 @@ - EARLY.TXT: Ϊ´Ó - &os; 4.X ǨÒƵ½ - &os; 5.X - ϵÁз¢ÐаæµÄÐÂÓû§×¼±¸µÄÖ¸ÄÏ¡£ - - - - RELNOTES.TXT£º·¢ÐÐ˵Ã÷£¬ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Oct 13 07:08:05 2005 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 CE37C16A421; Thu, 13 Oct 2005 07:08:04 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8D78E16A41F for ; Thu, 13 Oct 2005 07:08:04 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5022C43D46 for ; Thu, 13 Oct 2005 07:08:04 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9D784I4019220 for ; Thu, 13 Oct 2005 07:08:04 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9D7838l019217 for perforce@freebsd.org; Thu, 13 Oct 2005 07:08:04 GMT (envelope-from soc-andrew@freebsd.org) Date: Thu, 13 Oct 2005 07:08:04 GMT Message-Id: <200510130708.j9D7838l019217@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 85202 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, 13 Oct 2005 07:08:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=85202 Change 85202 by soc-andrew@soc-andrew_serv on 2005/10/13 07:07:35 Add a file I missed in 85066 and modify the configureation tble to enable the selection and de-selection of dists to install Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/conf/FreeBSD.lua#3 edit .. //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/inst/430_select_dists.lua#1 add Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/conf/FreeBSD.lua#3 (text+ko) ==== @@ -10,41 +10,43 @@ version = "6.0" } -install_items = { - { src = "base", dest = "/" }, - { src = "doc", dest = "/" }, - { src = "games", dest = "/" }, - { src = "manpages", dest = "/" }, - { src = "catpages", dest = "/" }, - { src = "proflibs", dest = "/" }, - { src = "dict", dest = "/" }, - { src = "info", dest = "/" }, - { src = "compat1x", dest = "/" }, - { src = "compat20", dest = "/" }, - { src = "compat21", dest = "/" }, - { src = "compat22", dest = "/" }, - { src = "compat3x", dest = "/" }, - { src = "compat4x", dest = "/" }, - { src = "sbase", dest = "/usr/src" }, - { src = "scrypto", dest = "/usr/src" }, - { src = "setc", dest = "/usr/src" }, - { src = "sgames", dest = "/usr/src" }, - { src = "sbin", dest = "/usr/src" }, - { src = "scontrib", dest = "/usr/src" }, - { src = "skrb5", dest = "/usr/src" }, - { src = "slib", dest = "/usr/src" }, - { src = "slibexec", dest = "/usr/src" }, - { src = "sgnu", dest = "/usr/src" }, - { src = "sinclude", dest = "/usr/src" }, - { src = "ssbin", dest = "/usr/src" }, - { src = "ssecure", dest = "/usr/src" }, - { src = "sshare", dest = "/usr/src" }, - { src = "srelease", dest = "/usr/src" }, - { src = "srescue", dest = "/usr/src" }, - { src = "subin", dest = "/usr/src" }, - { src = "susbin", dest = "/usr/src" }, - { src = "ssys", dest = "/usr/src" }, - { src = "stools", dest = "/usr/src" } +install_items = {} + +install_items_orig = { + { src = "base", dest = "/", install = "Y" }, + { src = "doc", dest = "/", install = "Y" }, + { src = "games", dest = "/", install = "Y" }, + { src = "manpages", dest = "/", install = "Y" }, + { src = "catpages", dest = "/", install = "Y" }, + { src = "proflibs", dest = "/", install = "Y" }, + { src = "dict", dest = "/", install = "Y" }, + { src = "info", dest = "/", install = "Y" }, + { src = "compat1x", dest = "/", install = "Y" }, + { src = "compat20", dest = "/", install = "Y" }, + { src = "compat21", dest = "/", install = "Y" }, + { src = "compat22", dest = "/", install = "Y" }, + { src = "compat3x", dest = "/", install = "Y" }, + { src = "compat4x", dest = "/", install = "Y" }, + { src = "sbase", dest = "/usr/src", install = "Y" }, + { src = "scrypto", dest = "/usr/src", install = "Y" }, + { src = "setc", dest = "/usr/src", install = "Y" }, + { src = "sgames", dest = "/usr/src", install = "Y" }, + { src = "sbin", dest = "/usr/src", install = "Y" }, + { src = "scontrib", dest = "/usr/src", install = "Y" }, + { src = "skrb5", dest = "/usr/src", install = "Y" }, + { src = "slib", dest = "/usr/src", install = "Y" }, + { src = "slibexec", dest = "/usr/src", install = "Y" }, + { src = "sgnu", dest = "/usr/src", install = "Y" }, + { src = "sinclude", dest = "/usr/src", install = "Y" }, + { src = "ssbin", dest = "/usr/src", install = "Y" }, + { src = "ssecure", dest = "/usr/src", install = "Y" }, + { src = "sshare", dest = "/usr/src", install = "Y" }, + { src = "srelease", dest = "/usr/src", install = "Y" }, + { src = "srescue", dest = "/usr/src", install = "Y" }, + { src = "subin", dest = "/usr/src", install = "Y" }, + { src = "susbin", dest = "/usr/src", install = "Y" }, + { src = "ssys", dest = "/usr/src", install = "Y" }, + { src = "stools", dest = "/usr/src", install = "Y" } } cmd_names = cmd_names + { From owner-p4-projects@FreeBSD.ORG Thu Oct 13 17:26:14 2005 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 B275716A421; Thu, 13 Oct 2005 17:26:13 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 75CCE16A41F for ; Thu, 13 Oct 2005 17:26:13 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D1EF443D48 for ; Thu, 13 Oct 2005 17:26:12 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9DHQCG1067366 for ; Thu, 13 Oct 2005 17:26:12 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9DHQCk0067363 for perforce@freebsd.org; Thu, 13 Oct 2005 17:26:12 GMT (envelope-from jhb@freebsd.org) Date: Thu, 13 Oct 2005 17:26:12 GMT Message-Id: <200510131726.j9DHQCk0067363@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 85221 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, 13 Oct 2005 17:26:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=85221 Change 85221 by jhb@jhb_slimer on 2005/10/13 17:26:01 Try to use memory operands in atomic operations and add missing constraints to let the compiler know that the memory is modified for the userland atomic operations. Affected files ... .. //depot/projects/smpng/sys/arm/include/atomic.h#19 edit Differences ... ==== //depot/projects/smpng/sys/arm/include/atomic.h#19 (text+ko) ==== @@ -77,9 +77,9 @@ static __inline uint32_t __swp(uint32_t val, volatile uint32_t *ptr) { - __asm __volatile("swp %0, %2, [%3]" + __asm __volatile("swp %0, %2, %1" : "=&r" (val), "=m" (*ptr) - : "r" (val) , "r" (ptr), "m" (*ptr) + : "r" (val) , "m" (*ptr) : "memory"); return (val); } @@ -154,16 +154,17 @@ "adr %1, 1b\n" "mov %0, #0xe0000004\n" "str %1, [%0]\n" - "ldr %1, [%2]\n" + "ldr %1, %2\n" "cmp %1, %3\n" - "streq %4, [%2]\n" + "streq %4, %2\n" "2:\n" "mov %1, #0\n" "str %1, [%0]\n" "moveq %1, #1\n" "movne %1, #0\n" : "=r" (ras_start), "=r" (done) - ,"+r" (p), "+r" (cmpval), "+r" (newval)); + ,"=m" (*p), "+r" (cmpval), "+r" (newval) + : "m" (*p)); return (done); } @@ -179,13 +180,14 @@ "adr %1, 1b\n" "mov %0, #0xe0000004\n" "str %1, [%0]\n" - "ldr %1, [%2]\n" + "ldr %1, %2\n" "add %1, %1, %3\n" - "str %1, [%2]\n" + "str %1, %2\n" "2:\n" "mov %1, #0\n" "str %1, [%0]\n" - : "=r" (ras_start), "=r" (start), "+r" (p), "+r" (val)); + : "=r" (ras_start), "=r" (start), "=m" (*p), "+r" (val) + : "m" (*p)); } static __inline void @@ -200,14 +202,15 @@ "adr %1, 1b\n" "mov %0, #0xe0000004\n" "str %1, [%0]\n" - "ldr %1, [%2]\n" + "ldr %1, %2\n" "sub %1, %1, %3\n" - "str %1, [%2]\n" + "str %1, %2\n" "2:\n" "mov %1, #0\n" "str %1, [%0]\n" - : "=r" (ras_start), "=r" (start), "+r" (p), "+r" (val)); + : "=r" (ras_start), "=r" (start), "=m" (*p), "+r" (val) + : "m" (*p)); } static __inline void @@ -222,14 +225,15 @@ "adr %1, 1b\n" "mov %0, #0xe0000004\n" "str %1, [%0]\n" - "ldr %1, [%2]\n" + "ldr %1, %2\n" "orr %1, %1, %3\n" - "str %1, [%2]\n" + "str %1, %2\n" "2:\n" "mov %1, #0\n" "str %1, [%0]\n" - : "=r" (ras_start), "=r" (start), "+r" (address), "+r" (setmask)); + : "=r" (ras_start), "=r" (start), "=m" (*address), "+r" (setmask) + : "m" (*address)); } static __inline void @@ -244,13 +248,14 @@ "adr %1, 1b\n" "mov %0, #0xe0000004\n" "str %1, [%0]\n" - "ldr %1, [%2]\n" + "ldr %1, %2\n" "bic %1, %1, %3\n" - "str %1, [%2]\n" + "str %1, %2\n" "2:\n" "mov %1, #0\n" "str %1, [%0]\n" - : "=r" (ras_start), "=r" (start), "+r" (address), "+r" (clearmask)); + : "=r" (ras_start), "=r" (start), "=m" (*address), "+r" (clearmask) + : "m" (*address)); } @@ -272,7 +277,8 @@ "2:\n" "mov %3, #0\n" "str %3, [%0]\n" - : "=r" (ras_start), "=r" (start), "=m" (*p), "+r" (v)); + : "=r" (ras_start), "=r" (start), "=m" (*p), "+r" (v) + : "m" (*p)); return (start); } From owner-p4-projects@FreeBSD.ORG Thu Oct 13 17:29:18 2005 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 8AF4516A421; Thu, 13 Oct 2005 17:29:17 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4D5F716A41F for ; Thu, 13 Oct 2005 17:29:17 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 077CA43D45 for ; Thu, 13 Oct 2005 17:29:17 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9DHTG9X067575 for ; Thu, 13 Oct 2005 17:29:16 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9DHTGx3067572 for perforce@freebsd.org; Thu, 13 Oct 2005 17:29:16 GMT (envelope-from jhb@freebsd.org) Date: Thu, 13 Oct 2005 17:29:16 GMT Message-Id: <200510131729.j9DHTGx3067572@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 85222 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, 13 Oct 2005 17:29:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=85222 Change 85222 by jhb@jhb_slimer on 2005/10/13 17:28:30 EGCCTOOSTUPID. Reported by: cognet Affected files ... .. //depot/projects/smpng/sys/arm/include/atomic.h#20 edit Differences ... ==== //depot/projects/smpng/sys/arm/include/atomic.h#20 (text+ko) ==== @@ -77,9 +77,9 @@ static __inline uint32_t __swp(uint32_t val, volatile uint32_t *ptr) { - __asm __volatile("swp %0, %2, %1" + __asm __volatile("swp %0, %2, [%3]" : "=&r" (val), "=m" (*ptr) - : "r" (val) , "m" (*ptr) + : "r" (val), "r" (ptr), "m" (*ptr) : "memory"); return (val); } From owner-p4-projects@FreeBSD.ORG Thu Oct 13 21:56:49 2005 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 C6DC516A421; Thu, 13 Oct 2005 21:56:48 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 87AA216A41F for ; Thu, 13 Oct 2005 21:56:48 +0000 (GMT) (envelope-from soc-chenk@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3B86C43D48 for ; Thu, 13 Oct 2005 21:56:48 +0000 (GMT) (envelope-from soc-chenk@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9DLum8A088437 for ; Thu, 13 Oct 2005 21:56:48 GMT (envelope-from soc-chenk@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9DLulBW088434 for perforce@freebsd.org; Thu, 13 Oct 2005 21:56:47 GMT (envelope-from soc-chenk@freebsd.org) Date: Thu, 13 Oct 2005 21:56:47 GMT Message-Id: <200510132156.j9DLulBW088434@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-chenk@freebsd.org using -f From: soc-chenk To: Perforce Change Reviews Cc: Subject: PERFORCE change 85234 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, 13 Oct 2005 21:56:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=85234 Change 85234 by soc-chenk@soc-chenk_leavemealone on 2005/10/13 21:55:53 * vnode identification cleaned up - use the VV_ROOT flag for identifying root node instead of inode number - do not truncate 64 bit nodedids Submitted by: soc-chenk Affected files ... .. //depot/projects/soc2005/fuse4bsd2/fuse_module/fuse.c#13 edit .. //depot/projects/soc2005/fuse4bsd2/fuse_module/fuse.h#6 edit Differences ... ==== //depot/projects/soc2005/fuse4bsd2/fuse_module/fuse.c#13 (text+ko) ==== @@ -538,10 +538,7 @@ static __inline int fdata_kick_get(struct fuse_data *data) { -#if _DEBUG - DEBUG2G("0x%x\n", data->dataflag & FDAT_KICK); - kdb_backtrace(); -#endif + DEBUG("0x%x\n", data->dataflag & FDAT_KICK); return (data->dataflag & FDAT_KICK); } @@ -1517,11 +1514,12 @@ typedef int fuse_buffeater_t(struct uio *uio, size_t reqsize, void *buf, size_t bufsize, void *param); typedef int fuse_metrics_t(struct vnode *vp, struct thread *td, struct ucred *cred, int mode, struct fuse_filehandle *fufh, void *param); -static __inline void fuse_vnode_init(struct vnode *vp, struct fuse_vnode_data *fvdat, enum vtype vtyp); +static __inline void fuse_vnode_init(struct vnode *vp, struct fuse_vnode_data *fvdat, uint64_t nodeid, enum vtype vtyp); static vfs_mount_t fuse_mount; static vfs_unmount_t fuse_unmount; static vfs_root_t fuse_root; static vfs_statfs_t fuse_statfs; +static vfs_hash_cmp_t fuse_vnode_cmp; /* static vfs_vget_t fuse_vget; */ static int fuse_vget_i(struct mount *mp, struct thread *td, uint64_t nodeid, enum vtype vtyp, struct vnode **vpp); static __inline void fat2vat(struct mount *mp, struct fuse_attr *fat, struct vattr *vap); @@ -1634,14 +1632,14 @@ */ #define GETPARENT(pvp, vp) \ do { \ - KASSERT((vp)->v_dd != (vp) || VTOI((vp)) == FUSE_ROOT_INODE, \ + KASSERT((vp)->v_dd != (vp) || (vp)->v_vflag & VV_ROOT, \ ("self-parented non-root")); \ (pvp) = (vp)->v_dd; \ } while (0) #define SETPARENT(vp, pvp) \ do { \ - KASSERT((vp) != (pvp) || VTOI((vp)) == FUSE_ROOT_INODE, \ + KASSERT((vp) != (pvp) || (vp)->v_vflag & VV_ROOT, \ ("attempt to make non-root node parented by itself")); \ (vp)->v_dd = (pvp); \ } while (0) @@ -1861,9 +1859,8 @@ * without resorting to the vfs hashing mechanism, thus it also * can be inserted directly to the v_hash slot. */ - rvp->v_hash = FUSE_ROOT_INODE; fmnt->rvp = rvp; - fuse_vnode_init(rvp, fvdat, VDIR); + fuse_vnode_init(rvp, fvdat, FUSE_ROOT_INODE, VDIR); rvp->v_vflag |= VV_ROOT; rootdone: @@ -1915,7 +1912,7 @@ if (err ) { data->mntco--; FUSE_LOCK; - if (data->mntco == 0 && (! data->dataflag & FDAT_OPENED)) { + if (data->mntco == 0 && ! (data->dataflag & FDAT_OPENED)) { fdev->si_drv1 = NULL; fdata_destroy(data); } @@ -2101,6 +2098,12 @@ return (0); } +static int +fuse_vnode_cmp(struct vnode *vp, void *nidp) +{ + return (((struct fuse_vnode_data *)vp->v_data)->nid != *((uint64_t *)nidp)); +} + /* ..._i, as "internal" */ static int @@ -2125,8 +2128,7 @@ DEBUG2G("mp %p: %s\n", mp, mp->mnt_stat.f_mntfromname); - /* XXX nodeid: cast from 64 bytes to 32 */ - if ((err = vfs_hash_get(mp, nodeid, /*flags*/ myflags, td, vpp, NULL, NULL))) + if ((err = vfs_hash_get(mp, 0, /*flags*/ myflags, td, vpp, fuse_vnode_cmp, &nodeid))) return (err); audit: @@ -2156,7 +2158,7 @@ } /* XXX nodeid: cast from 64 bytes to 32 */ - err = vfs_hash_insert(*vpp, nodeid, /*flags*/ myflags, td, &vp2, NULL, NULL); + err = vfs_hash_insert(*vpp, 0, /*flags*/ myflags, td, &vp2, fuse_vnode_cmp, &nodeid); if (err) { FREE(fvdat, M_FUSEFS); @@ -2172,7 +2174,7 @@ goto audit; } - fuse_vnode_init(*vpp, fvdat, vtyp); + fuse_vnode_init(*vpp, fvdat, nodeid, vtyp); #if _DEBUG DEBUG2G("\n"); vn_printf(*vpp, " * "); @@ -2193,11 +2195,11 @@ static __inline void fuse_vnode_init(struct vnode *vp, struct fuse_vnode_data *fvdat, - enum vtype vtyp) + uint64_t nodeid, enum vtype vtyp) { - KASSERT(VTOI(vp), ("vnode tried to be inited before getting an inode for it")); + fvdat->nid = nodeid; vp->v_data = fvdat; - SETPARENT(vp, (VTOI(vp) == FUSE_ROOT_INODE) ? vp : NULL); + SETPARENT(vp, (vp->v_vflag & VV_ROOT) ? vp : NULL); vp->v_type = vtyp; sx_init(&fvdat->fh_lock, "lock for fuse filehandles"); @@ -2211,20 +2213,17 @@ fuse_recyc_backend(struct vnode *vp, struct thread *td) { struct fuse_vnode_data *fvdat; - ino_t ino; if (! vp->v_data) { DEBUG("got a dataless node\n"); return (0); } - DEBUG("getting at vnode of ino %d\n", VTOI(vp)); + DEBUG("getting at vnode of ino %llu\n", VTOI(vp)); - ino = VTOI(vp); fvdat = vp->v_data; - vp->v_data = NULL; - if (VTOI(vp) != FUSE_ROOT_INODE) { + if (! (vp->v_vflag & VV_ROOT)) { vfs_hash_remove(vp); if (fvdat && fvdat->nlookup) { @@ -2241,6 +2240,7 @@ fvdat->nlookup, &fdi); } } + vp->v_data = NULL; /* * Taking down fuse_vnode_data structures is just hooked in here... @@ -2262,7 +2262,7 @@ KASSERT(fufh->useco >= 0, ("negative use count for fuse filehandle")); KASSERT(! fufh->fp || fufh->useco > 0, ("filehandle bound with 0 use counter")); - DEBUG2G("vnode #%d, fufh owner %p, useco %d\n", VTOI(vp), fufh->fp, fufh->useco); + DEBUG2G("vnode #%llu, fufh owner %p, useco %d\n", VTOI(vp), fufh->fp, fufh->useco); if (! fufh->fp && fufh->useco == 0) { LIST_REMOVE(fufh, fh_link); fuse_send_release(vp, td, cred, fufh, fufh->mode); @@ -2307,7 +2307,7 @@ int err; - DEBUG("getting at vnode of ino %d\n", VTOI(vp)); + DEBUG("getting at vnode of ino %llu\n", VTOI(vp)); #if _DEBUG DEBUG2G("=============>\n"); kdb_backtrace(); @@ -2478,7 +2478,7 @@ return (EIO); } - DEBUG("node #%d, type %d\n", VTOI(vp), vap->va_type); + DEBUG("node #%llu, type %d\n", VTOI(vp), vap->va_type); #if _DEBUG DEBUG2G("\n"); vn_printf(vp, " * "); @@ -2582,7 +2582,7 @@ #endif if (dvp->v_type != VDIR) { - DEBUG("vnode #%d of vtype %d is not a dir\n", VTOI(dvp), + DEBUG("vnode #%llu of vtype %d is not a dir\n", VTOI(dvp), dvp->v_type); return (ENOTDIR); } @@ -2602,14 +2602,14 @@ #if NO_EARLY_PERM_CHECK_HACK 1 #else - VTOI(dvp) == FUSE_ROOT_INODE + dvp->v_vflag & VV_ROOT #endif ) { if ((err = VOP_ACCESS(dvp, VEXEC, cred, td))) return (err); } - DEBUG2G("lookup in #%d, with flags 0x%x\n", VTOI(dvp), flags); + DEBUG2G("lookup in #%llu, with flags 0x%x\n", VTOI(dvp), flags); /* fetching data from "storage" */ @@ -2993,13 +2993,13 @@ sx_sunlock(&fvdat->fh_lock); if (err == -1) { - DEBUG2G("suitable fh of vnode #%d found\n", VTOI(vp)); + DEBUG2G("suitable fh of vnode #%llu found\n", VTOI(vp)); return (fufh); } else if (err) return (NULL); - DEBUG2G("we need to fetch a new filehandle for vnode #%d\n", VTOI(vp)); + DEBUG2G("we need to fetch a new filehandle for vnode #%llu\n", VTOI(vp)); fdi.iosize = sizeof(*foi); if ((err = fdisp_prepare_all(&fdi, @@ -3255,7 +3255,7 @@ KASSERT(! fufh->fp && fufh->useco == 0, ("active-looking fuse filehandle was attempted to release")); fvdat->fh_counter--; - DEBUG2G("filehandle of vnode #%d being released, fh counter now is %d\n", + DEBUG2G("filehandle of vnode #%llu being released, fh counter now is %d\n", VTOI(vp), fvdat->fh_counter); fdi.iosize = sizeof(*fri); @@ -3287,7 +3287,7 @@ */ #define BREAK_IF_BAD(fp) \ if (! (fp)->f_vnode->v_data) { \ - DEBUG("bad fileop on vnode no. %d\n", VTOI((fp)->f_vnode)); \ + DEBUG("bad fileop on vnode no. %llu\n", VTOI((fp)->f_vnode)); \ return (EBADF); \ } @@ -3319,7 +3319,7 @@ fvdat = fp->f_vnode->v_data; fufh = fp->f_data; KASSERT(fufh->fp == fp, ("file's filehandle is stolen")); - DEBUG2G("vnode #%d, fufh owner %p, useco %d\n", + DEBUG2G("vnode #%llu, fufh owner %p, useco %d\n", VTOI(fp->f_vnode), fp, fufh->useco); fufh->useco--; @@ -3536,13 +3536,13 @@ */ if (fp->f_flag & O_DIRECT || fufh->flags & FUSEFH_DIRECTIO) { - DEBUG2G("direct read of vnode %d via file handle %llu\n", + DEBUG2G("direct read of vnode %llu via file handle %llu\n", VTOI(fp->f_vnode), fufh->fh_id); err = fuse_read_directbackend(fp->f_vnode, fufh, uio, cred, td, FUSE_READ, fuse_std_buffeater, NULL); } else { - DEBUG2G("buffered read of vnode %d\n", VTOI(fp->f_vnode)); + DEBUG2G("buffered read of vnode %llu\n", VTOI(fp->f_vnode)); err = fuse_read_biobackend(fp->f_vnode, fufh, uio, cred, td, FUSE_READ, fuse_std_buffeater, NULL); } @@ -4214,8 +4214,8 @@ struct vnode *pdp2; DEBUG("trying at chenkpath\n"); do { - DEBUG("checkpath bumped into node %d\n", VTOI(pdp)); - if (VTOI(pdp) == FUSE_ROOT_INODE) + DEBUG("checkpath bumped into node %llu\n", VTOI(pdp)); + if (pdp->v_vflag & VV_ROOT) err = -1; if (pdp == fvp) { DEBUG("huh, we caught a move-into-subdir-of-itself attempt\n"); @@ -4850,12 +4850,12 @@ if (fp->f_flag & O_DIRECT || fufh->flags & FUSEFH_DIRECTIO) { - DEBUG2G("direct write of vnode %d via file handle %llu\n", + DEBUG2G("direct write of vnode %llu via file handle %llu\n", VTOI(fp->f_vnode), fufh->fh_id); err = fuse_write_directbackend(fp->f_vnode, fufh->fh_id, uio, cred, td); } else { - DEBUG2G("buffered write of vnode %d\n", VTOI(fp->f_vnode)); + DEBUG2G("buffered write of vnode %llu\n", VTOI(fp->f_vnode)); err = fuse_write_biobackend(fp->f_vnode, uio, cred, td); } @@ -4893,13 +4893,13 @@ #endif if (! (vp->v_type == VREG || vp->v_type == VDIR)) { - DEBUG("for vnode #%d v_type is %d, dropping\n", + DEBUG("for vnode #%llu v_type is %d, dropping\n", VTOI(vp), vp->v_type); return (EOPNOTSUPP); } if (bp->b_iocmd != BIO_READ && bp->b_iocmd != BIO_WRITE) { - DEBUG("for vnode #%d bio tried with biocmd 0x%x, dropping\n", + DEBUG("for vnode #%llu bio tried with biocmd 0x%x, dropping\n", VTOI(vp), bp->b_iocmd); return (EOPNOTSUPP); } @@ -4939,7 +4939,7 @@ if (err) goto out; - DEBUG2G("vp #%d, fufh #%llu\n", VTOI(vp), fufh->fh_id); + DEBUG2G("vp #%llu, fufh #%llu\n", VTOI(vp), fufh->fh_id); if (bp->b_iocmd == BIO_READ) { struct fuse_read_in *fri; @@ -5091,7 +5091,7 @@ { struct fuse_vnode_data *fvdat = ap->a_vp->v_data; - printf("nodeid: %d, fh_counter: %d, nlookup: %llu\n", + printf("nodeid: %llu, fh_counter: %d, nlookup: %llu\n", VTOI(ap->a_vp), fvdat->fh_counter, fvdat->nlookup); return (0); } @@ -5102,9 +5102,9 @@ struct vnode *vp; int rc; - DEBUG("vnode #%d\n", VTOI((struct vnode *)bo->bo_private)); + DEBUG("vnode #%llu\n", VTOI((struct vnode *)bo->bo_private)); vp = bo->bo_private; - KASSERT(bo == &vp->v_bufobj, ("BO/VP mismatch: vp %p #(%d) bo %p != %p", + KASSERT(bo == &vp->v_bufobj, ("BO/VP mismatch: vp %p (#%llu) bo %p != %p", vp, VTOI(vp), &vp->v_bufobj, bo)); rc = VOP_STRATEGY(vp, bp); KASSERT(rc == 0, ("Fuse VOP_STRATEGY failed: bp=%p, " ==== //depot/projects/soc2005/fuse4bsd2/fuse_module/fuse.h#6 (text+ko) ==== @@ -136,7 +136,7 @@ #define FUSE_ROOT_INODE 1 /* Fuse convention: node id of root node is 1 */ -#define VTOI(vp) (vp)->v_hash +#define VTOI(vp) ((struct fuse_vnode_data *)(vp)->v_data)->nid /** Max number of pages that can be used in a single read request */ /* (taken from Linux Fuse) */ @@ -173,7 +173,7 @@ }; struct fuse_vnode_data { - //uint64_t nid; + uint64_t nid; uint64_t nlookup; //struct vnode *parent; /* Timeout related stuff, etc. will come here */ From owner-p4-projects@FreeBSD.ORG Thu Oct 13 21:59:56 2005 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 3628716A451; Thu, 13 Oct 2005 21:59:53 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CD73116A430 for ; Thu, 13 Oct 2005 21:59:52 +0000 (GMT) (envelope-from soc-chenk@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7D8FC43D46 for ; Thu, 13 Oct 2005 21:59:52 +0000 (GMT) (envelope-from soc-chenk@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9DLxqVc088779 for ; Thu, 13 Oct 2005 21:59:52 GMT (envelope-from soc-chenk@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9DLxq2n088776 for perforce@freebsd.org; Thu, 13 Oct 2005 21:59:52 GMT (envelope-from soc-chenk@freebsd.org) Date: Thu, 13 Oct 2005 21:59:52 GMT Message-Id: <200510132159.j9DLxq2n088776@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-chenk@freebsd.org using -f From: soc-chenk To: Perforce Change Reviews Cc: Subject: PERFORCE change 85235 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, 13 Oct 2005 21:59:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=85235 Change 85235 by soc-chenk@soc-chenk_leavemealone on 2005/10/13 21:59:09 make fmaster devices work again Submitted by: soc-chenk Affected files ... .. //depot/projects/soc2005/fuse4bsd2/fuse_module/fmaster.c#3 edit .. //depot/projects/soc2005/fuse4bsd2/fuse_module/fuse.c#14 edit .. //depot/projects/soc2005/fuse4bsd2/fuse_module/fuse.h#7 edit Differences ... ==== //depot/projects/soc2005/fuse4bsd2/fuse_module/fmaster.c#3 (text+ko) ==== @@ -8,6 +8,7 @@ #include #include #include +#include #include "fuse.h" @@ -25,11 +26,11 @@ extern void fuse_iov_adjust(struct fuse_iov *fiov, size_t size); extern void ticket_invalidate(struct fuse_ticket *tick); extern void fuse_insert_message(struct fuse_ticket *tick); +extern void fdata_destroy(struct fuse_data *data); extern int fuse_callbn_get_opcode(struct fuse_callback_node *caliban); extern int fuse_callbn_pull_uio(struct fuse_callback_node *caliban, struct uio *uio); extern int fuse_callbn_wait_answer(struct fuse_callback_node *caliban); extern struct fuse_iov *fuse_callbn_resp(struct fuse_callback_node *caliban); -extern size_t fuse_response_body_len(struct uio *uio); extern void ticket_drop(struct fuse_ticket *tick); extern void fuse_insert_callback(struct fuse_ticket *tick, fuse_handler_t *handler); extern int fuse_body_audit(struct fuse_callback_node *caliban, size_t blen); @@ -70,6 +71,9 @@ // .d_read = fmaster_read, .d_write = fmaster0_write, .d_version = D_VERSION +#if ! DO_GIANT_MANUALLY + .d_flags = D_NEEDGIANT, +#endif }, { .d_open = fmaster_open, @@ -78,6 +82,9 @@ // .d_read = fmaster_read, .d_write = fmaster1_write, .d_version = D_VERSION +#if ! DO_GIANT_MANUALLY + .d_flags = D_NEEDGIANT, +#endif }, { .d_open = fmaster_open, @@ -86,6 +93,9 @@ // .d_read = fmaster_read, .d_write = fmaster2_write, .d_version = D_VERSION +#if ! DO_GIANT_MANUALLY + .d_flags = D_NEEDGIANT, +#endif }, { .d_open = fmaster_open, @@ -94,6 +104,9 @@ // .d_read = fmaster_read, .d_write = fmaster3_write, .d_version = D_VERSION +#if ! DO_GIANT_MANUALLY + .d_flags = D_NEEDGIANT, +#endif }, { .d_open = fmaster_open, @@ -102,6 +115,9 @@ // .d_read = fmaster_read, .d_write = fmaster3_write, .d_version = D_VERSION +#if ! DO_GIANT_MANUALLY + .d_flags = D_NEEDGIANT, +#endif } }; @@ -113,39 +129,73 @@ ******************************/ int -fmaster_open(struct cdev *dev, int oflags, int devtype, struct thread *p) +fmaster_open(struct cdev *dev, int oflags, int devtype, struct thread *td) { - uprintf("Opened device \"fmaster\" successfully.\n"); +#if DO_GIANT_MANUALLY + mtx_lock(&Giant); +#endif + if (fuse_useco < 0) { + /* Module unload is going on */ +#if DO_GIANT_MANUALLY + mtx_unlock(&Giant); +#endif + DEBUG2G("caught in the middle of unload\n"); + return (ENOENT); + } + fuse_useco++; +#if DO_GIANT_MANUALLY + mtx_unlock(&Giant); +#endif + + DEBUG2G("Opened device \"fmaster\" (that of minor %d) successfully on thread %d.\n", + minor(dev), td->td_tid); + return(0); } int -fmaster_close(struct cdev *dev, int fflag, int devtype, struct thread *p) +fmaster_close(struct cdev *dev, int fflag, int devtype, struct thread *td) { - uprintf("Closing device \"fmaster.\"\n"); + fuse_useco--; + + DEBUG2G("Closed device \"fmaster\" (that of minor %d) successfully on thread %d.\n", + minor(dev), td->td_tid); + return(0); } -#define FMASTER_COMMON_BLAHBLAH \ +#if DO_GIANT_MANUALLY && ! USE_FUSE_LOCK +#define FMASTER_LOCK mtx_lock(&Giant) +#define FMASTER_UNLOCK mtx_unlock(&Giant) +#else +#define FMASTER_LOCK FUSE_LOCK +#define FMASTER_UNLOCK FUSE_UNLOCK +#endif + + +#define FMASTER_COMMON_INBLAHBLAH \ int err = 0; \ struct fuse_ticket *tick; \ size_t len; \ struct fuse_in_header *ihead; \ struct cdev *fusedev; \ - struct sx *slock; \ struct fuse_data *data; \ \ - if (! (fusedev = LIST_FIRST(&fuseclones->head))) \ + FMASTER_LOCK; \ + if (! (fusedev = LIST_FIRST(&fuseclones->head))) { \ + FMASTER_UNLOCK; \ return (ENXIO); \ - \ - slock = fusedev_get_lock(fusedev); \ + } \ \ - sx_slock(slock); \ if (! (data = fusedev_get_data(fusedev))) { \ + FMASTER_UNLOCK; \ uprintf("first fuse device is not in use\n"); \ err = ENXIO; \ goto out; \ } \ + data->mntco++; \ + dev_ref(fusedev); \ + FMASTER_UNLOCK; \ \ len = uio->uio_iov->iov_len; \ \ @@ -169,22 +219,36 @@ ihead = (struct fuse_in_header *)tick->msgn.msg.base; \ ihead->unique = tick->unique; -/* example how a syscall handler routine can send a request when answer is ignorable +#define FMASTER_COMMON_OUTBLAHBLAH \ +out: \ + if (data) { \ + data->mntco--; \ + FMASTER_LOCK; \ + if (data->mntco == 0 && \ + ! (data->dataflag & FDAT_OPENED)) { \ + fusedev->si_drv1 = NULL; \ + fdata_destroy(data); \ + } \ + FMASTER_UNLOCK; \ + dev_rel(fusedev); \ + } \ + return (err); + +/* + * example how a syscall handler routine can send a request when answer is ignorable */ int fmaster0_write(struct cdev *dev, struct uio *uio, int ioflag) { - FMASTER_COMMON_BLAHBLAH /* style(9) don't say you shouldn't do this ;P */ + FMASTER_COMMON_INBLAHBLAH /* style(9) don't say you shouldn't do this ;P */ /* Hey, I mean it's demo code... */ fuse_insert_callback(tick, NULL); fuse_insert_message(tick); -out: - sx_sunlock(slock); - return (err); + FMASTER_COMMON_OUTBLAHBLAH } /* example how a syscall handler routine can send a "background" request @@ -199,14 +263,12 @@ int fmaster1_write(struct cdev *dev, struct uio *uio, int ioflag) { - FMASTER_COMMON_BLAHBLAH + FMASTER_COMMON_INBLAHBLAH fuse_insert_callback(tick, prettyprint_handler); fuse_insert_message(tick); -out: - sx_sunlock(slock); - return (err); + FMASTER_COMMON_OUTBLAHBLAH } /* example how a syscall handler routine can send a request and handle response by itself @@ -215,7 +277,7 @@ int fmaster2_write(struct cdev *dev, struct uio *uio, int ioflag) { - FMASTER_COMMON_BLAHBLAH + FMASTER_COMMON_INBLAHBLAH fuse_insert_callback(tick, fuse_standard_handler); fuse_insert_message(tick); @@ -232,9 +294,7 @@ fuse_response_prettyprint(fuse_callbn_get_opcode(&tick->callbn), fuse_callbn_resp(&tick->callbn)); ticket_drop(tick); -out: - sx_sunlock(slock); - return (err); + FMASTER_COMMON_OUTBLAHBLAH } @@ -244,14 +304,12 @@ fmaster3_write(struct cdev *dev, struct uio *uio, int ioflag) { - FMASTER_COMMON_BLAHBLAH + FMASTER_COMMON_INBLAHBLAH ticket_invalidate(tick); /* so ticket will be dropped after read passes it up */ fuse_insert_message(tick); -out: - sx_sunlock(slock); - return (err); + FMASTER_COMMON_OUTBLAHBLAH } /* a not too effective application of the new API. @@ -267,9 +325,9 @@ { struct fuse_dispatcher fdi; - FMASTER_COMMON_BLAHBLAH + FMASTER_COMMON_INBLAHBLAH - fdi.slock = slock; + fdi.slock = NULL; fdi.tick = tick; if ((err = fdisp_wait_answ(&fdi))) return (err); @@ -277,9 +335,7 @@ fuse_response_prettyprint(fuse_callbn_get_opcode(&tick->callbn), fuse_callbn_resp(&tick->callbn)); ticket_drop(tick); -out: - sx_sunlock(slock); - return (err); + FMASTER_COMMON_OUTBLAHBLAH } /****************************** @@ -437,18 +493,26 @@ case FUSE_FSYNCDIR: //pp_buf(fresp); break; +#ifdef FUSE_GETLK case FUSE_GETLK: - KASSERT(0, ("FUSE_GETLK implementor has forgotten to define a response body format check")); + panic("FUSE_GETLK implementor has forgotten to define a response body format check"); break; +#endif +#ifdef FUSE_SETLK case FUSE_SETLK: - KASSERT(0, ("FUSE_SETLK implementor has forgotten to define a response body format check")); + panic("FUSE_SETLK implementor has forgotten to define a response body format check"); break; +#endif +#ifdef FUSE_SETLKW case FUSE_SETLKW: - KASSERT(0, ("FUSE_SETLKW implementor has forgotten to define a response body format check")); + panic("FUSE_SETLKW implementor has forgotten to define a response body format check"); break; +#endif +#ifdef FUSE_ACCESS case FUSE_ACCESS: - KASSERT(0, ("FUSE_ACCESS implementor has forgotten to define a response body format check")); + panic("FUSE_ACCESS implementor has forgotten to define a response body format check"); break; +#endif default: KASSERT(0, ("fuse opcodes out of sync")); } @@ -463,12 +527,25 @@ opcode = fuse_callbn_get_opcode(caliban); - if (opcode == FUSE_FORGET || opcode == FUSE_SETXATTR || opcode == FUSE_GETXATTR || opcode == FUSE_LISTXATTR || opcode == FUSE_REMOVEXATTR || opcode == FUSE_GETLK || opcode == FUSE_SETLK || opcode == FUSE_SETLKW || opcode == FUSE_ACCESS) { + if (opcode == FUSE_FORGET || opcode == FUSE_SETXATTR || opcode == FUSE_GETXATTR || opcode == FUSE_LISTXATTR || opcode == FUSE_REMOVEXATTR || +#ifdef FUSE_GETLK + opcode == FUSE_GETLK || +#endif +#ifdef FUSE_SETLK + opcode == FUSE_SETLK || +#endif +#ifdef FUSE_SETLKW + opcode == FUSE_SETLKW || +#endif +#ifdef FUSE_ACCESS + opcode == FUSE_ACCESS || +#endif + 0) { fuprintf("Hey, you've inserted a %s (#%d) request, don't do it in real life, it breaks an assertion!\n", fuse_opnames[opcode], opcode); goto out; } - if ((err = fuse_body_audit(caliban, fuse_response_body_len(uio)))) { + if ((err = fuse_body_audit(caliban, uio->uio_resid))) { fuprintf("body audit refused body\n"); goto out; } ==== //depot/projects/soc2005/fuse4bsd2/fuse_module/fuse.c#14 (text+ko) ==== @@ -47,27 +47,12 @@ #define NOT_YET_USED 0 -#ifndef DO_GIANT_MANUALLY -#define DO_GIANT_MANUALLY 1 -#endif -#ifndef USE_FUSE_LOCK -#define USE_FUSE_LOCK 1 -#endif - -#if USE_FUSE_LOCK -#define FUSE_LOCK mtx_lock(&fuse_mtx) -#define FUSE_UNLOCK mtx_unlock(&fuse_mtx) -#else -#define FUSE_LOCK -#define FUSE_UNLOCK -#endif - MALLOC_DEFINE(M_FUSEMSG, "fuse messaging", "buffer for fuse messaging related things"); -static uint32_t fuse_useco = 0; +uint32_t fuse_useco = 0; #if USE_FUSE_LOCK -static struct mtx fuse_mtx; +struct mtx fuse_mtx; #endif __static struct clonedevs *fuseclones; @@ -138,7 +123,7 @@ #endif static struct fuse_data *fdata_alloc(struct ucred *cred); -static void fdata_destroy(struct fuse_data *data); +__static void fdata_destroy(struct fuse_data *data); /**/ static __inline void fuse_msgn_push(struct fuse_msg_node *msgn); static __inline struct fuse_msg_node *fdata_pop_msg(struct fuse_data *data); @@ -501,7 +486,7 @@ return (data); } -static void +__static void fdata_destroy(struct fuse_data *data) { struct fuse_ticket *tick; @@ -1160,7 +1145,7 @@ static int fusedev_write(struct cdev *dev, struct uio *uio, int ioflag) { -#ifdef DEBUG_MSGING +#if _DEBUG_MSGING static int counter=0; #endif struct fuse_out_header *ohead; @@ -5187,6 +5172,7 @@ #if FMASTER extern struct cdevsw fmaster_cdevsw[5]; +static struct cdev *fmaster_dev[5]; #endif extern struct vfsconf fuse_vfsconf; @@ -5194,17 +5180,21 @@ static void fuse_bringdown(eventhandler_tag eh_tag) { - EVENTHANDLER_DEREGISTER(dev_clone, eh_tag); +#if FMASTER + int i; +#endif + + EVENTHANDLER_DEREGISTER(dev_clone, eh_tag); - clone_cleanup(&fuseclones); + clone_cleanup(&fuseclones); #if USE_FUSE_LOCK - mtx_destroy(&fuse_mtx); + mtx_destroy(&fuse_mtx); #endif #if FMASTER - for (i = 0; i < 5; i++) { - DEBUG("destroying fmaster%d\n", i); - destroy_dev(fmaster_dev[i]); - } + for (i = 0; i < 5; i++) { + DEBUG("destroying fmaster%d\n", i); + destroy_dev(fmaster_dev[i]); + } #endif } @@ -5215,7 +5205,6 @@ int err = 0; #if FMASTER int i; - static struct cdev *fmaster_dev[5]; char *fmaster_name = "fmasterx"; #endif ==== //depot/projects/soc2005/fuse4bsd2/fuse_module/fuse.h#7 (text+ko) ==== @@ -184,6 +184,30 @@ }; #endif +/* Fuse locking */ + +#ifndef DO_GIANT_MANUALLY +#define DO_GIANT_MANUALLY 1 +#endif +#ifndef USE_FUSE_LOCK +#define USE_FUSE_LOCK 1 +#endif + +#if USE_FUSE_LOCK +#define FUSE_LOCK mtx_lock(&fuse_mtx) +#define FUSE_UNLOCK mtx_unlock(&fuse_mtx) +#else +#define FUSE_LOCK +#define FUSE_UNLOCK +#endif + +extern uint32_t fuse_useco; +#if USE_FUSE_LOCK +extern struct mtx fuse_mtx; +#endif + +/* Debug related stuff */ + #if DEBUGTOLOG #define dprintf(args ...) log(LOG_DEBUG, args) #else @@ -211,6 +235,12 @@ #define DEBUG2G(args ...) #endif +#if FMASTER +#ifndef _DEBUG_MSGING +#define _DEBUG_MSGING 1 +#endif +#endif + #if _DEBUG_MSGING #define fuprintf(args...) \ uprintf("[kern] " args) From owner-p4-projects@FreeBSD.ORG Thu Oct 13 22:00:55 2005 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 CA7E116A421; Thu, 13 Oct 2005 22:00:54 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A39C716A41F for ; Thu, 13 Oct 2005 22:00:54 +0000 (GMT) (envelope-from soc-chenk@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5624A43D46 for ; Thu, 13 Oct 2005 22:00:54 +0000 (GMT) (envelope-from soc-chenk@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9DM0s19088921 for ; Thu, 13 Oct 2005 22:00:54 GMT (envelope-from soc-chenk@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9DM0r7D088918 for perforce@freebsd.org; Thu, 13 Oct 2005 22:00:53 GMT (envelope-from soc-chenk@freebsd.org) Date: Thu, 13 Oct 2005 22:00:53 GMT Message-Id: <200510132200.j9DM0r7D088918@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-chenk@freebsd.org using -f From: soc-chenk To: Perforce Change Reviews Cc: Subject: PERFORCE change 85236 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, 13 Oct 2005 22:00:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=85236 Change 85236 by soc-chenk@soc-chenk_leavemealone on 2005/10/13 22:00:13 fixed panics related to stale vnodes Submitted by: soc-chenk Affected files ... .. //depot/projects/soc2005/fuse4bsd2/fuse_module/fuse.c#15 edit .. //depot/projects/soc2005/fuse4bsd2/fuse_module/fuse.h#8 edit Differences ... ==== //depot/projects/soc2005/fuse4bsd2/fuse_module/fuse.c#15 (text+ko) ==== @@ -1514,7 +1514,7 @@ static void fuse_filehandle_gc(struct vnode *vp, struct thread *td, struct ucred *cred); static vop_reclaim_t fuse_reclaim; static vop_inactive_t fuse_inactive; -static __inline void fuse_vnode_kick(struct vnode *vp); +static __inline void fuse_vnode_kick(struct vnode *vp, struct thread *td); static vop_access_t fuse_access; static __inline int fuse_access_by_attr(struct mount *mp, struct vattr *vap, mode_t mode, struct ucred *cred); /* static vop_cachedlookup_t fuse_lookup; */ @@ -1844,6 +1844,7 @@ * without resorting to the vfs hashing mechanism, thus it also * can be inserted directly to the v_hash slot. */ + rvp->v_hash = FUSE_ROOT_INODE; fmnt->rvp = rvp; fuse_vnode_init(rvp, fvdat, FUSE_ROOT_INODE, VDIR); rvp->v_vflag |= VV_ROOT; @@ -2113,7 +2114,7 @@ DEBUG2G("mp %p: %s\n", mp, mp->mnt_stat.f_mntfromname); - if ((err = vfs_hash_get(mp, 0, /*flags*/ myflags, td, vpp, fuse_vnode_cmp, &nodeid))) + if ((err = vfs_hash_get(mp, nodeid, /*flags*/ myflags, td, vpp, fuse_vnode_cmp, &nodeid))) return (err); audit: @@ -2122,7 +2123,7 @@ if ((*vpp)->v_type == vtyp) { return (0); } else - fuse_vnode_kick(*vpp); + fuse_vnode_kick(*vpp, td); } /* as the big guys say, malloc for your data before getnewvnode() */ @@ -2142,8 +2143,7 @@ return (err); } - /* XXX nodeid: cast from 64 bytes to 32 */ - err = vfs_hash_insert(*vpp, 0, /*flags*/ myflags, td, &vp2, fuse_vnode_cmp, &nodeid); + err = vfs_hash_insert(*vpp, nodeid, /*flags*/ myflags, td, &vp2, fuse_vnode_cmp, &nodeid); if (err) { FREE(fvdat, M_FUSEFS); @@ -2204,7 +2204,7 @@ return (0); } - DEBUG("getting at vnode of ino %llu\n", VTOI(vp)); + DEBUG("getting at vnode of ino %llu\n", VTOI32(vp)); fvdat = vp->v_data; @@ -2247,7 +2247,7 @@ KASSERT(fufh->useco >= 0, ("negative use count for fuse filehandle")); KASSERT(! fufh->fp || fufh->useco > 0, ("filehandle bound with 0 use counter")); - DEBUG2G("vnode #%llu, fufh owner %p, useco %d\n", VTOI(vp), fufh->fp, fufh->useco); + DEBUG2G("vnode #%llu, fufh owner %p, useco %d\n", VTOI32(vp), fufh->fp, fufh->useco); if (! fufh->fp && fufh->useco == 0) { LIST_REMOVE(fufh, fh_link); fuse_send_release(vp, td, cred, fufh, fufh->mode); @@ -2292,7 +2292,7 @@ int err; - DEBUG("getting at vnode of ino %llu\n", VTOI(vp)); + DEBUG("getting at vnode of ino %llu\n", VTOI32(vp)); #if _DEBUG DEBUG2G("=============>\n"); kdb_backtrace(); @@ -2342,12 +2342,22 @@ } static __inline void -fuse_vnode_kick(struct vnode *vp) +fuse_vnode_kick(struct vnode *vp, struct thread *td) { struct fuse_vnode_data *fvdat; + if (! td) + td = curthread; + + if (vp->v_vflag & VV_ROOT) { + fdata_kick_set(fusedev_get_data(((struct fuse_mnt_data *)vp->v_mount->mnt_data)->fdev)); + return; + } fvdat = vp->v_data; fvdat->nlookup = 0; + DEBUG("pfft...\n"); + fuse_filehandle_gc(vp, td, NULL); + vnode_destroy_vobject(vp); /* * this implies we won't get feedback on recycling * (other than panicking, or the lack of that) @@ -2355,8 +2365,7 @@ * would be too much hassle... */ vp->v_op = &dead_vnodeops; - DEBUG("pfft...\n"); - fuse_recyc_backend(vp, curthread); + fuse_recyc_backend(vp, td); vput(vp); } @@ -2458,12 +2467,13 @@ if (vp->v_type != vap->va_type) { /* stale vnode */ - DEBUG("node #%lu got stale, kicking...\n", vap->va_fileid); - fuse_vnode_kick(vp); + DEBUG("node #%lu got stale (old type 0x%x, new type 0x%x), kicking...\n", + vap->va_fileid, vp->v_type, vap->va_type); + fuse_vnode_kick(vp, td); return (EIO); } - DEBUG("node #%llu, type %d\n", VTOI(vp), vap->va_type); + DEBUG("node #%llu, type %d\n", VTOI32(vp), vap->va_type); #if _DEBUG DEBUG2G("\n"); vn_printf(vp, " * "); @@ -2567,7 +2577,7 @@ #endif if (dvp->v_type != VDIR) { - DEBUG("vnode #%llu of vtype %d is not a dir\n", VTOI(dvp), + DEBUG("vnode #%llu of vtype %d is not a dir\n", VTOI32(dvp), dvp->v_type); return (ENOTDIR); } @@ -2594,7 +2604,7 @@ return (err); } - DEBUG2G("lookup in #%llu, with flags 0x%x\n", VTOI(dvp), flags); + DEBUG2G("lookup in #%llu, with flags 0x%x\n", VTOI32(dvp), flags); /* fetching data from "storage" */ @@ -2978,13 +2988,13 @@ sx_sunlock(&fvdat->fh_lock); if (err == -1) { - DEBUG2G("suitable fh of vnode #%llu found\n", VTOI(vp)); + DEBUG2G("suitable fh of vnode #%llu found\n", VTOI32(vp)); return (fufh); } else if (err) return (NULL); - DEBUG2G("we need to fetch a new filehandle for vnode #%llu\n", VTOI(vp)); + DEBUG2G("we need to fetch a new filehandle for vnode #%llu\n", VTOI32(vp)); fdi.iosize = sizeof(*foi); if ((err = fdisp_prepare_all(&fdi, @@ -3241,7 +3251,7 @@ fvdat->fh_counter--; DEBUG2G("filehandle of vnode #%llu being released, fh counter now is %d\n", - VTOI(vp), fvdat->fh_counter); + VTOI32(vp), fvdat->fh_counter); fdi.iosize = sizeof(*fri); if ((err = fdisp_prepare_all(&fdi, @@ -3272,7 +3282,7 @@ */ #define BREAK_IF_BAD(fp) \ if (! (fp)->f_vnode->v_data) { \ - DEBUG("bad fileop on vnode no. %llu\n", VTOI((fp)->f_vnode)); \ + DEBUG("bad fileop on vnode no. %llu\n", VTOI32((fp)->f_vnode)); \ return (EBADF); \ } @@ -3305,7 +3315,7 @@ fufh = fp->f_data; KASSERT(fufh->fp == fp, ("file's filehandle is stolen")); DEBUG2G("vnode #%llu, fufh owner %p, useco %d\n", - VTOI(fp->f_vnode), fp, fufh->useco); + VTOI32(fp->f_vnode), fp, fufh->useco); fufh->useco--; sx_xlock(&fvdat->fh_lock); @@ -3504,6 +3514,7 @@ if (! FILE_IS_FAT(fp)) panic("non-fat file passed to read routine"); + vn_lock(fp->f_vnode, LK_EXCLUSIVE | LK_RETRY, td); if ((flags & FOF_OFFSET) == 0) uio->uio_offset = fp->f_offset; @@ -3522,12 +3533,12 @@ if (fp->f_flag & O_DIRECT || fufh->flags & FUSEFH_DIRECTIO) { DEBUG2G("direct read of vnode %llu via file handle %llu\n", - VTOI(fp->f_vnode), fufh->fh_id); + VTOI32(fp->f_vnode), fufh->fh_id); err = fuse_read_directbackend(fp->f_vnode, fufh, uio, cred, td, FUSE_READ, fuse_std_buffeater, NULL); } else { - DEBUG2G("buffered read of vnode %llu\n", VTOI(fp->f_vnode)); + DEBUG2G("buffered read of vnode %llu\n", VTOI32(fp->f_vnode)); err = fuse_read_biobackend(fp->f_vnode, fufh, uio, cred, td, FUSE_READ, fuse_std_buffeater, NULL); } @@ -3535,6 +3546,7 @@ if ((flags & FOF_OFFSET) == 0) fp->f_offset = uio->uio_offset; fp->f_nextoff = uio->uio_offset; + VOP_UNLOCK(fp->f_vnode, 0, td); return (err); } @@ -3974,7 +3986,7 @@ * XXX: handling of this case is untested. */ DEBUG("weird, file changed type during linking\n"); - fuse_vnode_kick(vp); + fuse_vnode_kick(vp, NULL); err = EBADF; } @@ -4199,7 +4211,7 @@ struct vnode *pdp2; DEBUG("trying at chenkpath\n"); do { - DEBUG("checkpath bumped into node %llu\n", VTOI(pdp)); + DEBUG("checkpath bumped into node %llu\n", VTOI32(pdp)); if (pdp->v_vflag & VV_ROOT) err = -1; if (pdp == fvp) { @@ -4421,7 +4433,7 @@ return (err); if (vp->v_type != IFTOVT(((struct fuse_attr_out *)fdi.answ)->attr.mode)) { - fuse_vnode_kick(vp); + fuse_vnode_kick(vp, td); err = EIO; } @@ -4827,6 +4839,7 @@ if (uio->uio_resid == 0) return (0); + vn_lock(fp->f_vnode, LK_EXCLUSIVE | LK_RETRY, td); if (fp->f_flag & O_APPEND) { VOP_GETATTR(fp->f_vnode, &va, cred, td); uio->uio_offset = va.va_size; @@ -4836,17 +4849,18 @@ if (fp->f_flag & O_DIRECT || fufh->flags & FUSEFH_DIRECTIO) { DEBUG2G("direct write of vnode %llu via file handle %llu\n", - VTOI(fp->f_vnode), fufh->fh_id); + VTOI32(fp->f_vnode), fufh->fh_id); err = fuse_write_directbackend(fp->f_vnode, fufh->fh_id, uio, cred, td); } else { - DEBUG2G("buffered write of vnode %llu\n", VTOI(fp->f_vnode)); + DEBUG2G("buffered write of vnode %llu\n", VTOI32(fp->f_vnode)); err = fuse_write_biobackend(fp->f_vnode, uio, cred, td); } if ((flags & FOF_OFFSET) == 0) fp->f_offset = uio->uio_offset; fp->f_nextoff = uio->uio_offset; + VOP_UNLOCK(fp->f_vnode, 0, td); DEBUG("leaving with %d\n", err); return (err); @@ -4879,13 +4893,13 @@ if (! (vp->v_type == VREG || vp->v_type == VDIR)) { DEBUG("for vnode #%llu v_type is %d, dropping\n", - VTOI(vp), vp->v_type); + VTOI32(vp), vp->v_type); return (EOPNOTSUPP); } if (bp->b_iocmd != BIO_READ && bp->b_iocmd != BIO_WRITE) { DEBUG("for vnode #%llu bio tried with biocmd 0x%x, dropping\n", - VTOI(vp), bp->b_iocmd); + VTOI32(vp), bp->b_iocmd); return (EOPNOTSUPP); } @@ -4924,7 +4938,7 @@ if (err) goto out; - DEBUG2G("vp #%llu, fufh #%llu\n", VTOI(vp), fufh->fh_id); + DEBUG2G("vp #%llu, fufh #%llu\n", VTOI32(vp), fufh->fh_id); if (bp->b_iocmd == BIO_READ) { struct fuse_read_in *fri; @@ -5077,7 +5091,7 @@ struct fuse_vnode_data *fvdat = ap->a_vp->v_data; printf("nodeid: %llu, fh_counter: %d, nlookup: %llu\n", - VTOI(ap->a_vp), fvdat->fh_counter, fvdat->nlookup); + VTOI32(ap->a_vp), fvdat->fh_counter, fvdat->nlookup); return (0); } @@ -5087,13 +5101,14 @@ struct vnode *vp; int rc; - DEBUG("vnode #%llu\n", VTOI((struct vnode *)bo->bo_private)); + DEBUG("vnode #%llu\n", VTOI32((struct vnode *)bo->bo_private)); vp = bo->bo_private; KASSERT(bo == &vp->v_bufobj, ("BO/VP mismatch: vp %p (#%llu) bo %p != %p", - vp, VTOI(vp), &vp->v_bufobj, bo)); + vp, VTOI32(vp), &vp->v_bufobj, bo)); rc = VOP_STRATEGY(vp, bp); - KASSERT(rc == 0, ("Fuse VOP_STRATEGY failed: bp=%p, " - "vp=%p, rc=%d", bp, vp, rc)); + KASSERT(vp->v_op == &dead_vnodeops || rc == 0, + ("Fuse VOP_STRATEGY failed: bp=%p, " + "vp=%p, rc=%d", bp, vp, rc)); } ==== //depot/projects/soc2005/fuse4bsd2/fuse_module/fuse.h#8 (text+ko) ==== @@ -137,6 +137,7 @@ #define FUSE_ROOT_INODE 1 /* Fuse convention: node id of root node is 1 */ #define VTOI(vp) ((struct fuse_vnode_data *)(vp)->v_data)->nid +#define VTOI32(vp) (uint64_t)(vp)->v_hash /** Max number of pages that can be used in a single read request */ /* (taken from Linux Fuse) */ From owner-p4-projects@FreeBSD.ORG Thu Oct 13 22:02:58 2005 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 06FF416A421; Thu, 13 Oct 2005 22:02:58 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A533E16A41F for ; Thu, 13 Oct 2005 22:02:57 +0000 (GMT) (envelope-from soc-chenk@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 627AA43D45 for ; Thu, 13 Oct 2005 22:02:57 +0000 (GMT) (envelope-from soc-chenk@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9DM2vgB089016 for ; Thu, 13 Oct 2005 22:02:57 GMT (envelope-from soc-chenk@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9DM2u6r089013 for perforce@freebsd.org; Thu, 13 Oct 2005 22:02:56 GMT (envelope-from soc-chenk@freebsd.org) Date: Thu, 13 Oct 2005 22:02:56 GMT Message-Id: <200510132202.j9DM2u6r089013@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-chenk@freebsd.org using -f From: soc-chenk To: Perforce Change Reviews Cc: Subject: PERFORCE change 85237 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, 13 Oct 2005 22:02:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=85237 Change 85237 by soc-chenk@soc-chenk_leavemealone on 2005/10/13 22:02:29 Makefile tunings - Merge in Anish Mistry's patch for mount_fusefs/Makefile - fuse_module/Makefile: - no invariants by default - add (non-automated support) for using old clonehandler API - update README.html accordingly Submitted by: soc-chenk Affected files ... .. //depot/projects/soc2005/fuse4bsd2/README.html#9 edit .. //depot/projects/soc2005/fuse4bsd2/fuse_module/Makefile#4 edit .. //depot/projects/soc2005/fuse4bsd2/mount_fusefs/Makefile#4 edit Differences ... ==== //depot/projects/soc2005/fuse4bsd2/README.html#9 (text+ko) ==== @@ -32,7 +32,7 @@ The main part of Fuse for FreeBSD is a kernel module which provides a kernel messaging interface to the Fuse library in userspace which is compatible with that of the Linux module. The userspace part is pretty portable. A lightweight patch is enough to get that compile and work.

-The module can be expected work with RELENG_6 snapshots of version number at least 600034, or with HEAD snapshots of version number at least 700002. (Hint: you can get the version number of your currently running kernel by sysctl -n kern.osreldate; or you can extract the version number directly from the source code by awk '/#define/{if ($2 == "__FreeBSD_version") { print $3; exit }}' /sys/sys/param.h.) (Desperate types can try with older HEAD/RELENG_6 snapshots if they set the -DUSE_OLD_CLONEHANDLER_API flag for cc.) +The module can be excepted to work with RELENG_6 and HEAD (ie., 7.x) snapshots.

What can be considered as a public homepage for the project is [WWW]http://wikitest.freebsd.org/moin.cgi/FuseFilesystem; for updates, further info go there. Get in contact with me via the soc-chenk email addrees of the FreeBSD organization (freebsd.org). @@ -88,6 +88,12 @@

  • + For older snapshots, you'll need a special make flag. If you use a 6.x kernel and its __FreeBSD_version is lesser than 600034, or you use a 7.x kernel and its __FreeBSD_version is lesser than 700002, you will also have to add -DUSE_OLD_CLONEHANDLER_API to make's parameters below. You can check this variable by the +

     awk '/#define/{if ($2 == "__FreeBSD_version") { print $3; exit }}' /sys/sys/param.h
    command. +

    +
    • +
  • +

    Type make. If you want normal quantity of debug output, use the make flag -DDEBUG2G, if you want tons of debug output, use -DDEBUG.

    • ==== //depot/projects/soc2005/fuse4bsd2/fuse_module/Makefile#4 (text+ko) ==== @@ -5,6 +5,14 @@ CFLAGS+= -DFMASTER .endif +.if defined(USE_OLD_CLONEHANDLER_API) +CFLAGS+= -DUSE_OLD_CLONEHANDLER_API +.endif + +.if defined(INVARIANTS) +CFLAGS+= -DINVARIANTS +.endif + .if defined(DEBUG) DEBUG_FLAGS+= -D_DEBUG -g .endif @@ -14,17 +22,13 @@ .endif .if defined(DEBUG_MSGING) -CFLAGS+= -D_DEBUG_MSGING +DEBUG_FLAGS+= -D_DEBUG_MSGING .endif .if defined(FMASTER) || defined(DEBUG) || defined(DEBUG2G) SRCS+= fuse_opnames.c .endif -.if !defined(NOINVARIANTS) -CFLAGS+= -DINVARIANTS -.endif - KMOD=fuse CLEANFILES+= fuse_kernel.h fuse_opnames.c fuse_opnames.o fmaster.o vnode_if.h vnode_if_typedef.h vnode_if_newproto.h fuse.ko.debug ==== //depot/projects/soc2005/fuse4bsd2/mount_fusefs/Makefile#4 (text+ko) ==== @@ -2,7 +2,8 @@ PROG = mount_fusefs SRCS = mount_fusefs.c getmntopts.c -MAN = mount_fusefs.8 +MAN8 = mount_fusefs.8 +NO_MANCOMPRESS?= yes CLEANFILES += mount_fusefs_safe mount_fusefs_safe.o mount_fusefs_safe.c # mount_fusefs needs mntopts.h and getmntopts.c from src/sbin/mount/ From owner-p4-projects@FreeBSD.ORG Thu Oct 13 22:05:01 2005 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 C583A16A421; Thu, 13 Oct 2005 22:05:00 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A06C516A41F for ; Thu, 13 Oct 2005 22:05:00 +0000 (GMT) (envelope-from soc-chenk@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5EE2043D49 for ; Thu, 13 Oct 2005 22:05:00 +0000 (GMT) (envelope-from soc-chenk@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9DM50HF089073 for ; Thu, 13 Oct 2005 22:05:00 GMT (envelope-from soc-chenk@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9DM50Ai089060 for perforce@freebsd.org; Thu, 13 Oct 2005 22:05:00 GMT (envelope-from soc-chenk@freebsd.org) Date: Thu, 13 Oct 2005 22:05:00 GMT Message-Id: <200510132205.j9DM50Ai089060@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-chenk@freebsd.org using -f From: soc-chenk To: Perforce Change Reviews Cc: Subject: PERFORCE change 85238 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, 13 Oct 2005 22:05:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=85238 Change 85238 by soc-chenk@soc-chenk_leavemealone on 2005/10/13 22:04:43 tagged 0.2.12pre1 Display version number 0.2.12pre1 in README.html Submitted by: soc-chenk Affected files ... .. //depot/projects/soc2005/fuse4bsd2/README.html#10 edit Differences ... ==== //depot/projects/soc2005/fuse4bsd2/README.html#10 (text+ko) ==== @@ -55,7 +55,7 @@

  • - The FreeBSD module. Source tarballs are provided at [WWW]http://creo.hu/~csaba/projects/fuse4bsd/downloads/ under the name fuse4bsd-<version>.tar.* (latest release is 0.2.11, date of release: 21th Sep 2005). The current code is available via [WWW]Darcs, you can fetch it by + The FreeBSD module. Source tarballs are provided at [WWW]http://creo.hu/~csaba/projects/fuse4bsd/downloads/ under the name fuse4bsd-<version>.tar.* (latest release is 0.2.12pre1, date of release: 11th Oct 2005). The current code is available via [WWW]Darcs, you can fetch it by 

     darcs get http://creo.hu/~csaba/darcs-repos/fuse4bsd
    command, or via [WWW]Perforce (you can use this latter link for online source code browsing).

    From owner-p4-projects@FreeBSD.ORG Thu Oct 13 22:06:03 2005 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 AD9E616A421; Thu, 13 Oct 2005 22:06:02 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 87CFC16A41F for ; Thu, 13 Oct 2005 22:06:02 +0000 (GMT) (envelope-from soc-chenk@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4AC7A43D4C for ; Thu, 13 Oct 2005 22:06:02 +0000 (GMT) (envelope-from soc-chenk@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9DM62dR089178 for ; Thu, 13 Oct 2005 22:06:02 GMT (envelope-from soc-chenk@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9DM61Xc089175 for perforce@freebsd.org; Thu, 13 Oct 2005 22:06:01 GMT (envelope-from soc-chenk@freebsd.org) Date: Thu, 13 Oct 2005 22:06:01 GMT Message-Id: <200510132206.j9DM61Xc089175@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-chenk@freebsd.org using -f From: soc-chenk To: Perforce Change Reviews Cc: Subject: PERFORCE change 85239 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, 13 Oct 2005 22:06:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=85239 Change 85239 by soc-chenk@soc-chenk_leavemealone on 2005/10/13 22:05:45 made inlining compatible with "-O -pipe" compiler flags Submitted by: soc-chenk Affected files ... .. //depot/projects/soc2005/fuse4bsd2/fuse_module/fuse.c#16 edit Differences ... ==== //depot/projects/soc2005/fuse4bsd2/fuse_module/fuse.c#16 (text+ko) ==== @@ -875,17 +875,17 @@ ihead->nodeid); } +__static __inline struct fuse_data * +fusedev_get_data(struct cdev *fdev) +{ + return (fdev->si_drv1); +} + __static __inline struct sx * fusedev_get_lock(struct cdev *fdev) { return (&fusedev_get_data(fdev)->slock); } - -__static __inline struct fuse_data * -fusedev_get_data(struct cdev *fdev) -{ - return (fdev->si_drv1); -} /******************** * @@ -1509,7 +1509,7 @@ static int fuse_vget_i(struct mount *mp, struct thread *td, uint64_t nodeid, enum vtype vtyp, struct vnode **vpp); static __inline void fat2vat(struct mount *mp, struct fuse_attr *fat, struct vattr *vap); static vop_getattr_t fuse_getattr; -static __inline int fuse_recyc_backend(struct vnode *vp, struct thread *td); +static int fuse_recyc_backend(struct vnode *vp, struct thread *td); static fuse_metrics_t release_filehandle; static void fuse_filehandle_gc(struct vnode *vp, struct thread *td, struct ucred *cred); static vop_reclaim_t fuse_reclaim; @@ -1629,7 +1629,56 @@ (vp)->v_dd = (pvp); \ } while (0) +/******** + * + * >>> More aux routines + * + *******/ + +static __inline void +fuse_vnode_init(struct vnode *vp, struct fuse_vnode_data *fvdat, + uint64_t nodeid, enum vtype vtyp) +{ + fvdat->nid = nodeid; + vp->v_data = fvdat; + SETPARENT(vp, (vp->v_vflag & VV_ROOT) ? vp : NULL); + vp->v_type = vtyp; + + sx_init(&fvdat->fh_lock, "lock for fuse filehandles"); + LIST_INIT(&fvdat->fh_head); + + vp->v_bufobj.bo_ops = &fuse_bufops; + vp->v_bufobj.bo_private = vp; +} +static __inline void +fuse_vnode_kick(struct vnode *vp, struct thread *td) +{ + struct fuse_vnode_data *fvdat; + + if (! td) + td = curthread; + + if (vp->v_vflag & VV_ROOT) { + fdata_kick_set(fusedev_get_data(((struct fuse_mnt_data *)vp->v_mount->mnt_data)->fdev)); + return; + } + fvdat = vp->v_data; + fvdat->nlookup = 0; + DEBUG("pfft...\n"); + fuse_filehandle_gc(vp, td, NULL); + vnode_destroy_vobject(vp); + /* + * this implies we won't get feedback on recycling + * (other than panicking, or the lack of that) + * but creating a customized set of bad vnode ops + * would be too much hassle... + */ + vp->v_op = &dead_vnodeops; + fuse_recyc_backend(vp, td); + vput(vp); +} + /************* * * >>> VFS ops @@ -2178,23 +2227,7 @@ -static __inline void -fuse_vnode_init(struct vnode *vp, struct fuse_vnode_data *fvdat, - uint64_t nodeid, enum vtype vtyp) -{ - fvdat->nid = nodeid; - vp->v_data = fvdat; - SETPARENT(vp, (vp->v_vflag & VV_ROOT) ? vp : NULL); - vp->v_type = vtyp; - - sx_init(&fvdat->fh_lock, "lock for fuse filehandles"); - LIST_INIT(&fvdat->fh_head); - - vp->v_bufobj.bo_ops = &fuse_bufops; - vp->v_bufobj.bo_private = vp; -} - -static __inline int +static int fuse_recyc_backend(struct vnode *vp, struct thread *td) { struct fuse_vnode_data *fvdat; @@ -2341,34 +2374,6 @@ return (0); } -static __inline void -fuse_vnode_kick(struct vnode *vp, struct thread *td) -{ - struct fuse_vnode_data *fvdat; - - if (! td) - td = curthread; - - if (vp->v_vflag & VV_ROOT) { - fdata_kick_set(fusedev_get_data(((struct fuse_mnt_data *)vp->v_mount->mnt_data)->fdev)); - return; - } - fvdat = vp->v_data; - fvdat->nlookup = 0; - DEBUG("pfft...\n"); - fuse_filehandle_gc(vp, td, NULL); - vnode_destroy_vobject(vp); - /* - * this implies we won't get feedback on recycling - * (other than panicking, or the lack of that) - * but creating a customized set of bad vnode ops - * would be too much hassle... - */ - vp->v_op = &dead_vnodeops; - fuse_recyc_backend(vp, td); - vput(vp); -} - /* * It's by-and-large reversing vn_stat() of kern/vfs_vnops.c */ @@ -3836,20 +3841,6 @@ return (err); } -static int -fuse_newentry_backend(struct vnode *dvp, struct vnode **vpp, - struct componentname *cnp, enum fuse_opcode op, - void *buf, size_t bufsize, enum vtype vtyp) -{ - struct fuse_dispatcher fdi; - int err = 0; - - if ((err = fuse_make_entry_req(dvp, cnp, op, buf, bufsize, &fdi))) - return (err); - - return (fuse_newentry_core(dvp->v_mount, vpp, vtyp, &fdi)); -} - static __inline int fuse_make_entry_req(struct vnode *dvp, struct componentname *cnp, enum fuse_opcode op, void *buf, size_t bufsize, @@ -3906,6 +3897,20 @@ } static int +fuse_newentry_backend(struct vnode *dvp, struct vnode **vpp, + struct componentname *cnp, enum fuse_opcode op, + void *buf, size_t bufsize, enum vtype vtyp) +{ + struct fuse_dispatcher fdi; + int err = 0; + + if ((err = fuse_make_entry_req(dvp, cnp, op, buf, bufsize, &fdi))) + return (err); + + return (fuse_newentry_core(dvp->v_mount, vpp, vtyp, &fdi)); +} + +static int fuse_mknod(struct vop_mknod_args *ap) { struct vnode *dvp = ap->a_dvp; From owner-p4-projects@FreeBSD.ORG Thu Oct 13 22:07:04 2005 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 6689D16A421; Thu, 13 Oct 2005 22:07:04 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 41C8516A41F for ; Thu, 13 Oct 2005 22:07:04 +0000 (GMT) (envelope-from soc-chenk@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 05F6143D46 for ; Thu, 13 Oct 2005 22:07:04 +0000 (GMT) (envelope-from soc-chenk@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9DM731Z089278 for ; Thu, 13 Oct 2005 22:07:03 GMT (envelope-from soc-chenk@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9DM733Z089275 for perforce@freebsd.org; Thu, 13 Oct 2005 22:07:03 GMT (envelope-from soc-chenk@freebsd.org) Date: Thu, 13 Oct 2005 22:07:03 GMT Message-Id: <200510132207.j9DM733Z089275@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-chenk@freebsd.org using -f From: soc-chenk To: Perforce Change Reviews Cc: Subject: PERFORCE change 85240 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, 13 Oct 2005 22:07:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=85240 Change 85240 by soc-chenk@soc-chenk_leavemealone on 2005/10/13 22:07:03 tagged 0.2.20pre2 Display version number 0.2.20pre2 in README.html Submitted by: soc-chenk Affected files ... .. //depot/projects/soc2005/fuse4bsd2/README.html#11 edit Differences ... ==== //depot/projects/soc2005/fuse4bsd2/README.html#11 (text+ko) ==== @@ -55,7 +55,7 @@

  • - The FreeBSD module. Source tarballs are provided at [WWW]http://creo.hu/~csaba/projects/fuse4bsd/downloads/ under the name fuse4bsd-<version>.tar.* (latest release is 0.2.12pre1, date of release: 11th Oct 2005). The current code is available via [WWW]Darcs, you can fetch it by + The FreeBSD module. Source tarballs are provided at [WWW]http://creo.hu/~csaba/projects/fuse4bsd/downloads/ under the name fuse4bsd-<version>.tar.* (latest release is 0.2.20pre2, date of release: 13th Oct 2005). The current code is available via [WWW]Darcs, you can fetch it by 

     darcs get http://creo.hu/~csaba/darcs-repos/fuse4bsd
    command, or via [WWW]Perforce (you can use this latter link for online source code browsing).

    From owner-p4-projects@FreeBSD.ORG Fri Oct 14 06:39:10 2005 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 E004A16A421; Fri, 14 Oct 2005 06:39:09 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B3F7116A41F for ; Fri, 14 Oct 2005 06:39:09 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 42CC043D48 for ; Fri, 14 Oct 2005 06:39:09 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9E6d9cW023691 for ; Fri, 14 Oct 2005 06:39:09 GMT (envelope-from alc@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9E6d50o023688 for perforce@freebsd.org; Fri, 14 Oct 2005 06:39:05 GMT (envelope-from alc@freebsd.org) Date: Fri, 14 Oct 2005 06:39:05 GMT Message-Id: <200510140639.j9E6d50o023688@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alc@freebsd.org using -f From: Alan Cox To: Perforce Change Reviews Cc: Subject: PERFORCE change 85261 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, 14 Oct 2005 06:39:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=85261 Change 85261 by alc@alc_home on 2005/10/14 06:38:34 IFC @85259 Affected files ... .. //depot/projects/superpages/doc/de_DE.ISO8859-1/articles/contributing/article.sgml#2 integrate .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/faq/book.sgml#2 integrate .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/fdp-primer/structure/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/Makefile#2 integrate .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/basics/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/boot/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/multimedia/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/network-servers/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/ports/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/security/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/serialcomms/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/de_DE.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#2 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/Makefile#2 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/bsdl-gpl/Makefile#1 branch .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/bsdl-gpl/article.sgml#1 branch .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#4 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#3 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/basics/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/boot/chapter.sgml#3 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/geom/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#3 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/share/sgml/authors.ent#3 integrate .. //depot/projects/superpages/doc/ja_JP.eucJP/Makefile#2 integrate .. //depot/projects/superpages/doc/ja_JP.eucJP/man/Makefile#2 integrate .. //depot/projects/superpages/doc/ru_RU.KOI8-R/articles/contributing/article.sgml#2 integrate .. //depot/projects/superpages/doc/ru_RU.KOI8-R/articles/freebsd-questions/article.sgml#2 integrate .. //depot/projects/superpages/doc/ru_RU.KOI8-R/articles/new-users/article.sgml#2 integrate .. //depot/projects/superpages/doc/ru_RU.KOI8-R/articles/pxe/article.sgml#2 integrate .. //depot/projects/superpages/doc/ru_RU.KOI8-R/articles/releng/article.sgml#2 integrate .. //depot/projects/superpages/doc/share/mk/doc.subdir.mk#2 integrate .. //depot/projects/superpages/doc/share/mk/doc.xml.mk#2 integrate .. //depot/projects/superpages/doc/share/sgml/man-refs.ent#3 integrate .. //depot/projects/superpages/doc/share/sgml/mirrors.xml#2 integrate .. //depot/projects/superpages/src/ObsoleteFiles.inc#2 integrate .. //depot/projects/superpages/src/contrib/bsnmp/FREEBSD-Xlist#2 integrate .. //depot/projects/superpages/src/contrib/bsnmp/NEWS#2 integrate .. //depot/projects/superpages/src/contrib/bsnmp/VERSION#2 integrate .. //depot/projects/superpages/src/contrib/bsnmp/gensnmpdef/gensnmpdef.1#2 integrate .. //depot/projects/superpages/src/contrib/bsnmp/gensnmptree/gensnmptree.1#2 integrate .. //depot/projects/superpages/src/contrib/bsnmp/gensnmptree/gensnmptree.c#2 integrate .. //depot/projects/superpages/src/contrib/bsnmp/lib/asn1.3#2 integrate .. //depot/projects/superpages/src/contrib/bsnmp/lib/asn1.c#2 integrate .. //depot/projects/superpages/src/contrib/bsnmp/lib/asn1.h#2 integrate .. //depot/projects/superpages/src/contrib/bsnmp/lib/bsnmpagent.3#2 integrate .. //depot/projects/superpages/src/contrib/bsnmp/lib/bsnmpclient.3#2 integrate .. //depot/projects/superpages/src/contrib/bsnmp/lib/bsnmplib.3#2 integrate .. //depot/projects/superpages/src/contrib/bsnmp/lib/snmp.c#2 integrate .. //depot/projects/superpages/src/contrib/bsnmp/lib/snmpagent.c#2 integrate .. //depot/projects/superpages/src/contrib/bsnmp/lib/snmpclient.c#2 integrate .. //depot/projects/superpages/src/contrib/bsnmp/snmp_mibII/mibII.c#2 integrate .. //depot/projects/superpages/src/contrib/bsnmp/snmp_mibII/mibII.h#2 integrate .. //depot/projects/superpages/src/contrib/bsnmp/snmp_mibII/mibII_ipaddr.c#2 integrate .. //depot/projects/superpages/src/contrib/bsnmp/snmp_mibII/mibII_route.c#2 integrate .. //depot/projects/superpages/src/contrib/bsnmp/snmp_mibII/snmp_mibII.3#2 integrate .. //depot/projects/superpages/src/contrib/bsnmp/snmp_ntp/BEGEMOT-NTP-MIB.txt#2 integrate .. //depot/projects/superpages/src/contrib/bsnmp/snmp_ntp/snmp_ntp.c#2 integrate .. //depot/projects/superpages/src/contrib/bsnmp/snmpd/.gdbinit#2 delete .. //depot/projects/superpages/src/contrib/bsnmp/snmpd/bsnmpd.1#2 integrate .. //depot/projects/superpages/src/contrib/bsnmp/snmpd/config.c#2 integrate .. //depot/projects/superpages/src/contrib/bsnmp/snmpd/main.c#2 integrate .. //depot/projects/superpages/src/contrib/bsnmp/snmpd/snmpmod.3#2 integrate .. //depot/projects/superpages/src/contrib/bsnmp/snmpd/snmpmod.h#2 integrate .. //depot/projects/superpages/src/contrib/bsnmp/snmpd/trans_udp.c#2 integrate .. //depot/projects/superpages/src/contrib/bsnmp/snmpd/trap.c#2 integrate .. //depot/projects/superpages/src/contrib/wpa_supplicant/FREEBSD-Xlist#2 integrate .. //depot/projects/superpages/src/contrib/wpa_supplicant/driver_ndis.c#1 branch .. //depot/projects/superpages/src/contrib/wpa_supplicant/driver_ndis.h#1 branch .. //depot/projects/superpages/src/contrib/wpa_supplicant/driver_ndis_.c#1 branch .. //depot/projects/superpages/src/crypto/openssl/ssl/s23_srvr.c#2 integrate .. //depot/projects/superpages/src/etc/defaults/rc.conf#3 integrate .. //depot/projects/superpages/src/etc/rc.d/Makefile#3 integrate .. //depot/projects/superpages/src/etc/rc.d/hcsecd#1 branch .. //depot/projects/superpages/src/etc/rc.d/ipsec#2 integrate .. //depot/projects/superpages/src/etc/rc.d/mountcritremote#2 integrate .. //depot/projects/superpages/src/etc/rc.d/sdpd#1 branch .. //depot/projects/superpages/src/etc/rc.firewall6#2 integrate .. //depot/projects/superpages/src/gnu/usr.bin/cpio/Makefile#2 integrate .. //depot/projects/superpages/src/lib/csu/amd64/crt1.c#2 integrate .. //depot/projects/superpages/src/lib/csu/i386-elf/crt1.c#2 integrate .. //depot/projects/superpages/src/lib/libarchive/COPYING#2 integrate .. //depot/projects/superpages/src/lib/libarchive/Makefile#2 integrate .. //depot/projects/superpages/src/lib/libarchive/Makefile.am#2 integrate .. //depot/projects/superpages/src/lib/libarchive/archive.h.in#2 integrate .. //depot/projects/superpages/src/lib/libarchive/archive_entry.c#2 integrate .. //depot/projects/superpages/src/lib/libarchive/archive_entry.h#2 integrate .. //depot/projects/superpages/src/lib/libarchive/archive_platform.h#2 integrate .. //depot/projects/superpages/src/lib/libarchive/archive_read_support_format_tar.c#2 integrate .. //depot/projects/superpages/src/lib/libarchive/archive_read_support_format_zip.c#2 integrate .. //depot/projects/superpages/src/lib/libarchive/archive_write_set_format_pax.c#2 integrate .. //depot/projects/superpages/src/lib/libarchive/configure.ac.in#2 integrate .. //depot/projects/superpages/src/lib/libbsnmp/libbsnmp/Makefile#2 integrate .. //depot/projects/superpages/src/lib/libdevstat/devstat.c#2 integrate .. //depot/projects/superpages/src/lib/libedit/editline.3#2 integrate .. //depot/projects/superpages/src/lib/libedit/el.c#2 integrate .. //depot/projects/superpages/src/lib/libedit/makelist#2 integrate .. //depot/projects/superpages/src/lib/libedit/map.c#2 integrate .. //depot/projects/superpages/src/lib/libthr/thread/thr_create.c#2 integrate .. //depot/projects/superpages/src/lib/libutil/trimdomain.c#2 integrate .. //depot/projects/superpages/src/lib/msun/src/e_rem_pio2f.c#2 integrate .. //depot/projects/superpages/src/lib/msun/src/k_cosf.c#2 integrate .. //depot/projects/superpages/src/lib/msun/src/k_rem_pio2f.c#2 integrate .. //depot/projects/superpages/src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#2 integrate .. //depot/projects/superpages/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#3 integrate .. //depot/projects/superpages/src/release/doc/share/misc/dev.archlist.txt#2 integrate .. //depot/projects/superpages/src/release/doc/zh_CN.GB2312/Makefile#2 integrate .. //depot/projects/superpages/src/release/doc/zh_CN.GB2312/early-adopter/Makefile#2 delete .. //depot/projects/superpages/src/release/doc/zh_CN.GB2312/early-adopter/article.sgml#2 delete .. //depot/projects/superpages/src/release/doc/zh_CN.GB2312/errata/article.sgml#2 integrate .. //depot/projects/superpages/src/release/doc/zh_CN.GB2312/hardware/amd64/proc-amd64.sgml#2 integrate .. //depot/projects/superpages/src/release/doc/zh_CN.GB2312/hardware/common/artheader.sgml#2 integrate .. //depot/projects/superpages/src/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#2 integrate .. //depot/projects/superpages/src/release/doc/zh_CN.GB2312/hardware/common/intro.sgml#2 integrate .. //depot/projects/superpages/src/release/doc/zh_CN.GB2312/hardware/i386/proc-i386.sgml#2 integrate .. //depot/projects/superpages/src/release/doc/zh_CN.GB2312/installation/common/artheader.sgml#2 integrate .. //depot/projects/superpages/src/release/doc/zh_CN.GB2312/installation/common/trouble.sgml#2 integrate .. //depot/projects/superpages/src/release/doc/zh_CN.GB2312/installation/common/upgrade.sgml#2 integrate .. //depot/projects/superpages/src/release/doc/zh_CN.GB2312/readme/article.sgml#2 integrate .. //depot/projects/superpages/src/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#2 integrate .. //depot/projects/superpages/src/sbin/Makefile#3 integrate .. //depot/projects/superpages/src/sbin/devd/devd.cc#2 integrate .. //depot/projects/superpages/src/sbin/ifconfig/ifbridge.c#2 integrate .. //depot/projects/superpages/src/sbin/ifconfig/ifvlan.c#3 integrate .. //depot/projects/superpages/src/sbin/mount/Makefile#2 integrate .. //depot/projects/superpages/src/sbin/mount/extern.h#2 integrate .. //depot/projects/superpages/src/sbin/mount/getmntopts.c#2 integrate .. //depot/projects/superpages/src/sbin/mount/mount.c#2 integrate .. //depot/projects/superpages/src/sbin/mount/mount_ufs.c#2 integrate .. //depot/projects/superpages/src/sbin/reboot/boot_i386.8#2 integrate .. //depot/projects/superpages/src/sbin/setkey/Makefile#1 branch .. //depot/projects/superpages/src/sbin/setkey/parse.y#1 branch .. //depot/projects/superpages/src/sbin/setkey/sample.cf#1 branch .. //depot/projects/superpages/src/sbin/setkey/scriptdump.pl#1 branch .. //depot/projects/superpages/src/sbin/setkey/setkey.8#1 branch .. //depot/projects/superpages/src/sbin/setkey/setkey.c#1 branch .. //depot/projects/superpages/src/sbin/setkey/test-pfkey.c#1 branch .. //depot/projects/superpages/src/sbin/setkey/test-policy.c#1 branch .. //depot/projects/superpages/src/sbin/setkey/token.l#1 branch .. //depot/projects/superpages/src/sbin/setkey/vchar.h#1 branch .. //depot/projects/superpages/src/share/man/man4/Makefile#3 integrate .. //depot/projects/superpages/src/share/man/man4/altq.4#2 integrate .. //depot/projects/superpages/src/share/man/man4/an.4#2 integrate .. //depot/projects/superpages/src/share/man/man4/ata.4#2 integrate .. //depot/projects/superpages/src/share/man/man4/ath.4#2 integrate .. //depot/projects/superpages/src/share/man/man4/aue.4#2 integrate .. //depot/projects/superpages/src/share/man/man4/awi.4#2 integrate .. //depot/projects/superpages/src/share/man/man4/axe.4#2 integrate .. //depot/projects/superpages/src/share/man/man4/bfe.4#2 integrate .. //depot/projects/superpages/src/share/man/man4/bge.4#2 integrate .. //depot/projects/superpages/src/share/man/man4/cdce.4#2 integrate .. //depot/projects/superpages/src/share/man/man4/cm.4#2 integrate .. //depot/projects/superpages/src/share/man/man4/cue.4#2 integrate .. //depot/projects/superpages/src/share/man/man4/dc.4#2 integrate .. //depot/projects/superpages/src/share/man/man4/dcons.4#2 integrate .. //depot/projects/superpages/src/share/man/man4/de.4#2 integrate .. //depot/projects/superpages/src/share/man/man4/ed.4#2 integrate .. //depot/projects/superpages/src/share/man/man4/em.4#2 integrate .. //depot/projects/superpages/src/share/man/man4/en.4#2 integrate .. //depot/projects/superpages/src/share/man/man4/fwe.4#2 integrate .. //depot/projects/superpages/src/share/man/man4/fwip.4#2 integrate .. //depot/projects/superpages/src/share/man/man4/fxp.4#2 integrate .. //depot/projects/superpages/src/share/man/man4/hme.4#2 integrate .. //depot/projects/superpages/src/share/man/man4/hptmv.4#2 integrate .. //depot/projects/superpages/src/share/man/man4/ipw.4#2 integrate .. //depot/projects/superpages/src/share/man/man4/iwi.4#2 integrate .. //depot/projects/superpages/src/share/man/man4/kue.4#2 integrate .. //depot/projects/superpages/src/share/man/man4/lge.4#2 integrate .. //depot/projects/superpages/src/share/man/man4/mac_seeotheruids.4#2 integrate .. //depot/projects/superpages/src/share/man/man4/man4.i386/arl.4#2 integrate .. //depot/projects/superpages/src/share/man/man4/man4.i386/cp.4#2 integrate .. //depot/projects/superpages/src/share/man/man4/man4.i386/cs.4#2 integrate .. //depot/projects/superpages/src/share/man/man4/man4.i386/cx.4#2 integrate .. //depot/projects/superpages/src/share/man/man4/man4.i386/ep.4#2 integrate .. //depot/projects/superpages/src/share/man/man4/man4.i386/ex.4#2 integrate .. //depot/projects/superpages/src/share/man/man4/man4.i386/fe.4#2 integrate .. //depot/projects/superpages/src/share/man/man4/man4.i386/ie.4#2 integrate .. //depot/projects/superpages/src/share/man/man4/man4.i386/lnc.4#2 integrate .. //depot/projects/superpages/src/share/man/man4/man4.i386/ray.4#2 integrate .. //depot/projects/superpages/src/share/man/man4/man4.i386/vx.4#2 integrate .. //depot/projects/superpages/src/share/man/man4/my.4#2 integrate .. //depot/projects/superpages/src/share/man/man4/ng_iface.4#2 integrate .. //depot/projects/superpages/src/share/man/man4/nge.4#2 integrate .. //depot/projects/superpages/src/share/man/man4/nve.4#2 integrate .. //depot/projects/superpages/src/share/man/man4/pcm.4#2 integrate .. //depot/projects/superpages/src/share/man/man4/pcn.4#2 integrate .. //depot/projects/superpages/src/share/man/man4/ral.4#2 integrate .. //depot/projects/superpages/src/share/man/man4/re.4#2 integrate .. //depot/projects/superpages/src/share/man/man4/rl.4#2 integrate .. //depot/projects/superpages/src/share/man/man4/rue.4#2 integrate .. //depot/projects/superpages/src/share/man/man4/sf.4#2 integrate .. //depot/projects/superpages/src/share/man/man4/sis.4#2 integrate .. //depot/projects/superpages/src/share/man/man4/sk.4#2 integrate .. //depot/projects/superpages/src/share/man/man4/sn.4#2 integrate .. //depot/projects/superpages/src/share/man/man4/snd_mss.4#1 branch .. //depot/projects/superpages/src/share/man/man4/ste.4#2 integrate .. //depot/projects/superpages/src/share/man/man4/ti.4#2 integrate .. //depot/projects/superpages/src/share/man/man4/tl.4#2 integrate .. //depot/projects/superpages/src/share/man/man4/tx.4#2 integrate .. //depot/projects/superpages/src/share/man/man4/txp.4#2 integrate .. //depot/projects/superpages/src/share/man/man4/udav.4#2 integrate .. //depot/projects/superpages/src/share/man/man4/ural.4#2 integrate .. //depot/projects/superpages/src/share/man/man4/vge.4#2 integrate .. //depot/projects/superpages/src/share/man/man4/vlan.4#2 integrate .. //depot/projects/superpages/src/share/man/man4/vr.4#2 integrate .. //depot/projects/superpages/src/share/man/man4/wb.4#2 integrate .. //depot/projects/superpages/src/share/man/man4/wi.4#2 integrate .. //depot/projects/superpages/src/share/man/man4/xe.4#2 integrate .. //depot/projects/superpages/src/share/man/man4/xl.4#2 integrate .. //depot/projects/superpages/src/share/man/man5/make.conf.5#2 integrate .. //depot/projects/superpages/src/share/man/man5/style.Makefile.5#2 integrate .. //depot/projects/superpages/src/share/man/man7/build.7#2 integrate .. //depot/projects/superpages/src/share/man/man7/development.7#2 integrate .. //depot/projects/superpages/src/share/man/man7/release.7#2 integrate .. //depot/projects/superpages/src/share/man/man8/diskless.8#2 integrate .. //depot/projects/superpages/src/share/man/man9/EVENTHANDLER.9#2 integrate .. //depot/projects/superpages/src/share/man/man9/Makefile#2 integrate .. //depot/projects/superpages/src/share/man/man9/critical_enter.9#2 integrate .. //depot/projects/superpages/src/share/man/man9/device_get_softc.9#2 integrate .. //depot/projects/superpages/src/share/man/man9/microtime.9#2 integrate .. //depot/projects/superpages/src/sys/amd64/conf/NOTES#2 integrate .. //depot/projects/superpages/src/sys/amd64/ia32/ia32_reg.c#2 integrate .. //depot/projects/superpages/src/sys/arm/arm/bcopy_page.S#2 integrate .. //depot/projects/superpages/src/sys/arm/arm/genassym.c#2 integrate .. //depot/projects/superpages/src/sys/arm/arm/swtch.S#3 integrate .. //depot/projects/superpages/src/sys/arm/conf/IQ31244#3 integrate .. //depot/projects/superpages/src/sys/arm/conf/SIMICS#2 integrate .. //depot/projects/superpages/src/sys/arm/include/pmap.h#4 integrate .. //depot/projects/superpages/src/sys/arm/xscale/i80321/iq31244_machdep.c#3 integrate .. //depot/projects/superpages/src/sys/compat/ndis/kern_ndis.c#2 integrate .. //depot/projects/superpages/src/sys/compat/ndis/kern_windrv.c#2 integrate .. //depot/projects/superpages/src/sys/compat/ndis/ndis_var.h#2 integrate .. //depot/projects/superpages/src/sys/compat/ndis/ntoskrnl_var.h#2 integrate .. //depot/projects/superpages/src/sys/compat/ndis/subr_hal.c#2 integrate .. //depot/projects/superpages/src/sys/compat/ndis/subr_ndis.c#2 integrate .. //depot/projects/superpages/src/sys/compat/ndis/subr_ntoskrnl.c#2 integrate .. //depot/projects/superpages/src/sys/compat/ndis/winx32_wrap.S#2 integrate .. //depot/projects/superpages/src/sys/conf/Makefile.arm#3 integrate .. //depot/projects/superpages/src/sys/conf/NOTES#4 integrate .. //depot/projects/superpages/src/sys/conf/files#4 integrate .. //depot/projects/superpages/src/sys/conf/files.arm#2 integrate .. //depot/projects/superpages/src/sys/conf/kern.pre.mk#2 integrate .. //depot/projects/superpages/src/sys/conf/kmod.mk#2 integrate .. //depot/projects/superpages/src/sys/conf/options#3 integrate .. //depot/projects/superpages/src/sys/contrib/dev/oltr/if_oltr_pci.c#2 integrate .. //depot/projects/superpages/src/sys/contrib/pf/net/if_pflog.c#2 integrate .. //depot/projects/superpages/src/sys/contrib/pf/net/if_pfsync.c#2 integrate .. //depot/projects/superpages/src/sys/dev/aac/aac.c#2 integrate .. //depot/projects/superpages/src/sys/dev/aac/aac_cam.c#2 integrate .. //depot/projects/superpages/src/sys/dev/aac/aac_debug.c#2 integrate .. //depot/projects/superpages/src/sys/dev/aac/aac_pci.c#2 integrate .. //depot/projects/superpages/src/sys/dev/aac/aac_tables.h#2 integrate .. //depot/projects/superpages/src/sys/dev/aac/aacreg.h#2 integrate .. //depot/projects/superpages/src/sys/dev/aac/aacvar.h#2 integrate .. //depot/projects/superpages/src/sys/dev/ata/ata-all.h#2 integrate .. //depot/projects/superpages/src/sys/dev/ata/ata-chipset.c#2 integrate .. //depot/projects/superpages/src/sys/dev/ata/ata-dma.c#2 integrate .. //depot/projects/superpages/src/sys/dev/ata/ata-pci.c#2 integrate .. //depot/projects/superpages/src/sys/dev/ata/ata-pci.h#2 integrate .. //depot/projects/superpages/src/sys/dev/ata/ata-raid.c#2 integrate .. //depot/projects/superpages/src/sys/dev/ata/atapi-cd.c#2 integrate .. //depot/projects/superpages/src/sys/dev/dc/dcphy.c#1 branch .. //depot/projects/superpages/src/sys/dev/dc/if_dc.c#1 branch .. //depot/projects/superpages/src/sys/dev/dc/if_dcreg.h#1 branch .. //depot/projects/superpages/src/sys/dev/dc/pnphy.c#1 branch .. //depot/projects/superpages/src/sys/dev/ed/ax88x90reg.h#1 branch .. //depot/projects/superpages/src/sys/dev/ed/dl100xxreg.h#1 branch .. //depot/projects/superpages/src/sys/dev/ed/if_ed_isa.c#2 integrate .. //depot/projects/superpages/src/sys/dev/ed/if_ed_pccard.c#2 integrate .. //depot/projects/superpages/src/sys/dev/ed/if_ed_pci.c#2 integrate .. //depot/projects/superpages/src/sys/dev/ed/if_ed_rtl80x9.c#1 branch .. //depot/projects/superpages/src/sys/dev/ed/if_edreg.h#2 integrate .. //depot/projects/superpages/src/sys/dev/ed/if_edvar.h#2 integrate .. //depot/projects/superpages/src/sys/dev/ed/rtl80x9reg.h#1 branch .. //depot/projects/superpages/src/sys/dev/ed/tc5299jreg.h#1 branch .. //depot/projects/superpages/src/sys/dev/em/if_em.c#2 integrate .. //depot/projects/superpages/src/sys/dev/exca/exca.c#2 integrate .. //depot/projects/superpages/src/sys/dev/firewire/if_fwe.c#2 integrate .. //depot/projects/superpages/src/sys/dev/firewire/if_fwip.c#2 integrate .. //depot/projects/superpages/src/sys/dev/fxp/if_fxp.c#2 integrate .. //depot/projects/superpages/src/sys/dev/hwpmc/hwpmc_piv.c#2 integrate .. //depot/projects/superpages/src/sys/dev/if_ndis/if_ndis.c#2 integrate .. //depot/projects/superpages/src/sys/dev/if_ndis/if_ndisvar.h#2 integrate .. //depot/projects/superpages/src/sys/dev/iwi/if_iwi.c#2 integrate .. //depot/projects/superpages/src/sys/dev/iwi/if_iwireg.h#2 integrate .. //depot/projects/superpages/src/sys/dev/ixgb/if_ixgb.c#2 integrate .. //depot/projects/superpages/src/sys/dev/lmc/if_lmc.c#2 integrate .. //depot/projects/superpages/src/sys/dev/md/md.c#2 integrate .. //depot/projects/superpages/src/sys/dev/mpt/mpt.c#2 integrate .. //depot/projects/superpages/src/sys/dev/nge/if_nge.c#2 integrate .. //depot/projects/superpages/src/sys/dev/nge/if_ngereg.h#2 integrate .. //depot/projects/superpages/src/sys/dev/pccard/pccarddevs#2 integrate .. //depot/projects/superpages/src/sys/dev/pccbb/pccbb.c#2 integrate .. //depot/projects/superpages/src/sys/dev/pccbb/pccbb_isa.c#2 integrate .. //depot/projects/superpages/src/sys/dev/pccbb/pccbb_pci.c#2 integrate .. //depot/projects/superpages/src/sys/dev/pccbb/pccbbvar.h#2 integrate .. //depot/projects/superpages/src/sys/dev/re/if_re.c#2 integrate .. //depot/projects/superpages/src/sys/dev/sound/pci/als4000.c#2 integrate .. //depot/projects/superpages/src/sys/dev/sound/pci/ich.c#2 integrate .. //depot/projects/superpages/src/sys/dev/sound/pci/via8233.c#2 integrate .. //depot/projects/superpages/src/sys/dev/sound/pci/via82c686.c#2 integrate .. //depot/projects/superpages/src/sys/dev/vge/if_vge.c#2 integrate .. //depot/projects/superpages/src/sys/dev/vx/if_vx.c#2 integrate .. //depot/projects/superpages/src/sys/dev/vx/if_vx_eisa.c#2 integrate .. //depot/projects/superpages/src/sys/dev/vx/if_vx_pci.c#2 integrate .. //depot/projects/superpages/src/sys/dev/vx/if_vxvar.h#2 integrate .. //depot/projects/superpages/src/sys/dev/xe/if_xereg.h#2 integrate .. //depot/projects/superpages/src/sys/fs/udf/udf_vfsops.c#2 integrate .. //depot/projects/superpages/src/sys/geom/geom_gpt.c#2 integrate .. //depot/projects/superpages/src/sys/i386/conf/NOTES#2 integrate .. //depot/projects/superpages/src/sys/i386/i386/vm_machdep.c#2 integrate .. //depot/projects/superpages/src/sys/i386/include/trap.h#2 integrate .. //depot/projects/superpages/src/sys/ia64/ia64/nexus.c#2 integrate .. //depot/projects/superpages/src/sys/kern/kern_clock.c#2 integrate .. //depot/projects/superpages/src/sys/kern/kern_descrip.c#2 integrate .. //depot/projects/superpages/src/sys/kern/kern_event.c#2 integrate .. //depot/projects/superpages/src/sys/kern/kern_exec.c#3 integrate .. //depot/projects/superpages/src/sys/kern/kern_mac.c#2 integrate .. //depot/projects/superpages/src/sys/kern/kern_poll.c#3 integrate .. //depot/projects/superpages/src/sys/kern/kern_uuid.c#2 integrate .. //depot/projects/superpages/src/sys/kern/subr_bus.c#2 integrate .. //depot/projects/superpages/src/sys/kern/subr_rman.c#2 integrate .. //depot/projects/superpages/src/sys/kern/sysv_shm.c#2 integrate .. //depot/projects/superpages/src/sys/kern/vfs_aio.c#2 integrate .. //depot/projects/superpages/src/sys/kern/vfs_bio.c#3 integrate .. //depot/projects/superpages/src/sys/kern/vfs_subr.c#2 integrate .. //depot/projects/superpages/src/sys/modules/ed/Makefile#2 integrate .. //depot/projects/superpages/src/sys/modules/lmc/Makefile#2 integrate .. //depot/projects/superpages/src/sys/net/bpf.c#2 integrate .. //depot/projects/superpages/src/sys/net/bridgestp.c#2 integrate .. //depot/projects/superpages/src/sys/net/if_bridge.c#3 integrate .. //depot/projects/superpages/src/sys/net/if_bridgevar.h#2 integrate .. //depot/projects/superpages/src/sys/net/if_clone.c#2 integrate .. //depot/projects/superpages/src/sys/net/if_disc.c#2 integrate .. //depot/projects/superpages/src/sys/net/if_ethersubr.c#2 integrate .. //depot/projects/superpages/src/sys/net/if_faith.c#2 integrate .. //depot/projects/superpages/src/sys/net/if_fwsubr.c#2 integrate .. //depot/projects/superpages/src/sys/net/if_gif.c#2 integrate .. //depot/projects/superpages/src/sys/net/if_gre.c#2 integrate .. //depot/projects/superpages/src/sys/net/if_ppp.c#2 integrate .. //depot/projects/superpages/src/sys/net/if_stf.c#2 integrate .. //depot/projects/superpages/src/sys/net/netisr.c#3 integrate .. //depot/projects/superpages/src/sys/netgraph/ng_base.c#2 integrate .. //depot/projects/superpages/src/sys/netgraph/ng_ether.c#2 integrate .. //depot/projects/superpages/src/sys/netgraph/ng_iface.c#2 integrate .. //depot/projects/superpages/src/sys/netgraph/ng_tty.c#2 integrate .. //depot/projects/superpages/src/sys/netinet/if_ether.c#2 integrate .. //depot/projects/superpages/src/sys/netinet/ip_carp.c#2 integrate .. //depot/projects/superpages/src/sys/netinet/raw_ip.c#2 integrate .. //depot/projects/superpages/src/sys/netinet/tcp_subr.c#3 edit .. //depot/projects/superpages/src/sys/netinet/udp_usrreq.c#2 integrate .. //depot/projects/superpages/src/sys/netinet6/esp_aesctr.c#2 integrate .. //depot/projects/superpages/src/sys/nfsclient/nfs_diskless.c#2 integrate .. //depot/projects/superpages/src/sys/pc98/conf/NOTES#2 integrate .. //depot/projects/superpages/src/sys/pci/if_dc.c#2 integrate .. //depot/projects/superpages/src/sys/pci/if_pcn.c#2 integrate .. //depot/projects/superpages/src/sys/pci/if_rl.c#2 integrate .. //depot/projects/superpages/src/sys/pci/if_sf.c#2 integrate .. //depot/projects/superpages/src/sys/pci/if_sis.c#2 integrate .. //depot/projects/superpages/src/sys/pci/if_sk.c#2 integrate .. //depot/projects/superpages/src/sys/pci/if_ste.c#2 integrate .. //depot/projects/superpages/src/sys/pci/if_ti.c#2 integrate .. //depot/projects/superpages/src/sys/pci/if_tl.c#2 integrate .. //depot/projects/superpages/src/sys/pci/if_vr.c#2 integrate .. //depot/projects/superpages/src/sys/pci/if_wb.c#2 integrate .. //depot/projects/superpages/src/sys/pci/if_xl.c#2 integrate .. //depot/projects/superpages/src/sys/security/mac/mac_process.c#2 integrate .. //depot/projects/superpages/src/sys/sys/cdefs.h#2 integrate .. //depot/projects/superpages/src/sys/sys/event.h#2 integrate .. //depot/projects/superpages/src/sys/sys/libkern.h#2 integrate .. //depot/projects/superpages/src/sys/sys/param.h#2 integrate .. //depot/projects/superpages/src/sys/sys/rman.h#2 integrate .. //depot/projects/superpages/src/sys/sys/signal.h#2 integrate .. //depot/projects/superpages/src/sys/sys/signalvar.h#2 integrate .. //depot/projects/superpages/src/sys/sys/uuid.h#2 integrate .. //depot/projects/superpages/src/sys/sys/vnode.h#2 integrate .. //depot/projects/superpages/src/sys/ufs/ffs/ffs_alloc.c#3 integrate .. //depot/projects/superpages/src/sys/ufs/ffs/ffs_snapshot.c#2 integrate .. //depot/projects/superpages/src/sys/ufs/ffs/ffs_vfsops.c#2 integrate .. //depot/projects/superpages/src/sys/ufs/ffs/ffs_vnops.c#2 integrate .. //depot/projects/superpages/src/sys/ufs/ufs/ufs_extattr.c#2 integrate .. //depot/projects/superpages/src/sys/ufs/ufs/ufs_vnops.c#2 integrate .. //depot/projects/superpages/src/sys/vm/uma.h#2 integrate .. //depot/projects/superpages/src/sys/vm/uma_core.c#2 integrate .. //depot/projects/superpages/src/sys/vm/vm_mmap.c#2 integrate .. //depot/projects/superpages/src/sys/vm/vm_page.c#3 integrate .. //depot/projects/superpages/src/tools/regression/aio/kqueue/lio/Makefile#2 integrate .. //depot/projects/superpages/src/tools/regression/geom_gpt/gctl.t#2 integrate .. //depot/projects/superpages/src/tools/regression/lib/libutil/Makefile#1 branch .. //depot/projects/superpages/src/tools/regression/lib/libutil/test-trimdomain-nodomain.c#1 branch .. //depot/projects/superpages/src/tools/regression/lib/libutil/test-trimdomain-nodomain.t#1 branch .. //depot/projects/superpages/src/tools/regression/lib/libutil/test-trimdomain.c#1 branch .. //depot/projects/superpages/src/tools/regression/lib/libutil/test-trimdomain.t#1 branch .. //depot/projects/superpages/src/tools/tools/README#2 integrate .. //depot/projects/superpages/src/tools/tools/iwi/Makefile#1 branch .. //depot/projects/superpages/src/tools/tools/iwi/iwistats.c#1 branch .. //depot/projects/superpages/src/tools/tools/netrate/http/Makefile#1 branch .. //depot/projects/superpages/src/tools/tools/netrate/http/http.c#1 branch .. //depot/projects/superpages/src/tools/tools/netrate/httpd/Makefile#1 branch .. //depot/projects/superpages/src/tools/tools/netrate/httpd/httpd.c#1 branch .. //depot/projects/superpages/src/tools/tools/netrate/tcpconnect/Makefile#1 branch .. //depot/projects/superpages/src/tools/tools/netrate/tcpconnect/tcpconnect.c#1 branch .. //depot/projects/superpages/src/tools/tools/netrate/tcpreceive/Makefile#1 branch .. //depot/projects/superpages/src/tools/tools/netrate/tcpreceive/tcpreceive.c#1 branch .. //depot/projects/superpages/src/tools/tools/tinderbox/etc/releng_6.rc#2 integrate .. //depot/projects/superpages/src/tools/tools/tinderbox/etc/update_releng_6.rc#2 integrate .. //depot/projects/superpages/src/usr.bin/calendar/calendars/calendar.freebsd#2 integrate .. //depot/projects/superpages/src/usr.bin/gprof/gprof.1#2 integrate .. //depot/projects/superpages/src/usr.bin/gprof/printgprof.c#2 integrate .. //depot/projects/superpages/src/usr.bin/lockf/lockf.c#2 integrate .. //depot/projects/superpages/src/usr.bin/mail/mail.1#2 integrate .. //depot/projects/superpages/src/usr.bin/mail/main.c#2 integrate .. //depot/projects/superpages/src/usr.bin/make/job.c#2 integrate .. //depot/projects/superpages/src/usr.bin/make/make.1#2 integrate .. //depot/projects/superpages/src/usr.sbin/Makefile#3 integrate .. //depot/projects/superpages/src/usr.sbin/bsnmpd/bsnmpd/Makefile#2 integrate .. //depot/projects/superpages/src/usr.sbin/bsnmpd/gensnmptree/Makefile#2 integrate .. //depot/projects/superpages/src/usr.sbin/bsnmpd/modules/Makefile.inc#2 integrate .. //depot/projects/superpages/src/usr.sbin/pkg_install/delete/main.c#2 integrate .. //depot/projects/superpages/src/usr.sbin/pkg_install/info/main.c#2 integrate .. //depot/projects/superpages/src/usr.sbin/pkg_install/version/perform.c#2 integrate .. //depot/projects/superpages/src/usr.sbin/pkg_install/version/test-pkg_version.sh#2 integrate .. //depot/projects/superpages/src/usr.sbin/setkey/Makefile#2 delete .. //depot/projects/superpages/src/usr.sbin/setkey/parse.y#2 delete .. //depot/projects/superpages/src/usr.sbin/setkey/sample.cf#2 delete .. //depot/projects/superpages/src/usr.sbin/setkey/scriptdump.pl#2 delete .. //depot/projects/superpages/src/usr.sbin/setkey/setkey.8#2 delete .. //depot/projects/superpages/src/usr.sbin/setkey/setkey.c#2 delete .. //depot/projects/superpages/src/usr.sbin/setkey/test-pfkey.c#2 delete .. //depot/projects/superpages/src/usr.sbin/setkey/test-policy.c#2 delete .. //depot/projects/superpages/src/usr.sbin/setkey/token.l#2 delete .. //depot/projects/superpages/src/usr.sbin/setkey/vchar.h#2 delete .. //depot/projects/superpages/src/usr.sbin/sysinstall/devices.c#2 integrate .. //depot/projects/superpages/src/usr.sbin/wpa/Makefile#2 integrate .. //depot/projects/superpages/src/usr.sbin/wpa/ndis_events/Makefile#1 branch .. //depot/projects/superpages/src/usr.sbin/wpa/ndis_events/ndis_events.8#1 branch .. //depot/projects/superpages/src/usr.sbin/wpa/ndis_events/ndis_events.c#1 branch .. //depot/projects/superpages/src/usr.sbin/wpa/wpa_supplicant/Makefile#2 integrate .. //depot/projects/superpages/src/usr.sbin/wpa/wpa_supplicant/Packet32.c#1 branch .. //depot/projects/superpages/src/usr.sbin/wpa/wpa_supplicant/Packet32.h#1 branch .. //depot/projects/superpages/src/usr.sbin/wpa/wpa_supplicant/ntddndis.h#1 branch .. //depot/projects/superpages/www/de/releases/4.11R/relnotes.sgml#2 integrate .. //depot/projects/superpages/www/de/releases/4.6.2R/relnotes.sgml#2 integrate .. //depot/projects/superpages/www/de/releases/4.7R/relnotes.sgml#2 integrate .. //depot/projects/superpages/www/de/releases/4.8R/relnotes.sgml#2 integrate .. //depot/projects/superpages/www/de/releases/4.9R/relnotes.sgml#2 integrate .. //depot/projects/superpages/www/de/releases/5.0R/relnotes.sgml#2 integrate .. //depot/projects/superpages/www/de/releases/5.1R/relnotes.sgml#2 integrate .. //depot/projects/superpages/www/de/releases/5.2R/relnotes.sgml#2 integrate .. //depot/projects/superpages/www/de/releases/5.3R/relnotes.sgml#2 integrate .. //depot/projects/superpages/www/en/Makefile#2 integrate .. //depot/projects/superpages/www/en/about.sgml#1 branch .. //depot/projects/superpages/www/en/art.sgml#2 integrate .. //depot/projects/superpages/www/en/cgi/Makefile#2 integrate .. //depot/projects/superpages/www/en/cgi/reg.cgi#2 delete .. //depot/projects/superpages/www/en/commercial/commercial.sgml#2 integrate .. //depot/projects/superpages/www/en/commercial/consult.xml#3 integrate .. //depot/projects/superpages/www/en/commercial/consult_bycat.xsl#2 integrate .. //depot/projects/superpages/www/en/commercial/entries.xsl#2 integrate .. //depot/projects/superpages/www/en/commercial/hardware.xml#2 integrate .. //depot/projects/superpages/www/en/commercial/isp.xml#3 integrate .. //depot/projects/superpages/www/en/commercial/soft_bycat.xsl#2 integrate .. //depot/projects/superpages/www/en/community.sgml#1 branch .. //depot/projects/superpages/www/en/community/irc.sgml#2 integrate .. //depot/projects/superpages/www/en/community/mailinglists.sgml#2 integrate .. //depot/projects/superpages/www/en/community/newsgroups.sgml#2 integrate .. //depot/projects/superpages/www/en/community/webresources.sgml#2 integrate .. //depot/projects/superpages/www/en/copyright/copyright.sgml#2 integrate .. //depot/projects/superpages/www/en/copyright/daemon.sgml#2 integrate .. //depot/projects/superpages/www/en/copyright/freebsd-doc-license.sgml#2 integrate .. //depot/projects/superpages/www/en/copyright/freebsd-license.sgml#2 integrate .. //depot/projects/superpages/www/en/copyright/license.sgml#2 integrate .. //depot/projects/superpages/www/en/copyright/trademarks.sgml#2 integrate .. //depot/projects/superpages/www/en/developers/cvs.sgml#2 integrate .. //depot/projects/superpages/www/en/docproj/current.sgml#2 integrate .. //depot/projects/superpages/www/en/docproj/doc-set.sgml#2 integrate .. //depot/projects/superpages/www/en/docproj/docproj.sgml#2 integrate .. //depot/projects/superpages/www/en/docproj/sgml.sgml#2 integrate .. //depot/projects/superpages/www/en/docproj/submitting.sgml#2 integrate .. //depot/projects/superpages/www/en/docproj/translations.sgml#2 integrate .. //depot/projects/superpages/www/en/docproj/who.sgml#2 integrate .. //depot/projects/superpages/www/en/docs.sgml#2 integrate .. //depot/projects/superpages/www/en/docs/books.sgml#2 integrate .. //depot/projects/superpages/www/en/docs/man.sgml#2 integrate .. //depot/projects/superpages/www/en/docs/webresources.sgml#2 integrate .. //depot/projects/superpages/www/en/donations/donors.sgml#2 integrate .. //depot/projects/superpages/www/en/donations/index.sgml#2 integrate .. //depot/projects/superpages/www/en/donations/wantlist.sgml#3 integrate .. //depot/projects/superpages/www/en/events/2002/bsdcon-devsummit.sgml#2 integrate .. //depot/projects/superpages/www/en/events/2002/usenix-devsummit.sgml#2 integrate .. //depot/projects/superpages/www/en/events/2003/bsdcon-devsummit.sgml#2 integrate .. //depot/projects/superpages/www/en/events/Makefile#2 integrate .. //depot/projects/superpages/www/en/events/events.xml#2 integrate .. //depot/projects/superpages/www/en/events/events.xsl#2 integrate .. //depot/projects/superpages/www/en/features.sgml#2 integrate .. //depot/projects/superpages/www/en/gnome/contact.sgml#2 integrate .. //depot/projects/superpages/www/en/gnome/docs/bugging.sgml#2 integrate .. //depot/projects/superpages/www/en/gnome/docs/develfaq.sgml#2 integrate .. //depot/projects/superpages/www/en/gnome/docs/example-Makefile.sgml#2 integrate .. //depot/projects/superpages/www/en/gnome/docs/faq2.sgml#2 integrate .. //depot/projects/superpages/www/en/gnome/docs/faq210.sgml#2 integrate .. //depot/projects/superpages/www/en/gnome/docs/faq28.sgml#2 integrate .. //depot/projects/superpages/www/en/gnome/docs/gnome1_porting.sgml#2 integrate .. //depot/projects/superpages/www/en/gnome/docs/gnome2_porting.sgml#2 integrate .. //depot/projects/superpages/www/en/gnome/docs/gnome_porting.sgml#2 integrate .. //depot/projects/superpages/www/en/gnome/docs/porting.sgml#2 integrate .. //depot/projects/superpages/www/en/gnome/docs/volunteer.sgml#2 integrate .. //depot/projects/superpages/www/en/gnome/index.xsl#2 integrate .. //depot/projects/superpages/www/en/gnome/news.xml#2 integrate .. //depot/projects/superpages/www/en/gnome/newsflash.xsl#2 integrate .. //depot/projects/superpages/www/en/gnome/screenshots.sgml#2 integrate .. //depot/projects/superpages/www/en/includes.navabout.sgml#2 integrate .. //depot/projects/superpages/www/en/includes.navcommunity.sgml#2 integrate .. //depot/projects/superpages/www/en/includes.navdevelopers.sgml#2 integrate .. //depot/projects/superpages/www/en/includes.navdocs.sgml#2 integrate .. //depot/projects/superpages/www/en/includes.navdownload.sgml#2 integrate .. //depot/projects/superpages/www/en/includes.navsupport.sgml#2 integrate .. //depot/projects/superpages/www/en/index.xsl#3 integrate .. //depot/projects/superpages/www/en/internal/about.sgml#2 integrate .. //depot/projects/superpages/www/en/internal/bylaws.sgml#2 integrate .. //depot/projects/superpages/www/en/internal/core-vote.sgml#2 integrate .. //depot/projects/superpages/www/en/internal/developer.sgml#2 integrate .. //depot/projects/superpages/www/en/internal/doceng.sgml#2 integrate .. //depot/projects/superpages/www/en/internal/expire-bits.sgml#2 integrate .. //depot/projects/superpages/www/en/internal/fortunes.sgml#2 integrate .. //depot/projects/superpages/www/en/internal/homepage.sgml#2 integrate .. //depot/projects/superpages/www/en/internal/internal.sgml#2 integrate .. //depot/projects/superpages/www/en/internal/machines.sgml#2 integrate .. //depot/projects/superpages/www/en/internal/mirror.sgml#2 integrate .. //depot/projects/superpages/www/en/internal/new-account.sgml#2 integrate .. //depot/projects/superpages/www/en/internal/photos.sgml#2 integrate .. //depot/projects/superpages/www/en/internal/policies.sgml#2 integrate .. //depot/projects/superpages/www/en/internal/releng.sgml#2 integrate .. //depot/projects/superpages/www/en/internal/rtp.sgml#2 integrate .. //depot/projects/superpages/www/en/internal/statistic.sgml#2 integrate .. //depot/projects/superpages/www/en/internet.sgml#2 integrate .. //depot/projects/superpages/www/en/java/advocacy.sgml#2 integrate .. //depot/projects/superpages/www/en/java/dists/10.sgml#2 integrate .. //depot/projects/superpages/www/en/java/dists/11.sgml#2 integrate .. //depot/projects/superpages/www/en/java/dists/12.sgml#2 integrate .. //depot/projects/superpages/www/en/java/dists/13.sgml#2 integrate .. //depot/projects/superpages/www/en/java/dists/14.sgml#2 integrate .. //depot/projects/superpages/www/en/java/dists/15.sgml#2 integrate .. //depot/projects/superpages/www/en/java/dists/index.sgml#2 integrate .. //depot/projects/superpages/www/en/java/docs/faq.sgml#2 integrate .. //depot/projects/superpages/www/en/java/docs/howtoports.sgml#2 integrate .. //depot/projects/superpages/www/en/java/docs/newbies.sgml#2 integrate .. //depot/projects/superpages/www/en/java/docs/performance.sgml#2 integrate .. //depot/projects/superpages/www/en/java/docs/tutorials.sgml#2 integrate .. //depot/projects/superpages/www/en/java/howhelp.sgml#2 integrate .. //depot/projects/superpages/www/en/java/index.sgml#2 integrate .. //depot/projects/superpages/www/en/java/install.sgml#2 integrate .. //depot/projects/superpages/www/en/java/links/api.sgml#2 integrate .. //depot/projects/superpages/www/en/java/links/development.sgml#2 integrate .. //depot/projects/superpages/www/en/java/links/documentation.sgml#2 integrate .. //depot/projects/superpages/www/en/java/links/freebsd.sgml#2 integrate .. //depot/projects/superpages/www/en/java/links/index.sgml#2 integrate .. //depot/projects/superpages/www/en/java/links/resources.sgml#2 integrate .. //depot/projects/superpages/www/en/java/links/servlets.sgml#2 integrate .. //depot/projects/superpages/www/en/java/links/tools.sgml#2 integrate .. //depot/projects/superpages/www/en/java/links/tutorials.sgml#2 integrate .. //depot/projects/superpages/www/en/java/links/vendor.sgml#2 integrate .. //depot/projects/superpages/www/en/java/newsflash.sgml#2 integrate .. //depot/projects/superpages/www/en/kse/index.sgml#2 integrate .. //depot/projects/superpages/www/en/layout/css/fixed.css#2 integrate .. //depot/projects/superpages/www/en/layout/css/fixed_large.css#2 integrate .. //depot/projects/superpages/www/en/layout/css/global.css#2 integrate .. //depot/projects/superpages/www/en/layout/css/iefixes.css#2 integrate .. //depot/projects/superpages/www/en/layout/css/layout.css#2 integrate .. //depot/projects/superpages/www/en/layout/css/navigation.css#2 integrate .. //depot/projects/superpages/www/en/layout/css/table.css#2 integrate .. //depot/projects/superpages/www/en/layout/css/text.css#2 integrate .. //depot/projects/superpages/www/en/mailto.sgml#2 integrate .. //depot/projects/superpages/www/en/marketing/index.sgml#2 integrate .. //depot/projects/superpages/www/en/marketing/os-comparison.sgml#2 integrate .. //depot/projects/superpages/www/en/navigation.xml#2 integrate .. //depot/projects/superpages/www/en/news/1996/index.sgml#2 integrate .. //depot/projects/superpages/www/en/news/1997/index.sgml#2 integrate .. //depot/projects/superpages/www/en/news/1998/index.sgml#2 integrate .. //depot/projects/superpages/www/en/news/1999/index.sgml#2 integrate .. //depot/projects/superpages/www/en/news/2000/index.sgml#2 integrate .. //depot/projects/superpages/www/en/news/news.sgml#2 integrate .. //depot/projects/superpages/www/en/news/news.xml#3 integrate .. //depot/projects/superpages/www/en/news/press-rel-1.sgml#2 integrate .. //depot/projects/superpages/www/en/news/press-rel-2.sgml#2 integrate .. //depot/projects/superpages/www/en/news/press-rel-3.sgml#2 integrate .. //depot/projects/superpages/www/en/news/press-rel-4.sgml#2 integrate .. //depot/projects/superpages/www/en/news/press-rel-5.sgml#2 integrate .. //depot/projects/superpages/www/en/news/press-rel-6.sgml#2 integrate .. //depot/projects/superpages/www/en/news/press-rel-7.sgml#2 integrate .. //depot/projects/superpages/www/en/news/press.xml#2 integrate .. //depot/projects/superpages/www/en/news/pressreleases.sgml#2 integrate .. //depot/projects/superpages/www/en/news/sou1999.sgml#2 integrate .. //depot/projects/superpages/www/en/news/status/report.xsl#2 integrate .. //depot/projects/superpages/www/en/news/status/status.sgml#2 integrate .. //depot/projects/superpages/www/en/platforms/alpha.sgml#2 integrate .. //depot/projects/superpages/www/en/platforms/amd64.sgml#2 integrate .. //depot/projects/superpages/www/en/platforms/amd64/motherboards.sgml#2 integrate .. //depot/projects/superpages/www/en/platforms/arm.sgml#2 integrate .. //depot/projects/superpages/www/en/platforms/i386.sgml#2 integrate .. //depot/projects/superpages/www/en/platforms/ia64.sgml#2 integrate .. //depot/projects/superpages/www/en/platforms/ia64/index.xsl#2 integrate .. //depot/projects/superpages/www/en/platforms/ia64/machines.sgml#2 integrate .. //depot/projects/superpages/www/en/platforms/ia64/refs.sgml#2 integrate .. //depot/projects/superpages/www/en/platforms/ia64/todo.xsl#2 integrate .. //depot/projects/superpages/www/en/platforms/index.sgml#2 integrate .. //depot/projects/superpages/www/en/platforms/mips.sgml#2 integrate .. //depot/projects/superpages/www/en/platforms/pc98.sgml#2 integrate .. //depot/projects/superpages/www/en/platforms/ppc.sgml#2 integrate .. //depot/projects/superpages/www/en/platforms/sparc.sgml#2 integrate .. //depot/projects/superpages/www/en/platforms/x86-64.sgml#2 integrate .. //depot/projects/superpages/www/en/portmgr/charter.sgml#2 integrate .. //depot/projects/superpages/www/en/portmgr/index.sgml#2 integrate .. //depot/projects/superpages/www/en/portmgr/policies.sgml#2 integrate .. //depot/projects/superpages/www/en/portmgr/qa.sgml#2 integrate .. //depot/projects/superpages/www/en/ports/portindex#2 integrate .. //depot/projects/superpages/www/en/projects/acpi/completed.sgml#2 integrate .. //depot/projects/superpages/www/en/projects/acpi/index.sgml#2 integrate .. //depot/projects/superpages/www/en/projects/bigdisk/index.sgml#2 integrate .. //depot/projects/superpages/www/en/projects/busdma/index.sgml#2 integrate .. //depot/projects/superpages/www/en/projects/cvsweb.sgml#2 integrate .. //depot/projects/superpages/www/en/projects/dingo/index.sgml#2 integrate .. //depot/projects/superpages/www/en/projects/mac/index.sgml#2 integrate .. //depot/projects/superpages/www/en/projects/nanobsd/index.sgml#2 integrate .. //depot/projects/superpages/www/en/projects/netperf/cluster.sgml#2 integrate .. //depot/projects/superpages/www/en/projects/netperf/index.sgml#2 integrate .. //depot/projects/superpages/www/en/projects/newbies.sgml#2 integrate .. //depot/projects/superpages/www/en/projects/projects.sgml#2 integrate .. //depot/projects/superpages/www/en/projects/summerofcode.sgml#2 integrate .. //depot/projects/superpages/www/en/prstats/index.sgml#2 integrate .. //depot/projects/superpages/www/en/publish.sgml#2 integrate .. //depot/projects/superpages/www/en/releases/2.0.5R/announce.sgml#2 integrate .. //depot/projects/superpages/www/en/releases/2.0.5R/notes.sgml#2 integrate .. //depot/projects/superpages/www/en/releases/2.0/announce.sgml#2 integrate .. //depot/projects/superpages/www/en/releases/2.0/credits.sgml#2 integrate .. //depot/projects/superpages/www/en/releases/2.0/install.sgml#2 integrate .. //depot/projects/superpages/www/en/releases/2.0/notes.sgml#2 integrate .. //depot/projects/superpages/www/en/releases/2.1.5R/announce.sgml#2 integrate .. //depot/projects/superpages/www/en/releases/2.1.5R/notes.sgml#2 integrate .. //depot/projects/superpages/www/en/releases/2.1.6R/announce.sgml#2 integrate .. //depot/projects/superpages/www/en/releases/2.1.6R/notes.sgml#2 integrate .. //depot/projects/superpages/www/en/releases/2.1.6R/security.sgml#2 integrate .. //depot/projects/superpages/www/en/releases/2.1.7R/announce.sgml#2 integrate .. //depot/projects/superpages/www/en/releases/2.1.7R/notes.sgml#2 integrate .. //depot/projects/superpages/www/en/releases/2.1R/announce.sgml#2 integrate .. //depot/projects/superpages/www/en/releases/2.1R/notes.sgml#2 integrate .. //depot/projects/superpages/www/en/releases/2.2.1R/notes.sgml#2 integrate .. //depot/projects/superpages/www/en/releases/2.2.2R/errata.sgml#2 integrate .. //depot/projects/superpages/www/en/releases/2.2.2R/notes.sgml#2 integrate .. //depot/projects/superpages/www/en/releases/2.2.5R/announce.sgml#2 integrate .. //depot/projects/superpages/www/en/releases/2.2.5R/errata.sgml#2 integrate .. //depot/projects/superpages/www/en/releases/2.2.5R/notes.sgml#2 integrate .. //depot/projects/superpages/www/en/releases/2.2.6R/announce.sgml#2 integrate .. //depot/projects/superpages/www/en/releases/2.2.6R/errata.sgml#2 integrate .. //depot/projects/superpages/www/en/releases/2.2.6R/notes.sgml#2 integrate .. //depot/projects/superpages/www/en/releases/2.2.7R/announce.sgml#2 integrate .. //depot/projects/superpages/www/en/releases/2.2.7R/errata.sgml#2 integrate .. //depot/projects/superpages/www/en/releases/2.2.7R/notes.sgml#2 integrate .. //depot/projects/superpages/www/en/releases/2.2.8R/announce.sgml#2 integrate .. //depot/projects/superpages/www/en/releases/2.2.8R/errata.sgml#2 integrate .. //depot/projects/superpages/www/en/releases/2.2.8R/notes.sgml#2 integrate .. //depot/projects/superpages/www/en/releases/2.2R/announce.sgml#2 integrate .. //depot/projects/superpages/www/en/releases/2.2R/install-media.sgml#2 integrate .. //depot/projects/superpages/www/en/releases/2.2R/notes.sgml#2 integrate .. //depot/projects/superpages/www/en/releases/3.0R/announce.sgml#2 integrate .. //depot/projects/superpages/www/en/releases/3.0R/errata.sgml#2 integrate .. //depot/projects/superpages/www/en/releases/3.0R/notes.sgml#2 integrate .. //depot/projects/superpages/www/en/releases/3.1R/announce.sgml#2 integrate .. //depot/projects/superpages/www/en/releases/3.1R/errata.sgml#2 integrate .. //depot/projects/superpages/www/en/releases/3.1R/notes.sgml#2 integrate .. //depot/projects/superpages/www/en/releases/3.2R/announce.sgml#2 integrate .. //depot/projects/superpages/www/en/releases/3.2R/errata.sgml#2 integrate .. //depot/projects/superpages/www/en/releases/3.2R/notes.sgml#2 integrate .. //depot/projects/superpages/www/en/releases/3.3R/announce.sgml#2 integrate .. //depot/projects/superpages/www/en/releases/3.3R/errata.sgml#2 integrate .. //depot/projects/superpages/www/en/releases/3.3R/notes.sgml#2 integrate .. //depot/projects/superpages/www/en/releases/3.4R/announce.sgml#2 integrate .. //depot/projects/superpages/www/en/releases/3.4R/errata.sgml#2 integrate .. //depot/projects/superpages/www/en/releases/3.4R/notes.sgml#2 integrate .. //depot/projects/superpages/www/en/releases/3.5R/announce.sgml#2 integrate .. //depot/projects/superpages/www/en/releases/3.5R/errata.sgml#2 integrate .. //depot/projects/superpages/www/en/releases/3.5R/notes.sgml#2 integrate .. //depot/projects/superpages/www/en/releases/4.0R/announce.sgml#2 integrate .. //depot/projects/superpages/www/en/releases/4.0R/errata.sgml#2 integrate .. //depot/projects/superpages/www/en/releases/4.0R/notes.sgml#2 integrate .. //depot/projects/superpages/www/en/releases/4.1.1R/errata.sgml#2 integrate .. //depot/projects/superpages/www/en/releases/4.1.1R/notes.sgml#2 integrate .. //depot/projects/superpages/www/en/releases/4.1R/errata.sgml#2 integrate .. //depot/projects/superpages/www/en/releases/4.1R/notes.sgml#2 integrate .. //depot/projects/superpages/www/en/releases/4.2R/errata.sgml#2 integrate .. //depot/projects/superpages/www/en/releases/4.2R/notes.sgml#2 integrate .. //depot/projects/superpages/www/en/releases/4.3R/errata.sgml#2 integrate .. //depot/projects/superpages/www/en/releases/4.3R/notes.sgml#2 integrate .. //depot/projects/superpages/www/en/releases/4.5R/contents.sgml#2 integrate .. //depot/projects/superpages/www/en/releases/4.5R/qa.sgml#2 integrate .. //depot/projects/superpages/www/en/releases/4.5R/schedule.sgml#2 integrate .. //depot/projects/superpages/www/en/releases/6.0R/approvals.sgml#2 integrate .. //depot/projects/superpages/www/en/releases/6.0R/schedule.sgml#3 integrate .. //depot/projects/superpages/www/en/releases/6.0R/todo.sgml#3 integrate .. //depot/projects/superpages/www/en/releases/index.sgml#2 integrate .. //depot/projects/superpages/www/en/releng/charter.sgml#2 integrate .. //depot/projects/superpages/www/en/releng/index.sgml#2 integrate .. //depot/projects/superpages/www/en/relnotes.sgml#3 integrate .. //depot/projects/superpages/www/en/security/charter.sgml#2 integrate .. //depot/projects/superpages/www/en/security/security.sgml#2 integrate .. //depot/projects/superpages/www/en/smp/index.sgml#2 integrate .. //depot/projects/superpages/www/en/snapshots/index.sgml#2 integrate .. //depot/projects/superpages/www/en/support.sgml#2 integrate .. //depot/projects/superpages/www/en/support/bugreports.sgml#2 integrate .. //depot/projects/superpages/www/en/tutorials/index.sgml#2 integrate .. //depot/projects/superpages/www/en/where.sgml#2 integrate .. //depot/projects/superpages/www/en/y2kbug.sgml#2 integrate .. //depot/projects/superpages/www/es/about.sgml#1 branch .. //depot/projects/superpages/www/es/includes.sgml#3 integrate .. //depot/projects/superpages/www/es/includes.xsl#3 integrate .. //depot/projects/superpages/www/es/index.xsl#3 integrate .. //depot/projects/superpages/www/es/publish.sgml#3 integrate .. //depot/projects/superpages/www/es/releases/index.sgml#2 integrate .. //depot/projects/superpages/www/es/support.sgml#3 integrate .. //depot/projects/superpages/www/fr/Makefile#2 integrate .. //depot/projects/superpages/www/fr/about.sgml#1 branch .. //depot/projects/superpages/www/fr/advocacy/index.sgml#2 integrate .. //depot/projects/superpages/www/fr/advocacy/myths.sgml#2 integrate .. //depot/projects/superpages/www/fr/applications.sgml#2 integrate .. //depot/projects/superpages/www/fr/art.sgml#2 integrate .. //depot/projects/superpages/www/fr/auditors.sgml#2 integrate .. //depot/projects/superpages/www/fr/availability.sgml#2 integrate .. //depot/projects/superpages/www/fr/commercial/commercial.sgml#2 integrate .. //depot/projects/superpages/www/fr/commercial/consulting.sgml#2 integrate .. //depot/projects/superpages/www/fr/commercial/consulting_bycat.sgml#2 integrate .. //depot/projects/superpages/www/fr/commercial/hardware.sgml#2 integrate .. //depot/projects/superpages/www/fr/commercial/includes.sgml#2 integrate .. //depot/projects/superpages/www/fr/commercial/misc.sgml#2 integrate .. //depot/projects/superpages/www/fr/commercial/software.sgml#2 integrate .. //depot/projects/superpages/www/fr/commercial/software_bycat.sgml#2 integrate .. //depot/projects/superpages/www/fr/community.sgml#1 branch .. //depot/projects/superpages/www/fr/community/Makefile#1 branch .. //depot/projects/superpages/www/fr/community/irc.sgml#1 branch .. //depot/projects/superpages/www/fr/community/mailinglists.sgml#1 branch .. //depot/projects/superpages/www/fr/community/newsgroups.sgml#1 branch .. //depot/projects/superpages/www/fr/community/webresources.sgml#1 branch .. //depot/projects/superpages/www/fr/copyright/copyright.sgml#2 integrate .. //depot/projects/superpages/www/fr/copyright/daemon.sgml#2 integrate .. //depot/projects/superpages/www/fr/copyright/freebsd-doc-license.sgml#2 integrate .. //depot/projects/superpages/www/fr/copyright/freebsd-license.sgml#2 integrate .. //depot/projects/superpages/www/fr/copyright/license.sgml#2 integrate .. //depot/projects/superpages/www/fr/copyright/trademarks.sgml#2 integrate .. //depot/projects/superpages/www/fr/developers.sgml#2 integrate .. //depot/projects/superpages/www/fr/docproj/current.sgml#2 integrate .. //depot/projects/superpages/www/fr/docproj/doc-set.sgml#2 integrate .. //depot/projects/superpages/www/fr/docproj/docproj.sgml#2 integrate .. //depot/projects/superpages/www/fr/docproj/handbook.sgml#2 integrate .. //depot/projects/superpages/www/fr/docproj/handbook3.sgml#2 integrate .. //depot/projects/superpages/www/fr/docproj/sgml.sgml#2 integrate .. //depot/projects/superpages/www/fr/docproj/submitting.sgml#2 integrate .. //depot/projects/superpages/www/fr/docproj/translations.sgml#2 integrate .. //depot/projects/superpages/www/fr/docproj/who.sgml#2 integrate .. //depot/projects/superpages/www/fr/docs.sgml#2 integrate .. //depot/projects/superpages/www/fr/donations/donors.sgml#2 integrate .. //depot/projects/superpages/www/fr/donations/index.sgml#2 integrate .. //depot/projects/superpages/www/fr/donations/wantlist.sgml#2 integrate .. //depot/projects/superpages/www/fr/events/events.xsl#2 integrate .. //depot/projects/superpages/www/fr/features.sgml#2 integrate .. //depot/projects/superpages/www/fr/gallery/gallery-entry.xsl#2 integrate .. //depot/projects/superpages/www/fr/gallery/gallery.xsl#2 integrate .. //depot/projects/superpages/www/fr/gnome/contact.sgml#2 integrate .. //depot/projects/superpages/www/fr/gnome/docs/22knownissues.sgml#2 integrate .. //depot/projects/superpages/www/fr/gnome/docs/bugging.sgml#2 integrate .. //depot/projects/superpages/www/fr/gnome/docs/faq.sgml#2 integrate .. //depot/projects/superpages/www/fr/gnome/docs/faq2.sgml#2 integrate .. //depot/projects/superpages/www/fr/gnome/docs/gnome2_porting.sgml#2 integrate .. //depot/projects/superpages/www/fr/gnome/docs/gnome_porting.sgml#2 integrate .. //depot/projects/superpages/www/fr/gnome/docs/porting.sgml#2 integrate .. //depot/projects/superpages/www/fr/gnome/docs/volunteer.sgml#2 integrate .. //depot/projects/superpages/www/fr/gnome/includes.sgml#2 integrate .. //depot/projects/superpages/www/fr/gnome/index.xsl#2 integrate .. //depot/projects/superpages/www/fr/gnome/newsflash.xsl#2 integrate .. //depot/projects/superpages/www/fr/gnome/screenshots.sgml#2 integrate .. //depot/projects/superpages/www/fr/includes.navabout.sgml#1 branch .. //depot/projects/superpages/www/fr/includes.navcommunity.sgml#1 branch .. //depot/projects/superpages/www/fr/includes.navdevelopers.sgml#1 branch .. //depot/projects/superpages/www/fr/includes.navdocs.sgml#1 branch .. //depot/projects/superpages/www/fr/includes.navdownload.sgml#1 branch .. //depot/projects/superpages/www/fr/includes.navsupport.sgml#1 branch .. //depot/projects/superpages/www/fr/includes.sgml#2 integrate .. //depot/projects/superpages/www/fr/includes.xsl#2 integrate .. //depot/projects/superpages/www/fr/index.xsl#2 integrate .. //depot/projects/superpages/www/fr/internal/about.sgml#2 integrate .. //depot/projects/superpages/www/fr/internal/bylaws.sgml#2 integrate .. //depot/projects/superpages/www/fr/internal/core-vote.sgml#2 integrate .. //depot/projects/superpages/www/fr/internal/developer.sgml#2 integrate .. //depot/projects/superpages/www/fr/internal/expire-bits.sgml#2 integrate .. //depot/projects/superpages/www/fr/internal/homepage.sgml#2 integrate .. //depot/projects/superpages/www/fr/internal/internal.sgml#2 integrate .. //depot/projects/superpages/www/fr/internal/machines.sgml#2 integrate .. //depot/projects/superpages/www/fr/internal/mirror.sgml#2 integrate .. //depot/projects/superpages/www/fr/internal/new-account.sgml#2 integrate .. //depot/projects/superpages/www/fr/internal/photos.sgml#2 integrate .. //depot/projects/superpages/www/fr/internal/releng.sgml#2 integrate .. //depot/projects/superpages/www/fr/internal/staff.sgml#2 integrate .. //depot/projects/superpages/www/fr/internal/statistic.sgml#2 integrate .. //depot/projects/superpages/www/fr/internet.sgml#2 integrate .. //depot/projects/superpages/www/fr/java/advocacy.sgml#2 integrate .. //depot/projects/superpages/www/fr/java/dists/10.sgml#2 integrate .. //depot/projects/superpages/www/fr/java/dists/11.sgml#2 integrate .. //depot/projects/superpages/www/fr/java/dists/12.sgml#2 integrate .. //depot/projects/superpages/www/fr/java/dists/13.sgml#2 integrate .. //depot/projects/superpages/www/fr/java/dists/14.sgml#2 integrate .. //depot/projects/superpages/www/fr/java/dists/15.sgml#2 integrate .. //depot/projects/superpages/www/fr/java/dists/index.sgml#2 integrate .. //depot/projects/superpages/www/fr/java/docs/faq.sgml#2 integrate .. //depot/projects/superpages/www/fr/java/docs/howtoports.sgml#2 integrate .. //depot/projects/superpages/www/fr/java/docs/newbies.sgml#2 integrate .. //depot/projects/superpages/www/fr/java/docs/performance.sgml#2 integrate .. //depot/projects/superpages/www/fr/java/docs/tutorials.sgml#2 integrate .. //depot/projects/superpages/www/fr/java/howhelp.sgml#2 integrate .. //depot/projects/superpages/www/fr/java/index.sgml#2 integrate .. //depot/projects/superpages/www/fr/java/install.sgml#2 integrate .. //depot/projects/superpages/www/fr/java/links/api.sgml#2 integrate .. //depot/projects/superpages/www/fr/java/links/development.sgml#2 integrate .. //depot/projects/superpages/www/fr/java/links/documentation.sgml#2 integrate .. //depot/projects/superpages/www/fr/java/links/freebsd.sgml#2 integrate .. //depot/projects/superpages/www/fr/java/links/index.sgml#2 integrate .. //depot/projects/superpages/www/fr/java/links/resources.sgml#2 integrate .. //depot/projects/superpages/www/fr/java/links/servlets.sgml#2 integrate .. //depot/projects/superpages/www/fr/java/links/tools.sgml#2 integrate .. //depot/projects/superpages/www/fr/java/links/tutorials.sgml#2 integrate .. //depot/projects/superpages/www/fr/java/links/vendor.sgml#2 integrate .. //depot/projects/superpages/www/fr/java/newsflash.sgml#2 integrate .. //depot/projects/superpages/www/fr/java/press.sgml#2 integrate .. //depot/projects/superpages/www/fr/kse/index.sgml#2 integrate .. //depot/projects/superpages/www/fr/mailto.sgml#2 integrate .. //depot/projects/superpages/www/fr/news/1996/index.sgml#2 integrate .. //depot/projects/superpages/www/fr/news/1997/index.sgml#2 integrate .. //depot/projects/superpages/www/fr/news/1998/index.sgml#2 integrate .. //depot/projects/superpages/www/fr/news/1999/index.sgml#2 integrate .. //depot/projects/superpages/www/fr/news/2000/index.sgml#2 integrate .. //depot/projects/superpages/www/fr/news/includes.sgml#2 integrate .. //depot/projects/superpages/www/fr/news/news.sgml#2 integrate .. //depot/projects/superpages/www/fr/news/newsflash.xsl#2 integrate .. //depot/projects/superpages/www/fr/news/press-rel-1.sgml#2 integrate .. //depot/projects/superpages/www/fr/news/press-rel-2.sgml#2 integrate .. //depot/projects/superpages/www/fr/news/press-rel-3.sgml#2 integrate .. //depot/projects/superpages/www/fr/news/press-rel-4.sgml#2 integrate .. //depot/projects/superpages/www/fr/news/press-rel-5.sgml#2 integrate .. //depot/projects/superpages/www/fr/news/press-rel-6.sgml#2 integrate .. //depot/projects/superpages/www/fr/news/press-rel-7.sgml#2 integrate .. //depot/projects/superpages/www/fr/news/press.xsl#2 integrate .. //depot/projects/superpages/www/fr/news/pressreleases.sgml#2 integrate .. //depot/projects/superpages/www/fr/news/sou1999.sgml#2 integrate .. //depot/projects/superpages/www/fr/news/status/report.xsl#2 integrate .. //depot/projects/superpages/www/fr/news/status/status.sgml#2 integrate .. //depot/projects/superpages/www/fr/news/webchanges.sgml#2 integrate .. //depot/projects/superpages/www/fr/platforms/alpha.sgml#2 integrate .. //depot/projects/superpages/www/fr/platforms/amd64.sgml#2 integrate .. //depot/projects/superpages/www/fr/platforms/arm.sgml#2 integrate .. //depot/projects/superpages/www/fr/platforms/i386.sgml#2 integrate .. //depot/projects/superpages/www/fr/platforms/ia64.sgml#2 integrate .. //depot/projects/superpages/www/fr/platforms/ia64/index.sgml#2 integrate .. //depot/projects/superpages/www/fr/platforms/ia64/machines.sgml#2 integrate .. //depot/projects/superpages/www/fr/platforms/ia64/refs.sgml#2 integrate .. //depot/projects/superpages/www/fr/platforms/ia64/todo.sgml#2 integrate .. //depot/projects/superpages/www/fr/platforms/index.sgml#2 integrate .. //depot/projects/superpages/www/fr/platforms/mips.sgml#2 integrate .. //depot/projects/superpages/www/fr/platforms/pc98.sgml#2 integrate .. //depot/projects/superpages/www/fr/platforms/ppc.sgml#2 integrate .. //depot/projects/superpages/www/fr/platforms/sparc.sgml#2 integrate .. //depot/projects/superpages/www/fr/platforms/x86-64.sgml#2 integrate .. //depot/projects/superpages/www/fr/projects/acpi/index.sgml#2 integrate .. //depot/projects/superpages/www/fr/projects/busdma/index.sgml#2 integrate .. //depot/projects/superpages/www/fr/projects/c99/index.sgml#2 integrate .. //depot/projects/superpages/www/fr/projects/cvsweb.sgml#2 integrate .. //depot/projects/superpages/www/fr/projects/libh.sgml#2 integrate .. //depot/projects/superpages/www/fr/projects/mips/index.sgml#2 integrate .. //depot/projects/superpages/www/fr/projects/newbies.sgml#2 integrate .. //depot/projects/superpages/www/fr/projects/projects.sgml#2 integrate .. //depot/projects/superpages/www/fr/projects/updater.sgml#2 integrate .. //depot/projects/superpages/www/fr/prstats/index.sgml#2 integrate .. //depot/projects/superpages/www/fr/publish.sgml#2 integrate .. //depot/projects/superpages/www/fr/register.sgml#2 delete .. //depot/projects/superpages/www/fr/releases/2.0/credits.sgml#2 integrate .. //depot/projects/superpages/www/fr/releases/2.2.8R/notes.sgml#2 integrate .. //depot/projects/superpages/www/fr/releases/3.1R/notes.sgml#2 integrate .. //depot/projects/superpages/www/fr/releases/3.2R/notes.sgml#2 integrate .. //depot/projects/superpages/www/fr/releases/3.3R/notes.sgml#2 integrate .. //depot/projects/superpages/www/fr/releases/3.4R/notes.sgml#2 integrate .. //depot/projects/superpages/www/fr/releases/3.5R/notes.sgml#2 integrate .. //depot/projects/superpages/www/fr/releases/4.0R/announce.sgml#2 integrate .. //depot/projects/superpages/www/fr/releases/4.0R/errata.sgml#2 integrate .. //depot/projects/superpages/www/fr/releases/4.0R/notes.sgml#2 integrate .. //depot/projects/superpages/www/fr/releases/4.1.1R/errata.sgml#2 integrate .. //depot/projects/superpages/www/fr/releases/4.1R/announce.sgml#2 integrate .. //depot/projects/superpages/www/fr/releases/4.1R/errata.sgml#2 integrate .. //depot/projects/superpages/www/fr/releases/4.1R/notes.sgml#2 integrate .. //depot/projects/superpages/www/fr/releases/4.2R/announce.sgml#2 integrate .. //depot/projects/superpages/www/fr/releases/4.2R/errata.sgml#2 integrate .. //depot/projects/superpages/www/fr/releases/4.2R/notes.sgml#2 integrate .. //depot/projects/superpages/www/fr/releases/4.3R/announce.sgml#2 integrate .. //depot/projects/superpages/www/fr/releases/4.3R/errata.sgml#2 integrate .. //depot/projects/superpages/www/fr/releases/4.3R/notes.sgml#2 integrate .. //depot/projects/superpages/www/fr/releases/4.4R/announce.sgml#2 integrate .. //depot/projects/superpages/www/fr/releases/4.5R/announce.sgml#2 integrate .. //depot/projects/superpages/www/fr/releases/4.5R/notes.sgml#2 integrate .. //depot/projects/superpages/www/fr/releases/4.6.2R/relnotes.sgml#2 integrate .. //depot/projects/superpages/www/fr/releases/4.6R/relnotes.sgml#2 integrate .. //depot/projects/superpages/www/fr/releases/4.7R/announce.sgml#2 integrate .. //depot/projects/superpages/www/fr/releases/5.0R/DP1/relnotes.sgml#2 integrate .. //depot/projects/superpages/www/fr/releases/5.1R/installation.sgml#2 integrate .. //depot/projects/superpages/www/fr/releases/5.1R/relnotes.sgml#2 integrate .. //depot/projects/superpages/www/fr/releases/index.sgml#2 integrate .. //depot/projects/superpages/www/fr/releases/snapshots.sgml#2 integrate .. //depot/projects/superpages/www/fr/releng/charter.sgml#2 integrate .. //depot/projects/superpages/www/fr/releng/index.sgml#2 integrate .. //depot/projects/superpages/www/fr/relnotes.sgml#3 integrate .. //depot/projects/superpages/www/fr/search/index-site.sgml#2 integrate .. //depot/projects/superpages/www/fr/search/search-mid.sgml#2 integrate .. //depot/projects/superpages/www/fr/search/search.sgml#2 integrate .. //depot/projects/superpages/www/fr/search/searchhints.sgml#2 integrate .. //depot/projects/superpages/www/fr/security/security.sgml#2 integrate .. //depot/projects/superpages/www/fr/send-pr.sgml#2 integrate .. //depot/projects/superpages/www/fr/smp/index.sgml#2 integrate .. //depot/projects/superpages/www/fr/support.sgml#2 integrate .. //depot/projects/superpages/www/fr/support/Makefile#1 branch .. //depot/projects/superpages/www/fr/support/bugreports.sgml#1 branch .. //depot/projects/superpages/www/fr/support/webresources.sgml#1 branch .. //depot/projects/superpages/www/fr/tutorials/index.sgml#2 integrate .. //depot/projects/superpages/www/fr/where.sgml#2 integrate .. //depot/projects/superpages/www/fr/y2kbug.sgml#2 integrate .. //depot/projects/superpages/www/it/Makefile#2 integrate .. //depot/projects/superpages/www/it/about.sgml#1 branch .. //depot/projects/superpages/www/it/docs.sgml#2 integrate .. //depot/projects/superpages/www/it/docs/Makefile#1 branch .. //depot/projects/superpages/www/it/docs/books.sgml#1 branch .. //depot/projects/superpages/www/it/includes.header.sgml#1 branch .. //depot/projects/superpages/www/it/includes.navabout.sgml#1 branch .. //depot/projects/superpages/www/it/includes.navcommunity.sgml#1 branch .. //depot/projects/superpages/www/it/includes.navdevelopers.sgml#1 branch .. //depot/projects/superpages/www/it/includes.navdocs.sgml#1 branch .. //depot/projects/superpages/www/it/includes.navdownload.sgml#1 branch .. //depot/projects/superpages/www/it/includes.navsupport.sgml#1 branch .. //depot/projects/superpages/www/it/includes.release.sgml#1 branch .. //depot/projects/superpages/www/it/includes.sgml#2 integrate .. //depot/projects/superpages/www/it/includes.xsl#2 integrate .. //depot/projects/superpages/www/it/index.xsl#2 integrate .. //depot/projects/superpages/www/it/mailto.sgml#2 integrate .. //depot/projects/superpages/www/it/releases/4.10R/announce.sgml#2 integrate .. //depot/projects/superpages/www/it/releases/4.11R/announce.sgml#2 integrate .. //depot/projects/superpages/www/it/releases/5.2.1R/announce.sgml#2 integrate .. //depot/projects/superpages/www/it/releases/5.2R/announce.sgml#2 integrate .. //depot/projects/superpages/www/it/releases/5.3R/announce.sgml#2 integrate .. //depot/projects/superpages/www/it/releases/5.4R/announce.sgml#2 integrate .. //depot/projects/superpages/www/it/releases/index.sgml#2 integrate .. //depot/projects/superpages/www/ja/Makefile#2 integrate .. //depot/projects/superpages/www/ja/about.sgml#1 branch .. //depot/projects/superpages/www/ja/alpha/alpha.sgml#2 integrate .. //depot/projects/superpages/www/ja/alpha/index.sgml#2 integrate .. //depot/projects/superpages/www/ja/applications.sgml#2 integrate .. //depot/projects/superpages/www/ja/auditors.sgml#2 delete .. //depot/projects/superpages/www/ja/availability.sgml#2 integrate .. //depot/projects/superpages/www/ja/commercial/commercial.sgml#2 integrate .. //depot/projects/superpages/www/ja/community.sgml#1 branch .. //depot/projects/superpages/www/ja/conspectus/index.sgml#2 integrate .. //depot/projects/superpages/www/ja/copyright/copyright.sgml#2 integrate .. //depot/projects/superpages/www/ja/copyright/daemon.sgml#2 integrate .. //depot/projects/superpages/www/ja/copyright/freebsd-license.sgml#2 integrate .. //depot/projects/superpages/www/ja/copyright/license.sgml#2 integrate .. //depot/projects/superpages/www/ja/copyright/trademarks.sgml#2 integrate .. //depot/projects/superpages/www/ja/docproj/current.sgml#2 integrate .. //depot/projects/superpages/www/ja/docproj/doc-set.sgml#2 integrate .. //depot/projects/superpages/www/ja/docproj/docproj.sgml#2 integrate .. //depot/projects/superpages/www/ja/docproj/sgml.sgml#2 integrate .. //depot/projects/superpages/www/ja/docproj/submitting.sgml#2 integrate .. //depot/projects/superpages/www/ja/docproj/translations.sgml#2 integrate .. //depot/projects/superpages/www/ja/docproj/who.sgml#2 integrate .. //depot/projects/superpages/www/ja/docs.sgml#2 integrate .. //depot/projects/superpages/www/ja/features.sgml#2 integrate .. //depot/projects/superpages/www/ja/includes.navabout.sgml#1 branch .. //depot/projects/superpages/www/ja/includes.navcommunity.sgml#1 branch .. //depot/projects/superpages/www/ja/includes.navdevelopers.sgml#1 branch .. //depot/projects/superpages/www/ja/includes.navdocs.sgml#1 branch .. //depot/projects/superpages/www/ja/includes.navdownload.sgml#1 branch .. //depot/projects/superpages/www/ja/includes.navsupport.sgml#1 branch .. //depot/projects/superpages/www/ja/includes.sgml#2 integrate .. //depot/projects/superpages/www/ja/includes.xsl#2 integrate .. //depot/projects/superpages/www/ja/index.xsl#2 integrate .. //depot/projects/superpages/www/ja/internal/about.sgml#2 integrate .. //depot/projects/superpages/www/ja/internal/developer.sgml#2 integrate .. //depot/projects/superpages/www/ja/internal/internal.sgml#2 integrate .. //depot/projects/superpages/www/ja/internal/machines.sgml#2 integrate .. //depot/projects/superpages/www/ja/internal/mirror.sgml#2 integrate .. //depot/projects/superpages/www/ja/internal/statistic.sgml#2 integrate .. //depot/projects/superpages/www/ja/internet.sgml#2 integrate .. //depot/projects/superpages/www/ja/jabout.sgml#2 integrate .. //depot/projects/superpages/www/ja/java/advocacy.sgml#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Oct 14 11:28:34 2005 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 4F9A816A421; Fri, 14 Oct 2005 11:28:34 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2605716A41F for ; Fri, 14 Oct 2005 11:28:34 +0000 (GMT) (envelope-from gnn@neville-neil.com) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AB4DE43D46 for ; Fri, 14 Oct 2005 11:28:33 +0000 (GMT) (envelope-from gnn@neville-neil.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9EBSXl5041970 for ; Fri, 14 Oct 2005 11:28:33 GMT (envelope-from gnn@neville-neil.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9EBSV7W041967 for perforce@freebsd.org; Fri, 14 Oct 2005 11:28:31 GMT (envelope-from gnn@neville-neil.com) Date: Fri, 14 Oct 2005 11:28:31 GMT Message-Id: <200510141128.j9EBSV7W041967@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gnn@neville-neil.com using -f From: "George V. Neville-Neil" To: Perforce Change Reviews Cc: Subject: PERFORCE change 85271 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, 14 Oct 2005 11:28:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=85271 Change 85271 by gnn@gnn_laptop_fast_ipsec on 2005/10/14 11:27:47 Integrate from HEAD. Affected files ... .. //depot/projects/fast_ipsec/src/sys/alpha/alpha/busdma_machdep.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/alpha/alpha/interrupt.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/alpha/alpha/sgmap.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/alpha/alpha/trap.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/alpha/conf/GENERIC#2 integrate .. //depot/projects/fast_ipsec/src/sys/alpha/conf/MAC#1 branch .. //depot/projects/fast_ipsec/src/sys/alpha/include/atomic.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/alpha/include/chipset.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/alpha/include/pmap.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/alpha/isa/isa.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/alpha/mcbus/mcpcia.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/alpha/osf1/osf1_ioctl.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/alpha/osf1/osf1_misc.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/alpha/osf1/osf1_signal.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/alpha/pci/apecs.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/alpha/pci/cia.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/alpha/pci/irongate.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/alpha/pci/lca.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/alpha/pci/pcibus.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/alpha/pci/t2.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/alpha/pci/tsunami.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/alpha/pci/tsunami_pci.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/alpha/tlsb/dwlpx.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/amd64/cpu_switch.S#2 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/amd64/elf_machdep.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/amd64/gdb_machdep.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/amd64/genassym.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/amd64/machdep.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/amd64/mptable_pci.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/amd64/nexus.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/amd64/support.S#2 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/amd64/trap.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/amd64/vm_machdep.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/conf/MAC#1 branch .. //depot/projects/fast_ipsec/src/sys/amd64/conf/NOTES#2 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/ia32/ia32_reg.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/ia32/ia32_signal.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/include/atomic.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/include/legacyvar.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/include/pcb.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/linux32/linux32_sysvec.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/pci/pci_bus.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/arm/arm/bcopy_page.S#2 integrate .. //depot/projects/fast_ipsec/src/sys/arm/arm/bcopyinout.S#2 integrate .. //depot/projects/fast_ipsec/src/sys/arm/arm/bcopyinout_xscale.S#2 integrate .. //depot/projects/fast_ipsec/src/sys/arm/arm/busdma_machdep.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/arm/arm/dump_machdep.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/arm/arm/elf_trampoline.c#1 branch .. //depot/projects/fast_ipsec/src/sys/arm/arm/genassym.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/arm/arm/in_cksum.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/arm/arm/in_cksum_arm.S#2 integrate .. //depot/projects/fast_ipsec/src/sys/arm/arm/inckern.S#1 branch .. //depot/projects/fast_ipsec/src/sys/arm/arm/intr.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/arm/arm/locore.S#2 integrate .. //depot/projects/fast_ipsec/src/sys/arm/arm/machdep.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/arm/arm/mem.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/arm/arm/nexus.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/arm/arm/pmap.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/arm/arm/support.S#2 integrate .. //depot/projects/fast_ipsec/src/sys/arm/arm/swtch.S#2 integrate .. //depot/projects/fast_ipsec/src/sys/arm/arm/vm_machdep.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/arm/conf/IQ31244#2 integrate .. //depot/projects/fast_ipsec/src/sys/arm/conf/SIMICS#2 integrate .. //depot/projects/fast_ipsec/src/sys/arm/include/atomic.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/arm/include/in_cksum.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/arm/include/md_var.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/arm/include/pmap.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/arm/sa11x0/assabet_machdep.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/arm/sa11x0/sa11x0.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/arm/sa11x0/sa11x0_irqhandler.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/arm/sa11x0/sa11x0_var.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/arm/xscale/i80321/files.i80321#2 integrate .. //depot/projects/fast_ipsec/src/sys/arm/xscale/i80321/i80321_aau.c#1 branch .. //depot/projects/fast_ipsec/src/sys/arm/xscale/i80321/i80321_dma.c#1 branch .. //depot/projects/fast_ipsec/src/sys/arm/xscale/i80321/i80321_pci.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/arm/xscale/i80321/i80321_timer.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/arm/xscale/i80321/i80321var.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/arm/xscale/i80321/iq31244_machdep.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/arm/xscale/i80321/iq80321.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/arm/xscale/i80321/obio.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/arm/xscale/i80321/obiovar.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/boot/common/help.common#2 integrate .. //depot/projects/fast_ipsec/src/sys/boot/common/loader.8#2 integrate .. //depot/projects/fast_ipsec/src/sys/boot/efi/libefi/bootinfo.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/boot/forth/loader.conf#2 integrate .. //depot/projects/fast_ipsec/src/sys/boot/i386/boot2/boot2.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/boot/i386/libi386/bootinfo.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/boot/i386/libi386/libi386.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/boot/i386/loader/main.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/boot/ia64/ski/bootinfo.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/boot/pc98/Makefile.inc#2 integrate .. //depot/projects/fast_ipsec/src/sys/boot/pc98/boot2/io.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/boot/pc98/libpc98/comconsole.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/boot/pc98/loader/main.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/boot/powerpc/loader/metadata.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/boot/sparc64/loader/metadata.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/cam/cam_xpt.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/compat/freebsd32/freebsd32_misc.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/compat/freebsd32/freebsd32_proto.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/compat/freebsd32/freebsd32_syscall.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/compat/freebsd32/freebsd32_syscalls.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/compat/freebsd32/freebsd32_sysent.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/compat/freebsd32/syscalls.master#2 integrate .. //depot/projects/fast_ipsec/src/sys/compat/linux/linux_socket.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/compat/ndis/kern_ndis.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/compat/ndis/kern_windrv.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/compat/ndis/ndis_var.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/compat/ndis/ntoskrnl_var.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/compat/ndis/subr_hal.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/compat/ndis/subr_ndis.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/compat/ndis/subr_ntoskrnl.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/compat/ndis/winx32_wrap.S#2 integrate .. //depot/projects/fast_ipsec/src/sys/compat/svr4/svr4_fcntl.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/compat/svr4/svr4_ioctl.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/compat/svr4/svr4_ipc.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/compat/svr4/svr4_misc.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/compat/svr4/svr4_signal.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/compat/svr4/svr4_stat.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/compat/svr4/svr4_stream.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/compat/svr4/svr4_termios.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/compat/svr4/svr4_ttold.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/compat/svr4/svr4_util.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/conf/Makefile.arm#2 integrate .. //depot/projects/fast_ipsec/src/sys/conf/NOTES#2 integrate .. //depot/projects/fast_ipsec/src/sys/conf/files#2 integrate .. //depot/projects/fast_ipsec/src/sys/conf/files.arm#2 integrate .. //depot/projects/fast_ipsec/src/sys/conf/files.i386#2 integrate .. //depot/projects/fast_ipsec/src/sys/conf/files.pc98#2 integrate .. //depot/projects/fast_ipsec/src/sys/conf/kern.pre.mk#2 integrate .. //depot/projects/fast_ipsec/src/sys/conf/kmod.mk#2 integrate .. //depot/projects/fast_ipsec/src/sys/conf/options#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/oltr/if_oltr.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/oltr/if_oltr_pci.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/pf/net/if_pflog.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/pf/net/if_pfsync.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/ddb/db_command.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/ddb/db_output.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/aac/aac.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/aac/aac_cam.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/aac/aac_debug.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/aac/aac_pci.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/aac/aac_tables.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/aac/aacreg.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/aac/aacvar.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/acpica/acpi_pcib_acpi.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/adlink/adlink.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/aic/aic_pccard.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/aic7xxx/ahd_pci.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/aic7xxx/aic79xx.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/aic7xxx/aic79xx_osm.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/aic7xxx/aic7xxx_osm.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/aic7xxx/aic7xxx_pci.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/an/if_an.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/an/if_an_pccard.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/arl/if_arl_isa.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ata/ata-all.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ata/ata-all.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ata/ata-card.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ata/ata-chipset.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ata/ata-dma.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ata/ata-lowlevel.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ata/ata-pci.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ata/ata-pci.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ata/ata-queue.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ata/ata-raid.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ata/atapi-cd.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ath/if_ath.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/awi/if_awi_pccard.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/bfe/if_bfe.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/bge/if_bge.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/cardbus/cardbus.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/cm/if_cm_isa.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/cnw/if_cnw.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/cp/if_cp.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/cs/if_cs.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/cs/if_cs_pccard.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ctau/if_ct.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/cx/if_cx.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/dc/dcphy.c#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/dc/if_dc.c#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/dc/if_dcreg.h#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/dc/pnphy.c#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/digi/digi.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ed/ax88x90reg.h#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/ed/dl100xxreg.h#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/ed/if_ed.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ed/if_ed_cbus.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ed/if_ed_isa.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ed/if_ed_pccard.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ed/if_ed_pci.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ed/if_ed_rtl80x9.c#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/ed/if_edreg.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ed/if_edvar.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ed/rtl80x9reg.h#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/ed/tc5299jreg.h#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/em/if_em.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/em/if_em.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/en/if_en_pci.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ep/if_ep.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ep/if_ep_pccard.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ex/if_ex.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ex/if_ex_pccard.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/exca/exca.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/fatm/if_fatm.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/fb/creator.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/fb/fbreg.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/fb/gfb.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/fb/machfb.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/fb/s3_pci.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/fb/tga.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/fb/vga.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/fe/if_fe.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/fe/if_fe_pccard.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/firewire/00README#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/firewire/if_fwe.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/firewire/if_fwip.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/fxp/if_fxp.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/fxp/if_fxpvar.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/gem/if_gem.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/hatm/if_hatm.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/hatm/if_hatm_intr.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/hwpmc/hwpmc_amd.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/hwpmc/hwpmc_piv.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ie/if_ie.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ieee488/pcii.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ieee488/tnt4882.c#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/ieee488/upd7210.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ieee488/upd7210.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/if_ndis/if_ndis.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/if_ndis/if_ndisvar.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ips/ips.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ips/ips.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ips/ips_commands.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ips/ips_disk.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ips/ips_ioctl.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ipw/if_ipw.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/iwi/if_iwi.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/iwi/if_iwireg.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/iwi/if_iwivar.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ixgb/README#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ixgb/if_ixgb.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ixgb/if_ixgb.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/joy/joy_pccard.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/lge/if_lge.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/lge/if_lgereg.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/lmc/if_lmc.c#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/lmc/if_lmc.h#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/lnc/if_lnc.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/md/md.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mii/acphy.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mii/amphy.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mii/brgphy.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mii/ciphy.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mii/dcphy.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mii/exphy.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mii/lxtphy.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mii/mii_physubr.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mii/miivar.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mii/nsgphy.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mii/nsphy.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mii/pnaphy.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mii/pnphy.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mii/qsphy.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mii/rgephy.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mii/rlphy.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mii/tdkphy.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mii/tlphy.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mii/ukphy.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mii/xmphy.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mpt/mpt.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ncv/ncr53c500_pccard.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/nge/if_nge.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/nge/if_ngereg.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/nsp/nsp_pccard.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/nve/if_nve.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/patm/if_patm_attach.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/patm/if_patm_rx.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/pccard/card_if.m#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/pccard/pccard.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/pccard/pccard_cis.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/pccard/pccard_cis_quirks.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/pccard/pccard_device.c#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/pccard/pccarddevs#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/pccard/pccardvar.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/pccard/pccardvarp.h#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/pccbb/pccbb.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/pccbb/pccbb_isa.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/pccbb/pccbb_pci.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/pccbb/pccbbdevid.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/pccbb/pccbbvar.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/pci/isa_pci.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/pci/pci.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/puc/puc.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ral/if_ral.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ral/if_ral_pccard.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ray/if_ray.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/re/if_re.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sbsh/if_sbsh.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sio/sio.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sio/sio_pccard.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sn/if_sn.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sn/if_sn_pccard.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sn/if_snreg.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sn/if_snvar.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/snc/if_snc_pccard.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/snp/snp.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sound/isa/mss.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sound/pci/als4000.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sound/pci/es137x.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sound/pci/ich.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sound/pci/maestro3.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sound/pci/via8233.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sound/pci/via82c686.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sound/pcm/ac97.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sound/pcm/ac97.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sound/pcm/ac97_patch.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sound/pcm/ac97_patch.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sound/pcm/channel.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sound/pcm/dsp.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sound/pcm/feeder_volume.c#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/sound/pcm/mixer.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sound/pcm/sndstat.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sound/pcm/sound.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sound/pcm/sound.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sound/usb/uaudio.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sound/usb/uaudio_pcm.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/stg/tmc18c30_pccard.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/syscons/scgfbrndr.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/syscons/scmouse.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/syscons/scvgarndr.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/syscons/scvidctl.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/syscons/syscons.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/syscons/syscons.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/tx/if_tx.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/txp/if_txp.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/txp/if_txpreg.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/uart/uart_bus_pccard.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/ehci_pci.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/ehcireg.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/ehcivar.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/if_aue.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/if_axe.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/if_cdce.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/if_cdcereg.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/if_cue.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/if_kue.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/if_rue.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/if_udav.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/if_ural.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/slhci_pccard.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/usb_port.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/usbdevs#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/uvscom.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/vge/if_vge.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/vx/if_vx.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/vx/if_vx_eisa.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/vx/if_vx_pci.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/vx/if_vxvar.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/watchdog/watchdog.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/wi/if_wi.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/wi/if_wi_pccard.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/wi/if_wivar.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/wl/if_wl.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/xe/if_xe_pccard.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/xe/if_xereg.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/fs/devfs/devfs.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/fs/devfs/devfs_devs.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/fs/devfs/devfs_int.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/fs/devfs/devfs_rule.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/fs/devfs/devfs_vfsops.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/fs/devfs/devfs_vnops.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/fs/fifofs/fifo_vnops.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/fs/msdosfs/bootsect.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/fs/msdosfs/msdosfs_vfsops.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/fs/nullfs/null_vnops.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/fs/nwfs/nwfs_vfsops.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/fs/udf/udf_vfsops.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/geom/geom_ctl.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/geom/geom_disk.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/geom/geom_gpt.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/geom/geom_io.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/geom/geom_slice.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/geom/uzip/g_uzip.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/gnu/fs/ext2fs/ext2_alloc.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/conf/MAC#1 branch .. //depot/projects/fast_ipsec/src/sys/i386/conf/NOTES#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/i386/apic_vector.s#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/i386/local_apic.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/i386/mp_machdep.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/i386/mptable_pci.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/i386/sys_machdep.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/i386/trap.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/i386/vm86.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/i386/vm_machdep.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/include/atomic.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/include/legacyvar.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/include/pcb_ext.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/include/smptests.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/include/trap.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/isa/isa.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/isa/vesa.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/pci/pci_bus.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/ia64/conf/MAC#1 branch .. //depot/projects/fast_ipsec/src/sys/ia64/ia32/ia32_signal.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/ia64/ia64/nexus.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/ia64/ia64/unaligned.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/ia64/include/atomic.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/isa/pnp.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/imgact_elf.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/init_main.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/init_sysent.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_acct.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_acl.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_clock.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_conf.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_cpu.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_descrip.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_environment.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_event.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_exec.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_intr.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_jail.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_kse.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_lock.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_mac.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_mbuf.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_poll.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_proc.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_prot.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_resource.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_shutdown.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_tc.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_thread.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_timeout.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_uuid.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/sched_ule.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/subr_bus.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/subr_kdb.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/subr_pcpu.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/subr_prf.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/subr_rman.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/subr_sleepqueue.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/subr_turnstile.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/subr_witness.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/syscalls.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/syscalls.master#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/sysv_shm.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/uipc_socket.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/uipc_socket2.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/uipc_usrreq.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/vfs_aio.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/vfs_bio.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/vfs_export.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/vfs_lookup.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/vfs_subr.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/vfs_syscalls.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/agp/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/ath/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/ath_rate_amrr/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/ath_rate_onoe/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/ath_rate_sample/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/aue/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/axe/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/bfe/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/bge/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/bridge/Makefile#2 delete .. //depot/projects/fast_ipsec/src/sys/modules/cdce/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/cue/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/dc/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/de/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/dummynet/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/ed/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/em/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/fxp/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/geom/geom_bsd/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/geom/geom_uzip/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/hifn/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/if_ndis/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/ipw/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/iwi/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/ixgb/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/kue/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/lge/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/lmc/Makefile#1 branch .. //depot/projects/fast_ipsec/src/sys/modules/mii/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/ncv/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/ndis/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/nge/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/nsp/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/pccard/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/pcn/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/ral/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/re/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/rl/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/rue/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/safe/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/sf/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/sis/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/sk/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/snc/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/snp/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/sound/sound/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/ste/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/stg/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/ti/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/tl/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/tx/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/txp/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/ubsec/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/udav/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/ural/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/vge/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/vr/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/vx/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/wb/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/xl/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/net/bpf.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/net/bridge.c#2 delete .. //depot/projects/fast_ipsec/src/sys/net/bridge.h#2 delete .. //depot/projects/fast_ipsec/src/sys/net/bridgestp.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/net/if.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/net/if.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/net/if_bridge.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/net/if_bridgevar.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/net/if_clone.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/net/if_disc.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/net/if_ethersubr.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/net/if_faith.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/net/if_fwsubr.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/net/if_gif.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/net/if_gre.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/net/if_ppp.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/net/if_sl.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/net/if_spppsubr.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/net/if_stf.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/net/if_var.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/net/if_vlan.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/net/netisr.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/net/route.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/net/route.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/net/rtsock.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netgraph/netgraph.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/netgraph/ng_base.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netgraph/ng_ether.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netgraph/ng_iface.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netgraph/ng_pppoe.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netgraph/ng_socket.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netgraph/ng_tty.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/if_ether.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/in.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/in.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/in_pcb.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/in_rmx.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/ip_carp.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/ip_dummynet.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/ip_dummynet.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/ip_fastfwd.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/ip_fw2.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/ip_mroute.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/ip_output.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/libalias/alias_db.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/raw_ip.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/tcp_subr.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/tcp_syncache.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/udp_usrreq.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netinet6/esp_aesctr.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netinet6/in6_rmx.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netinet6/nd6_nbr.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netipsec/ipsec_mbuf.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netsmb/netbios.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/nfsclient/nfs_diskless.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/nfsclient/nfs_socket.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/nfsserver/nfs_srvsock.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/nfsserver/nfs_srvsubs.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/pc98/cbus/fdc.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/pc98/cbus/gdc.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/pc98/cbus/nmi.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/pc98/cbus/sio.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/pc98/conf/GENERIC#2 integrate .. //depot/projects/fast_ipsec/src/sys/pc98/conf/GENERIC.hints#2 integrate .. //depot/projects/fast_ipsec/src/sys/pc98/conf/MAC#1 branch .. //depot/projects/fast_ipsec/src/sys/pc98/conf/NOTES#2 integrate .. //depot/projects/fast_ipsec/src/sys/pc98/pc98/epsonio.h#2 delete .. //depot/projects/fast_ipsec/src/sys/pc98/pc98/machdep.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/pc98/pc98/pc98_machdep.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/pc98/pc98/pc98_machdep.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/pccard/mecia.c#2 delete .. //depot/projects/fast_ipsec/src/sys/pccard/pccard.c#2 delete .. //depot/projects/fast_ipsec/src/sys/pccard/pccard_beep.c#2 delete .. //depot/projects/fast_ipsec/src/sys/pccard/pccard_nbk.c#2 delete .. //depot/projects/fast_ipsec/src/sys/pccard/pcic.c#2 delete .. //depot/projects/fast_ipsec/src/sys/pccard/pcic_isa.c#2 delete .. //depot/projects/fast_ipsec/src/sys/pccard/pcic_pci.c#2 delete .. //depot/projects/fast_ipsec/src/sys/pci/agp_amd64.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/pci/agp_ati.c#1 branch .. //depot/projects/fast_ipsec/src/sys/pci/agp_nvidia.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/pci/agpreg.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/pci/if_dc.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/pci/if_pcn.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/pci/if_rl.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/pci/if_rlreg.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/pci/if_sf.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/pci/if_sis.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/pci/if_sisreg.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/pci/if_sk.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/pci/if_ste.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/pci/if_ti.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/pci/if_tireg.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/pci/if_tl.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/pci/if_tlreg.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/pci/if_vr.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/pci/if_wb.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/pci/if_xl.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/powerpc/conf/MAC#1 branch .. //depot/projects/fast_ipsec/src/sys/powerpc/include/atomic.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/powerpc/ofw/ofw_syscons.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/rpc/rpcclnt.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/security/mac/mac_process.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/security/mac/mac_vfs.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/security/mac_biba/mac_biba.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/security/mac_lomac/mac_lomac.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/security/mac_mls/mac_mls.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/security/mac_none/mac_none.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/security/mac_partition/mac_partition.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/security/mac_seeotheruids/mac_seeotheruids.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/security/mac_stub/mac_stub.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/security/mac_test/mac_test.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/conf/MAC#1 branch .. //depot/projects/fast_ipsec/src/sys/sparc64/include/atomic.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/buf.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/bus.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/cdefs.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/conf.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/event.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/filedesc.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/gpt.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/kerneldump.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/libkern.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/mac.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/mac_policy.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/mchain.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/param.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/proc.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/refcount.h#1 branch .. //depot/projects/fast_ipsec/src/sys/sys/resourcevar.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/rman.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/signal.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/signalvar.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/snoop.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/socket.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/syscall.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/syscall.mk#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/sysproto.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/types.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/ucred.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/uuid.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/vnode.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/tools/bus_macro.sh#1 branch .. //depot/projects/fast_ipsec/src/sys/ufs/ffs/ffs_alloc.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/ufs/ffs/ffs_snapshot.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/ufs/ffs/ffs_softdep.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/ufs/ffs/ffs_vfsops.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/ufs/ffs/ffs_vnops.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/ufs/ufs/ufs_extattr.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/ufs/ufs/ufs_inode.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/ufs/ufs/ufs_vnops.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/vm/swap_pager.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/vm/uma.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/vm/uma_core.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/vm/vm_mmap.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/vm/vm_page.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/vm/vm_zeroidle.c#2 integrate .. //depot/projects/fast_ipsec/src/usr.sbin/setkey/Makefile#2 delete .. //depot/projects/fast_ipsec/src/usr.sbin/setkey/parse.y#2 delete .. //depot/projects/fast_ipsec/src/usr.sbin/setkey/sample.cf#2 delete .. //depot/projects/fast_ipsec/src/usr.sbin/setkey/scriptdump.pl#2 delete .. //depot/projects/fast_ipsec/src/usr.sbin/setkey/setkey.8#2 delete .. //depot/projects/fast_ipsec/src/usr.sbin/setkey/setkey.c#2 delete .. //depot/projects/fast_ipsec/src/usr.sbin/setkey/test-pfkey.c#2 delete .. //depot/projects/fast_ipsec/src/usr.sbin/setkey/test-policy.c#2 delete .. //depot/projects/fast_ipsec/src/usr.sbin/setkey/token.l#2 delete .. //depot/projects/fast_ipsec/src/usr.sbin/setkey/vchar.h#2 delete Differences ... ==== //depot/projects/fast_ipsec/src/sys/alpha/alpha/busdma_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.51 2005/05/25 07:25:12 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.53 2005/09/19 13:50:07 ticso Exp $"); #include #include @@ -472,8 +472,6 @@ * Map the buffer buf into bus space using the dmamap map. */ -vm_offset_t alpha_XXX_dmamap_or = 1024UL*1024UL*1024UL; /*XXX */ - int bus_dmamap_load(bus_dma_tag_t dmat, bus_dmamap_t map, void *buf, bus_size_t buflen, bus_dmamap_callback_t *callback, @@ -581,7 +579,7 @@ } if (sg->ds_len == 0) { - sg->ds_addr = paddr | alpha_XXX_dmamap_or; + sg->ds_addr = paddr + chipset.dmoffset; sg->ds_len = size; } else if (paddr == nextpaddr) { sg->ds_len += size; @@ -591,7 +589,7 @@ seg++; if (seg > dmat->nsegments) break; - sg->ds_addr = paddr | alpha_XXX_dmamap_or; + sg->ds_addr = paddr + chipset.dmoffset; sg->ds_len = size; } vaddr += size; @@ -671,7 +669,7 @@ * previous segment if possible. */ if (first) { - segs[seg].ds_addr = curaddr | alpha_XXX_dmamap_or; + segs[seg].ds_addr = curaddr + chipset.dmoffset; segs[seg].ds_len = sgsize; first = 0; } else { @@ -683,7 +681,7 @@ else { if (++seg >= dmat->nsegments) break; - segs[seg].ds_addr = curaddr | alpha_XXX_dmamap_or; + segs[seg].ds_addr = curaddr + chipset.dmoffset;; segs[seg].ds_len = sgsize; } } @@ -891,6 +889,10 @@ } } } + + /* Ensure any pending writes have drained. */ + if (op & (BUS_DMASYNC_PREWRITE)) + alpha_mb(); } static void ==== //depot/projects/fast_ipsec/src/sys/alpha/alpha/interrupt.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ #include /* RCS ID & Copyright macro defns */ /* __KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.23 1998/02/24 07:38:01 thorpej Exp $");*/ -__FBSDID("$FreeBSD: src/sys/alpha/alpha/interrupt.c,v 1.86 2005/04/12 23:18:53 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/interrupt.c,v 1.87 2005/09/29 19:12:44 jhb Exp $"); #include #include @@ -427,6 +427,13 @@ atomic_add_long(i->cntp, 1); /* + * It seems that we need to return from an interrupt back to PAL + * on the same CPU that received the interrupt, so pin the interrupted + * thread to the current CPU until we return from the interrupt. + */ + sched_pin(); + + /* * Handle a fast interrupt if there is no actual thread for this * interrupt by calling the handler directly without Giant. Note * that this means that any fast interrupt handler must be MP safe. @@ -435,26 +442,18 @@ if ((ih->ih_flags & IH_FAST) != 0) { critical_enter(); ih->ih_handler(ih->ih_argument); - /* XXX */ - curthread->td_owepreempt = 0; critical_exit(); - return; - } + } else { + if (ithd->it_disable) { + CTR1(KTR_INTR, + "alpha_dispatch_intr: disabling vector 0x%x", + i->vector); + ithd->it_disable(ithd->it_vector); + } - if (ithd->it_disable) { - CTR1(KTR_INTR, - "alpha_dispatch_intr: disabling vector 0x%x", i->vector); - ithd->it_disable(ithd->it_vector); + error = ithread_schedule(ithd); + KASSERT(error == 0, ("got an impossible stray interrupt")); } - - /* - * It seems that we need to return from an interrupt back to PAL - * on the same CPU that received the interrupt, so pin the interrupted - * thread to the current CPU until we return from the interrupt. - */ - sched_pin(); - error = ithread_schedule(ithd); - KASSERT(error == 0, ("got an impossible stray interrupt")); sched_unpin(); } ==== //depot/projects/fast_ipsec/src/sys/alpha/alpha/sgmap.c#2 (text+ko) ==== @@ -25,9 +25,8 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/sgmap.c,v 1.7 2004/07/01 15:07:26 gallatin Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/sgmap.c,v 1.8 2005/09/25 20:12:29 phk Exp $"); -#define __RMAN_RESOURCE_VISIBLE #include #include #include ==== //depot/projects/fast_ipsec/src/sys/alpha/alpha/trap.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/trap.c,v 1.123 2005/04/12 23:18:53 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/trap.c,v 1.125 2005/09/28 07:03:01 rwatson Exp $"); /* #include "opt_fix_unaligned_vax_fp.h" */ #include "opt_ddb.h" ==== //depot/projects/fast_ipsec/src/sys/alpha/conf/GENERIC#2 (text+ko) ==== @@ -18,7 +18,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.187 2005/07/14 15:39:04 kensmith Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.188 2005/09/24 16:47:34 wilko Exp $ machine alpha cpu EV4 @@ -86,6 +86,9 @@ # To make an SMP kernel, the next line is needed options SMP # Symmetric MultiProcessor Kernel +# Alpha's do not appear to react well to probing high EISA slots +options EISA_SLOTS=2 + # Standard busses device isa device eisa ==== //depot/projects/fast_ipsec/src/sys/alpha/include/atomic.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/alpha/include/atomic.h,v 1.22 2005/07/15 18:17:57 jhb Exp $ + * $FreeBSD: src/sys/alpha/include/atomic.h,v 1.24 2005/09/27 17:39:09 jhb Exp $ */ #ifndef _MACHINE_ATOMIC_H_ @@ -56,12 +56,12 @@ #ifdef __GNUCLIKE_ASM __asm __volatile ( - "1:\tldl_l %0, %2\n\t" /* load old value */ - "bis %0, %3, %0\n\t" /* calculate new value */ + "1:\tldl_l %0, %3\n\t" /* load old value */ + "bis %0, %2, %0\n\t" /* calculate new value */ "stl_c %0, %1\n\t" /* attempt to store */ "beq %0, 1b\n" /* spin if failed */ : "=&r" (temp), "=m" (*p) - : "m" (*p), "r" (v) + : "r" (v), "m" (*p) : "memory"); #endif } @@ -72,12 +72,12 @@ #ifdef __GNUCLIKE_ASM __asm __volatile ( - "1:\tldl_l %0, %1\n\t" /* load old value */ + "1:\tldl_l %0, %3\n\t" /* load old value */ "bic %0, %2, %0\n\t" /* calculate new value */ "stl_c %0, %1\n\t" /* attempt to store */ "beq %0, 1b\n" /* spin if failed */ - : "=&r" (temp), "+m" (*p) - : "r" (v) + : "=&r" (temp), "=m" (*p) + : "r" (v), "m" (*p) : "memory"); #endif } @@ -88,12 +88,12 @@ #ifdef __GNUCLIKE_ASM __asm __volatile ( - "1:\tldl_l %0, %1\n\t" /* load old value */ + "1:\tldl_l %0, %3\n\t" /* load old value */ "addl %0, %2, %0\n\t" /* calculate new value */ "stl_c %0, %1\n\t" /* attempt to store */ "beq %0, 1b\n" /* spin if failed */ - : "=&r" (temp), "+m" (*p) - : "r" (v) + : "=&r" (temp), "=m" (*p) + : "r" (v), "m" (*p) : "memory"); #endif } @@ -104,12 +104,12 @@ #ifdef __GNUCLIKE_ASM __asm __volatile ( - "1:\tldl_l %0, %1\n\t" /* load old value */ + "1:\tldl_l %0, %3\n\t" /* load old value */ "subl %0, %2, %0\n\t" /* calculate new value */ "stl_c %0, %1\n\t" /* attempt to store */ "beq %0, 1b\n" /* spin if failed */ - : "=&r" (temp), "+m" (*p) - : "r" (v) + : "=&r" (temp), "=m" (*p) + : "r" (v), "m" (*p) : "memory"); #endif } @@ -121,12 +121,12 @@ #ifdef __GNUCLIKE_ASM __asm __volatile ( "wmb\n" /* ensure pending writes have drained */ - "1:\tldl_l %0,%2\n\t" /* load current value, asserting lock */ + "1:\tldl_l %0,%3\n\t" /* load current value, asserting lock */ "ldiq %1,0\n\t" /* value to store */ "stl_c %1,%2\n\t" /* attempt to store */ "beq %1,1b\n" /* if the store failed, spin */ - : "=&r"(result), "=&r"(temp), "+m" (*addr) - : + : "=&r"(result), "=&r"(temp), "=m" (*addr) + : "m" (*addr) : "memory"); #endif @@ -139,12 +139,12 @@ #ifdef __GNUCLIKE_ASM __asm __volatile ( - "1:\tldq_l %0, %1\n\t" /* load old value */ + "1:\tldq_l %0, %3\n\t" /* load old value */ "bis %0, %2, %0\n\t" /* calculate new value */ "stq_c %0, %1\n\t" /* attempt to store */ "beq %0, 1b\n" /* spin if failed */ - : "=&r" (temp), "+m" (*p) - : "r" (v) + : "=&r" (temp), "=m" (*p) + : "r" (v), "m" (*p) : "memory"); #endif } @@ -155,12 +155,12 @@ #ifdef __GNUCLIKE_ASM __asm __volatile ( - "1:\tldq_l %0, %1\n\t" /* load old value */ + "1:\tldq_l %0, %3\n\t" /* load old value */ "bic %0, %2, %0\n\t" /* calculate new value */ "stq_c %0, %1\n\t" /* attempt to store */ "beq %0, 1b\n" /* spin if failed */ - : "=&r" (temp), "+m" (*p) - : "r" (v) + : "=&r" (temp), "=m" (*p) + : "r" (v), "m" (*p) : "memory"); #endif } @@ -171,12 +171,12 @@ #ifdef __GNUCLIKE_ASM __asm __volatile ( - "1:\tldq_l %0, %1\n\t" /* load old value */ + "1:\tldq_l %0, %3\n\t" /* load old value */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Oct 14 18:04:08 2005 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 1087F16A421; Fri, 14 Oct 2005 18:04:08 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DDCBA16A41F for ; Fri, 14 Oct 2005 18:04:07 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1BA8A43D5A for ; Fri, 14 Oct 2005 18:04:07 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9EI474s074334 for ; Fri, 14 Oct 2005 18:04:07 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9EI45iK074331 for perforce@freebsd.org; Fri, 14 Oct 2005 18:04:05 GMT (envelope-from jhb@freebsd.org) Date: Fri, 14 Oct 2005 18:04:05 GMT Message-Id: <200510141804.j9EI45iK074331@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 85293 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, 14 Oct 2005 18:04:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=85293 Change 85293 by jhb@jhb_slimer on 2005/10/14 18:03:59 IFC @85291. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/machdep.c#81 integrate .. //depot/projects/smpng/sys/alpha/alpha/trap.c#61 integrate .. //depot/projects/smpng/sys/alpha/linux/linux_sysvec.c#21 integrate .. //depot/projects/smpng/sys/alpha/osf1/osf1_signal.c#29 integrate .. //depot/projects/smpng/sys/alpha/osf1/osf1_signal.h#3 integrate .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#44 integrate .. //depot/projects/smpng/sys/amd64/amd64/trap.c#35 integrate .. //depot/projects/smpng/sys/amd64/conf/NOTES#21 integrate .. //depot/projects/smpng/sys/amd64/ia32/ia32_reg.c#2 integrate .. //depot/projects/smpng/sys/amd64/ia32/ia32_signal.c#12 integrate .. //depot/projects/smpng/sys/amd64/ia32/ia32_syscall.c#10 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_sysvec.c#9 integrate .. //depot/projects/smpng/sys/arm/arm/bcopy_page.S#4 integrate .. //depot/projects/smpng/sys/arm/arm/busdma_machdep.c#15 integrate .. //depot/projects/smpng/sys/arm/arm/genassym.c#6 integrate .. //depot/projects/smpng/sys/arm/arm/machdep.c#14 integrate .. //depot/projects/smpng/sys/arm/arm/swtch.S#13 integrate .. //depot/projects/smpng/sys/arm/arm/trap.c#13 integrate .. //depot/projects/smpng/sys/arm/arm/undefined.c#8 integrate .. //depot/projects/smpng/sys/arm/conf/IQ31244#9 integrate .. //depot/projects/smpng/sys/arm/conf/SIMICS#7 integrate .. //depot/projects/smpng/sys/arm/include/pmap.h#12 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/iq31244_machdep.c#14 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#24 integrate .. //depot/projects/smpng/sys/compat/ia32/ia32_signal.h#8 integrate .. //depot/projects/smpng/sys/compat/linux/linux_misc.c#60 integrate .. //depot/projects/smpng/sys/compat/ndis/kern_ndis.c#30 integrate .. //depot/projects/smpng/sys/compat/ndis/kern_windrv.c#5 integrate .. //depot/projects/smpng/sys/compat/ndis/ndis_var.h#22 integrate .. //depot/projects/smpng/sys/compat/ndis/ntoskrnl_var.h#18 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_hal.c#17 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_ndis.c#30 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_ntoskrnl.c#31 integrate .. //depot/projects/smpng/sys/compat/ndis/winx32_wrap.S#2 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_signal.h#5 integrate .. //depot/projects/smpng/sys/conf/Makefile.arm#11 integrate .. //depot/projects/smpng/sys/conf/NOTES#107 integrate .. //depot/projects/smpng/sys/conf/files#152 integrate .. //depot/projects/smpng/sys/conf/files.arm#7 integrate .. //depot/projects/smpng/sys/conf/kern.pre.mk#48 integrate .. //depot/projects/smpng/sys/conf/kmod.mk#50 integrate .. //depot/projects/smpng/sys/conf/options#107 integrate .. //depot/projects/smpng/sys/contrib/dev/oltr/if_oltr_pci.c#3 integrate .. //depot/projects/smpng/sys/contrib/pf/net/if_pflog.c#11 integrate .. //depot/projects/smpng/sys/contrib/pf/net/if_pfsync.c#17 integrate .. //depot/projects/smpng/sys/dev/aac/aac.c#51 integrate .. //depot/projects/smpng/sys/dev/aac/aac_cam.c#17 integrate .. //depot/projects/smpng/sys/dev/aac/aac_debug.c#17 integrate .. //depot/projects/smpng/sys/dev/aac/aac_pci.c#40 integrate .. //depot/projects/smpng/sys/dev/aac/aac_tables.h#5 integrate .. //depot/projects/smpng/sys/dev/aac/aacreg.h#17 integrate .. //depot/projects/smpng/sys/dev/aac/aacvar.h#25 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.h#39 integrate .. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#57 integrate .. //depot/projects/smpng/sys/dev/ata/ata-dma.c#45 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.c#57 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.h#35 integrate .. //depot/projects/smpng/sys/dev/ata/ata-raid.c#38 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-cd.c#58 integrate .. //depot/projects/smpng/sys/dev/dc/dcphy.c#1 branch .. //depot/projects/smpng/sys/dev/dc/if_dc.c#1 branch .. //depot/projects/smpng/sys/dev/dc/if_dcreg.h#1 branch .. //depot/projects/smpng/sys/dev/dc/pnphy.c#1 branch .. //depot/projects/smpng/sys/dev/ed/ax88x90reg.h#1 branch .. //depot/projects/smpng/sys/dev/ed/dl100xxreg.h#1 branch .. //depot/projects/smpng/sys/dev/ed/if_ed_isa.c#12 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_pccard.c#35 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_pci.c#13 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_rtl80x9.c#1 branch .. //depot/projects/smpng/sys/dev/ed/if_edreg.h#7 integrate .. //depot/projects/smpng/sys/dev/ed/if_edvar.h#13 integrate .. //depot/projects/smpng/sys/dev/ed/rtl80x9reg.h#1 branch .. //depot/projects/smpng/sys/dev/ed/tc5299jreg.h#1 branch .. //depot/projects/smpng/sys/dev/em/if_em.c#54 integrate .. //depot/projects/smpng/sys/dev/exca/exca.c#16 integrate .. //depot/projects/smpng/sys/dev/firewire/if_fwe.c#29 integrate .. //depot/projects/smpng/sys/dev/firewire/if_fwip.c#8 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#68 integrate .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_piv.c#4 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis.c#33 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndisvar.h#15 integrate .. //depot/projects/smpng/sys/dev/iwi/if_iwi.c#11 integrate .. //depot/projects/smpng/sys/dev/iwi/if_iwireg.h#4 integrate .. //depot/projects/smpng/sys/dev/ixgb/if_ixgb.c#13 integrate .. //depot/projects/smpng/sys/dev/md/md.c#69 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt.c#10 integrate .. //depot/projects/smpng/sys/dev/nge/if_nge.c#44 integrate .. //depot/projects/smpng/sys/dev/nge/if_ngereg.h#10 integrate .. //depot/projects/smpng/sys/dev/pccard/pccarddevs#52 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbb.c#52 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbb_isa.c#4 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbb_pci.c#10 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbbvar.h#17 integrate .. //depot/projects/smpng/sys/dev/re/if_re.c#30 integrate .. //depot/projects/smpng/sys/dev/sound/pci/als4000.c#17 integrate .. //depot/projects/smpng/sys/dev/sound/pci/ich.c#36 integrate .. //depot/projects/smpng/sys/dev/sound/pci/via8233.c#18 integrate .. //depot/projects/smpng/sys/dev/sound/pci/via82c686.c#23 integrate .. //depot/projects/smpng/sys/dev/vge/if_vge.c#11 integrate .. //depot/projects/smpng/sys/dev/vx/if_vx.c#22 integrate .. //depot/projects/smpng/sys/dev/vx/if_vx_eisa.c#10 integrate .. //depot/projects/smpng/sys/dev/vx/if_vx_pci.c#13 integrate .. //depot/projects/smpng/sys/dev/vx/if_vxvar.h#6 integrate .. //depot/projects/smpng/sys/dev/wi/if_wi_pccard.c#37 integrate .. //depot/projects/smpng/sys/dev/xe/if_xereg.h#3 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs_ctl.c#22 integrate .. //depot/projects/smpng/sys/fs/udf/udf_vfsops.c#23 integrate .. //depot/projects/smpng/sys/geom/geom_gpt.c#20 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#106 integrate .. //depot/projects/smpng/sys/i386/i386/machdep.c#98 integrate .. //depot/projects/smpng/sys/i386/i386/trap.c#85 integrate .. //depot/projects/smpng/sys/i386/i386/vm_machdep.c#72 integrate .. //depot/projects/smpng/sys/i386/include/trap.h#3 integrate .. //depot/projects/smpng/sys/i386/linux/linux_sysvec.c#45 integrate .. //depot/projects/smpng/sys/i386/svr4/svr4_machdep.c#16 integrate .. //depot/projects/smpng/sys/ia64/ia32/ia32_signal.c#4 integrate .. //depot/projects/smpng/sys/ia64/ia32/ia32_trap.c#5 integrate .. //depot/projects/smpng/sys/ia64/ia64/machdep.c#97 integrate .. //depot/projects/smpng/sys/ia64/ia64/nexus.c#11 integrate .. //depot/projects/smpng/sys/ia64/ia64/trap.c#77 integrate .. //depot/projects/smpng/sys/kern/init_sysent.c#60 integrate .. //depot/projects/smpng/sys/kern/kern_clock.c#42 integrate .. //depot/projects/smpng/sys/kern/kern_descrip.c#83 integrate .. //depot/projects/smpng/sys/kern/kern_event.c#43 integrate .. //depot/projects/smpng/sys/kern/kern_exec.c#89 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#100 integrate .. //depot/projects/smpng/sys/kern/kern_kse.c#26 integrate .. //depot/projects/smpng/sys/kern/kern_mac.c#42 integrate .. //depot/projects/smpng/sys/kern/kern_poll.c#19 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#109 integrate .. //depot/projects/smpng/sys/kern/kern_thr.c#27 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#80 integrate .. //depot/projects/smpng/sys/kern/kern_uuid.c#10 integrate .. //depot/projects/smpng/sys/kern/subr_bus.c#56 integrate .. //depot/projects/smpng/sys/kern/subr_rman.c#24 integrate .. //depot/projects/smpng/sys/kern/subr_trap.c#78 integrate .. //depot/projects/smpng/sys/kern/syscalls.c#60 integrate .. //depot/projects/smpng/sys/kern/syscalls.master#62 integrate .. //depot/projects/smpng/sys/kern/sysv_shm.c#32 integrate .. //depot/projects/smpng/sys/kern/vfs_aio.c#60 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#84 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#112 integrate .. //depot/projects/smpng/sys/modules/Makefile#108 integrate .. //depot/projects/smpng/sys/modules/ed/Makefile#7 integrate .. //depot/projects/smpng/sys/modules/lmc/Makefile#2 integrate .. //depot/projects/smpng/sys/net/bpf.c#57 integrate .. //depot/projects/smpng/sys/net/bridgestp.c#5 integrate .. //depot/projects/smpng/sys/net/if_bridge.c#12 integrate .. //depot/projects/smpng/sys/net/if_bridgevar.h#3 integrate .. //depot/projects/smpng/sys/net/if_clone.c#6 integrate .. //depot/projects/smpng/sys/net/if_disc.c#20 integrate .. //depot/projects/smpng/sys/net/if_ethersubr.c#65 integrate .. //depot/projects/smpng/sys/net/if_faith.c#29 integrate .. //depot/projects/smpng/sys/net/if_fwsubr.c#9 integrate .. //depot/projects/smpng/sys/net/if_gif.c#29 integrate .. //depot/projects/smpng/sys/net/if_gre.c#25 integrate .. //depot/projects/smpng/sys/net/if_ppp.c#36 integrate .. //depot/projects/smpng/sys/net/if_stf.c#33 integrate .. //depot/projects/smpng/sys/net/netisr.c#10 integrate .. //depot/projects/smpng/sys/netgraph/ng_base.c#40 integrate .. //depot/projects/smpng/sys/netgraph/ng_ether.c#27 integrate .. //depot/projects/smpng/sys/netgraph/ng_iface.c#25 integrate .. //depot/projects/smpng/sys/netgraph/ng_tty.c#17 integrate .. //depot/projects/smpng/sys/netinet/if_ether.c#41 integrate .. //depot/projects/smpng/sys/netinet/ip_carp.c#12 integrate .. //depot/projects/smpng/sys/netinet/raw_ip.c#53 integrate .. //depot/projects/smpng/sys/netinet/tcp_subr.c#74 integrate .. //depot/projects/smpng/sys/netinet/udp_usrreq.c#60 integrate .. //depot/projects/smpng/sys/netinet6/esp_aesctr.c#3 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_diskless.c#11 integrate .. //depot/projects/smpng/sys/pc98/conf/NOTES#43 integrate .. //depot/projects/smpng/sys/pc98/pc98/machdep.c#5 integrate .. //depot/projects/smpng/sys/pci/if_dc.c#72 integrate .. //depot/projects/smpng/sys/pci/if_pcn.c#37 integrate .. //depot/projects/smpng/sys/pci/if_rl.c#61 integrate .. //depot/projects/smpng/sys/pci/if_sf.c#40 integrate .. //depot/projects/smpng/sys/pci/if_sis.c#56 integrate .. //depot/projects/smpng/sys/pci/if_sk.c#50 integrate .. //depot/projects/smpng/sys/pci/if_ste.c#41 integrate .. //depot/projects/smpng/sys/pci/if_ti.c#50 integrate .. //depot/projects/smpng/sys/pci/if_tl.c#30 integrate .. //depot/projects/smpng/sys/pci/if_vr.c#39 integrate .. //depot/projects/smpng/sys/pci/if_wb.c#34 integrate .. //depot/projects/smpng/sys/pci/if_xl.c#64 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/machdep.c#64 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/trap.c#47 integrate .. //depot/projects/smpng/sys/security/mac/mac_process.c#8 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#77 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/trap.c#62 integrate .. //depot/projects/smpng/sys/sys/cdefs.h#31 integrate .. //depot/projects/smpng/sys/sys/event.h#19 integrate .. //depot/projects/smpng/sys/sys/libkern.h#20 integrate .. //depot/projects/smpng/sys/sys/param.h#87 integrate .. //depot/projects/smpng/sys/sys/proc.h#152 integrate .. //depot/projects/smpng/sys/sys/rman.h#15 integrate .. //depot/projects/smpng/sys/sys/signal.h#17 integrate .. //depot/projects/smpng/sys/sys/signalvar.h#24 integrate .. //depot/projects/smpng/sys/sys/syscall.h#59 integrate .. //depot/projects/smpng/sys/sys/syscall.mk#59 integrate .. //depot/projects/smpng/sys/sys/sysent.h#13 integrate .. //depot/projects/smpng/sys/sys/sysproto.h#61 integrate .. //depot/projects/smpng/sys/sys/uuid.h#6 integrate .. //depot/projects/smpng/sys/sys/vnode.h#67 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_alloc.c#38 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_snapshot.c#52 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#76 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vnops.c#44 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_extattr.c#36 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_vnops.c#54 integrate .. //depot/projects/smpng/sys/vm/uma.h#18 integrate .. //depot/projects/smpng/sys/vm/uma_core.c#59 integrate .. //depot/projects/smpng/sys/vm/vm_mmap.c#56 integrate .. //depot/projects/smpng/sys/vm/vm_page.c#65 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/machdep.c#81 (text+ko) ==== @@ -88,7 +88,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.235 2005/04/04 21:53:51 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.236 2005/10/14 12:43:42 davidxu Exp $"); #include "opt_compat.h" #include "opt_ddb.h" @@ -211,11 +211,10 @@ #define PHYS_AVAIL_ARRAY_END ((sizeof(phys_avail) / sizeof(vm_offset_t)) - 2) #ifdef COMPAT_43 -void osendsig(sig_t catcher, int sig, sigset_t *mask, u_long code); +void osendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask); #endif #ifdef COMPAT_FREEBSD4 -static void freebsd4_sendsig(sig_t catcher, int sig, sigset_t *mask, - u_long code); +static void freebsd4_sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask); #endif static void get_fpcontext(struct thread *td, mcontext_t *mcp); @@ -1107,7 +1106,7 @@ */ #ifdef COMPAT_43 void -osendsig(sig_t catcher, int sig, sigset_t *mask, u_long code) +osendsig(sig_t catcher, ksiginfo_t *kp, sigset_t *mask) { struct proc *p; struct thread *td; @@ -1115,10 +1114,14 @@ struct trapframe *frame; struct sigacts *psp; int oonstack, fsize, rndfsize; + int sig; + int code; td = curthread; p = td->td_proc; PROC_LOCK_ASSERT(p, MA_OWNED); + sig = kp->ksi_signo; + code = kp->ksi_code; psp = p->p_sigacts; mtx_assert(&psp->ps_mtx, MA_OWNED); @@ -1177,7 +1180,7 @@ /* Fill in POSIX parts */ ksi.si_signo = sig; ksi.si_code = code; - ksi.si_value.sigval_ptr = NULL; /* XXX */ + ksi.si_value = kp->ksi_value; /* * copy the frame out to userland. @@ -1212,7 +1215,7 @@ #ifdef COMPAT_FREEBSD4 static void -freebsd4_sendsig(sig_t catcher, int sig, sigset_t *mask, u_long code) +freebsd4_sendsig(sig_t catcher, ksiginfo_t *kp, sigset_t *mask) { struct proc *p; struct thread *td; @@ -1220,10 +1223,14 @@ struct sigacts *psp; struct sigframe4 sf, *sfp; int oonstack, rndfsize; + int sig; + int code; td = curthread; p = td->td_proc; PROC_LOCK_ASSERT(p, MA_OWNED); + sig = kp->ksi_signo; + code = kp->ksi_code; psp = p->p_sigacts; mtx_assert(&psp->ps_mtx, MA_OWNED); @@ -1308,9 +1315,7 @@ frame->tf_regs[FRAME_A1] = (u_int64_t)&(sfp->sf_si); /* Fill in POSIX parts */ - sf.sf_si.si_signo = sig; - sf.sf_si.si_code = code; - sf.sf_si.si_addr = (void*)frame->tf_regs[FRAME_TRAPARG_A0]; + sf.sf_si = kp->ksi_info; } else frame->tf_regs[FRAME_A1] = code; @@ -1323,7 +1328,7 @@ #endif /* COMPAT_FREEBSD4 */ void -sendsig(sig_t catcher, int sig, sigset_t *mask, u_long code) +sendsig(sig_t catcher, ksiginfo_t *kp, sigset_t *mask) { struct proc *p; struct thread *td; @@ -1331,21 +1336,25 @@ struct sigacts *psp; struct sigframe sf, *sfp; int oonstack, rndfsize; + int sig; + int code; td = curthread; p = td->td_proc; PROC_LOCK_ASSERT(p, MA_OWNED); + sig = kp->ksi_signo; + code = kp->ksi_code; psp = p->p_sigacts; mtx_assert(&psp->ps_mtx, MA_OWNED); #ifdef COMPAT_FREEBSD4 if (SIGISMEMBER(psp->ps_freebsd4, sig)) { - freebsd4_sendsig(catcher, sig, mask, code); + freebsd4_sendsig(catcher, kp, mask); return; } #endif #ifdef COMPAT_43 if (SIGISMEMBER(psp->ps_osigset, sig)) { - osendsig(catcher, sig, mask, code); + osendsig(catcher, kp, mask); return; } #endif @@ -1432,9 +1441,7 @@ frame->tf_regs[FRAME_A1] = (u_int64_t)&(sfp->sf_si); /* Fill in POSIX parts */ - sf.sf_si.si_signo = sig; - sf.sf_si.si_code = code; - sf.sf_si.si_addr = (void*)frame->tf_regs[FRAME_TRAPARG_A0]; + sf.sf_si = kp->ksi_info; } else frame->tf_regs[FRAME_A1] = code; @@ -1446,25 +1453,6 @@ } /* - * Build siginfo_t for SA thread - */ -void -cpu_thread_siginfo(int sig, u_long code, siginfo_t *si) -{ - struct proc *p; - struct thread *td; - - td = curthread; - p = td->td_proc; - PROC_LOCK_ASSERT(p, MA_OWNED); - - bzero(si, sizeof(*si)); - si->si_signo = sig; - si->si_code = code; - /* XXXKSE fill other fields */ -} - -/* * System call to cleanup state after a signal * has been taken. Reset signal mask and * stack state from context left by sendsig (above). ==== //depot/projects/smpng/sys/alpha/alpha/trap.c#61 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/trap.c,v 1.125 2005/09/28 07:03:01 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/trap.c,v 1.126 2005/10/14 12:43:42 davidxu Exp $"); /* #include "opt_fix_unaligned_vax_fp.h" */ #include "opt_ddb.h" @@ -264,6 +264,7 @@ #ifdef SMP register_t s; #endif + ksiginfo_t ksi; /* * Find our per-cpu globals. @@ -585,7 +586,12 @@ framep->tf_regs[FRAME_TRAPARG_A0] = a0; framep->tf_regs[FRAME_TRAPARG_A1] = a1; framep->tf_regs[FRAME_TRAPARG_A2] = a2; - trapsignal(td, i, ucode); + ksiginfo_init_trap(&ksi); + ksi.ksi_signo = i; + ksi.ksi_code = ucode; /* XXX, Should be POSIX si_code */ + ksi.ksi_addr = (void *)a0; + trapsignal(td, &ksi); + out: if (user) { framep->tf_regs[FRAME_SP] = alpha_pal_rdusp(); ==== //depot/projects/smpng/sys/alpha/linux/linux_sysvec.c#21 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.95 2005/07/29 19:40:38 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.96 2005/10/14 12:43:43 davidxu Exp $"); /* XXX we use functions that might not exist. */ #include "opt_compat.h" @@ -75,7 +75,7 @@ SET_DECLARE(linux_ioctl_handler_set, struct linux_ioctl_handler); -void osendsig(sig_t catcher, int sig, sigset_t *mask, u_long code); +void osendsig(sig_t catcher, ksiginfo_t *kp, sigset_t *mask); static int elf_linux_fixup(register_t **stack_base, struct image_params *iparams); ==== //depot/projects/smpng/sys/alpha/osf1/osf1_signal.c#29 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_signal.c,v 1.42 2005/09/28 07:03:01 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_signal.c,v 1.43 2005/10/14 12:43:43 davidxu Exp $"); #include "opt_compat.h" #ifndef COMPAT_43 @@ -459,7 +459,7 @@ */ void -osf1_sendsig(sig_t catcher, int sig, sigset_t *mask, u_long code) +osf1_sendsig(sig_t catcher, ksiginfo_t *kp, sigset_t *mask) { int fsize, oonstack, rndfsize; struct thread *td; @@ -467,10 +467,14 @@ osiginfo_t *sip, ksi; struct trapframe *frame; struct sigacts *psp; + int sig; + int code; td = curthread; p = td->td_proc; PROC_LOCK_ASSERT(p, MA_OWNED); + sig = kp->ksi_signo; + code = kp->ksi_code; psp = p->p_sigacts; mtx_assert(&psp->ps_mtx, MA_OWNED); @@ -526,7 +530,7 @@ /* Fill in POSIX parts */ ksi.si_signo = sig; ksi.si_code = code; - ksi.si_value.sigval_ptr = NULL; /* XXX */ + ksi.si_value = kp->ksi_value; /* * copy the frame out to userland. ==== //depot/projects/smpng/sys/alpha/osf1/osf1_signal.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/osf1/osf1_signal.h,v 1.3 2002/03/20 18:58:46 obrien Exp $ */ +/* $FreeBSD: src/sys/alpha/osf1/osf1_signal.h,v 1.4 2005/10/14 12:43:43 davidxu Exp $ */ #ifndef _OSF1_SIGNAL_H #define _OSF1_SIGNAL_H @@ -61,7 +61,7 @@ void bsd_to_osf1_sigset(const sigset_t *, osf1_sigset_t *); void osf1_to_bsd_sigaltstack(const struct osf1_sigaltstack *, struct sigaltstack *); void osf1_to_bsd_sigset(const osf1_sigset_t *, sigset_t *); -void osf1_sendsig(sig_t, int , sigset_t *, u_long ); +void osf1_sendsig(sig_t, struct ksiginfo *, sigset_t *); #endif /* !_OSF1_SIGNAL_H */ ==== //depot/projects/smpng/sys/amd64/amd64/machdep.c#44 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.640 2005/09/27 18:15:57 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.641 2005/10/14 12:43:43 davidxu Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -237,11 +237,7 @@ * specified pc, psl. */ void -sendsig(catcher, sig, mask, code) - sig_t catcher; - int sig; - sigset_t *mask; - u_long code; +sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) { struct sigframe sf, *sfp; struct proc *p; @@ -250,10 +246,12 @@ char *sp; struct trapframe *regs; int oonstack; + int sig; td = curthread; p = td->td_proc; PROC_LOCK_ASSERT(p, MA_OWNED); + sig = ksi->ksi_signo; psp = p->p_sigacts; mtx_assert(&psp->ps_mtx, MA_OWNED); regs = td->td_frame; @@ -297,13 +295,13 @@ sf.sf_ahu.sf_action = (__siginfohandler_t *)catcher; /* Fill in POSIX parts */ - sf.sf_si.si_signo = sig; - sf.sf_si.si_code = code; - regs->tf_rcx = regs->tf_addr; /* arg 4 in %rcx */ + sf.sf_si = ksi->ksi_info; + sf.sf_si.si_signo = sig; /* maybe a translated signal */ + regs->tf_rcx = (register_t)ksi->ksi_addr; /* arg 4 in %rcx */ } else { /* Old FreeBSD-style arguments. */ - regs->tf_rsi = code; /* arg 2 in %rsi */ - regs->tf_rcx = regs->tf_addr; /* arg 4 in %rcx */ + regs->tf_rsi = ksi->ksi_code; /* arg 2 in %rsi */ + regs->tf_rcx = (register_t)ksi->ksi_addr; /* arg 4 in %rcx */ sf.sf_ahu.sf_handler = catcher; } mtx_unlock(&psp->ps_mtx); @@ -329,28 +327,6 @@ } /* - * Build siginfo_t for SA thread - */ -void -cpu_thread_siginfo(int sig, u_long code, siginfo_t *si) -{ - struct proc *p; - struct thread *td; - struct trapframe *regs; - - td = curthread; - p = td->td_proc; - regs = td->td_frame; - PROC_LOCK_ASSERT(p, MA_OWNED); - - bzero(si, sizeof(*si)); - si->si_signo = sig; - si->si_code = code; - si->si_addr = (void *)regs->tf_addr; - /* XXXKSE fill other fields */ -} - -/* * System call to cleanup state after a signal * has been taken. Reset signal mask and * stack state from context left by sendsig (above). @@ -374,6 +350,7 @@ const ucontext_t *ucp; long rflags; int cs, error, ret; + ksiginfo_t ksi; error = copyin(uap->sigcntxp, &uc, sizeof(uc)); if (error != 0) @@ -407,7 +384,12 @@ cs = ucp->uc_mcontext.mc_cs; if (!CS_SECURE(cs)) { printf("sigreturn: cs = 0x%x\n", cs); - trapsignal(td, SIGBUS, T_PROTFLT); + ksiginfo_init_trap(&ksi); + ksi.ksi_signo = SIGBUS; + ksi.ksi_code = BUS_OBJERR; + ksi.ksi_trapno = T_PROTFLT; + ksi.ksi_addr = (void *)regs->tf_rip; + trapsignal(td, &ksi); return (EINVAL); } ==== //depot/projects/smpng/sys/amd64/amd64/trap.c#35 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.294 2005/10/01 18:56:16 glebius Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.295 2005/10/14 12:43:43 davidxu Exp $"); /* * AMD64 Trap and System call handling @@ -161,6 +161,8 @@ struct proc *p = td->td_proc; u_int sticks = 0; int i = 0, ucode = 0, type, code; + register_t addr = 0; + ksiginfo_t ksi; PCPU_LAZY_INC(cnt.v_trap); type = frame.tf_trapno; @@ -241,13 +243,14 @@ sticks = td->td_sticks; td->td_frame = &frame; + addr = frame.tf_rip; if (td->td_ucred != p->p_ucred) cred_update_thread(td); switch (type) { case T_PRIVINFLT: /* privileged instruction fault */ - ucode = type; i = SIGILL; + ucode = ILL_PRVOPC; break; case T_BPTFLT: /* bpt instruction fault */ @@ -255,6 +258,7 @@ enable_intr(); frame.tf_rflags &= ~PSL_T; i = SIGTRAP; + ucode = (type == T_TRCTRAP ? TRAP_TRACE : TRAP_BRKPT); break; case T_ARITHTRAP: /* arithmetic trap */ @@ -265,16 +269,26 @@ break; case T_PROTFLT: /* general protection fault */ + i = SIGBUS; + ucode = BUS_OBJERR; + break; case T_STKFLT: /* stack fault */ case T_SEGNPFLT: /* segment not present fault */ + i = SIGBUS; + ucode = BUS_ADRERR; + break; case T_TSSFLT: /* invalid TSS fault */ + i = SIGBUS; + ucode = BUS_OBJERR; + break; case T_DOUBLEFLT: /* double fault */ default: - ucode = code + BUS_SEGM_FAULT ; i = SIGBUS; + ucode = BUS_OBJERR; break; case T_PAGEFLT: /* page fault */ + addr = frame.tf_addr; if (td->td_pflags & TDP_SA) thread_user_enter(td); i = trap_pfault(&frame, TRUE); @@ -283,7 +297,12 @@ if (i == 0) goto user; - ucode = T_PAGEFLT; + if (i == SIGSEGV) + ucode = SEGV_MAPERR; + else { + i = SIGSEGV; /* XXX hack */ + ucode = SEGV_ACCERR; + } break; case T_DIVIDE: /* integer divide fault */ @@ -326,12 +345,14 @@ /* transparent fault (due to context switch "late") */ if (fpudna()) goto userout; - i = SIGFPE; - ucode = FPE_FPU_NP_TRAP; + printf("pid %d killed due to lack of floating point\n", + p->p_pid); + i = SIGKILL; + ucode = 0; break; case T_FPOPFLT: /* FPU operand fetch fault */ - ucode = T_FPOPFLT; + ucode = ILL_COPROC; i = SIGILL; break; @@ -472,7 +493,12 @@ if (*p->p_sysent->sv_transtrap) i = (*p->p_sysent->sv_transtrap)(i, type); - trapsignal(td, i, ucode); + ksiginfo_init_trap(&ksi); + ksi.ksi_signo = i; + ksi.ksi_code = ucode; + ksi.ksi_trapno = type; + ksi.ksi_addr = (void *)addr; + trapsignal(td, &ksi); #ifdef DEBUG if (type <= MAX_TRAP_MSG) { @@ -696,6 +722,7 @@ register_t *argp; u_int code; int reg, regcnt; + ksiginfo_t ksi; /* * note: PCPU_LAZY_INC() can only be used if we can afford @@ -826,7 +853,12 @@ */ if (orig_tf_rflags & PSL_T) { frame.tf_rflags &= ~PSL_T; - trapsignal(td, SIGTRAP, 0); + + ksiginfo_init_trap(&ksi); + ksi.ksi_signo = SIGTRAP; + ksi.ksi_code = TRAP_TRACE; + ksi.ksi_addr = (void *)frame.tf_rip; + trapsignal(td, &ksi); } /* ==== //depot/projects/smpng/sys/amd64/conf/NOTES#21 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.42 2005/09/08 03:29:18 scottl Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.44 2005/10/14 17:22:28 ru Exp $ # # @@ -76,10 +76,10 @@ # potential increase in response times. # It is strongly recommended to use HZ=1000 or 2000 with DEVICE_POLLING # to achieve smoother behaviour. -# Additionally, you can enable/disable polling at runtime with the -# sysctl variable kern.polling.enable (defaults off), and select -# the CPU fraction reserved to userland with the sysctl variable -# kern.polling.user_frac (default 50, range 0..100). +# Additionally, you can enable/disable polling at runtime with help of +# the ifconfig(8) utility, and select the CPU fraction reserved to +# userland with the sysctl variable kern.polling.user_frac +# (default 50, range 0..100). # # Not all device drivers support this mode of operation at the time of # this writing. See polling(4) for more details. @@ -235,9 +235,9 @@ device ath device ath_hal # Atheros HAL (includes binary component) -device ath_rate_onoe # Onoe rate control for ath driver #device ath_rate_amrr # AMRR rate control for ath driver -#device ath_rate_sample # SampleRate rate control for the ath driver +#device ath_rate_onoe # Onoe rate control for ath driver +device ath_rate_sample # SampleRate rate control for the ath driver #device wlan # 802.11 layer # ==== //depot/projects/smpng/sys/amd64/ia32/ia32_reg.c#2 (text+ko) ==== @@ -23,11 +23,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/ia32/ia32_reg.c,v 1.1 2005/06/30 07:49:21 peter Exp $ + * $FreeBSD: src/sys/amd64/ia32/ia32_reg.c,v 1.2 2005/10/04 23:26:00 peter Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_reg.c,v 1.1 2005/06/30 07:49:21 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_reg.c,v 1.2 2005/10/04 23:26:00 peter Exp $"); #include #include @@ -112,12 +112,14 @@ if (!EFL_SECURE(regs->r_eflags, tp->tf_rflags) || !CS_SECURE(regs->r_cs)) return (EINVAL); pcb = td->td_pcb; +#if 0 load_fs(regs->r_fs); pcb->pcb_fs = regs->r_fs; load_es(regs->r_es); pcb->pcb_es = regs->r_es; load_ds(regs->r_ds); pcb->pcb_ds = regs->r_ds; +#endif tp->tf_rdi = regs->r_edi; tp->tf_rsi = regs->r_esi; tp->tf_rbp = regs->r_ebp; @@ -130,8 +132,10 @@ tp->tf_rflags = regs->r_eflags; tp->tf_rsp = regs->r_esp; tp->tf_ss = regs->r_ss; +#if 0 load_gs(regs->r_gs); pcb->pcb_gs = regs->r_gs; +#endif return (0); } ==== //depot/projects/smpng/sys/amd64/ia32/ia32_signal.c#12 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.11 2005/09/27 18:04:20 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.12 2005/10/14 12:43:43 davidxu Exp $"); #include "opt_compat.h" @@ -79,7 +79,7 @@ #include #ifdef COMPAT_FREEBSD4 -static void freebsd4_ia32_sendsig(sig_t, int, sigset_t *, u_long); +static void freebsd4_ia32_sendsig(sig_t, ksiginfo_t *, sigset_t *); #endif static void ia32_get_fpcontext(struct thread *td, struct ia32_mcontext *mcp); static int ia32_set_fpcontext(struct thread *td, const struct ia32_mcontext *mcp); @@ -295,18 +295,23 @@ */ #ifdef COMPAT_FREEBSD4 static void -freebsd4_ia32_sendsig(sig_t catcher, int sig, sigset_t *mask, u_long code) +freebsd4_ia32_sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) { struct ia32_sigframe4 sf, *sfp; + struct ia32_siginfo siginfo; struct proc *p; struct thread *td; struct sigacts *psp; struct trapframe *regs; int oonstack; + int sig; td = curthread; p = td->td_proc; + siginfo_to_ia32siginfo(&ksi->ksi_info, &siginfo); + PROC_LOCK_ASSERT(p, MA_OWNED); + sig = siginfo.si_signo; psp = p->p_sigacts; mtx_assert(&psp->ps_mtx, MA_OWNED); regs = td->td_frame; @@ -362,13 +367,12 @@ sf.sf_ah = (u_int32_t)(uintptr_t)catcher; /* Fill in POSIX parts */ + sf.sf_si = siginfo; sf.sf_si.si_signo = sig; - sf.sf_si.si_code = code; - sf.sf_si.si_addr = regs->tf_addr; } else { /* Old FreeBSD-style arguments. */ - sf.sf_siginfo = code; - sf.sf_addr = regs->tf_addr; + sf.sf_siginfo = siginfo.si_code; + sf.sf_addr = (u_int32_t)siginfo.si_addr; sf.sf_ah = (u_int32_t)(uintptr_t)catcher; } mtx_unlock(&psp->ps_mtx); @@ -400,23 +404,27 @@ #endif /* COMPAT_FREEBSD4 */ void -ia32_sendsig(sig_t catcher, int sig, sigset_t *mask, u_long code) +ia32_sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) { struct ia32_sigframe sf, *sfp; + struct ia32_siginfo siginfo; struct proc *p; struct thread *td; struct sigacts *psp; char *sp; struct trapframe *regs; int oonstack; + int sig; + siginfo_to_ia32siginfo(&ksi->ksi_info, &siginfo); td = curthread; p = td->td_proc; PROC_LOCK_ASSERT(p, MA_OWNED); + sig = siginfo.si_signo; psp = p->p_sigacts; #ifdef COMPAT_FREEBSD4 if (SIGISMEMBER(psp->ps_freebsd4, sig)) { - freebsd4_ia32_sendsig(catcher, sig, mask, code); + freebsd4_ia32_sendsig(catcher, ksi, mask); return; } #endif @@ -479,13 +487,12 @@ sf.sf_ah = (u_int32_t)(uintptr_t)catcher; /* Fill in POSIX parts */ + sf.sf_si = siginfo; sf.sf_si.si_signo = sig; - sf.sf_si.si_code = code; - sf.sf_si.si_addr = regs->tf_addr; } else { /* Old FreeBSD-style arguments. */ - sf.sf_siginfo = code; - sf.sf_addr = regs->tf_addr; + sf.sf_siginfo = siginfo.si_code; + sf.sf_addr = (u_int32_t)siginfo.si_addr; sf.sf_ah = (u_int32_t)(uintptr_t)catcher; } mtx_unlock(&psp->ps_mtx); @@ -540,6 +547,7 @@ struct trapframe *regs; const struct ia32_ucontext4 *ucp; int cs, eflags, error; + ksiginfo_t ksi; error = copyin(uap->sigcntxp, &uc, sizeof(uc)); if (error != 0) @@ -573,7 +581,12 @@ cs = ucp->uc_mcontext.mc_cs; if (!CS_SECURE(cs)) { printf("freebsd4_sigreturn: cs = 0x%x\n", cs); - trapsignal(td, SIGBUS, T_PROTFLT); + ksiginfo_init_trap(&ksi); + ksi.ksi_signo = SIGBUS; + ksi.ksi_code = BUS_OBJERR; + ksi.ksi_trapno = T_PROTFLT; + ksi.ksi_addr = (void *)regs->tf_rip; + trapsignal(td, &ksi); return (EINVAL); } @@ -617,6 +630,7 @@ struct trapframe *regs; const struct ia32_ucontext *ucp; int cs, eflags, error, ret; + ksiginfo_t ksi; error = copyin(uap->sigcntxp, &uc, sizeof(uc)); if (error != 0) @@ -650,7 +664,12 @@ cs = ucp->uc_mcontext.mc_cs; if (!CS_SECURE(cs)) { printf("sigreturn: cs = 0x%x\n", cs); - trapsignal(td, SIGBUS, T_PROTFLT); + ksiginfo_init_trap(&ksi); + ksi.ksi_signo = SIGBUS; + ksi.ksi_code = BUS_OBJERR; + ksi.ksi_trapno = T_PROTFLT; + ksi.ksi_addr = (void *)regs->tf_rip; + trapsignal(td, &ksi); return (EINVAL); } @@ -722,3 +741,18 @@ pcb->pcb_flags |= PCB_FULLCTX; td->td_retval[1] = 0; } + +void +siginfo_to_ia32siginfo(siginfo_t *src, struct ia32_siginfo *dst) +{ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Oct 14 18:52:08 2005 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 1C5ED16A421; Fri, 14 Oct 2005 18:52:08 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CCFE516A41F for ; Fri, 14 Oct 2005 18:52:07 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8F4FA43D6E for ; Fri, 14 Oct 2005 18:52:07 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9EIq770077079 for ; Fri, 14 Oct 2005 18:52:07 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9EIq7PE077076 for perforce@freebsd.org; Fri, 14 Oct 2005 18:52:07 GMT (envelope-from jhb@freebsd.org) Date: Fri, 14 Oct 2005 18:52:07 GMT Message-Id: <200510141852.j9EIq7PE077076@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 85298 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, 14 Oct 2005 18:52:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=85298 Change 85298 by jhb@jhb_slimer on 2005/10/14 18:51:44 IFC @85297. Affected files ... .. //depot/projects/smpng/sys/arm/include/atomic.h#21 integrate .. //depot/projects/smpng/sys/conf/files#153 integrate .. //depot/projects/smpng/sys/conf/options#108 integrate .. //depot/projects/smpng/sys/dev/sx/cd1865.h#3 delete .. //depot/projects/smpng/sys/dev/sx/sx.c#7 delete .. //depot/projects/smpng/sys/dev/sx/sx.h#6 delete .. //depot/projects/smpng/sys/dev/sx/sx_pci.c#5 delete .. //depot/projects/smpng/sys/dev/sx/sx_util.c#3 delete .. //depot/projects/smpng/sys/dev/sx/sx_util.h#3 delete .. //depot/projects/smpng/sys/dev/sx/sxvar.h#3 delete .. //depot/projects/smpng/sys/i386/conf/NOTES#107 integrate .. //depot/projects/smpng/sys/pc98/conf/NOTES#44 integrate Differences ... ==== //depot/projects/smpng/sys/arm/include/atomic.h#21 (text+ko) ==== @@ -33,7 +33,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/atomic.h,v 1.11 2005/09/27 17:39:10 jhb Exp $ + * $FreeBSD: src/sys/arm/include/atomic.h,v 1.13 2005/10/14 18:36:49 jhb Exp $ */ #ifndef _MACHINE_ATOMIC_H_ ==== //depot/projects/smpng/sys/conf/files#153 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1056 2005/10/06 19:06:06 pjd Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1057 2005/10/14 18:24:57 jhb Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -901,10 +901,6 @@ dev/stg/tmc18c30_pci.c optional stg pci dev/stg/tmc18c30_subr.c optional stg dev/streams/streams.c optional streams -dev/sx/sx.c optional sx -#dev/sx/sx_isa.c optional sx isa -dev/sx/sx_util.c optional sx -dev/sx/sx_pci.c optional sx pci dev/sym/sym_hipd.c optional sym \ dependency "$S/dev/sym/sym_{conf,defs}.h" dev/syscons/blank/blank_saver.c optional blank_saver ==== //depot/projects/smpng/sys/conf/options#108 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.516 2005/10/05 10:09:14 glebius Exp $ +# $FreeBSD: src/sys/conf/options,v 1.517 2005/10/14 18:24:58 jhb Exp $ # # On the handling of kernel options # @@ -478,7 +478,6 @@ LOCKF_DEBUG opt_debug_lockf.h NETATALKDEBUG opt_atalk.h SI_DEBUG opt_debug_si.h -SX_DEBUG opt_debug_sx.h # Fb options FB_DEBUG opt_fb.h ==== //depot/projects/smpng/sys/i386/conf/NOTES#107 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/i386/conf/NOTES,v 1.1207 2005/10/14 17:22:28 ru Exp $ +# $FreeBSD: src/sys/i386/conf/NOTES,v 1.1208 2005/10/14 18:24:58 jhb Exp $ # # @@ -692,9 +692,6 @@ device spic hint.spic.0.at="isa" hint.spic.0.port="0x10a0" -# sx device is i386 and pc98 only at the moment. -device sx -options SX_DEBUG # HOT1 Xilinx 6200 card (http://www.vcc.com/) device xrpu ==== //depot/projects/smpng/sys/pc98/conf/NOTES#44 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/pc98/conf/NOTES,v 1.63 2005/10/07 09:23:51 glebius Exp $ +# $FreeBSD: src/sys/pc98/conf/NOTES,v 1.64 2005/10/14 18:24:58 jhb Exp $ # # @@ -460,9 +460,6 @@ hint.pmc.0.at="isa" hint.pmc.0.port="0x8f0" device pmtimer # Adjust system timer at wakeup time -# sx device is i386 and pc98 only at the moment. -device sx -options SX_DEBUG # # Laptop/Notebook options: From owner-p4-projects@FreeBSD.ORG Fri Oct 14 20:48:42 2005 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 C761816A421; Fri, 14 Oct 2005 20:48:41 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8A47016A41F for ; Fri, 14 Oct 2005 20:48:41 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EB44443D46 for ; Fri, 14 Oct 2005 20:48:40 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9EKmejp089046 for ; Fri, 14 Oct 2005 20:48:40 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9EKmeq2089043 for perforce@freebsd.org; Fri, 14 Oct 2005 20:48:40 GMT (envelope-from millert@freebsd.org) Date: Fri, 14 Oct 2005 20:48:40 GMT Message-Id: <200510142048.j9EKmeq2089043@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 85307 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, 14 Oct 2005 20:48:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=85307 Change 85307 by millert@millert_ibook on 2005/10/14 20:48:08 Fix the bug in MAC_INTERNALIZE where the return code from the policies' internalize ops was not being checked. Also invert the logic for comparing the label namespace. Also invert the logic for comparing label namespaces in the MAC_EXTERNALIZE macro to clarify the source. From the DSEP branch (wsalamon). Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/security/mac_internal.h#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/security/mac_internal.h#4 (text+ko) ==== @@ -264,24 +264,22 @@ continue; \ \ for (idx = 0; idx < ME_mpc->mpc_labelname_count; idx++) { \ - if (strcmp(ME_mpc->mpc_labelnames[idx], element) == 0){\ - if (count == 0) { \ - error = sbuf_printf(&sb, "%s/", \ - element); \ - if (error) \ - break; \ - } else { \ - error = sbuf_printf(&sb, ","); \ - if (error) \ - break; \ - } \ - error = \ - ME_mpc->mpc_ops->mpo_externalize_## type ##_label\ - (label, element, &sb); \ + if (strcmp(ME_mpc->mpc_labelnames[idx], element) != 0)\ + continue; \ + if (count == 0) { \ + error = sbuf_printf(&sb, "%s/", element);\ + if (error) \ + break; \ + } else { \ + error = sbuf_printf(&sb, ","); \ if (error) \ break; \ - count++; \ } \ + error = ME_mpc->mpc_ops->mpo_externalize_## type ##_label\ + (label, element, &sb); \ + if (error) \ + break; \ + count++; \ } \ if (error) \ break; \ @@ -404,13 +402,13 @@ continue; \ \ for (idx = 0; idx < MI_mpc->mpc_labelname_count; idx++) { \ - if (strcmp(MI_mpc->mpc_labelnames[idx], element) == 0){\ - MI_mpc->mpc_ops->mpo_internalize_## type ##_label\ + if (strcmp(MI_mpc->mpc_labelnames[idx], element) != 0) \ + continue; \ + error = MI_mpc->mpc_ops->mpo_internalize_## type ##_label\ (label, element, element_data); \ - if (error) \ - break; \ - count++; \ - } \ + if (error) \ + break; \ + count++; \ } \ if (error) \ break; \ From owner-p4-projects@FreeBSD.ORG Fri Oct 14 23:41:14 2005 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 37B7C16A421; Fri, 14 Oct 2005 23:41:14 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1110C16A41F for ; Fri, 14 Oct 2005 23:41:14 +0000 (GMT) (envelope-from soc-chenk@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A477043D46 for ; Fri, 14 Oct 2005 23:41:13 +0000 (GMT) (envelope-from soc-chenk@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9ENfDpq098093 for ; Fri, 14 Oct 2005 23:41:13 GMT (envelope-from soc-chenk@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9ENfDig098090 for perforce@freebsd.org; Fri, 14 Oct 2005 23:41:13 GMT (envelope-from soc-chenk@freebsd.org) Date: Fri, 14 Oct 2005 23:41:13 GMT Message-Id: <200510142341.j9ENfDig098090@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-chenk@freebsd.org using -f From: soc-chenk To: Perforce Change Reviews Cc: Subject: PERFORCE change 85318 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, 14 Oct 2005 23:41:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=85318 Change 85318 by soc-chenk@soc-chenk_leavemealone on 2005/10/14 23:40:32 Attempt to fix some known non-privilegedly accessible crash schemes - tried to fix: - forced unmount when being busy - deadlocks by null mounts Submitted by: soc-chenk Affected files ... .. //depot/projects/soc2005/fuse4bsd2/fuse_module/fuse.c#17 edit Differences ... ==== //depot/projects/soc2005/fuse4bsd2/fuse_module/fuse.c#17 (text+ko) ==== @@ -333,8 +333,18 @@ out: mtx_unlock(&caliban->answer_mtx); - KASSERT(err || fuse_callbn_answered(caliban), - ("fuse requester was woken up but still no answer")); + if (! (err || fuse_callbn_answered(caliban))) { + /* + * Some deadlocky scenarios can get us here, like SIGKILLing + * the fusexmp daemon after a fuse dir has been null mounted + * over its original copy in the "normal" fs + * + * (I guess there is no need of kicking the daemon at this + * point...) + */ + DEBUG2G("fuse requester was woken up but still no answer"); + err = ENXIO; + } return (err); } @@ -3520,6 +3530,16 @@ panic("non-fat file passed to read routine"); vn_lock(fp->f_vnode, LK_EXCLUSIVE | LK_RETRY, td); + + if (fp->f_vnode->v_type == VBAD) { +#if _DEBUG2G + DEBUG2G("bad file\n"); + vn_printf(fp->f_vnode, " * "); +#endif + VOP_UNLOCK(fp->f_vnode, 0, td); + return (EBADF); + } + if ((flags & FOF_OFFSET) == 0) uio->uio_offset = fp->f_offset; @@ -4845,6 +4865,16 @@ return (0); vn_lock(fp->f_vnode, LK_EXCLUSIVE | LK_RETRY, td); + + if (fp->f_vnode->v_type == VBAD) { +#if _DEBUG2G + DEBUG2G("bad file\n"); + vn_printf(fp->f_vnode, " * "); +#endif + VOP_UNLOCK(fp->f_vnode, 0, td); + return (EBADF); + } + if (fp->f_flag & O_APPEND) { VOP_GETATTR(fp->f_vnode, &va, cred, td); uio->uio_offset = va.va_size; From owner-p4-projects@FreeBSD.ORG Sat Oct 15 01:23:22 2005 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 404D716A421; Sat, 15 Oct 2005 01:23:21 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8BEB116A41F for ; Sat, 15 Oct 2005 01:23:20 +0000 (GMT) (envelope-from gnn@neville-neil.com) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1010643D48 for ; Sat, 15 Oct 2005 01:23:20 +0000 (GMT) (envelope-from gnn@neville-neil.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9F1NKep009149 for ; Sat, 15 Oct 2005 01:23:20 GMT (envelope-from gnn@neville-neil.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9F1NJVa009146 for perforce@freebsd.org; Sat, 15 Oct 2005 01:23:19 GMT (envelope-from gnn@neville-neil.com) Date: Sat, 15 Oct 2005 01:23:19 GMT Message-Id: <200510150123.j9F1NJVa009146@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gnn@neville-neil.com using -f From: "George V. Neville-Neil" To: Perforce Change Reviews Cc: Subject: PERFORCE change 85324 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, 15 Oct 2005 01:23:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=85324 Change 85324 by gnn@fast_ipsec_integ on 2005/10/15 01:22:36 Integration from HEAD Affected files ... .. //depot/projects/fast_ipsec/src/sys/alpha/alpha/machdep.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/alpha/alpha/trap.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/alpha/linux/linux_sysvec.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/alpha/osf1/osf1_signal.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/alpha/osf1/osf1_signal.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/amd64/identcpu.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/amd64/initcpu.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/amd64/machdep.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/amd64/trap.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/conf/NOTES#3 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/ia32/ia32_signal.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/ia32/ia32_syscall.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/include/md_var.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/include/specialreg.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/linux32/linux32_sysvec.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/arm/arm/machdep.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/arm/arm/trap.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/arm/arm/undefined.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/arm/include/atomic.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/compat/ia32/ia32_signal.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/compat/linux/linux_misc.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/compat/svr4/svr4_signal.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/conf/files#3 integrate .. //depot/projects/fast_ipsec/src/sys/conf/kmod.mk#3 integrate .. //depot/projects/fast_ipsec/src/sys/conf/options#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/aac/aac.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/aac/aacreg.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/pccard/pccarddevs#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/re/if_re.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sx/cd1865.h#2 delete .. //depot/projects/fast_ipsec/src/sys/dev/sx/sx.c#2 delete .. //depot/projects/fast_ipsec/src/sys/dev/sx/sx.h#2 delete .. //depot/projects/fast_ipsec/src/sys/dev/sx/sx_pci.c#2 delete .. //depot/projects/fast_ipsec/src/sys/dev/sx/sx_util.c#2 delete .. //depot/projects/fast_ipsec/src/sys/dev/sx/sx_util.h#2 delete .. //depot/projects/fast_ipsec/src/sys/dev/sx/sxvar.h#2 delete .. //depot/projects/fast_ipsec/src/sys/dev/wi/if_wi_pccard.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/fs/nwfs/nwfs_vfsops.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/fs/procfs/procfs_ctl.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/fs/smbfs/smbfs_vfsops.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/conf/NOTES#3 integrate .. //depot/projects/fast_ipsec/src/sys/i386/i386/identcpu.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/i386/initcpu.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/i386/machdep.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/i386/trap.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/i386/include/md_var.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/include/specialreg.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/linux/linux_sysvec.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/svr4/svr4_machdep.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/ia64/ia32/ia32_signal.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/ia64/ia32/ia32_trap.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/ia64/ia64/machdep.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/ia64/ia64/trap.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/init_sysent.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_exec.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_exit.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_kse.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_sig.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_thr.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_thread.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/kern/subr_param.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/subr_trap.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/syscalls.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/kern/syscalls.master#3 integrate .. //depot/projects/fast_ipsec/src/sys/kern/vfs_subr.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/modules/3dfx/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/Makefile#3 integrate .. //depot/projects/fast_ipsec/src/sys/modules/acpi/acpi/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/aha/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/ahb/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/an/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/ar/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/arcnet/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/arl/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/awi/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/bktr/bktr/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/cam/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/coda5/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/cp/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/ctau/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/cx/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/dcons/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/digi/digi/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/en/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/fatm/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/firewire/fwip/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/hatm/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/hifn/Makefile#3 integrate .. //depot/projects/fast_ipsec/src/sys/modules/if_bridge/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/if_disc/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/if_ef/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/if_faith/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/if_gif/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/if_gre/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/if_ppp/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/if_sl/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/if_stf/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/if_tap/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/if_tun/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/if_vlan/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/ip_mroute_mod/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/ipfilter/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/kbdmux/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/linux/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/netgraph/gif/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/netgraph/iface/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/netgraph/mppc/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/netgraph/sync_ar/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/netgraph/sync_sr/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/nfs4client/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/nfsclient/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/nfsserver/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/nmdm/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/nwfs/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/osf1/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/patm/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/pf/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/rc/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/rp/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/safe/Makefile#3 integrate .. //depot/projects/fast_ipsec/src/sys/modules/sio/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/smbfs/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/snc/Makefile#3 integrate .. //depot/projects/fast_ipsec/src/sys/modules/sppp/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/sr/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/svr4/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/trm/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/ubsec/Makefile#3 integrate .. //depot/projects/fast_ipsec/src/sys/modules/ukbd/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/vkbd/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/wi/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/wlan/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/net/if_bridge.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/netgraph/ng_mppc.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/pc98/conf/NOTES#3 integrate .. //depot/projects/fast_ipsec/src/sys/pc98/pc98/machdep.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/pci/if_rlreg.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/pci/if_sk.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/pci/if_skreg.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/powerpc/powerpc/machdep.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/powerpc/powerpc/trap.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/include/param.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/sparc64/machdep.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/sparc64/trap.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/proc.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/sys/signalvar.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/sys/syscall.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/sys/syscall.mk#3 integrate .. //depot/projects/fast_ipsec/src/sys/sys/sysent.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/sysproto.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/ufs/ufs/ufs_lookup.c#2 integrate Differences ... ==== //depot/projects/fast_ipsec/src/sys/alpha/alpha/machdep.c#2 (text+ko) ==== @@ -88,7 +88,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.235 2005/04/04 21:53:51 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.236 2005/10/14 12:43:42 davidxu Exp $"); #include "opt_compat.h" #include "opt_ddb.h" @@ -211,11 +211,10 @@ #define PHYS_AVAIL_ARRAY_END ((sizeof(phys_avail) / sizeof(vm_offset_t)) - 2) #ifdef COMPAT_43 -void osendsig(sig_t catcher, int sig, sigset_t *mask, u_long code); +void osendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask); #endif #ifdef COMPAT_FREEBSD4 -static void freebsd4_sendsig(sig_t catcher, int sig, sigset_t *mask, - u_long code); +static void freebsd4_sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask); #endif static void get_fpcontext(struct thread *td, mcontext_t *mcp); @@ -1107,7 +1106,7 @@ */ #ifdef COMPAT_43 void -osendsig(sig_t catcher, int sig, sigset_t *mask, u_long code) +osendsig(sig_t catcher, ksiginfo_t *kp, sigset_t *mask) { struct proc *p; struct thread *td; @@ -1115,10 +1114,14 @@ struct trapframe *frame; struct sigacts *psp; int oonstack, fsize, rndfsize; + int sig; + int code; td = curthread; p = td->td_proc; PROC_LOCK_ASSERT(p, MA_OWNED); + sig = kp->ksi_signo; + code = kp->ksi_code; psp = p->p_sigacts; mtx_assert(&psp->ps_mtx, MA_OWNED); @@ -1177,7 +1180,7 @@ /* Fill in POSIX parts */ ksi.si_signo = sig; ksi.si_code = code; - ksi.si_value.sigval_ptr = NULL; /* XXX */ + ksi.si_value = kp->ksi_value; /* * copy the frame out to userland. @@ -1212,7 +1215,7 @@ #ifdef COMPAT_FREEBSD4 static void -freebsd4_sendsig(sig_t catcher, int sig, sigset_t *mask, u_long code) +freebsd4_sendsig(sig_t catcher, ksiginfo_t *kp, sigset_t *mask) { struct proc *p; struct thread *td; @@ -1220,10 +1223,14 @@ struct sigacts *psp; struct sigframe4 sf, *sfp; int oonstack, rndfsize; + int sig; + int code; td = curthread; p = td->td_proc; PROC_LOCK_ASSERT(p, MA_OWNED); + sig = kp->ksi_signo; + code = kp->ksi_code; psp = p->p_sigacts; mtx_assert(&psp->ps_mtx, MA_OWNED); @@ -1308,9 +1315,7 @@ frame->tf_regs[FRAME_A1] = (u_int64_t)&(sfp->sf_si); /* Fill in POSIX parts */ - sf.sf_si.si_signo = sig; - sf.sf_si.si_code = code; - sf.sf_si.si_addr = (void*)frame->tf_regs[FRAME_TRAPARG_A0]; + sf.sf_si = kp->ksi_info; } else frame->tf_regs[FRAME_A1] = code; @@ -1323,7 +1328,7 @@ #endif /* COMPAT_FREEBSD4 */ void -sendsig(sig_t catcher, int sig, sigset_t *mask, u_long code) +sendsig(sig_t catcher, ksiginfo_t *kp, sigset_t *mask) { struct proc *p; struct thread *td; @@ -1331,21 +1336,25 @@ struct sigacts *psp; struct sigframe sf, *sfp; int oonstack, rndfsize; + int sig; + int code; td = curthread; p = td->td_proc; PROC_LOCK_ASSERT(p, MA_OWNED); + sig = kp->ksi_signo; + code = kp->ksi_code; psp = p->p_sigacts; mtx_assert(&psp->ps_mtx, MA_OWNED); #ifdef COMPAT_FREEBSD4 if (SIGISMEMBER(psp->ps_freebsd4, sig)) { - freebsd4_sendsig(catcher, sig, mask, code); + freebsd4_sendsig(catcher, kp, mask); return; } #endif #ifdef COMPAT_43 if (SIGISMEMBER(psp->ps_osigset, sig)) { - osendsig(catcher, sig, mask, code); + osendsig(catcher, kp, mask); return; } #endif @@ -1432,9 +1441,7 @@ frame->tf_regs[FRAME_A1] = (u_int64_t)&(sfp->sf_si); /* Fill in POSIX parts */ - sf.sf_si.si_signo = sig; - sf.sf_si.si_code = code; - sf.sf_si.si_addr = (void*)frame->tf_regs[FRAME_TRAPARG_A0]; + sf.sf_si = kp->ksi_info; } else frame->tf_regs[FRAME_A1] = code; @@ -1446,25 +1453,6 @@ } /* - * Build siginfo_t for SA thread - */ -void -cpu_thread_siginfo(int sig, u_long code, siginfo_t *si) -{ - struct proc *p; - struct thread *td; - - td = curthread; - p = td->td_proc; - PROC_LOCK_ASSERT(p, MA_OWNED); - - bzero(si, sizeof(*si)); - si->si_signo = sig; - si->si_code = code; - /* XXXKSE fill other fields */ -} - -/* * System call to cleanup state after a signal * has been taken. Reset signal mask and * stack state from context left by sendsig (above). ==== //depot/projects/fast_ipsec/src/sys/alpha/alpha/trap.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/trap.c,v 1.125 2005/09/28 07:03:01 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/trap.c,v 1.126 2005/10/14 12:43:42 davidxu Exp $"); /* #include "opt_fix_unaligned_vax_fp.h" */ #include "opt_ddb.h" @@ -264,6 +264,7 @@ #ifdef SMP register_t s; #endif + ksiginfo_t ksi; /* * Find our per-cpu globals. @@ -585,7 +586,12 @@ framep->tf_regs[FRAME_TRAPARG_A0] = a0; framep->tf_regs[FRAME_TRAPARG_A1] = a1; framep->tf_regs[FRAME_TRAPARG_A2] = a2; - trapsignal(td, i, ucode); + ksiginfo_init_trap(&ksi); + ksi.ksi_signo = i; + ksi.ksi_code = ucode; /* XXX, Should be POSIX si_code */ + ksi.ksi_addr = (void *)a0; + trapsignal(td, &ksi); + out: if (user) { framep->tf_regs[FRAME_SP] = alpha_pal_rdusp(); ==== //depot/projects/fast_ipsec/src/sys/alpha/linux/linux_sysvec.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.95 2005/07/29 19:40:38 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.96 2005/10/14 12:43:43 davidxu Exp $"); /* XXX we use functions that might not exist. */ #include "opt_compat.h" @@ -77,7 +77,7 @@ SET_DECLARE(linux_ioctl_handler_set, struct linux_ioctl_handler); -void osendsig(sig_t catcher, int sig, sigset_t *mask, u_long code); +void osendsig(sig_t catcher, ksiginfo_t *kp, sigset_t *mask); static int elf_linux_fixup(register_t **stack_base, struct image_params *iparams); ==== //depot/projects/fast_ipsec/src/sys/alpha/osf1/osf1_signal.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_signal.c,v 1.42 2005/09/28 07:03:01 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_signal.c,v 1.43 2005/10/14 12:43:43 davidxu Exp $"); #include "opt_compat.h" #ifndef COMPAT_43 @@ -459,7 +459,7 @@ */ void -osf1_sendsig(sig_t catcher, int sig, sigset_t *mask, u_long code) +osf1_sendsig(sig_t catcher, ksiginfo_t *kp, sigset_t *mask) { int fsize, oonstack, rndfsize; struct thread *td; @@ -467,10 +467,14 @@ osiginfo_t *sip, ksi; struct trapframe *frame; struct sigacts *psp; + int sig; + int code; td = curthread; p = td->td_proc; PROC_LOCK_ASSERT(p, MA_OWNED); + sig = kp->ksi_signo; + code = kp->ksi_code; psp = p->p_sigacts; mtx_assert(&psp->ps_mtx, MA_OWNED); @@ -526,7 +530,7 @@ /* Fill in POSIX parts */ ksi.si_signo = sig; ksi.si_code = code; - ksi.si_value.sigval_ptr = NULL; /* XXX */ + ksi.si_value = kp->ksi_value; /* * copy the frame out to userland. ==== //depot/projects/fast_ipsec/src/sys/alpha/osf1/osf1_signal.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/osf1/osf1_signal.h,v 1.3 2002/03/20 18:58:46 obrien Exp $ */ +/* $FreeBSD: src/sys/alpha/osf1/osf1_signal.h,v 1.4 2005/10/14 12:43:43 davidxu Exp $ */ #ifndef _OSF1_SIGNAL_H #define _OSF1_SIGNAL_H @@ -61,7 +61,7 @@ void bsd_to_osf1_sigset(const sigset_t *, osf1_sigset_t *); void osf1_to_bsd_sigaltstack(const struct osf1_sigaltstack *, struct sigaltstack *); void osf1_to_bsd_sigset(const osf1_sigset_t *, sigset_t *); -void osf1_sendsig(sig_t, int , sigset_t *, u_long ); +void osf1_sendsig(sig_t, struct ksiginfo *, sigset_t *); #endif /* !_OSF1_SIGNAL_H */ ==== //depot/projects/fast_ipsec/src/sys/amd64/amd64/identcpu.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.136 2005/05/29 17:43:23 schweikh Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.137 2005/10/14 22:52:00 jkim Exp $"); #include "opt_cpu.h" @@ -165,6 +165,8 @@ strcmp(cpu_vendor, "AuthenticAMD") == 0) { printf(" Stepping = %u", cpu_id & 0xf); if (cpu_high > 0) { + u_int cmp = 1, htt = 1; + /* * Here we should probably set up flags indicating * whether or not various features are available. @@ -246,6 +248,16 @@ "\040" ); } + + /* + * AMD64 Architecture Programmer's Manual Volume 3: + * General-Purpose and System Instructions + * http://www.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/24594.pdf + * + * IA-32 Intel Architecture Software Developer's Manual, + * Volume 2A: Instruction Set Reference, A-M + * ftp://download.intel.com/design/Pentium4/manuals/25366617.pdf + */ if (amd_feature != 0) { printf("\n AMD Features=0x%b", amd_feature, "\020" /* in hex */ @@ -274,9 +286,9 @@ "\027MMX+" /* AMD MMX Extensions */ "\030" /* Same */ "\031" /* Same */ - "\032" /* Undefined */ + "\032FFXSR" /* Fast FXSAVE/FXRSTOR */ "\033" /* Undefined */ - "\034" /* Undefined */ + "\034RDTSCP" /* RDTSCP */ "\035" /* Undefined */ "\036LM" /* 64 bit long mode */ "\0373DNow+" /* AMD 3DNow! Extensions */ @@ -284,14 +296,61 @@ ); } + if (amd_feature2 != 0) { + printf("\n AMD Features2=0x%b", amd_feature2, + "\020" + "\001LAHF" /* LAHF/SAHF in long mode */ + "\002CMP" /* CMP legacy */ + "\003" + "\004" + "\005CR8" /* CR8 in legacy mode */ + "\006" + "\007" + "\010" + "\011" + "\012" + "\013" + "\014" + "\015" + "\016" + "\017" + "\020" + "\021" + "\022" + "\023" + "\024" + "\025" + "\026" + "\027" + "\030" + "\031" + "\032" + "\033" + "\034" + "\035" + "\036" + "\037" + "\040" + ); + } + /* - * If this CPU supports hyperthreading then mention - * the number of logical CPU's it contains. + * If this CPU supports HTT or CMP then mention the + * number of physical/logical cores it contains. */ - if (cpu_feature & CPUID_HTT && - (cpu_procinfo & CPUID_HTT_CORES) >> 16 > 1) - printf("\n Hyperthreading: %d logical CPUs", - (cpu_procinfo & CPUID_HTT_CORES) >> 16); + if (cpu_feature & CPUID_HTT) + htt = (cpu_procinfo & CPUID_HTT_CORES) >> 16; + if (strcmp(cpu_vendor, "AuthenticAMD") == 0 && + (amd_feature2 & AMDID2_CMP)) + cmp = (cpu_procinfo2 & AMDID_CMP_CORES) + 1; + else if (strcmp(cpu_vendor, "GenuineIntel") == 0 && + (cpu_high >= 4)) { + cpuid_count(4, 0, regs); + cmp = ((regs[0] & 0xfc000000) >> 26) + 1; + } + if (htt > 1) + printf("\n Physical/Logical cores: %d/%d", + cmp, htt); } } /* Avoid ugly blank lines: only print newline when we have to. */ @@ -357,6 +416,11 @@ if (cpu_exthigh >= 0x80000001) { do_cpuid(0x80000001, regs); amd_feature = regs[3] & ~(cpu_feature & 0x0183f3ff); + amd_feature2 = regs[2]; + } + if (cpu_exthigh >= 0x80000008) { + do_cpuid(0x80000008, regs); + cpu_procinfo2 = regs[2]; } /* XXX */ ==== //depot/projects/fast_ipsec/src/sys/amd64/amd64/initcpu.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/initcpu.c,v 1.48 2004/06/08 01:02:51 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/initcpu.c,v 1.49 2005/10/14 22:52:00 jkim Exp $"); #include "opt_cpu.h" @@ -51,11 +51,13 @@ int cpu; /* Are we 386, 386sx, 486, etc? */ u_int cpu_feature; /* Feature flags */ u_int cpu_feature2; /* Feature flags */ -u_int amd_feature; /* Feature flags */ +u_int amd_feature; /* AMD feature flags */ +u_int amd_feature2; /* AMD feature flags */ u_int cpu_high; /* Highest arg to CPUID */ u_int cpu_exthigh; /* Highest arg to extended CPUID */ u_int cpu_id; /* Stepping ID */ u_int cpu_procinfo; /* HyperThreading Info / Brand Index / CLFUSH */ +u_int cpu_procinfo2; /* Multicore info */ char cpu_vendor[20]; /* CPU Origin code */ u_int cpu_fxsr; /* SSE enabled */ ==== //depot/projects/fast_ipsec/src/sys/amd64/amd64/machdep.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.640 2005/09/27 18:15:57 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.641 2005/10/14 12:43:43 davidxu Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -237,11 +237,7 @@ * specified pc, psl. */ void -sendsig(catcher, sig, mask, code) - sig_t catcher; - int sig; - sigset_t *mask; - u_long code; +sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) { struct sigframe sf, *sfp; struct proc *p; @@ -250,10 +246,12 @@ char *sp; struct trapframe *regs; int oonstack; + int sig; td = curthread; p = td->td_proc; PROC_LOCK_ASSERT(p, MA_OWNED); + sig = ksi->ksi_signo; psp = p->p_sigacts; mtx_assert(&psp->ps_mtx, MA_OWNED); regs = td->td_frame; @@ -297,13 +295,13 @@ sf.sf_ahu.sf_action = (__siginfohandler_t *)catcher; /* Fill in POSIX parts */ - sf.sf_si.si_signo = sig; - sf.sf_si.si_code = code; - regs->tf_rcx = regs->tf_addr; /* arg 4 in %rcx */ + sf.sf_si = ksi->ksi_info; + sf.sf_si.si_signo = sig; /* maybe a translated signal */ + regs->tf_rcx = (register_t)ksi->ksi_addr; /* arg 4 in %rcx */ } else { /* Old FreeBSD-style arguments. */ - regs->tf_rsi = code; /* arg 2 in %rsi */ - regs->tf_rcx = regs->tf_addr; /* arg 4 in %rcx */ + regs->tf_rsi = ksi->ksi_code; /* arg 2 in %rsi */ + regs->tf_rcx = (register_t)ksi->ksi_addr; /* arg 4 in %rcx */ sf.sf_ahu.sf_handler = catcher; } mtx_unlock(&psp->ps_mtx); @@ -329,28 +327,6 @@ } /* - * Build siginfo_t for SA thread - */ -void -cpu_thread_siginfo(int sig, u_long code, siginfo_t *si) -{ - struct proc *p; - struct thread *td; - struct trapframe *regs; - - td = curthread; - p = td->td_proc; - regs = td->td_frame; - PROC_LOCK_ASSERT(p, MA_OWNED); - - bzero(si, sizeof(*si)); - si->si_signo = sig; - si->si_code = code; - si->si_addr = (void *)regs->tf_addr; - /* XXXKSE fill other fields */ -} - -/* * System call to cleanup state after a signal * has been taken. Reset signal mask and * stack state from context left by sendsig (above). @@ -374,6 +350,7 @@ const ucontext_t *ucp; long rflags; int cs, error, ret; + ksiginfo_t ksi; error = copyin(uap->sigcntxp, &uc, sizeof(uc)); if (error != 0) @@ -407,7 +384,12 @@ cs = ucp->uc_mcontext.mc_cs; if (!CS_SECURE(cs)) { printf("sigreturn: cs = 0x%x\n", cs); - trapsignal(td, SIGBUS, T_PROTFLT); + ksiginfo_init_trap(&ksi); + ksi.ksi_signo = SIGBUS; + ksi.ksi_code = BUS_OBJERR; + ksi.ksi_trapno = T_PROTFLT; + ksi.ksi_addr = (void *)regs->tf_rip; + trapsignal(td, &ksi); return (EINVAL); } ==== //depot/projects/fast_ipsec/src/sys/amd64/amd64/trap.c#3 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.294 2005/10/01 18:56:16 glebius Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.295 2005/10/14 12:43:43 davidxu Exp $"); /* * AMD64 Trap and System call handling @@ -161,6 +161,8 @@ struct proc *p = td->td_proc; u_int sticks = 0; int i = 0, ucode = 0, type, code; + register_t addr = 0; + ksiginfo_t ksi; PCPU_LAZY_INC(cnt.v_trap); type = frame.tf_trapno; @@ -241,13 +243,14 @@ sticks = td->td_sticks; td->td_frame = &frame; + addr = frame.tf_rip; if (td->td_ucred != p->p_ucred) cred_update_thread(td); switch (type) { case T_PRIVINFLT: /* privileged instruction fault */ - ucode = type; i = SIGILL; + ucode = ILL_PRVOPC; break; case T_BPTFLT: /* bpt instruction fault */ @@ -255,6 +258,7 @@ enable_intr(); frame.tf_rflags &= ~PSL_T; i = SIGTRAP; + ucode = (type == T_TRCTRAP ? TRAP_TRACE : TRAP_BRKPT); break; case T_ARITHTRAP: /* arithmetic trap */ @@ -265,16 +269,26 @@ break; case T_PROTFLT: /* general protection fault */ + i = SIGBUS; + ucode = BUS_OBJERR; + break; case T_STKFLT: /* stack fault */ case T_SEGNPFLT: /* segment not present fault */ + i = SIGBUS; + ucode = BUS_ADRERR; + break; case T_TSSFLT: /* invalid TSS fault */ + i = SIGBUS; + ucode = BUS_OBJERR; + break; case T_DOUBLEFLT: /* double fault */ default: - ucode = code + BUS_SEGM_FAULT ; i = SIGBUS; + ucode = BUS_OBJERR; break; case T_PAGEFLT: /* page fault */ + addr = frame.tf_addr; if (td->td_pflags & TDP_SA) thread_user_enter(td); i = trap_pfault(&frame, TRUE); @@ -283,7 +297,12 @@ if (i == 0) goto user; - ucode = T_PAGEFLT; + if (i == SIGSEGV) + ucode = SEGV_MAPERR; + else { + i = SIGSEGV; /* XXX hack */ + ucode = SEGV_ACCERR; + } break; case T_DIVIDE: /* integer divide fault */ @@ -326,12 +345,14 @@ /* transparent fault (due to context switch "late") */ if (fpudna()) goto userout; - i = SIGFPE; - ucode = FPE_FPU_NP_TRAP; + printf("pid %d killed due to lack of floating point\n", + p->p_pid); + i = SIGKILL; + ucode = 0; break; case T_FPOPFLT: /* FPU operand fetch fault */ - ucode = T_FPOPFLT; + ucode = ILL_COPROC; i = SIGILL; break; @@ -472,7 +493,12 @@ if (*p->p_sysent->sv_transtrap) i = (*p->p_sysent->sv_transtrap)(i, type); - trapsignal(td, i, ucode); + ksiginfo_init_trap(&ksi); + ksi.ksi_signo = i; + ksi.ksi_code = ucode; + ksi.ksi_trapno = type; + ksi.ksi_addr = (void *)addr; + trapsignal(td, &ksi); #ifdef DEBUG if (type <= MAX_TRAP_MSG) { @@ -696,6 +722,7 @@ register_t *argp; u_int code; int reg, regcnt; + ksiginfo_t ksi; /* * note: PCPU_LAZY_INC() can only be used if we can afford @@ -826,7 +853,12 @@ */ if (orig_tf_rflags & PSL_T) { frame.tf_rflags &= ~PSL_T; - trapsignal(td, SIGTRAP, 0); + + ksiginfo_init_trap(&ksi); + ksi.ksi_signo = SIGTRAP; + ksi.ksi_code = TRAP_TRACE; + ksi.ksi_addr = (void *)frame.tf_rip; + trapsignal(td, &ksi); } /* ==== //depot/projects/fast_ipsec/src/sys/amd64/conf/NOTES#3 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.43 2005/10/07 09:23:51 glebius Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.44 2005/10/14 17:22:28 ru Exp $ # # @@ -235,9 +235,9 @@ device ath device ath_hal # Atheros HAL (includes binary component) -device ath_rate_onoe # Onoe rate control for ath driver #device ath_rate_amrr # AMRR rate control for ath driver -#device ath_rate_sample # SampleRate rate control for the ath driver +#device ath_rate_onoe # Onoe rate control for ath driver +device ath_rate_sample # SampleRate rate control for the ath driver #device wlan # 802.11 layer # ==== //depot/projects/fast_ipsec/src/sys/amd64/ia32/ia32_signal.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.11 2005/09/27 18:04:20 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.12 2005/10/14 12:43:43 davidxu Exp $"); #include "opt_compat.h" @@ -79,7 +79,7 @@ #include #ifdef COMPAT_FREEBSD4 -static void freebsd4_ia32_sendsig(sig_t, int, sigset_t *, u_long); +static void freebsd4_ia32_sendsig(sig_t, ksiginfo_t *, sigset_t *); #endif static void ia32_get_fpcontext(struct thread *td, struct ia32_mcontext *mcp); static int ia32_set_fpcontext(struct thread *td, const struct ia32_mcontext *mcp); @@ -295,18 +295,23 @@ */ #ifdef COMPAT_FREEBSD4 static void -freebsd4_ia32_sendsig(sig_t catcher, int sig, sigset_t *mask, u_long code) +freebsd4_ia32_sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) { struct ia32_sigframe4 sf, *sfp; + struct ia32_siginfo siginfo; struct proc *p; struct thread *td; struct sigacts *psp; struct trapframe *regs; int oonstack; + int sig; td = curthread; p = td->td_proc; + siginfo_to_ia32siginfo(&ksi->ksi_info, &siginfo); + PROC_LOCK_ASSERT(p, MA_OWNED); + sig = siginfo.si_signo; psp = p->p_sigacts; mtx_assert(&psp->ps_mtx, MA_OWNED); regs = td->td_frame; @@ -362,13 +367,12 @@ sf.sf_ah = (u_int32_t)(uintptr_t)catcher; /* Fill in POSIX parts */ + sf.sf_si = siginfo; sf.sf_si.si_signo = sig; - sf.sf_si.si_code = code; - sf.sf_si.si_addr = regs->tf_addr; } else { /* Old FreeBSD-style arguments. */ - sf.sf_siginfo = code; - sf.sf_addr = regs->tf_addr; + sf.sf_siginfo = siginfo.si_code; + sf.sf_addr = (u_int32_t)siginfo.si_addr; sf.sf_ah = (u_int32_t)(uintptr_t)catcher; } mtx_unlock(&psp->ps_mtx); @@ -400,23 +404,27 @@ #endif /* COMPAT_FREEBSD4 */ void -ia32_sendsig(sig_t catcher, int sig, sigset_t *mask, u_long code) +ia32_sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) { struct ia32_sigframe sf, *sfp; + struct ia32_siginfo siginfo; struct proc *p; struct thread *td; struct sigacts *psp; char *sp; struct trapframe *regs; int oonstack; + int sig; + siginfo_to_ia32siginfo(&ksi->ksi_info, &siginfo); td = curthread; p = td->td_proc; PROC_LOCK_ASSERT(p, MA_OWNED); + sig = siginfo.si_signo; psp = p->p_sigacts; #ifdef COMPAT_FREEBSD4 if (SIGISMEMBER(psp->ps_freebsd4, sig)) { - freebsd4_ia32_sendsig(catcher, sig, mask, code); + freebsd4_ia32_sendsig(catcher, ksi, mask); return; } #endif @@ -479,13 +487,12 @@ sf.sf_ah = (u_int32_t)(uintptr_t)catcher; /* Fill in POSIX parts */ + sf.sf_si = siginfo; sf.sf_si.si_signo = sig; - sf.sf_si.si_code = code; - sf.sf_si.si_addr = regs->tf_addr; } else { /* Old FreeBSD-style arguments. */ - sf.sf_siginfo = code; - sf.sf_addr = regs->tf_addr; + sf.sf_siginfo = siginfo.si_code; + sf.sf_addr = (u_int32_t)siginfo.si_addr; sf.sf_ah = (u_int32_t)(uintptr_t)catcher; } mtx_unlock(&psp->ps_mtx); @@ -540,6 +547,7 @@ struct trapframe *regs; const struct ia32_ucontext4 *ucp; int cs, eflags, error; + ksiginfo_t ksi; error = copyin(uap->sigcntxp, &uc, sizeof(uc)); if (error != 0) @@ -573,7 +581,12 @@ cs = ucp->uc_mcontext.mc_cs; if (!CS_SECURE(cs)) { printf("freebsd4_sigreturn: cs = 0x%x\n", cs); - trapsignal(td, SIGBUS, T_PROTFLT); + ksiginfo_init_trap(&ksi); + ksi.ksi_signo = SIGBUS; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Oct 15 09:13:04 2005 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 C0B0816A421; Sat, 15 Oct 2005 09:13:03 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 70FF516A41F for ; Sat, 15 Oct 2005 09:13:03 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3BA4443D46 for ; Sat, 15 Oct 2005 09:13:03 +0000 (GMT) (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.1/8.13.1) with ESMTP id j9F9D2FX041718 for ; Sat, 15 Oct 2005 09:13:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9F9D2LJ041714 for perforce@freebsd.org; Sat, 15 Oct 2005 09:13:02 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 15 Oct 2005 09:13:02 GMT Message-Id: <200510150913.j9F9D2LJ041714@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 85337 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, 15 Oct 2005 09:13:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=85337 Change 85337 by rwatson@rwatson_peppercorn on 2005/10/15 09:13:02 Staticize bsm_free_q. Slight style tweak. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/kern_bsm_audit.c#17 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/kern_bsm_audit.c#17 (text+ko) ==== @@ -52,7 +52,7 @@ * bounded by MAX_AUDIT_RECORDS. Memory allocated for these records are never * freed */ -LIST_HEAD(, au_record) bsm_free_q; +static LIST_HEAD(, au_record) bsm_free_q; /* * Lock for serializing access to the list of audit records. @@ -62,7 +62,7 @@ /* * Forward declares. */ -void audit_sys_auditon(struct audit_record *ar, struct au_record *rec); +void audit_sys_auditon(struct audit_record *ar, struct au_record *rec); /* * Initialize the BSM auditing subsystem. From owner-p4-projects@FreeBSD.ORG Sat Oct 15 15:46:08 2005 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 A220D16A421; Sat, 15 Oct 2005 15:46:07 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6209816A41F for ; Sat, 15 Oct 2005 15:46:07 +0000 (GMT) (envelope-from soc-chenk@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 27D3143D49 for ; Sat, 15 Oct 2005 15:46:07 +0000 (GMT) (envelope-from soc-chenk@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9FFk7W2063639 for ; Sat, 15 Oct 2005 15:46:07 GMT (envelope-from soc-chenk@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9FFk6X1063636 for perforce@freebsd.org; Sat, 15 Oct 2005 15:46:06 GMT (envelope-from soc-chenk@freebsd.org) Date: Sat, 15 Oct 2005 15:46:06 GMT Message-Id: <200510151546.j9FFk6X1063636@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-chenk@freebsd.org using -f From: soc-chenk To: Perforce Change Reviews Cc: Subject: PERFORCE change 85342 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, 15 Oct 2005 15:46:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=85342 Change 85342 by soc-chenk@soc-chenk_leavemealone on 2005/10/15 15:45:35 device read converted to use msleep instead of condvar [this seems to prevent daemon-segfaults-in-readdir panics] Submitted by: soc-chenk Affected files ... .. //depot/projects/soc2005/fuse4bsd2/fuse_module/fuse.c#18 edit .. //depot/projects/soc2005/fuse4bsd2/fuse_module/fuse.h#9 edit Differences ... ==== //depot/projects/soc2005/fuse4bsd2/fuse_module/fuse.c#18 (text+ko) ==== @@ -478,7 +478,6 @@ /* Setting up fields of mine */ mtx_init(&data->msg_mtx, "mutex for fuse message list", NULL, MTX_DEF); - cv_init(&data->msg_cv, "cv to wake up fusedev_read"); STAILQ_INIT(&data->fmsg_head); mtx_init(&data->ticket_mtx, "mutex for the fuse ticketer", NULL, MTX_DEF); @@ -503,7 +502,6 @@ /* Driving off stage all that stuff thrown at device... */ mtx_destroy(&data->msg_mtx); - cv_destroy(&data->msg_cv); mtx_destroy(&data->callback_mtx); mtx_destroy(&data->ticket_mtx); @@ -526,7 +524,7 @@ DEBUG2G("banning daemon\n"); mtx_lock(&data->msg_mtx); data->dataflag |= FDAT_KICK; - cv_signal(&data->msg_cv); + wakeup_one(data); mtx_unlock(&data->msg_mtx); } @@ -693,7 +691,7 @@ mtx_lock(&tick->data->msg_mtx); fuse_msgn_push(&tick->msgn); DEBUG("ring the bell\n"); - cv_signal(&tick->data->msg_cv); + wakeup_one(tick->data); mtx_unlock(&tick->data->msg_mtx); } @@ -1077,6 +1075,7 @@ fuprintf("fuse device being read on thread %d\n", uio->uio_td->td_tid); mtx_lock(&data->msg_mtx); +again: if (fdata_kick_get(data)) { DEBUG("we know early on that reader should be kicked so we don't wait for news\n"); mtx_unlock(&data->msg_mtx); @@ -1084,13 +1083,23 @@ } if ( ! (fmsgn = fdata_pop_msg(data))) { - err = cv_wait_sig(&data->msg_cv, &data->msg_mtx); + err = msleep(data, &data->msg_mtx, PCATCH, "fu msg", 0); if (err != 0) { mtx_unlock(&data->msg_mtx); return (fdata_kick_get(data) ? ENODEV : err); } fmsgn = fdata_pop_msg(data); } + if (! fmsgn) { + /* + * We can get here if fuse daemon suddenly terminates, + * eg, by being hit by a SIGKILL + * -- and some other cases, too, tho not totally clear, when + * (cv_signal/wakeup_one signals the whole process ?) + */ + DEBUG("no message on thread #%d\n", uio->uio_td->td_tid); + goto again; + } mtx_unlock(&data->msg_mtx); if (fdata_kick_get(data)) { @@ -1105,16 +1114,6 @@ } return (ENODEV); /* This should make the daemon get off of us */ } - if (! fmsgn) { - /* - * We can get here if fuse daemon suddenly terminates, - * eg, by being hit by a SIGKILL - * -- and some other cases, too, tho not totally clear, when - * (cv_signal signals the whole process ?) - */ - DEBUG("no message on thread #%d\n", uio->uio_td->td_tid); - return (EINTR); - } DEBUG("message got on thread #%d\n", uio->uio_td->td_tid); KASSERT(fmsgn->msg_bufdata || fmsgn->msg_bufsize == 0, ==== //depot/projects/soc2005/fuse4bsd2/fuse_module/fuse.h#9 (text+ko) ==== @@ -90,7 +90,6 @@ struct fuse_data { struct mtx msg_mtx; - struct cv msg_cv; STAILQ_HEAD(, fuse_msg_node) fmsg_head; struct mtx callback_mtx; From owner-p4-projects@FreeBSD.ORG Sat Oct 15 15:47:10 2005 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 8A59F16A421; Sat, 15 Oct 2005 15:47:09 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4E16316A41F for ; Sat, 15 Oct 2005 15:47:09 +0000 (GMT) (envelope-from soc-chenk@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F1B2543D46 for ; Sat, 15 Oct 2005 15:47:08 +0000 (GMT) (envelope-from soc-chenk@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9FFl867063691 for ; Sat, 15 Oct 2005 15:47:08 GMT (envelope-from soc-chenk@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9FFl8Nm063688 for perforce@freebsd.org; Sat, 15 Oct 2005 15:47:08 GMT (envelope-from soc-chenk@freebsd.org) Date: Sat, 15 Oct 2005 15:47:08 GMT Message-Id: <200510151547.j9FFl8Nm063688@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-chenk@freebsd.org using -f From: soc-chenk To: Perforce Change Reviews Cc: Subject: PERFORCE change 85343 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, 15 Oct 2005 15:47:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=85343 Change 85343 by soc-chenk@soc-chenk_leavemealone on 2005/10/15 15:46:28 Add remark about problems with BSD style non-privileged mounts to IMPLEMENTATION_NOTES Submitted by: soc-chenk Affected files ... .. //depot/projects/soc2005/fuse4bsd2/IMPLEMENTATION_NOTES#9 edit Differences ... ==== //depot/projects/soc2005/fuse4bsd2/IMPLEMENTATION_NOTES#9 (text+ko) ==== @@ -230,6 +230,37 @@ permissions of fuse devives directly, by chmod, or generally, via devfs(8) rules. +Let's elaborate a bit more on this "naturally useable" BSD mount access +control. This also makes Fuse more exposed to attacks under FreeBSD than +it is under Linux: in Linux, non privileged mountability of Fuse based +filesystems don't open up further privileged tasks. In FreeBSD, mounting +and unmounting will be available more generally if the respective +permissive move ("sysctl vfs.usermount=1") has been done. (With the +help of sudo, one can setup an access control scheme which is similar to +that of Linux, yet we are to give full support for the system provided +facilities.) + +As we said, device permissions can fall into the role of mount +permissions, thus there are limits to the freedom provided by +"vfs.usermount=1", but this happens only with device based filesystems. +The null filesystem (the equivalent of the "bind mounting" facility in +Linux) is one example for a deviceless filesystem. A user can create a +deadlock by null mounting a directory of a Fuse filesystem over another +directory, if the Fuse filesystem requires this other directory during +its operation. And users can freely unmount their filesystems, including +forced unmounts, which can easily lead to panics. (Note that while Linux +tends to stay on the safe side and refuse forced umounts too, if the +filesystem is busy, FreeBSD tends to go forward and perform the forced +unmount and occasionally panic.) So in FreeBSD, we will have to cope +with these, too, if we want to claim that mounting of untrusted daemons +is safe. + +Careful code review slowly leads us toward a state in which this claim +can be maintained. To add, Linux Fuse doesn't seem to rely on its more +protected situation: Linux Fuse was immune to those crashing schemes +that were used to be possible to summon by non-privileged users in +FreeBSD (in Linux, these were attempted as root, of course). + * 1c -- dealing with the "allow other" misery This is related to security, too, but deserves an dedicated subchapter. From owner-p4-projects@FreeBSD.ORG Sat Oct 15 16:38:12 2005 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 8653A16A421; Sat, 15 Oct 2005 16:38:11 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 45DBD16A41F for ; Sat, 15 Oct 2005 16:38:11 +0000 (GMT) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E41FD43D48 for ; Sat, 15 Oct 2005 16:38:10 +0000 (GMT) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9FGcApI065510 for ; Sat, 15 Oct 2005 16:38:10 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9FGcA7b065507 for perforce@freebsd.org; Sat, 15 Oct 2005 16:38:10 GMT (envelope-from bz@freebsd.org) Date: Sat, 15 Oct 2005 16:38:10 GMT Message-Id: <200510151638.j9FGcA7b065507@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" To: Perforce Change Reviews Cc: Subject: PERFORCE change 85345 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, 15 Oct 2005 16:38:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=85345 Change 85345 by bz@bz_y2k_i386 on 2005/10/15 16:37:24 IFC setkey now lives in sbin and no longer in usr.sbin Affected files ... .. //depot/projects/fast_ipsec/src/sbin/setkey/Makefile#1 branch .. //depot/projects/fast_ipsec/src/sbin/setkey/parse.y#1 branch .. //depot/projects/fast_ipsec/src/sbin/setkey/sample.cf#1 branch .. //depot/projects/fast_ipsec/src/sbin/setkey/scriptdump.pl#1 branch .. //depot/projects/fast_ipsec/src/sbin/setkey/setkey.8#1 branch .. //depot/projects/fast_ipsec/src/sbin/setkey/setkey.c#1 branch .. //depot/projects/fast_ipsec/src/sbin/setkey/test-pfkey.c#1 branch .. //depot/projects/fast_ipsec/src/sbin/setkey/test-policy.c#1 branch .. //depot/projects/fast_ipsec/src/sbin/setkey/token.l#1 branch .. //depot/projects/fast_ipsec/src/sbin/setkey/vchar.h#1 branch .. //depot/projects/fast_ipsec/src/sys/compat/freebsd32/freebsd32_misc.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/compat/freebsd32/freebsd32_proto.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/compat/freebsd32/freebsd32_syscall.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/compat/freebsd32/freebsd32_syscalls.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/compat/freebsd32/freebsd32_sysent.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/compat/freebsd32/syscalls.master#3 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_time.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/uipc_syscalls.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netinet6/raw_ip6.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/sparc64/trap.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/sys/syscallsubr.h#2 integrate Differences ... ==== //depot/projects/fast_ipsec/src/sys/compat/freebsd32/freebsd32_misc.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.40 2005/10/03 18:34:17 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.43 2005/10/15 05:57:06 ps Exp $"); #include "opt_compat.h" @@ -797,6 +797,171 @@ return (error); } +static int +freebsd32_copyiniov(struct iovec32 *iovp, u_int iovcnt, struct iovec **iov, + int error) +{ + struct iovec32 iov32; + int i; + + u_int iovlen; + + *iov = NULL; + if (iovcnt > UIO_MAXIOV) + return (error); + iovlen = iovcnt * sizeof(struct iovec); + *iov = malloc(iovlen, M_IOV, M_WAITOK); + for (i = 0; i < iovcnt; i++) { + error = copyin(&iovp[i], &iov32, sizeof(struct iovec32)); + if (error) { + free(*iov, M_IOV); + *iov = NULL; + return (error); + } + iov[i]->iov_base = PTRIN(iov32.iov_base); + iov[i]->iov_len = iov32.iov_len; + } + return (0); +} + +struct msghdr32 { + u_int32_t msg_name; + socklen_t msg_namelen; + u_int32_t msg_iov; + int msg_iovlen; + u_int32_t msg_control; + socklen_t msg_controllen; + int msg_flags; +}; +CTASSERT(sizeof(struct msghdr32) == 28); + +static int +freebsd32_copyinmsghdr(struct msghdr32 *msg32, struct msghdr *msg) +{ + struct msghdr32 m32; + int error; + + error = copyin(msg32, &m32, sizeof(m32)); + if (error) + return (error); + msg->msg_name = PTRIN(m32.msg_name); + msg->msg_namelen = m32.msg_namelen; + msg->msg_iov = PTRIN(m32.msg_iov); + msg->msg_iovlen = m32.msg_iovlen; + msg->msg_control = PTRIN(m32.msg_control); + msg->msg_controllen = m32.msg_controllen; + msg->msg_flags = m32.msg_flags; + return (freebsd32_copyiniov((struct iovec32 *)(uintptr_t)m32.msg_iov, m32.msg_iovlen, &msg->msg_iov, + EMSGSIZE)); +} + +static int +freebsd32_copyoutmsghdr(struct msghdr *msg, struct msghdr32 *msg32) +{ + struct msghdr32 m32; + int error; + + m32.msg_name = PTROUT(msg->msg_name); + m32.msg_namelen = msg->msg_namelen; + m32.msg_iov = PTROUT(msg->msg_iov); + m32.msg_iovlen = msg->msg_iovlen; + m32.msg_control = PTROUT(msg->msg_control); + m32.msg_controllen = msg->msg_controllen; + m32.msg_flags = msg->msg_flags; + error = copyout(&m32, msg32, sizeof(m32)); + return (error); +} + +int +freebsd32_recvmsg(td, uap) + struct thread *td; + struct freebsd32_recvmsg_args /* { + int s; + struct msghdr32 *msg; + int flags; + } */ *uap; +{ + struct msghdr msg; + struct msghdr32 m32; + struct iovec *uiov, *iov; + int error; + + error = copyin(uap->msg, &m32, sizeof(m32)); + if (error) + return (error); + error = freebsd32_copyinmsghdr(uap->msg, &msg); + if (error) + return (error); + error = freebsd32_copyiniov((struct iovec32 *)(uintptr_t)m32.msg_iov, + m32.msg_iovlen, &iov, EMSGSIZE); + if (error) + return (error); + msg.msg_flags = uap->flags; + uiov = msg.msg_iov; + msg.msg_iov = iov; + error = kern_recvit(td, uap->s, &msg, NULL, UIO_SYSSPACE); + if (error == 0) { + msg.msg_iov = uiov; + error = freebsd32_copyoutmsghdr(&msg, uap->msg); + } + free(iov, M_IOV); + free(uiov, M_IOV); + return (error); +} + +int +freebsd32_sendmsg(struct thread *td, + struct freebsd32_sendmsg_args *uap) +{ + struct msghdr msg; + struct msghdr32 m32; + struct iovec *iov; + int error; + + error = copyin(uap->msg, &m32, sizeof(m32)); + if (error) + return (error); + error = freebsd32_copyinmsghdr(uap->msg, &msg); + if (error) + return (error); + error = freebsd32_copyiniov((struct iovec32 *)(uintptr_t)m32.msg_iov, + m32.msg_iovlen, &iov, EMSGSIZE); + if (error) + return (error); + msg.msg_iov = iov; + error = kern_sendit(td, uap->s, &msg, uap->flags, NULL, UIO_SYSSPACE); + free(iov, M_IOV); + return (error); +} + +int +freebsd32_recvfrom(struct thread *td, + struct freebsd32_recvfrom_args *uap) +{ + struct msghdr msg; + struct iovec aiov; + int error; + + if (uap->fromlenaddr) { + error = copyin((void *)(uintptr_t)uap->fromlenaddr, + &msg.msg_namelen, sizeof(msg.msg_namelen)); + if (error) + return (error); + } else { + msg.msg_namelen = 0; + } + + msg.msg_name = (void *)(uintptr_t)uap->from; + msg.msg_iov = &aiov; + msg.msg_iovlen = 1; + aiov.iov_base = (void *)(uintptr_t)uap->buf; + aiov.iov_len = uap->len; + msg.msg_control = 0; + msg.msg_flags = uap->flags; + error = kern_recvit(td, uap->s, &msg, (void *)(uintptr_t)uap->fromlenaddr, UIO_USERSPACE); + return (error); +} + int freebsd32_settimeofday(struct thread *td, struct freebsd32_settimeofday_args *uap) @@ -1236,7 +1401,7 @@ struct timespec rmt, rqt; int error; - error = copyin(uap->rqtp, &rqt32, sizeof(rqt)); + error = copyin(uap->rqtp, &rqt32, sizeof(rqt32)); if (error) return (error); @@ -1253,13 +1418,66 @@ CP(rmt, rmt32, tv_sec); CP(rmt, rmt32, tv_nsec); - error2 = copyout(&rmt32, uap->rmtp, sizeof(rmt)); + error2 = copyout(&rmt32, uap->rmtp, sizeof(rmt32)); if (error2) error = error2; } return (error); } +int +freebsd32_clock_gettime(struct thread *td, + struct freebsd32_clock_gettime_args *uap) +{ + struct timespec ats; + struct timespec32 ats32; + int error; + + error = kern_clock_gettime(td, uap->clock_id, &ats); + if (error == 0) { + CP(ats, ats32, tv_sec); + CP(ats, ats32, tv_nsec); + error = copyout(&ats32, uap->tp, sizeof(ats32)); + } + return (error); +} + +int +freebsd32_clock_settime(struct thread *td, + struct freebsd32_clock_settime_args *uap) +{ + struct timespec ats; + struct timespec32 ats32; + int error; + + error = copyin(uap->tp, &ats32, sizeof(ats32)); + if (error) + return (error); + CP(ats32, ats, tv_sec); + CP(ats32, ats, tv_nsec); + + return (kern_clock_settime(td, uap->clock_id, &ats)); +} + +int +freebsd32_clock_getres(struct thread *td, + struct freebsd32_clock_getres_args *uap) +{ + struct timespec ts; + struct timespec32 ts32; + int error; + + if (uap->tp == NULL) + return (0); + error = kern_clock_getres(td, uap->clock_id, &ts); + if (error == 0) { + CP(ts, ts32, tv_sec); + CP(ts, ts32, tv_nsec); + error = copyout(&ts32, uap->tp, sizeof(ts32)); + } + return (error); +} + #if 0 int ==== //depot/projects/fast_ipsec/src/sys/compat/freebsd32/freebsd32_proto.h#3 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.40 2005/09/27 18:04:52 peter Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.52 2005/09/27 18:04:20 peter Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.43 2005/10/15 05:57:34 ps Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.55 2005/10/15 05:57:06 ps Exp */ #ifndef _FREEBSD32_SYSPROTO_H_ @@ -38,6 +38,24 @@ char options_l_[PADL_(int)]; int options; char options_r_[PADR_(int)]; char rusage_l_[PADL_(struct rusage32 *)]; struct rusage32 * rusage; char rusage_r_[PADR_(struct rusage32 *)]; }; +struct freebsd32_recvmsg_args { + char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)]; + char msg_l_[PADL_(struct msghdr32 *)]; struct msghdr32 * msg; char msg_r_[PADR_(struct msghdr32 *)]; + char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; +}; +struct freebsd32_sendmsg_args { + char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)]; + char msg_l_[PADL_(struct msghdr32 *)]; struct msghdr32 * msg; char msg_r_[PADR_(struct msghdr32 *)]; + char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; +}; +struct freebsd32_recvfrom_args { + char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)]; + char buf_l_[PADL_(u_int32_t)]; u_int32_t buf; char buf_r_[PADR_(u_int32_t)]; + char len_l_[PADL_(u_int32_t)]; u_int32_t len; char len_r_[PADR_(u_int32_t)]; + char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; + char from_l_[PADL_(u_int32_t)]; u_int32_t from; char from_r_[PADR_(u_int32_t)]; + char fromlenaddr_l_[PADL_(u_int32_t)]; u_int32_t fromlenaddr; char fromlenaddr_r_[PADR_(u_int32_t)]; +}; struct freebsd32_sigaltstack_args { char ss_l_[PADL_(struct sigaltstack32 *)]; struct sigaltstack32 * ss; char ss_r_[PADR_(struct sigaltstack32 *)]; char oss_l_[PADL_(struct sigaltstack32 *)]; struct sigaltstack32 * oss; char oss_r_[PADR_(struct sigaltstack32 *)]; @@ -179,9 +197,21 @@ char new_l_[PADL_(void *)]; void * new; char new_r_[PADR_(void *)]; char newlen_l_[PADL_(u_int32_t)]; u_int32_t newlen; char newlen_r_[PADR_(u_int32_t)]; }; +struct freebsd32_clock_gettime_args { + char clock_id_l_[PADL_(clockid_t)]; clockid_t clock_id; char clock_id_r_[PADR_(clockid_t)]; + char tp_l_[PADL_(struct timespec32 *)]; struct timespec32 * tp; char tp_r_[PADR_(struct timespec32 *)]; +}; +struct freebsd32_clock_settime_args { + char clock_id_l_[PADL_(clockid_t)]; clockid_t clock_id; char clock_id_r_[PADR_(clockid_t)]; + char tp_l_[PADL_(const struct timespec32 *)]; const struct timespec32 * tp; char tp_r_[PADR_(const struct timespec32 *)]; +}; +struct freebsd32_clock_getres_args { + char clock_id_l_[PADL_(clockid_t)]; clockid_t clock_id; char clock_id_r_[PADR_(clockid_t)]; + char tp_l_[PADL_(struct timespec32 *)]; struct timespec32 * tp; char tp_r_[PADR_(struct timespec32 *)]; +}; struct freebsd32_nanosleep_args { - char rqtp_l_[PADL_(const struct timespec *)]; const struct timespec * rqtp; char rqtp_r_[PADR_(const struct timespec *)]; - char rmtp_l_[PADL_(struct timespec *)]; struct timespec * rmtp; char rmtp_r_[PADR_(struct timespec *)]; + char rqtp_l_[PADL_(const struct timespec32 *)]; const struct timespec32 * rqtp; char rqtp_r_[PADR_(const struct timespec32 *)]; + char rmtp_l_[PADL_(struct timespec32 *)]; struct timespec32 * rmtp; char rmtp_r_[PADR_(struct timespec32 *)]; }; struct freebsd32_preadv_args { char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; @@ -236,6 +266,9 @@ char ucp_l_[PADL_(const struct freebsd32_ucontext *)]; const struct freebsd32_ucontext * ucp; char ucp_r_[PADR_(const struct freebsd32_ucontext *)]; }; int freebsd32_wait4(struct thread *, struct freebsd32_wait4_args *); +int freebsd32_recvmsg(struct thread *, struct freebsd32_recvmsg_args *); +int freebsd32_sendmsg(struct thread *, struct freebsd32_sendmsg_args *); +int freebsd32_recvfrom(struct thread *, struct freebsd32_recvfrom_args *); int freebsd32_sigaltstack(struct thread *, struct freebsd32_sigaltstack_args *); int freebsd32_execve(struct thread *, struct freebsd32_execve_args *); int freebsd32_setitimer(struct thread *, struct freebsd32_setitimer_args *); @@ -261,6 +294,9 @@ int freebsd32_truncate(struct thread *, struct freebsd32_truncate_args *); int freebsd32_ftruncate(struct thread *, struct freebsd32_ftruncate_args *); int freebsd32_sysctl(struct thread *, struct freebsd32_sysctl_args *); +int freebsd32_clock_gettime(struct thread *, struct freebsd32_clock_gettime_args *); +int freebsd32_clock_settime(struct thread *, struct freebsd32_clock_settime_args *); +int freebsd32_clock_getres(struct thread *, struct freebsd32_clock_getres_args *); int freebsd32_nanosleep(struct thread *, struct freebsd32_nanosleep_args *); int freebsd32_preadv(struct thread *, struct freebsd32_preadv_args *); int freebsd32_pwritev(struct thread *, struct freebsd32_pwritev_args *); ==== //depot/projects/fast_ipsec/src/sys/compat/freebsd32/freebsd32_syscall.h#3 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.40 2005/09/27 18:04:52 peter Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.52 2005/09/27 18:04:20 peter Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.43 2005/10/15 05:57:34 ps Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.55 2005/10/15 05:57:06 ps Exp */ #define FREEBSD32_SYS_syscall 0 @@ -33,8 +33,9 @@ #define FREEBSD32_SYS_getuid 24 #define FREEBSD32_SYS_geteuid 25 #define FREEBSD32_SYS_ptrace 26 -#define FREEBSD32_SYS_sendmsg 28 -#define FREEBSD32_SYS_recvfrom 29 +#define FREEBSD32_SYS_freebsd32_recvmsg 27 +#define FREEBSD32_SYS_freebsd32_sendmsg 28 +#define FREEBSD32_SYS_freebsd32_recvfrom 29 #define FREEBSD32_SYS_accept 30 #define FREEBSD32_SYS_getpeername 31 #define FREEBSD32_SYS_getsockname 32 @@ -198,9 +199,9 @@ #define FREEBSD32_SYS_shmctl 229 #define FREEBSD32_SYS_shmdt 230 #define FREEBSD32_SYS_shmget 231 -#define FREEBSD32_SYS_clock_gettime 232 -#define FREEBSD32_SYS_clock_settime 233 -#define FREEBSD32_SYS_clock_getres 234 +#define FREEBSD32_SYS_freebsd32_clock_gettime 232 +#define FREEBSD32_SYS_freebsd32_clock_settime 233 +#define FREEBSD32_SYS_freebsd32_clock_getres 234 #define FREEBSD32_SYS_freebsd32_nanosleep 240 #define FREEBSD32_SYS_minherit 250 #define FREEBSD32_SYS_rfork 251 ==== //depot/projects/fast_ipsec/src/sys/compat/freebsd32/freebsd32_syscalls.c#3 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.31 2005/09/27 18:04:52 peter Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.52 2005/09/27 18:04:20 peter Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.34 2005/10/15 05:57:34 ps Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.55 2005/10/15 05:57:06 ps Exp */ const char *freebsd32_syscallnames[] = { @@ -34,9 +34,9 @@ "getuid", /* 24 = getuid */ "geteuid", /* 25 = geteuid */ "ptrace", /* 26 = ptrace */ - "#27", /* 27 = recvmsg */ - "sendmsg", /* 28 = sendmsg */ - "recvfrom", /* 29 = recvfrom */ + "freebsd32_recvmsg", /* 27 = freebsd32_recvmsg */ + "freebsd32_sendmsg", /* 28 = freebsd32_sendmsg */ + "freebsd32_recvfrom", /* 29 = freebsd32_recvfrom */ "accept", /* 30 = accept */ "getpeername", /* 31 = getpeername */ "getsockname", /* 32 = getsockname */ @@ -239,9 +239,9 @@ "shmctl", /* 229 = shmctl */ "shmdt", /* 230 = shmdt */ "shmget", /* 231 = shmget */ - "clock_gettime", /* 232 = clock_gettime */ - "clock_settime", /* 233 = clock_settime */ - "clock_getres", /* 234 = clock_getres */ + "freebsd32_clock_gettime", /* 232 = freebsd32_clock_gettime */ + "freebsd32_clock_settime", /* 233 = freebsd32_clock_settime */ + "freebsd32_clock_getres", /* 234 = freebsd32_clock_getres */ "#235", /* 235 = timer_create */ "#236", /* 236 = timer_delete */ "#237", /* 237 = timer_settime */ ==== //depot/projects/fast_ipsec/src/sys/compat/freebsd32/freebsd32_sysent.c#3 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.41 2005/09/27 18:04:52 peter Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.52 2005/09/27 18:04:20 peter Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.44 2005/10/15 05:57:34 ps Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.55 2005/10/15 05:57:06 ps Exp */ #include "opt_compat.h" @@ -53,9 +53,9 @@ { SYF_MPSAFE | 0, (sy_call_t *)getuid, AUE_NULL }, /* 24 = getuid */ { SYF_MPSAFE | 0, (sy_call_t *)geteuid, AUE_NULL }, /* 25 = geteuid */ { SYF_MPSAFE | AS(ptrace_args), (sy_call_t *)ptrace, AUE_NULL }, /* 26 = ptrace */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 27 = recvmsg */ - { SYF_MPSAFE | AS(sendmsg_args), (sy_call_t *)sendmsg, AUE_NULL }, /* 28 = sendmsg */ - { SYF_MPSAFE | AS(recvfrom_args), (sy_call_t *)recvfrom, AUE_NULL }, /* 29 = recvfrom */ + { SYF_MPSAFE | AS(freebsd32_recvmsg_args), (sy_call_t *)freebsd32_recvmsg, AUE_NULL }, /* 27 = freebsd32_recvmsg */ + { SYF_MPSAFE | AS(freebsd32_sendmsg_args), (sy_call_t *)freebsd32_sendmsg, AUE_NULL }, /* 28 = freebsd32_sendmsg */ + { SYF_MPSAFE | AS(freebsd32_recvfrom_args), (sy_call_t *)freebsd32_recvfrom, AUE_NULL }, /* 29 = freebsd32_recvfrom */ { SYF_MPSAFE | AS(accept_args), (sy_call_t *)accept, AUE_NULL }, /* 30 = accept */ { SYF_MPSAFE | AS(getpeername_args), (sy_call_t *)getpeername, AUE_NULL }, /* 31 = getpeername */ { SYF_MPSAFE | AS(getsockname_args), (sy_call_t *)getsockname, AUE_NULL }, /* 32 = getsockname */ @@ -258,9 +258,9 @@ { SYF_MPSAFE | AS(shmctl_args), (sy_call_t *)shmctl, AUE_NULL }, /* 229 = shmctl */ { SYF_MPSAFE | AS(shmdt_args), (sy_call_t *)shmdt, AUE_NULL }, /* 230 = shmdt */ { SYF_MPSAFE | AS(shmget_args), (sy_call_t *)shmget, AUE_NULL }, /* 231 = shmget */ - { SYF_MPSAFE | AS(clock_gettime_args), (sy_call_t *)clock_gettime, AUE_NULL }, /* 232 = clock_gettime */ - { SYF_MPSAFE | AS(clock_settime_args), (sy_call_t *)clock_settime, AUE_NULL }, /* 233 = clock_settime */ - { SYF_MPSAFE | AS(clock_getres_args), (sy_call_t *)clock_getres, AUE_NULL }, /* 234 = clock_getres */ + { SYF_MPSAFE | AS(freebsd32_clock_gettime_args), (sy_call_t *)freebsd32_clock_gettime, AUE_NULL }, /* 232 = freebsd32_clock_gettime */ + { SYF_MPSAFE | AS(freebsd32_clock_settime_args), (sy_call_t *)freebsd32_clock_settime, AUE_NULL }, /* 233 = freebsd32_clock_settime */ + { SYF_MPSAFE | AS(freebsd32_clock_getres_args), (sy_call_t *)freebsd32_clock_getres, AUE_NULL }, /* 234 = freebsd32_clock_getres */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 235 = timer_create */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 236 = timer_delete */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 237 = timer_settime */ ==== //depot/projects/fast_ipsec/src/sys/compat/freebsd32/syscalls.master#3 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.52 2005/09/27 18:04:20 peter Exp $ + $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.55 2005/10/15 05:57:06 ps Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; @@ -88,12 +88,13 @@ 26 AUE_NULL MNOPROTO { int ptrace(int req, pid_t pid, \ caddr_t addr, int data); } ; XXX implement -27 AUE_NULL UNIMPL recvmsg -28 AUE_NULL MNOPROTO { int sendmsg(int s, caddr_t msg, \ +27 AUE_NULL MSTD { int freebsd32_recvmsg(int s, struct msghdr32 *msg, \ + int flags); } +28 AUE_NULL MSTD { int freebsd32_sendmsg(int s, struct msghdr32 *msg, \ int flags); } -29 AUE_NULL MNOPROTO { int recvfrom(int s, caddr_t buf, \ - size_t len, int flags, caddr_t from, \ - int *fromlenaddr); } +29 AUE_NULL MSTD { int freebsd32_recvfrom(int s, u_int32_t buf, \ + u_int32_t len, int flags, u_int32_t from, \ + u_int32_t fromlenaddr); } 30 AUE_NULL MNOPROTO { int accept(int s, caddr_t name, \ int *anamelen); } 31 AUE_NULL MNOPROTO { int getpeername(int fdes, caddr_t asa, \ @@ -412,20 +413,20 @@ 231 AUE_NULL MNOPROTO { int shmget(key_t key, int size, \ int shmflg); } ; -232 AUE_NULL MNOPROTO { int clock_gettime(clockid_t clock_id, \ - struct timespec *tp); } -233 AUE_NULL MNOPROTO { int clock_settime(clockid_t clock_id, \ - const struct timespec *tp); } -234 AUE_NULL MNOPROTO { int clock_getres(clockid_t clock_id, \ - struct timespec *tp); } +232 AUE_NULL MSTD { int freebsd32_clock_gettime(clockid_t clock_id, \ + struct timespec32 *tp); } +233 AUE_NULL MSTD { int freebsd32_clock_settime(clockid_t clock_id, \ + const struct timespec32 *tp); } +234 AUE_NULL MSTD { int freebsd32_clock_getres(clockid_t clock_id, \ + struct timespec32 *tp); } 235 AUE_NULL UNIMPL timer_create 236 AUE_NULL UNIMPL timer_delete 237 AUE_NULL UNIMPL timer_settime 238 AUE_NULL UNIMPL timer_gettime 239 AUE_NULL UNIMPL timer_getoverrun 240 AUE_NULL MSTD { int freebsd32_nanosleep( \ - const struct timespec *rqtp, \ - struct timespec *rmtp); } + const struct timespec32 *rqtp, \ + struct timespec32 *rmtp); } 241 AUE_NULL UNIMPL nosys 242 AUE_NULL UNIMPL nosys 243 AUE_NULL UNIMPL nosys ==== //depot/projects/fast_ipsec/src/sys/kern/kern_time.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_time.c,v 1.116 2005/03/31 22:51:18 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_time.c,v 1.117 2005/10/15 02:54:18 ps Exp $"); #include "opt_mac.h" @@ -155,34 +155,46 @@ clock_gettime(struct thread *td, struct clock_gettime_args *uap) { struct timespec ats; + int error; + + error = kern_clock_gettime(td, uap->clock_id, &ats); + if (error == 0) + error = copyout(&ats, uap->tp, sizeof(ats)); + + return (error); +} + +int +kern_clock_gettime(struct thread *td, clockid_t clock_id, struct timespec *ats) +{ struct timeval sys, user; struct proc *p; p = td->td_proc; - switch (uap->clock_id) { + switch (clock_id) { case CLOCK_REALTIME: - nanotime(&ats); + nanotime(ats); break; case CLOCK_VIRTUAL: PROC_LOCK(p); calcru(p, &user, &sys); PROC_UNLOCK(p); - TIMEVAL_TO_TIMESPEC(&user, &ats); + TIMEVAL_TO_TIMESPEC(&user, ats); break; case CLOCK_PROF: PROC_LOCK(p); calcru(p, &user, &sys); PROC_UNLOCK(p); timevaladd(&user, &sys); - TIMEVAL_TO_TIMESPEC(&user, &ats); + TIMEVAL_TO_TIMESPEC(&user, ats); break; case CLOCK_MONOTONIC: - nanouptime(&ats); + nanouptime(ats); break; default: return (EINVAL); } - return (copyout(&ats, uap->tp, sizeof(ats))); + return (0); } #ifndef _SYS_SYSPROTO_H_ @@ -199,8 +211,18 @@ int clock_settime(struct thread *td, struct clock_settime_args *uap) { + struct timespec ats; + int error; + + if ((error = copyin(uap->tp, &ats, sizeof(ats))) != 0) + return (error); + return (kern_clock_settime(td, uap->clock_id, &ats)); +} + +int +kern_clock_settime(struct thread *td, clockid_t clock_id, struct timespec *ats) +{ struct timeval atv; - struct timespec ats; int error; #ifdef MAC @@ -210,14 +232,12 @@ #endif if ((error = suser(td)) != 0) return (error); - if (uap->clock_id != CLOCK_REALTIME) + if (clock_id != CLOCK_REALTIME) return (EINVAL); - if ((error = copyin(uap->tp, &ats, sizeof(ats))) != 0) - return (error); - if (ats.tv_nsec < 0 || ats.tv_nsec >= 1000000000) + if (ats->tv_nsec < 0 || ats->tv_nsec >= 1000000000) return (EINVAL); /* XXX Don't convert nsec->usec and back */ - TIMESPEC_TO_TIMEVAL(&atv, &ats); + TIMESPEC_TO_TIMEVAL(&atv, ats); error = settime(td, &atv); return (error); } @@ -233,9 +253,23 @@ clock_getres(struct thread *td, struct clock_getres_args *uap) { struct timespec ts; + int error; + + if (uap->tp == NULL) + return (0); + + error = kern_clock_getres(td, uap->clock_id, &ts); + if (error == 0) + error = copyout(&ts, uap->tp, sizeof(ts)); + return (error); +} - ts.tv_sec = 0; - switch (uap->clock_id) { +int +kern_clock_getres(struct thread *td, clockid_t clock_id, struct timespec *ts) +{ + + ts->tv_sec = 0; + switch (clock_id) { case CLOCK_REALTIME: case CLOCK_MONOTONIC: /* @@ -243,19 +277,17 @@ * Rounding up is especially important if rounding down * would give 0. Perfect rounding is unimportant. */ - ts.tv_nsec = 1000000000 / tc_getfrequency() + 1; + ts->tv_nsec = 1000000000 / tc_getfrequency() + 1; break; case CLOCK_VIRTUAL: case CLOCK_PROF: /* Accurately round up here because we can do so cheaply. */ - ts.tv_nsec = (1000000000 + hz - 1) / hz; + ts->tv_nsec = (1000000000 + hz - 1) / hz; break; default: return (EINVAL); } - if (uap->tp == NULL) - return (0); - return (copyout(&ts, uap->tp, sizeof(ts))); + return (0); } static int nanowait; ==== //depot/projects/fast_ipsec/src/sys/kern/uipc_syscalls.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.221 2005/07/05 22:49:09 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.222 2005/10/15 05:57:06 ps Exp $"); #include "opt_compat.h" #include "opt_ktrace.h" @@ -922,12 +922,13 @@ return (error); } -static int -recvit(td, s, mp, namelenp) +int +kern_recvit(td, s, mp, namelenp, segflg) struct thread *td; int s; struct msghdr *mp; void *namelenp; + enum uio_seg segflg; { struct uio auio; struct iovec *iov; @@ -964,7 +965,7 @@ auio.uio_iov = mp->msg_iov; auio.uio_iovcnt = mp->msg_iovlen; - auio.uio_segflg = UIO_USERSPACE; + auio.uio_segflg = segflg; auio.uio_rw = UIO_READ; auio.uio_td = td; auio.uio_offset = 0; /* XXX */ @@ -1082,6 +1083,17 @@ return (error); } +static int +recvit(td, s, mp, namelenp) + struct thread *td; + int s; + struct msghdr *mp; + void *namelenp; +{ + + return (kern_recvit(td, s, mp, namelenp, UIO_USERSPACE)); +} + /* * MPSAFE */ ==== //depot/projects/fast_ipsec/src/sys/netinet6/raw_ip6.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/netinet6/raw_ip6.c,v 1.55 2005/08/18 11:11:27 suz Exp $ + * $FreeBSD: src/sys/netinet6/raw_ip6.c,v 1.56 2005/10/15 08:49:49 suz Exp $ */ /*- @@ -566,8 +566,10 @@ } MALLOC(filter, struct icmp6_filter *, sizeof(struct icmp6_filter), M_PCB, M_NOWAIT); - if (filter == NULL) + if (filter == NULL) { + INP_INFO_WUNLOCK(&ripcbinfo); return ENOMEM; + } s = splnet(); error = in_pcballoc(so, &ripcbinfo, "raw6inp"); splx(s); ==== //depot/projects/fast_ipsec/src/sys/sparc64/sparc64/trap.c#3 (text+ko) ==== @@ -37,7 +37,7 @@ * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 * from: FreeBSD: src/sys/i386/i386/trap.c,v 1.197 2001/07/19 - * $FreeBSD: src/sys/sparc64/sparc64/trap.c,v 1.75 2005/10/14 12:43:47 davidxu Exp $ + * $FreeBSD: src/sys/sparc64/sparc64/trap.c,v 1.76 2005/10/15 02:09:43 davidxu Exp $ */ #include "opt_ddb.h" @@ -289,7 +289,7 @@ ksi.ksi_signo = sig; ksi.ksi_code = (int)tf->tf_type; /* XXX not POSIX */ /* ksi.ksi_addr = ? */ - ksi.ksi_trap = (int)tf->tf_type; + ksi.ksi_trapno = (int)tf->tf_type; trapsignal(td, &ksi); } ==== //depot/projects/fast_ipsec/src/sys/sys/syscallsubr.h#2 (text+ko) ==== @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/syscallsubr.h,v 1.31 2005/07/07 18:17:55 jhb Exp $ + * $FreeBSD: src/sys/sys/syscallsubr.h,v 1.33 2005/10/15 05:57:05 ps Exp $ */ #ifndef _SYS_SYSCALLSUBR_H_ @@ -60,6 +60,12 @@ int mode); int kern_chown(struct thread *td, char *path, enum uio_seg pathseg, int uid, int gid); +int kern_clock_getres(struct thread *td, clockid_t clock_id, + struct timespec *ts); +int kern_clock_gettime(struct thread *td, clockid_t clock_id, + struct timespec *ats); +int kern_clock_settime(struct thread *td, clockid_t clock_id, + struct timespec *ats); int kern_connect(struct thread *td, int fd, struct sockaddr *sa); int kern_execve(struct thread *td, struct image_args *args, struct mac *mac_p); @@ -105,6 +111,8 @@ int kern_readlink(struct thread *td, char *path, enum uio_seg pathseg, char *buf, enum uio_seg bufseg, int count); int kern_readv(struct thread *td, int fd, struct uio *auio); +int kern_recvit(struct thread *td, int s, struct msghdr *mp, void *namelenp, + enum uio_seg segflg); int kern_rename(struct thread *td, char *from, char *to, enum uio_seg pathseg); int kern_rmdir(struct thread *td, char *path, enum uio_seg pathseg); From owner-p4-projects@FreeBSD.ORG Sat Oct 15 16:50:27 2005 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 A545416A41F; Sat, 15 Oct 2005 16:50:26 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5258816A41F for ; Sat, 15 Oct 2005 16:50:26 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 184F043D46 for ; Sat, 15 Oct 2005 16:50:26 +0000 (GMT) (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.1/8.13.1) with ESMTP id j9FGoPCk073442 for ; Sat, 15 Oct 2005 16:50:25 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9FGoPUj073439 for perforce@freebsd.org; Sat, 15 Oct 2005 16:50:25 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 15 Oct 2005 16:50:25 GMT Message-Id: <200510151650.j9FGoPUj073439@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 85346 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, 15 Oct 2005 16:50:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=85346 Change 85346 by rwatson@rwatson_peppercorn on 2005/10/15 16:50:14 Staticize audit_sys_auditon(), since it's only used in kern_bsm_audit.c. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/kern_bsm_audit.c#18 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/kern_bsm_audit.c#18 (text+ko) ==== @@ -62,7 +62,8 @@ /* * Forward declares. */ -void audit_sys_auditon(struct audit_record *ar, struct au_record *rec); +static void audit_sys_auditon(struct audit_record *ar, + struct au_record *rec); /* * Initialize the BSM auditing subsystem. @@ -308,9 +309,8 @@ * Implement auditing for the auditon() system call. The audit tokens * that are generated depend on the command that was sent into the * auditon() system call. - * */ -void +static void audit_sys_auditon(struct audit_record *ar, struct au_record *rec) { struct au_token *tok; From owner-p4-projects@FreeBSD.ORG Sat Oct 15 16:53:31 2005 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 B2D5E16A428; Sat, 15 Oct 2005 16:53:30 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8687016A41F for ; Sat, 15 Oct 2005 16:53:30 +0000 (GMT) (envelope-from soc-chenk@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 46B4443D46 for ; Sat, 15 Oct 2005 16:53:30 +0000 (GMT) (envelope-from soc-chenk@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9FGrU9w073854 for ; Sat, 15 Oct 2005 16:53:30 GMT (envelope-from soc-chenk@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9FGrTkY073851 for perforce@freebsd.org; Sat, 15 Oct 2005 16:53:29 GMT (envelope-from soc-chenk@freebsd.org) Date: Sat, 15 Oct 2005 16:53:29 GMT Message-Id: <200510151653.j9FGrTkY073851@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-chenk@freebsd.org using -f From: soc-chenk To: Perforce Change Reviews Cc: Subject: PERFORCE change 85347 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, 15 Oct 2005 16:53:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=85347 Change 85347 by soc-chenk@soc-chenk_leavemealone on 2005/10/15 16:53:15 Display version 0.2.20pre3 in README.html tagged 0.2.20pre3 Submitted by: soc-chenk Affected files ... .. //depot/projects/soc2005/fuse4bsd2/README.html#12 edit Differences ... ==== //depot/projects/soc2005/fuse4bsd2/README.html#12 (text+ko) ==== @@ -55,7 +55,7 @@

  • - The FreeBSD module. Source tarballs are provided at [WWW]http://creo.hu/~csaba/projects/fuse4bsd/downloads/ under the name fuse4bsd-<version>.tar.* (latest release is 0.2.20pre2, date of release: 13th Oct 2005). The current code is available via [WWW]Darcs, you can fetch it by + The FreeBSD module. Source tarballs are provided at [WWW]http://creo.hu/~csaba/projects/fuse4bsd/downloads/ under the name fuse4bsd-<version>.tar.* (latest release is 0.2.20pre3, date of release: 15th Oct 2005). The current code is available via [WWW]Darcs, you can fetch it by 

     darcs get http://creo.hu/~csaba/darcs-repos/fuse4bsd
    command, or via [WWW]Perforce (you can use this latter link for online source code browsing).

    From owner-p4-projects@FreeBSD.ORG Sat Oct 15 22:16:00 2005 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 1272E16A421; Sat, 15 Oct 2005 22:16:00 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C6CBC16A41F for ; Sat, 15 Oct 2005 22:15:59 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7959443D48 for ; Sat, 15 Oct 2005 22:15:59 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9FMFxBJ095604 for ; Sat, 15 Oct 2005 22:15:59 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9FMFxJA095601 for perforce@freebsd.org; Sat, 15 Oct 2005 22:15:59 GMT (envelope-from wsalamon@computer.org) Date: Sat, 15 Oct 2005 22:15:59 GMT Message-Id: <200510152215.j9FMFxJA095601@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 85352 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, 15 Oct 2005 22:16:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=85352 Change 85352 by wsalamon@gretsch on 2005/10/15 22:15:17 Initialize some globals that weren't previously be initialized. Rearrange the globals into groups of related bits. Reported by: panxj Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/kern_audit.c#46 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/kern_audit.c#46 (text+ko) ==== @@ -102,9 +102,9 @@ int audit_fail_stop; /* - * Audit queue control settings (minimum free, low/high water marks, etc.) + * Are we currently "failing stop" due to out of disk space? */ -struct au_qctrl audit_qctrl; +static int audit_in_failure; /* * Global audit statistiscs. @@ -135,6 +135,11 @@ static int audit_pre_q_len; /* + * Audit queue control settings (minimum free, low/high water marks, etc.) + */ +struct au_qctrl audit_qctrl; + +/* * Condition variable to signal to the worker that it has work to do: * either new records are in the queue, or a log replacement is taking * place. @@ -188,11 +193,6 @@ static int audit_file_rotate_wait; /* - * Are we currently "failing stop" due to out of disk space? - */ -static int audit_in_failure; - -/* * Perform a deep free of an audit record (core record and referenced objects) */ static void @@ -594,17 +594,24 @@ int error; printf("Security auditing service present\n"); - TAILQ_INIT(&audit_q); - audit_q_len = 0; - audit_pre_q_len = 0; audit_enabled = 0; audit_suspended = 0; + audit_panic_on_write_fail = 0; + audit_fail_stop = 0; + audit_in_failure = 0; + + audit_replacement_vp = NULL; audit_replacement_cred = NULL; audit_replacement_flag = 0; - audit_file_rotate_wait = 0; - audit_replacement_vp = NULL; + audit_fstat.af_filesz = 0; /* '0' means unset, unbounded */ audit_fstat.af_currsz = 0; + audit_nae_mask.am_success = AU_NULL; + audit_nae_mask.am_failure = AU_NULL; + + TAILQ_INIT(&audit_q); + audit_q_len = 0; + audit_pre_q_len = 0; audit_qctrl.aq_hiwater = AQ_HIWATER; audit_qctrl.aq_lowater = AQ_LOWATER; audit_qctrl.aq_bufsz = AQ_BUFSZ; @@ -619,6 +626,7 @@ /* Initialize the BSM audit subsystem. */ kau_init(); + audit_file_rotate_wait = 0; audit_trigger_init(); /* Register shutdown handler. */