From owner-p4-projects@FreeBSD.ORG Sun Jun 4 05:19:03 2006 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 9932D16A474; Sun, 4 Jun 2006 05:19:03 +0000 (UTC) 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 5374D16A41F for ; Sun, 4 Jun 2006 05:19:02 +0000 (UTC) (envelope-from adamartin@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ECEFC43D48 for ; Sun, 4 Jun 2006 05:19:01 +0000 (GMT) (envelope-from adamartin@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k545HO2a037969 for ; Sun, 4 Jun 2006 05:17:24 GMT (envelope-from adamartin@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k545HNUT037952 for perforce@freebsd.org; Sun, 4 Jun 2006 05:17:23 GMT (envelope-from adamartin@FreeBSD.org) Date: Sun, 4 Jun 2006 05:17:23 GMT Message-Id: <200606040517.k545HNUT037952@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to adamartin@FreeBSD.org using -f From: Adam Martin To: Perforce Change Reviews Cc: Subject: PERFORCE change 98450 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Jun 2006 05:19:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=98450 Change 98450 by adamartin@adamartin_tethys on 2006/06/04 05:10:10 Attempting to import the whole FreeBSD tree, for development of AutoFS on FreeBSD. Affected files ... .. //depot/projects/soc2006/adamartin_autofs/COPYRIGHT#1 branch .. //depot/projects/soc2006/adamartin_autofs/LOCKS#1 branch .. //depot/projects/soc2006/adamartin_autofs/MAINTAINERS#1 branch .. //depot/projects/soc2006/adamartin_autofs/Makefile#1 branch .. //depot/projects/soc2006/adamartin_autofs/Makefile.inc1#1 branch .. //depot/projects/soc2006/adamartin_autofs/ObsoleteFiles.inc#1 branch .. //depot/projects/soc2006/adamartin_autofs/UPDATING#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/Makefile#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/Makefile.inc#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/cat/Makefile#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/cat/cat.1#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/cat/cat.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/chflags/Makefile#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/chflags/chflags.1#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/chflags/chflags.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/chio/Makefile#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/chio/chio.1#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/chio/chio.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/chio/defs.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/chio/pathnames.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/chmod/Makefile#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/chmod/chmod.1#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/chmod/chmod.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/cp/Makefile#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/cp/cp.1#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/cp/cp.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/cp/extern.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/cp/utils.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/csh/Makefile#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/csh/USD.doc/csh.1#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/csh/USD.doc/csh.2#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/csh/USD.doc/csh.3#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/csh/USD.doc/csh.4#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/csh/USD.doc/csh.a#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/csh/USD.doc/csh.g#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/csh/USD.doc/tabs#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/csh/config.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/csh/config_p.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/csh/host.defs#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/csh/iconv.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/csh/iconv_stub.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/date/Makefile#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/date/date.1#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/date/date.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/date/extern.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/date/netdate.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/date/vary.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/date/vary.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/dd/Makefile#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/dd/args.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/dd/conv.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/dd/conv_tab.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/dd/dd.1#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/dd/dd.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/dd/dd.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/dd/extern.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/dd/gen.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/dd/misc.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/dd/position.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/dd/ref.ascii#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/dd/ref.ebcdic#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/dd/ref.ibm#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/dd/ref.lcase#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/dd/ref.oldascii#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/dd/ref.oldebcdic#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/dd/ref.oldibm#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/dd/ref.pareven#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/dd/ref.parnone#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/dd/ref.parodd#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/dd/ref.parset#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/dd/ref.swab#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/dd/ref.ucase#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/df/Makefile#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/df/df.1#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/df/df.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/domainname/Makefile#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/domainname/domainname.1#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/domainname/domainname.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/echo/Makefile#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/echo/echo.1#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/echo/echo.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/Makefile#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/POSIX#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/README#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/buf.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/cbc.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/ed.1#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/ed.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/glbl.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/io.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/main.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/re.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/sub.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/=.err#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/Makefile#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/README#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/TODO#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/a.d#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/a.r#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/a.t#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/a1.err#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/a2.err#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/addr.d#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/addr.r#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/addr.t#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/addr1.err#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/addr2.err#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/ascii.d.uu#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/ascii.r.uu#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/ascii.t#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/bang1.d#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/bang1.err#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/bang1.r#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/bang1.t#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/bang2.err#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/c.d#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/c.r#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/c.t#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/c1.err#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/c2.err#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/ckscripts.sh#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/d.d#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/d.err#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/d.r#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/d.t#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/e1.d#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/e1.err#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/e1.r#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/e1.t#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/e2.d#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/e2.err#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/e2.r#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/e2.t#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/e3.d#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/e3.err#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/e3.r#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/e3.t#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/e4.d#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/e4.r#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/e4.t#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/f1.err#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/f2.err#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/g1.d#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/g1.err#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/g1.r#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/g1.t#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/g2.d#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/g2.err#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/g2.r#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/g2.t#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/g3.d#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/g3.err#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/g3.r#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/g3.t#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/g4.d#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/g4.r#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/g4.t#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/g5.d#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/g5.r#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/g5.t#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/h.err#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/i.d#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/i.r#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/i.t#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/i1.err#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/i2.err#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/i3.err#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/j.d#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/j.r#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/j.t#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/k.d#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/k.r#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/k.t#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/k1.err#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/k2.err#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/k3.err#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/k4.err#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/l.d#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/l.r#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/l.t#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/m.d#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/m.err#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/m.r#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/m.t#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/mkscripts.sh#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/n.d#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/n.r#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/n.t#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/nl.err#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/nl1.d#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/nl1.r#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/nl1.t#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/nl2.d#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/nl2.r#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/nl2.t#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/p.d#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/p.r#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/p.t#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/q.d#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/q.r#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/q.t#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/q1.err#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/r1.d#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/r1.err#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/r1.r#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/r1.t#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/r2.d#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/r2.err#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/r2.r#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/r2.t#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/r3.d#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/r3.r#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/r3.t#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/s1.d#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/s1.err#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/s1.r#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/s1.t#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/s10.err#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/s2.d#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/s2.err#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/s2.r#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/s2.t#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/s3.d#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/s3.err#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/s3.r#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/s3.t#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/s4.err#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/s5.err#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/s6.err#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/s7.err#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/s8.err#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/s9.err#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/t.d#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/t.r#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/t1.d#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/t1.err#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/t1.r#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/t1.t#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/t2.d#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/t2.err#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/t2.r#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/t2.t#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/u.d#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/u.err#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/u.r#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/u.t#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/v.d#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/v.r#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/v.t#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/w.d#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/w.r#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/w.t#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/w1.err#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/w2.err#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/w3.err#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/x.err#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/test/z.err#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ed/undo.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/expr/Makefile#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/expr/expr.1#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/expr/expr.y#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/getfacl/Makefile#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/getfacl/getfacl.1#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/getfacl/getfacl.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/hostname/Makefile#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/hostname/hostname.1#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/hostname/hostname.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/kenv/Makefile#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/kenv/kenv.1#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/kenv/kenv.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/kill/Makefile#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/kill/kill.1#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/kill/kill.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ln/Makefile#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ln/ln.1#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ln/ln.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ln/symlink.7#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ls/Makefile#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ls/cmp.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ls/extern.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ls/ls.1#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ls/ls.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ls/ls.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ls/print.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ls/util.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/mkdir/Makefile#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/mkdir/mkdir.1#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/mkdir/mkdir.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/mv/Makefile#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/mv/mv.1#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/mv/mv.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/pax/Makefile#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/pax/ar_io.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/pax/ar_subs.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/pax/buf_subs.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/pax/cache.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/pax/cache.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/pax/cpio.1#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/pax/cpio.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/pax/cpio.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/pax/extern.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/pax/file_subs.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/pax/ftree.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/pax/ftree.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/pax/gen_subs.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/pax/getoldopt.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/pax/options.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/pax/options.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/pax/pat_rep.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/pax/pat_rep.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/pax/pax.1#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/pax/pax.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/pax/pax.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/pax/sel_subs.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/pax/sel_subs.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/pax/tables.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/pax/tables.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/pax/tar.1#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/pax/tar.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/pax/tar.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/pax/tty_subs.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ps/Makefile#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ps/extern.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ps/fmt.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ps/keyword.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ps/nlist.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ps/print.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ps/ps.1#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ps/ps.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/ps/ps.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/pwd/Makefile#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/pwd/pwd.1#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/pwd/pwd.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/rcp/Makefile#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/rcp/extern.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/rcp/rcp.1#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/rcp/rcp.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/rcp/util.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/realpath/Makefile#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/realpath/realpath.1#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/realpath/realpath.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/rm/Makefile#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/rm/rm.1#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/rm/rm.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/rmail/Makefile#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/rmdir/Makefile#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/rmdir/rmdir.1#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/rmdir/rmdir.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/setfacl/Makefile#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/setfacl/file.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/setfacl/mask.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/setfacl/merge.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/setfacl/remove.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/setfacl/setfacl.1#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/setfacl/setfacl.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/setfacl/setfacl.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/setfacl/util.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sh/Makefile#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sh/TOUR#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sh/alias.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sh/alias.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sh/arith.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sh/arith.y#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sh/arith_lex.l#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sh/bltin/bltin.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sh/bltin/echo.1#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sh/bltin/echo.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sh/builtins.def#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sh/cd.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sh/cd.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sh/error.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sh/error.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sh/eval.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sh/eval.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sh/exec.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sh/exec.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sh/expand.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sh/expand.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sh/funcs/cmv#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sh/funcs/dirs#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sh/funcs/kill#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sh/funcs/login#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sh/funcs/newgrp#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sh/funcs/popd#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sh/funcs/pushd#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sh/funcs/suspend#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sh/histedit.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sh/init.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sh/input.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sh/input.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sh/jobs.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sh/jobs.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sh/mail.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sh/mail.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sh/main.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sh/main.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sh/memalloc.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sh/memalloc.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sh/miscbltin.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sh/mkbuiltins#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sh/mkinit.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sh/mknodes.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sh/mksyntax.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sh/mktokens#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sh/myhistedit.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sh/mystring.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sh/mystring.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sh/nodes.c.pat#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sh/nodetypes#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sh/options.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sh/options.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sh/output.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sh/output.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sh/parser.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sh/parser.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sh/redir.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sh/redir.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sh/sh.1#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sh/shell.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sh/show.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sh/show.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sh/trap.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sh/trap.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sh/var.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sh/var.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sleep/Makefile#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sleep/sleep.1#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sleep/sleep.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/stty/Makefile#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/stty/cchar.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/stty/extern.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/stty/gfmt.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/stty/key.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/stty/modes.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/stty/print.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/stty/stty.1#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/stty/stty.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/stty/stty.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/stty/util.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sync/Makefile#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sync/sync.8#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/sync/sync.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/test/Makefile#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/test/TEST.README#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/test/TEST.csh#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/test/TEST.sh#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/test/test.1#1 branch .. //depot/projects/soc2006/adamartin_autofs/bin/test/test.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/AUTHORS#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/BUGS#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/COPYING#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/ChangeLog#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/FREEBSD-Xlist#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/FREEBSD-upgrade#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/INSTALL#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/MIRRORS.html#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/MIRRORS.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/NEWS#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/README#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/README.ldap#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/README.y2k#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/amd/am_ops.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/amd/amd.8#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/amd/amd.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/amd/amd.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/amd/amfs_auto.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/amd/amfs_direct.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/amd/amfs_error.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/amd/amfs_host.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/amd/amfs_inherit.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/amd/amfs_link.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/amd/amfs_linkx.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/amd/amfs_nfsl.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/amd/amfs_nfsx.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/amd/amfs_program.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/amd/amfs_root.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/amd/amfs_toplvl.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/amd/amfs_union.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/amd/amq_subr.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/amd/amq_svc.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/amd/autil.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/amd/clock.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/amd/conf.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/amd/conf_parse.y#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/amd/conf_tok.l#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/amd/get_args.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/amd/info_file.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/amd/info_hesiod.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/amd/info_ldap.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/amd/info_ndbm.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/amd/info_nis.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/amd/info_nisplus.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/amd/info_passwd.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/amd/info_union.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/amd/map.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/amd/mapc.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/amd/mntfs.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/amd/nfs_prot_svc.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/amd/nfs_start.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/amd/nfs_subr.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/amd/ops_TEMPLATE.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/amd/ops_cachefs.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/amd/ops_cdfs.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/amd/ops_efs.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/amd/ops_lofs.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/amd/ops_mfs.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/amd/ops_nfs.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/amd/ops_nfs3.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/amd/ops_nullfs.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/amd/ops_pcfs.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/amd/ops_tfs.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/amd/ops_tmpfs.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/amd/ops_ufs.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/amd/ops_umapfs.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/amd/ops_unionfs.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/amd/ops_xfs.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/amd/opts.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/amd/restart.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/amd/rpc_fwd.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/amd/sched.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/amd/srvr_amfs_auto.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/amd/srvr_nfs.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/amq/amq.8#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/amq/amq.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/amq/amq.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/amq/amq_clnt.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/amq/amq_xdr.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/amq/pawd.1#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/amq/pawd.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/aux_conf.h.in#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/bootstrap#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/conf/checkmount/checkmount_bsd44.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/conf/fh_dref/fh_dref_freebsd22.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/conf/mtab/mtab_bsd.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/conf/sa_dref/sa_dref_bsd44.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/conf/transp/transp_sockets.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/conf/trap/trap_default.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/conf/umount/umount_bsd44.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/doc/am-utils.texi#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/doc/texinfo.tex#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/doc/version.texi#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/fixmount/fixmount.8#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/fixmount/fixmount.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/fsinfo/fsi_analyze.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/fsinfo/fsi_data.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/fsinfo/fsi_dict.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/fsinfo/fsi_gram.y#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/fsinfo/fsi_lex.l#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/fsinfo/fsi_util.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/fsinfo/fsinfo.8#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/fsinfo/fsinfo.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/fsinfo/fsinfo.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/fsinfo/wr_atab.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/fsinfo/wr_bparam.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/fsinfo/wr_dumpset.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/fsinfo/wr_exportfs.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/fsinfo/wr_fstab.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/hlfsd/hlfsd.8#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/hlfsd/hlfsd.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/hlfsd/hlfsd.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/hlfsd/homedir.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/hlfsd/nfs_prot_svc.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/hlfsd/stubs.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/include/am_compat.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/include/am_defs.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/include/am_utils.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/include/am_xdr_func.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/include/amq_defs.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/include/mount_headers1.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/include/mount_headers2.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/ldap-id.ms#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/ldap-id.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/libamu/alloca.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/libamu/amu.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/libamu/hasmntopt.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/libamu/misc_rpc.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/libamu/mount_fs.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/libamu/mtab.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/libamu/nfs_prot_xdr.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/libamu/strerror.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/libamu/util.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/libamu/wire.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/libamu/xdr_func.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/libamu/xutil.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/m4/GNUmakefile#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/m4/amdgrep#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/m4/amindent#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/m4/autopat#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/m4/chop-aclocal.pl#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/m4/copy-if-newbig#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/m4/macros/HEADER#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/m4/macros/TRAILER#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/m4/mk-aclocal#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/m4/mkconf#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/m4/rmtspc#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/m4/update_build_version#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/mk-amd-map/mk-amd-map.8#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/mk-amd-map/mk-amd-map.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/scripts/Makefile.am#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/scripts/Makefile.in#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/scripts/am-eject.in#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/scripts/amd.conf-sample#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/scripts/amd.conf.5#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/scripts/amd2ldif.in#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/scripts/amd2sun.in#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/scripts/automount2amd.8#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/scripts/automount2amd.in#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/scripts/ctl-amd.in#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/scripts/ctl-hlfsd.in#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/scripts/expn.1#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/scripts/expn.in#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/scripts/fix-amd-map.in#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/scripts/fixrmtab.in#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/scripts/redhat-ctl-amd.in#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/scripts/wait4amd.in#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/scripts/wait4amd2die.in#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/tasks#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/wire-test/wire-test.8#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/amd/wire-test/wire-test.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/AUTHORS#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/ChangeLog#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/Examples/ckbook.b#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/Examples/pi.b#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/Examples/primes.b#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/Examples/twins.b#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/FAQ#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/FREEBSD-upgrade#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/INSTALL#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/Makefile.am#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/Makefile.in#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/NEWS#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/README#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/Test/BUG.bc#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/Test/array.b#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/Test/arrayp.b#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/Test/aryprm.b#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/Test/atan.b#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/Test/checklib.b#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/Test/div.b#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/Test/exp.b#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/Test/fact.b#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/Test/jn.b#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/Test/ln.b#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/Test/mul.b#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/Test/raise.b#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/Test/signum#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/Test/sine.b#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/Test/sqrt.b#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/Test/sqrt1.b#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/Test/sqrt2.b#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/Test/testfn.b#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/Test/timetest#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/acconfig.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/aclocal.m4#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/bc/Makefile.am#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/bc/Makefile.in#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/bc/bc.y#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/bc/bcdefs.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/bc/const.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/bc/execute.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/bc/fix-libmath_h#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/bc/global.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/bc/global.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/bc/libmath.b#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/bc/libmath.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/bc/load.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/bc/main.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/bc/proto.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/bc/sbc.y#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/bc/scan.l#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/bc/storage.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/bc/util.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/config.h.in#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/configure#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/configure.in#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/dc/Makefile.am#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/dc/Makefile.in#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/dc/array.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/dc/dc-proto.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/dc/dc-regdef.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/dc/dc.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/dc/dc.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/dc/eval.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/dc/misc.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/dc/numeric.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/dc/stack.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/dc/string.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/doc/Makefile.am#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/doc/Makefile.in#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/doc/bc.1#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/doc/bc.texi#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/doc/dc.1#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/doc/dc.texi#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/h/number.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/install-sh#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/lib/Makefile.am#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/lib/Makefile.in#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/lib/number.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/lib/testmul.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/lib/vfprintf.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/missing#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/mkinstalldirs#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bc/stamp-h.in#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/CHANGES#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/COPYRIGHT#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/FAQ#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/FAQ.xml#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/FREEBSD-Upgrade#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/FREEBSD-Xlist#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/Makefile.in#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/README#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/acconfig.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/Makefile.in#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/check/Makefile.in#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/check/check-tool.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/check/check-tool.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/check/named-checkconf.8#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/check/named-checkconf.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/check/named-checkconf.docbook#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/check/named-checkconf.html#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/check/named-checkzone.8#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/check/named-checkzone.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/check/named-checkzone.docbook#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/check/named-checkzone.html#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/dig/Makefile.in#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/dig/dig.1#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/dig/dig.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/dig/dig.docbook#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/dig/dig.html#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/dig/dighost.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/dig/host.1#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/dig/host.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/dig/host.docbook#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/dig/host.html#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/dig/include/dig/dig.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/dig/nslookup.1#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/dig/nslookup.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/dig/nslookup.docbook#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/dig/nslookup.html#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/dnssec/Makefile.in#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/dnssec/dnssec-keygen.8#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/dnssec/dnssec-keygen.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/dnssec/dnssec-keygen.html#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/dnssec/dnssec-signzone.8#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/dnssec/dnssec-signzone.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/dnssec/dnssec-signzone.html#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/dnssec/dnssectool.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/dnssec/dnssectool.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/named/Makefile.in#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/named/aclconf.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/named/builtin.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/named/client.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/named/config.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/named/control.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/named/controlconf.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/named/include/named/aclconf.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/named/include/named/builtin.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/named/include/named/client.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/named/include/named/config.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/named/include/named/control.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/named/include/named/globals.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/named/include/named/interfacemgr.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/named/include/named/listenlist.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/named/include/named/log.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/named/include/named/logconf.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/named/include/named/lwaddr.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/named/include/named/lwdclient.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/named/include/named/lwresd.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/named/include/named/lwsearch.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/named/include/named/main.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/named/include/named/notify.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/named/include/named/ns_smf_globals.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/named/include/named/query.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/named/include/named/server.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/named/include/named/sortlist.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/named/include/named/tkeyconf.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/named/include/named/tsigconf.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/named/include/named/types.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/named/include/named/update.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/named/include/named/xfrout.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/named/include/named/zoneconf.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/named/interfacemgr.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/named/listenlist.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/named/log.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/named/logconf.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/named/lwaddr.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/named/lwdclient.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/named/lwderror.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/named/lwdgabn.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/named/lwdgnba.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/named/lwdgrbn.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/named/lwdnoop.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/named/lwresd.8#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/named/lwresd.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/named/lwresd.docbook#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/named/lwresd.html#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/named/lwsearch.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/named/main.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/named/named.8#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/named/named.conf.5#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/named/named.conf.docbook#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/named/named.conf.html#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/named/named.docbook#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/named/named.html#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/named/notify.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/named/query.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/named/server.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/named/sortlist.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/named/tkeyconf.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/named/tsigconf.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/named/unix/Makefile.in#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/named/unix/include/named/os.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/named/unix/os.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/named/update.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/named/xfrout.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/named/zoneconf.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/nsupdate/Makefile.in#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/nsupdate/nsupdate.8#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/nsupdate/nsupdate.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/nsupdate/nsupdate.docbook#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/nsupdate/nsupdate.html#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/rndc/Makefile.in#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/rndc/include/rndc/os.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/rndc/rndc-confgen.8#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/rndc/rndc-confgen.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/rndc/rndc-confgen.docbook#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/rndc/rndc-confgen.html#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/rndc/rndc.8#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/rndc/rndc.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/rndc/rndc.conf#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/rndc/rndc.conf.5#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/rndc/rndc.conf.docbook#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/rndc/rndc.conf.html#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/rndc/rndc.docbook#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/rndc/rndc.html#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/rndc/unix/Makefile.in#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/rndc/unix/os.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/rndc/util.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/bin/rndc/util.h#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/config.guess#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/config.sub#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/config.threads.in#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/configure.in#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/Makefile.in#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/arm/Bv9ARM-book.xml#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/arm/Bv9ARM.ch01.html#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/arm/Bv9ARM.ch02.html#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/arm/Bv9ARM.ch03.html#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/arm/Bv9ARM.ch04.html#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/arm/Bv9ARM.ch05.html#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/arm/Bv9ARM.ch06.html#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/arm/Bv9ARM.ch07.html#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/arm/Bv9ARM.ch08.html#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/arm/Bv9ARM.ch09.html#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/arm/Bv9ARM.html#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/arm/Bv9ARM.pdf#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/arm/Makefile.in#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/arm/README-SGML#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/draft/draft-baba-dnsext-acl-reqts-01.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/draft/draft-daigle-napstr-04.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/draft/draft-danisch-dns-rr-smtp-03.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/draft/draft-dnsext-opcode-discover-02.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/draft/draft-durand-dnsop-dynreverse-00.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/draft/draft-ietf-dnsext-2929bis-01.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/draft/draft-ietf-dnsext-axfr-clarify-05.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-09.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/draft/draft-ietf-dnsext-dns-name-p-s-00.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-2535typecode-change-06.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-bis-updates-01.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-experiments-01.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-00.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-opt-in-07.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-trans-02.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/draft/draft-ietf-dnsext-ecc-key-07.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-06.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-02.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/draft/draft-ietf-dnsext-keyrr-key-signing-flag-12.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-43.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-02.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2536bis-dsa-06.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2538bis-04.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2539bis-dhk-06.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/draft/draft-ietf-dnsext-signed-nonexistence-requirements-01.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-05.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-01.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-04.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-08.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-04.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-04.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/draft/draft-ietf-dnsop-inaddr-required-07.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-06.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-11.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-transport-guidelines-01.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-02.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-02.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-04.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/draft/draft-ietf-enum-e164-gstn-np-05.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/draft/draft-ietf-ipv6-node-requirements-08.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/draft/draft-ietf-secsh-dns-05.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/draft/draft-ihren-dnsext-threshold-validation-00.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/draft/draft-kato-dnsop-local-zones-00.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/draft/draft-park-ipv6-extensions-dns-pnp-00.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/draft/update#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/misc/Makefile.in#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/misc/dnssec#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/misc/format-options.pl#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/misc/ipv6#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/misc/migration#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/misc/migration-4to9#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/misc/options#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/misc/rfc-compliance#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/misc/roadmap#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/misc/sdb#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/index#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc1032.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc1033.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc1034.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc1035.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc1101.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc1122.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc1123.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc1183.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc1348.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc1535.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc1536.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc1537.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc1591.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc1611.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc1612.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc1706.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc1712.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc1750.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc1876.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc1886.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc1982.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc1995.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc1996.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc2052.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc2104.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc2119.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc2133.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc2136.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc2137.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc2163.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc2168.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc2181.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc2230.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc2308.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc2317.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc2373.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc2374.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc2375.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc2418.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc2535.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc2536.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc2537.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc2538.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc2539.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc2540.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc2541.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc2553.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc2671.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc2672.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc2673.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc2782.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc2825.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc2826.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc2845.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc2874.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc2915.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc2929.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc2930.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc2931.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc3007.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc3008.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc3071.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc3090.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc3110.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc3123.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc3152.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc3197.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc3225.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc3226.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc3258.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc3363.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc3364.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc3425.txt#1 branch .. //depot/projects/soc2006/adamartin_autofs/contrib/bind9/doc/rfc/rfc3445.txt#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jun 4 19:59:10 2006 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 0057916AA66; Sun, 4 Jun 2006 19:59:09 +0000 (UTC) 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 30CA616AA61 for ; Sun, 4 Jun 2006 19:59:09 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2140143D46 for ; Sun, 4 Jun 2006 19:58:47 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k54Jv6nF048642 for ; Sun, 4 Jun 2006 19:57:06 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k54Jv6ZA048639 for perforce@freebsd.org; Sun, 4 Jun 2006 19:57:06 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 4 Jun 2006 19:57:06 GMT Message-Id: <200606041957.k54Jv6ZA048639@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 98495 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Jun 2006 19:59:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=98495 Change 98495 by kmacy@kmacy_storage:sun4v_work_stable on 2006/06/04 19:56:48 create branch Affected files ... .. //depot/projects/kmacy_sun4v_stable/src/COPYRIGHT#1 branch .. //depot/projects/kmacy_sun4v_stable/src/LOCKS#1 branch .. //depot/projects/kmacy_sun4v_stable/src/MAINTAINERS#1 branch .. //depot/projects/kmacy_sun4v_stable/src/Makefile#1 branch .. //depot/projects/kmacy_sun4v_stable/src/Makefile.inc1#1 branch .. //depot/projects/kmacy_sun4v_stable/src/ObsoleteFiles.inc#1 branch .. //depot/projects/kmacy_sun4v_stable/src/README#1 branch .. //depot/projects/kmacy_sun4v_stable/src/UPDATING#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/Makefile#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/Makefile.inc#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/cat/Makefile#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/cat/cat.1#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/cat/cat.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/chflags/Makefile#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/chflags/chflags.1#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/chflags/chflags.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/chio/Makefile#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/chio/chio.1#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/chio/chio.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/chio/defs.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/chio/pathnames.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/chmod/Makefile#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/chmod/chmod.1#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/chmod/chmod.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/cp/Makefile#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/cp/cp.1#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/cp/cp.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/cp/extern.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/cp/utils.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/csh/Makefile#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/csh/USD.doc/csh.1#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/csh/USD.doc/csh.2#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/csh/USD.doc/csh.3#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/csh/USD.doc/csh.4#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/csh/USD.doc/csh.a#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/csh/USD.doc/csh.g#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/csh/USD.doc/tabs#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/csh/config.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/csh/config_p.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/csh/host.defs#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/csh/iconv.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/csh/iconv_stub.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/date/Makefile#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/date/date.1#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/date/date.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/date/extern.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/date/netdate.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/date/vary.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/date/vary.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/dd/Makefile#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/dd/args.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/dd/conv.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/dd/conv_tab.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/dd/dd.1#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/dd/dd.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/dd/dd.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/dd/extern.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/dd/gen.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/dd/misc.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/dd/position.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/dd/ref.ascii#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/dd/ref.ebcdic#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/dd/ref.ibm#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/dd/ref.lcase#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/dd/ref.oldascii#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/dd/ref.oldebcdic#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/dd/ref.oldibm#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/dd/ref.pareven#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/dd/ref.parnone#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/dd/ref.parodd#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/dd/ref.parset#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/dd/ref.swab#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/dd/ref.ucase#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/df/Makefile#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/df/df.1#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/df/df.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/domainname/Makefile#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/domainname/domainname.1#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/domainname/domainname.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/echo/Makefile#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/echo/echo.1#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/echo/echo.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/Makefile#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/POSIX#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/README#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/buf.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/cbc.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/ed.1#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/ed.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/glbl.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/io.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/main.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/re.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/sub.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/=.err#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/Makefile#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/README#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/TODO#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/a.d#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/a.r#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/a.t#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/a1.err#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/a2.err#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/addr.d#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/addr.r#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/addr.t#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/addr1.err#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/addr2.err#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/ascii.d.uu#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/ascii.r.uu#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/ascii.t#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/bang1.d#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/bang1.err#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/bang1.r#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/bang1.t#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/bang2.err#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/c.d#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/c.r#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/c.t#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/c1.err#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/c2.err#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/ckscripts.sh#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/d.d#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/d.err#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/d.r#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/d.t#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/e1.d#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/e1.err#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/e1.r#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/e1.t#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/e2.d#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/e2.err#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/e2.r#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/e2.t#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/e3.d#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/e3.err#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/e3.r#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/e3.t#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/e4.d#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/e4.r#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/e4.t#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/f1.err#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/f2.err#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/g1.d#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/g1.err#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/g1.r#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/g1.t#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/g2.d#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/g2.err#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/g2.r#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/g2.t#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/g3.d#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/g3.err#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/g3.r#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/g3.t#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/g4.d#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/g4.r#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/g4.t#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/g5.d#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/g5.r#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/g5.t#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/h.err#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/i.d#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/i.r#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/i.t#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/i1.err#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/i2.err#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/i3.err#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/j.d#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/j.r#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/j.t#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/k.d#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/k.r#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/k.t#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/k1.err#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/k2.err#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/k3.err#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/k4.err#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/l.d#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/l.r#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/l.t#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/m.d#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/m.err#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/m.r#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/m.t#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/mkscripts.sh#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/n.d#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/n.r#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/n.t#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/nl.err#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/nl1.d#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/nl1.r#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/nl1.t#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/nl2.d#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/nl2.r#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/nl2.t#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/p.d#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/p.r#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/p.t#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/q.d#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/q.r#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/q.t#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/q1.err#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/r1.d#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/r1.err#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/r1.r#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/r1.t#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/r2.d#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/r2.err#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/r2.r#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/r2.t#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/r3.d#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/r3.r#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/r3.t#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/s1.d#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/s1.err#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/s1.r#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/s1.t#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/s10.err#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/s2.d#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/s2.err#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/s2.r#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/s2.t#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/s3.d#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/s3.err#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/s3.r#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/s3.t#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/s4.err#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/s5.err#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/s6.err#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/s7.err#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/s8.err#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/s9.err#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/t.d#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/t.r#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/t1.d#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/t1.err#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/t1.r#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/t1.t#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/t2.d#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/t2.err#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/t2.r#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/t2.t#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/u.d#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/u.err#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/u.r#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/u.t#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/v.d#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/v.r#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/v.t#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/w.d#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/w.r#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/w.t#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/w1.err#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/w2.err#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/w3.err#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/x.err#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/test/z.err#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ed/undo.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/expr/Makefile#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/expr/expr.1#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/expr/expr.y#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/getfacl/Makefile#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/getfacl/getfacl.1#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/getfacl/getfacl.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/hostname/Makefile#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/hostname/hostname.1#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/hostname/hostname.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/kenv/Makefile#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/kenv/kenv.1#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/kenv/kenv.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/kill/Makefile#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/kill/kill.1#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/kill/kill.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ln/Makefile#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ln/ln.1#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ln/ln.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ln/symlink.7#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ls/Makefile#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ls/cmp.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ls/extern.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ls/ls.1#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ls/ls.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ls/ls.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ls/print.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ls/util.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/mkdir/Makefile#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/mkdir/mkdir.1#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/mkdir/mkdir.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/mv/Makefile#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/mv/mv.1#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/mv/mv.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/pax/Makefile#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/pax/ar_io.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/pax/ar_subs.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/pax/buf_subs.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/pax/cache.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/pax/cache.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/pax/cpio.1#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/pax/cpio.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/pax/cpio.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/pax/extern.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/pax/file_subs.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/pax/ftree.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/pax/ftree.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/pax/gen_subs.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/pax/getoldopt.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/pax/options.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/pax/options.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/pax/pat_rep.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/pax/pat_rep.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/pax/pax.1#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/pax/pax.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/pax/pax.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/pax/sel_subs.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/pax/sel_subs.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/pax/tables.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/pax/tables.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/pax/tar.1#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/pax/tar.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/pax/tar.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/pax/tty_subs.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ps/Makefile#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ps/extern.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ps/fmt.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ps/keyword.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ps/nlist.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ps/print.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ps/ps.1#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ps/ps.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/ps/ps.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/pwd/Makefile#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/pwd/pwd.1#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/pwd/pwd.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/rcp/Makefile#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/rcp/extern.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/rcp/rcp.1#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/rcp/rcp.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/rcp/util.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/realpath/Makefile#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/realpath/realpath.1#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/realpath/realpath.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/rm/Makefile#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/rm/rm.1#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/rm/rm.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/rmail/Makefile#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/rmdir/Makefile#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/rmdir/rmdir.1#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/rmdir/rmdir.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/setfacl/Makefile#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/setfacl/file.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/setfacl/mask.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/setfacl/merge.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/setfacl/remove.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/setfacl/setfacl.1#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/setfacl/setfacl.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/setfacl/setfacl.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/setfacl/util.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/Makefile#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/TOUR#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/alias.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/alias.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/arith.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/arith.y#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/arith_lex.l#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/bltin/bltin.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/bltin/echo.1#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/bltin/echo.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/builtins.def#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/cd.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/cd.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/error.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/error.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/eval.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/eval.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/exec.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/exec.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/expand.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/expand.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/funcs/cmv#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/funcs/dirs#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/funcs/kill#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/funcs/login#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/funcs/newgrp#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/funcs/popd#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/funcs/pushd#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/funcs/suspend#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/histedit.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/init.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/input.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/input.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/jobs.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/jobs.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/mail.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/mail.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/main.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/main.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/memalloc.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/memalloc.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/miscbltin.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/mkbuiltins#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/mkinit.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/mknodes.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/mksyntax.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/mktokens#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/myhistedit.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/mystring.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/mystring.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/nodes.c.pat#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/nodetypes#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/options.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/options.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/output.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/output.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/parser.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/parser.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/redir.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/redir.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/sh.1#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/shell.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/show.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/show.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/trap.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/trap.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/var.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/var.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sleep/Makefile#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sleep/sleep.1#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sleep/sleep.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/stty/Makefile#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/stty/cchar.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/stty/extern.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/stty/gfmt.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/stty/key.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/stty/modes.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/stty/print.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/stty/stty.1#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/stty/stty.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/stty/stty.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/stty/util.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sync/Makefile#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sync/sync.8#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/sync/sync.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/test/Makefile#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/test/TEST.README#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/test/TEST.csh#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/test/TEST.sh#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/test/test.1#1 branch .. //depot/projects/kmacy_sun4v_stable/src/bin/test/test.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/AUTHORS#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/BUGS#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/COPYING#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/ChangeLog#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/FREEBSD-Xlist#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/FREEBSD-upgrade#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/INSTALL#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/MIRRORS.html#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/MIRRORS.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/NEWS#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/README#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/README.ldap#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/README.y2k#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/amd/am_ops.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/amd/amd.8#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/amd/amd.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/amd/amd.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/amd/amfs_auto.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/amd/amfs_direct.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/amd/amfs_error.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/amd/amfs_host.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/amd/amfs_inherit.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/amd/amfs_link.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/amd/amfs_linkx.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/amd/amfs_nfsl.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/amd/amfs_nfsx.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/amd/amfs_program.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/amd/amfs_root.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/amd/amfs_toplvl.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/amd/amfs_union.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/amd/amq_subr.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/amd/amq_svc.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/amd/autil.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/amd/clock.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/amd/conf.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/amd/conf_parse.y#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/amd/conf_tok.l#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/amd/get_args.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/amd/info_file.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/amd/info_hesiod.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/amd/info_ldap.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/amd/info_ndbm.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/amd/info_nis.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/amd/info_nisplus.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/amd/info_passwd.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/amd/info_union.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/amd/map.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/amd/mapc.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/amd/mntfs.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/amd/nfs_prot_svc.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/amd/nfs_start.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/amd/nfs_subr.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/amd/ops_TEMPLATE.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/amd/ops_cachefs.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/amd/ops_cdfs.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/amd/ops_efs.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/amd/ops_lofs.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/amd/ops_mfs.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/amd/ops_nfs.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/amd/ops_nfs3.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/amd/ops_nullfs.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/amd/ops_pcfs.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/amd/ops_tfs.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/amd/ops_tmpfs.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/amd/ops_ufs.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/amd/ops_umapfs.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/amd/ops_unionfs.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/amd/ops_xfs.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/amd/opts.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/amd/restart.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/amd/rpc_fwd.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/amd/sched.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/amd/srvr_amfs_auto.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/amd/srvr_nfs.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/amq/amq.8#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/amq/amq.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/amq/amq.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/amq/amq_clnt.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/amq/amq_xdr.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/amq/pawd.1#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/amq/pawd.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/aux_conf.h.in#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/bootstrap#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/conf/checkmount/checkmount_bsd44.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/conf/fh_dref/fh_dref_freebsd22.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/conf/mtab/mtab_bsd.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/conf/sa_dref/sa_dref_bsd44.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/conf/transp/transp_sockets.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/conf/trap/trap_default.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/conf/umount/umount_bsd44.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/doc/am-utils.texi#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/doc/texinfo.tex#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/doc/version.texi#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/fixmount/fixmount.8#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/fixmount/fixmount.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/fsinfo/fsi_analyze.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/fsinfo/fsi_data.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/fsinfo/fsi_dict.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/fsinfo/fsi_gram.y#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/fsinfo/fsi_lex.l#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/fsinfo/fsi_util.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/fsinfo/fsinfo.8#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/fsinfo/fsinfo.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/fsinfo/fsinfo.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/fsinfo/wr_atab.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/fsinfo/wr_bparam.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/fsinfo/wr_dumpset.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/fsinfo/wr_exportfs.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/fsinfo/wr_fstab.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/hlfsd/hlfsd.8#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/hlfsd/hlfsd.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/hlfsd/hlfsd.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/hlfsd/homedir.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/hlfsd/nfs_prot_svc.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/hlfsd/stubs.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/include/am_compat.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/include/am_defs.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/include/am_utils.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/include/am_xdr_func.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/include/amq_defs.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/include/mount_headers1.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/include/mount_headers2.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/ldap-id.ms#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/ldap-id.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/libamu/alloca.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/libamu/amu.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/libamu/hasmntopt.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/libamu/misc_rpc.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/libamu/mount_fs.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/libamu/mtab.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/libamu/nfs_prot_xdr.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/libamu/strerror.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/libamu/util.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/libamu/wire.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/libamu/xdr_func.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/libamu/xutil.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/m4/GNUmakefile#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/m4/amdgrep#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/m4/amindent#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/m4/autopat#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/m4/chop-aclocal.pl#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/m4/copy-if-newbig#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/m4/macros/HEADER#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/m4/macros/TRAILER#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/m4/mk-aclocal#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/m4/mkconf#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/m4/rmtspc#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/m4/update_build_version#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/mk-amd-map/mk-amd-map.8#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/mk-amd-map/mk-amd-map.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/scripts/Makefile.am#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/scripts/Makefile.in#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/scripts/am-eject.in#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/scripts/amd.conf-sample#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/scripts/amd.conf.5#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/scripts/amd2ldif.in#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/scripts/amd2sun.in#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/scripts/automount2amd.8#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/scripts/automount2amd.in#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/scripts/ctl-amd.in#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/scripts/ctl-hlfsd.in#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/scripts/expn.1#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/scripts/expn.in#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/scripts/fix-amd-map.in#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/scripts/fixrmtab.in#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/scripts/redhat-ctl-amd.in#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/scripts/wait4amd.in#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/scripts/wait4amd2die.in#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/tasks#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/wire-test/wire-test.8#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/amd/wire-test/wire-test.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/AUTHORS#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/ChangeLog#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/Examples/ckbook.b#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/Examples/pi.b#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/Examples/primes.b#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/Examples/twins.b#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/FAQ#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/FREEBSD-upgrade#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/INSTALL#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/Makefile.am#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/Makefile.in#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/NEWS#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/README#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/Test/BUG.bc#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/Test/array.b#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/Test/arrayp.b#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/Test/aryprm.b#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/Test/atan.b#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/Test/checklib.b#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/Test/div.b#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/Test/exp.b#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/Test/fact.b#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/Test/jn.b#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/Test/ln.b#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/Test/mul.b#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/Test/raise.b#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/Test/signum#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/Test/sine.b#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/Test/sqrt.b#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/Test/sqrt1.b#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/Test/sqrt2.b#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/Test/testfn.b#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/Test/timetest#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/acconfig.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/aclocal.m4#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/bc/Makefile.am#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/bc/Makefile.in#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/bc/bc.y#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/bc/bcdefs.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/bc/const.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/bc/execute.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/bc/fix-libmath_h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/bc/global.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/bc/global.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/bc/libmath.b#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/bc/libmath.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/bc/load.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/bc/main.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/bc/proto.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/bc/sbc.y#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/bc/scan.l#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/bc/storage.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/bc/util.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/config.h.in#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/configure#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/configure.in#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/dc/Makefile.am#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/dc/Makefile.in#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/dc/array.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/dc/dc-proto.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/dc/dc-regdef.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/dc/dc.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/dc/dc.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/dc/eval.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/dc/misc.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/dc/numeric.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/dc/stack.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/dc/string.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/doc/Makefile.am#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/doc/Makefile.in#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/doc/bc.1#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/doc/bc.texi#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/doc/dc.1#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/doc/dc.texi#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/h/number.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/install-sh#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/lib/Makefile.am#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/lib/Makefile.in#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/lib/number.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/lib/testmul.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/lib/vfprintf.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/missing#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/mkinstalldirs#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bc/stamp-h.in#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/CHANGES#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/COPYRIGHT#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/FAQ#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/FAQ.xml#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/FREEBSD-Upgrade#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/FREEBSD-Xlist#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/Makefile.in#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/README#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/acconfig.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/Makefile.in#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/check/Makefile.in#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/check/check-tool.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/check/check-tool.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/check/named-checkconf.8#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/check/named-checkconf.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/check/named-checkconf.docbook#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/check/named-checkconf.html#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/check/named-checkzone.8#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/check/named-checkzone.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/check/named-checkzone.docbook#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/check/named-checkzone.html#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/dig/Makefile.in#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/dig/dig.1#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/dig/dig.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/dig/dig.docbook#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/dig/dig.html#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/dig/dighost.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/dig/host.1#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/dig/host.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/dig/host.docbook#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/dig/host.html#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/dig/include/dig/dig.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/dig/nslookup.1#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/dig/nslookup.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/dig/nslookup.docbook#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/dig/nslookup.html#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/dnssec/Makefile.in#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/dnssec/dnssec-keygen.8#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/dnssec/dnssec-keygen.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/dnssec/dnssec-keygen.html#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/dnssec/dnssec-signzone.8#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/dnssec/dnssec-signzone.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/dnssec/dnssec-signzone.html#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/dnssec/dnssectool.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/dnssec/dnssectool.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/named/Makefile.in#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/named/aclconf.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/named/builtin.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/named/client.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/named/config.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/named/control.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/named/controlconf.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/named/include/named/aclconf.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/named/include/named/builtin.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/named/include/named/client.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/named/include/named/config.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/named/include/named/control.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/named/include/named/globals.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/named/include/named/interfacemgr.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/named/include/named/listenlist.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/named/include/named/log.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/named/include/named/logconf.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/named/include/named/lwaddr.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/named/include/named/lwdclient.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/named/include/named/lwresd.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/named/include/named/lwsearch.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/named/include/named/main.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/named/include/named/notify.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/named/include/named/ns_smf_globals.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/named/include/named/query.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/named/include/named/server.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/named/include/named/sortlist.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/named/include/named/tkeyconf.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/named/include/named/tsigconf.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/named/include/named/types.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/named/include/named/update.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/named/include/named/xfrout.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/named/include/named/zoneconf.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/named/interfacemgr.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/named/listenlist.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/named/log.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/named/logconf.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/named/lwaddr.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/named/lwdclient.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/named/lwderror.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/named/lwdgabn.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/named/lwdgnba.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/named/lwdgrbn.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/named/lwdnoop.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/named/lwresd.8#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/named/lwresd.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/named/lwresd.docbook#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/named/lwresd.html#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/named/lwsearch.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/named/main.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/named/named.8#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/named/named.conf.5#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/named/named.conf.docbook#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/named/named.conf.html#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/named/named.docbook#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/named/named.html#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/named/notify.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/named/query.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/named/server.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/named/sortlist.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/named/tkeyconf.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/named/tsigconf.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/named/unix/Makefile.in#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/named/unix/include/named/os.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/named/unix/os.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/named/update.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/named/xfrout.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/named/zoneconf.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/nsupdate/Makefile.in#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/nsupdate/nsupdate.8#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/nsupdate/nsupdate.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/nsupdate/nsupdate.docbook#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/nsupdate/nsupdate.html#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/rndc/Makefile.in#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/rndc/include/rndc/os.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/rndc/rndc-confgen.8#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/rndc/rndc-confgen.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/rndc/rndc-confgen.docbook#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/rndc/rndc-confgen.html#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/rndc/rndc.8#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/rndc/rndc.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/rndc/rndc.conf#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/rndc/rndc.conf.5#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/rndc/rndc.conf.docbook#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/rndc/rndc.conf.html#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/rndc/rndc.docbook#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/rndc/rndc.html#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/rndc/unix/Makefile.in#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/rndc/unix/os.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/rndc/util.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/rndc/util.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/config.guess#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/config.sub#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/config.threads.in#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/configure.in#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/Makefile.in#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/arm/Bv9ARM-book.xml#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/arm/Bv9ARM.ch01.html#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/arm/Bv9ARM.ch02.html#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/arm/Bv9ARM.ch03.html#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/arm/Bv9ARM.ch04.html#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/arm/Bv9ARM.ch05.html#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/arm/Bv9ARM.ch06.html#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/arm/Bv9ARM.ch07.html#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/arm/Bv9ARM.ch08.html#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/arm/Bv9ARM.ch09.html#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/arm/Bv9ARM.html#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/arm/Bv9ARM.pdf#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/arm/Makefile.in#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/arm/README-SGML#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/draft/draft-baba-dnsext-acl-reqts-01.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/draft/draft-daigle-napstr-04.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/draft/draft-danisch-dns-rr-smtp-03.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/draft/draft-dnsext-opcode-discover-02.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/draft/draft-durand-dnsop-dynreverse-00.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/draft/draft-ietf-dnsext-2929bis-01.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/draft/draft-ietf-dnsext-axfr-clarify-05.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-09.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dns-name-p-s-00.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-2535typecode-change-06.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-bis-updates-01.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-experiments-01.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-00.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-opt-in-07.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-trans-02.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/draft/draft-ietf-dnsext-ecc-key-07.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-06.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-02.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/draft/draft-ietf-dnsext-keyrr-key-signing-flag-12.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-43.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-02.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2536bis-dsa-06.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2538bis-04.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2539bis-dhk-06.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/draft/draft-ietf-dnsext-signed-nonexistence-requirements-01.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-05.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-01.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-04.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-08.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-04.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-04.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/draft/draft-ietf-dnsop-inaddr-required-07.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-06.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-11.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-transport-guidelines-01.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-02.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-02.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-04.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/draft/draft-ietf-enum-e164-gstn-np-05.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/draft/draft-ietf-ipv6-node-requirements-08.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/draft/draft-ietf-secsh-dns-05.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/draft/draft-ihren-dnsext-threshold-validation-00.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/draft/draft-kato-dnsop-local-zones-00.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/draft/draft-park-ipv6-extensions-dns-pnp-00.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/draft/update#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/misc/Makefile.in#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/misc/dnssec#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/misc/format-options.pl#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/misc/ipv6#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/misc/migration#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/misc/migration-4to9#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/misc/options#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/misc/rfc-compliance#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/misc/roadmap#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/misc/sdb#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/index#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc1032.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc1033.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc1034.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc1035.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc1101.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc1122.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc1123.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc1183.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc1348.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc1535.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc1536.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc1537.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc1591.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc1611.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc1612.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc1706.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc1712.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc1750.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc1876.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc1886.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc1982.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc1995.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc1996.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc2052.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc2104.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc2119.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc2133.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc2136.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc2137.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc2163.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc2168.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc2181.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc2230.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc2308.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc2317.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc2373.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc2374.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc2375.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc2418.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc2535.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc2536.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc2537.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc2538.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc2539.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc2540.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc2541.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc2553.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc2671.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc2672.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc2673.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc2782.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc2825.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc2826.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc2845.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc2874.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc2915.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc2929.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc2930.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc2931.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc3007.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc3008.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc3071.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc3090.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc3110.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc3123.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc3152.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc3197.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc3225.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc3226.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc3258.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc3363.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc3364.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc3425.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/doc/rfc/rfc3445.txt#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jun 4 20:23:20 2006 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 3C5D716A4DC; Sun, 4 Jun 2006 20:23:20 +0000 (UTC) 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 4FD4616A4C7 for ; Sun, 4 Jun 2006 20:23:19 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0577843D45 for ; Sun, 4 Jun 2006 20:23:19 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k54KLcAG051431 for ; Sun, 4 Jun 2006 20:21:38 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k54KLbKv051428 for perforce@freebsd.org; Sun, 4 Jun 2006 20:21:37 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 4 Jun 2006 20:21:37 GMT Message-Id: <200606042021.k54KLbKv051428@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 98497 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Jun 2006 20:23:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=98497 Change 98497 by kmacy@kmacy_storage:sun4v_work on 2006/06/04 20:21:27 align stack to 64-bytes optimize spill/fill handlers to use block initializing stores Affected files ... .. //depot/projects/kmacy_sun4v/src/contrib/gcc/config/sparc/sparc.h#3 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#61 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/contrib/gcc/config/sparc/sparc.h#3 (text+ko) ==== @@ -797,7 +797,7 @@ /* ALIGN FRAMES on double word boundaries */ #define SPARC_STACK_ALIGN(LOC) \ - (TARGET_ARCH64 ? (((LOC)+15) & ~15) : (((LOC)+7) & ~7)) + (TARGET_ARCH64 ? (((LOC)+63) & ~63) : (((LOC)+7) & ~7)) /* Allocation boundary (in *bits*) for the code of a function. */ #define FUNCTION_BOUNDARY 32 ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#61 (text+ko) ==== @@ -140,6 +140,26 @@ storer %i6, [%g5 + %g3]asi ;\ storer %i7, [%g5 + %g4]asi +/* 16 instructions */ +#define SPILL_ASI_64 \ + stxa %l0, [%g1 + 0x0]%asi ;\ + stxa %i0, [%g1 + 0x40]%asi ;\ + stxa %l1, [%g1 + 0x8]%asi ;\ + stxa %l2, [%g1 + 0x10]%asi ;\ + stxa %l3, [%g1 + 0x18]%asi ;\ + stxa %l4, [%g1 + 0x20]%asi ;\ + stxa %l5, [%g1 + 0x28]%asi ;\ + stxa %l6, [%g1 + 0x30]%asi ;\ + stxa %l7, [%g1 + 0x38]%asi ;\ + stxa %i1, [%g1 + 0x48]%asi ;\ + stxa %i2, [%g1 + 0x50]%asi ;\ + stxa %i3, [%g1 + 0x58]%asi ;\ + stxa %i4, [%g1 + 0x60]%asi ;\ + stxa %i5, [%g1 + 0x68]%asi ;\ + stxa %i6, [%g1 + 0x70]%asi ;\ + stxa %i7, [%g1 + 0x78]%asi + +/* 23 instructions */ #define FILL(loader, bias, size, asi) \ mov 0 + bias, %g1 ;\ loader [%sp + %g1]asi, %l0 ;\ @@ -165,20 +185,54 @@ loader [%g5 + %g3]asi, %i6 ;\ loader [%g5 + %g4]asi, %i7 -#define FILL_DW(asi) \ - mov 0 + SPOFF, %g1 ;\ - ldda [%sp + %g1]asi, %l0 ;\ - mov 16 + SPOFF, %g2 ;\ - ldda [%sp + %g2]asi, %l2 ;\ - add %sp, 32, %g3 ;\ - ldda [%g3 + %g1]asi, %l4 ;\ - ldda [%g3 + %g2]asi, %l6 ;\ - add %g3, 32, %g3 ;\ - ldda [%g3 + %g1]asi, %i0 ;\ - ldda [%g3 + %g2]asi, %i2 ;\ - add %g3, 32, %g3 ;\ - ldda [%g3 + %g1]asi, %i4 ;\ - ldda [%g3 + %g2]asi, %i6 +#define SPILL_ASI_SET(storer, size) \ + storer %l0, [%g1 + (0 * size)]%asi ;\ + storer %l1, [%g1 + (1 * size)]%asi ;\ + storer %l2, [%g1 + (2 * size)]%asi ;\ + storer %l3, [%g1 + (3 * size)]%asi ;\ + storer %l4, [%g1 + (4 * size)]%asi ;\ + storer %l5, [%g1 + (5 * size)]%asi ;\ + storer %l6, [%g1 + (6 * size)]%asi ;\ + storer %l7, [%g1 + (7 * size)]%asi ;\ + storer %i0, [%g1 + (8 * size)]%asi ;\ + storer %i1, [%g1 + (9 * size)]%asi ;\ + storer %i2, [%g1 + (10 * size)]%asi ;\ + storer %i3, [%g1 + (11 * size)]%asi ;\ + storer %i4, [%g1 + (12 * size)]%asi ;\ + storer %i5, [%g1 + (13 * size)]%asi ;\ + storer %i6, [%g1 + (14 * size)]%asi ;\ + storer %i7, [%g1 + (15 * size)]%asi + +/* 16 instructions */ +#define FILL_ASI_SET(loader, size) \ + loader [%g1 + 0x0]%asi, %l0 ;\ + loader [%g1 + (size * 1)]%asi, %l1 ;\ + loader [%g1 + (size * 2)]%asi, %l2 ;\ + loader [%g1 + (size * 3)]%asi, %l3 ;\ + loader [%g1 + (size * 4)]%asi, %l4 ;\ + loader [%g1 + (size * 5)]%asi, %l5 ;\ + loader [%g1 + (size * 6)]%asi, %l6 ;\ + loader [%g1 + (size * 7)]%asi, %l7 ;\ + loader [%g1 + (size * 8)]%asi, %i0 ;\ + loader [%g1 + (size * 9)]%asi, %i1 ;\ + loader [%g1 + (size * 10)]%asi, %i2 ;\ + loader [%g1 + (size * 11)]%asi, %i3 ;\ + loader [%g1 + (size * 12)]%asi, %i4 ;\ + loader [%g1 + (size * 13)]%asi, %i5 ;\ + loader [%g1 + (size * 14)]%asi, %i6 ;\ + loader [%g1 + (size * 15)]%asi, %i7 + +/* 9 instructions */ +#define FILL_DW \ + prefetch [%g1 + 0x40], #one_read ;\ + ldda [%g1 + 0]%asi, %l0 ;\ + ldda [%g1 + 0x10]%asi, %l2 ;\ + ldda [%g1 + 0x20]%asi, %l4 ;\ + ldda [%g1 + 0x30]%asi, %l6 ;\ + ldda [%g1 + 0x40]%asi, %i0 ;\ + ldda [%g1 + 0x50]%asi, %i2 ;\ + ldda [%g1 + 0x60]%asi, %i4 ;\ + ldda [%g1 + 0x70]%asi, %i6 #include /* @@ -372,8 +426,76 @@ .endm -#define ALIGN_128 .align 128 +#define ALIGN_128 .align 128 +#define SYNC #Sync +#define LOOKASIDE #Lookaside + +#define USE_FAST_SPILLFILL +#ifdef USE_FAST_SPILLFILL +#define spill_64bit_asi(asival, asival_unaligned, target) \ + wr %g0, asival, %asi ; \ + add %sp, SPOFF, %g1 ; \ + SPILL_ASI_64 ; \ + membar LOOKASIDE ; \ + saved ; \ + retry ; \ + .skip (31-21)*4 ; \ + ba,a,pt %xcc, fault_64bit_##target ; \ + ALIGN_128 + +#define spill_64clean(asival, asival_unaligned, target) \ + wr %g0, asival, %asi ; \ + add %sp, SPOFF, %g1 ; \ + SPILL_ASI_64 ; \ + membar LOOKASIDE ; \ + b spill_clean ; \ + mov WSTATE_USER64, %g7 ; \ + .skip (31-21)*4 ; \ + ba,a,pt %xcc, fault_64bit_##target ; \ + ALIGN_128 + +#define fill_64bit_asi(asival, asival_unaligned, target) \ + add %sp, SPOFF, %g1 ; \ + wr %g0, asival, %asi ; \ + FILL_DW ; \ + restored ; \ + retry ; \ + .skip (31-13)*4 ; \ + ba,a,pt %xcc, fault_64bit_##target ; \ + ALIGN_128 +#else +#define spill_64bit_asi(asival, asival_unaligned, target) \ + wr %g0, asival_unaligned, %asi ; \ + add %sp, SPOFF, %g1 ; \ + SPILL_ASI_SET(stxa, 8) ; \ + saved ; \ + retry ; \ + .skip (31-20)*4 ; \ + ba,a,pt %xcc, fault_64bit_##target ; \ + ALIGN_128 + +#define spill_64clean(asival, asival_unaligned, target) \ + wr %g0, asival_unaligned, %asi ; \ + add %sp, SPOFF, %g1 ; \ + SPILL_ASI_SET(stxa, 8) ; \ + b spill_clean ; \ + mov WSTATE_USER64, %g7 ; \ + .skip (31-20)*4 ; \ + ba,a,pt %xcc, fault_64bit_##target ; \ + ALIGN_128 + +#define fill_64bit_asi(asival, asival_unaligned, target) \ + wr %g0, asival_unaligned, %asi ; \ + add %sp, SPOFF, %g1 ; \ + FILL_ASI_SET(ldxa, 8) ; \ + restored ; \ + retry ; \ + .skip (31-20)*4 ; \ + ba,a,pt %xcc, fault_64bit_##target ; \ + ALIGN_128 +#endif + #define spill_32bit_asi(asi, target) \ srl %sp, 0, %sp ; \ SPILL_FILL_MAGIC_TRAP_ON; \ @@ -385,16 +507,6 @@ ba,a,pt %xcc, fault_32bit_##target ; \ ALIGN_128 -#define spill_64bit_asi(asi, target) \ - SPILL_FILL_MAGIC_TRAP_ON ; \ - SPILL_ASI(stxa, SPOFF, 8, asi) ; \ - saved ; \ - SPILL_FILL_MAGIC_TRAP_OFF ; \ - retry ; \ - .skip (31-27)*4 ; \ - ba,a,pt %xcc, fault_64bit_##target ; \ - ALIGN_128 - #define spill_32clean(asi, target) \ srl %sp, 0, %sp ; \ SPILL_FILL_MAGIC_TRAP_ON; \ @@ -405,15 +517,6 @@ ba,a,pt %xcc, fault_32bit_##target ; \ ALIGN_128 -#define spill_64clean(asi, target) \ - SPILL_FILL_MAGIC_TRAP_ON; \ - SPILL_ASI(stxa, SPOFF, 8, asi) ; \ - b spill_clean ; \ - mov WSTATE_USER64, %g7 ; \ - .skip (31-26)*4 ; \ - ba,a,pt %xcc, fault_64bit_##target ; \ - ALIGN_128 - #define fill_32bit_asi(asi, target) \ srl %sp, 0, %sp ; \ SPILL_FILL_MAGIC_TRAP_ON; \ @@ -424,22 +527,32 @@ ba,a,pt %xcc, fault_32bit_##target ; \ ALIGN_128 -#define fill_64bit_asi(asi, target) \ - SPILL_FILL_MAGIC_TRAP_ON; \ - FILL(ldxa, SPOFF, 8, asi) ; \ - restored ; \ - SPILL_FILL_MAGIC_TRAP_OFF ; \ - retry ; \ - .skip (31-27)*4 ; \ - ba,a,pt %xcc, fault_64bit_##target ; \ - .align 128 +.align 128 +ENTRY(fill_64bit_slow_fn0) +fill_slow_start: + FILL_ASI_SET(ldxa, 8); + restored ; + retry ; + .skip (31-18)*4 ; + ba,a,pt %xcc, fault_64bit_fn0 ; + .align 128 +END(fill_64bit_slow_fn0) +ENTRY(fill_64bit_slow_not) + FILL_ASI_SET(ldxa, 8); + restored ; + retry ; + .skip (31-18)*4 ; + ba,a,pt %xcc, fault_64bit_not ; + .align 128 +END(fill_64bit_slow_not) +fill_slow_end: .macro spill_32bit_primary_sn0 spill_32bit_asi(ASI_AIUP, sn0) .endm .macro spill_64bit_primary_sn0 - spill_64bit_asi(ASI_AIUP, sn0) + spill_64bit_asi(ASI_LDSTBI_AIUP, ASI_AIUP, sn0) .endm .macro spill_32clean_primary_sn0 @@ -447,7 +560,7 @@ .endm .macro spill_64clean_primary_sn0 - spill_64clean(ASI_AIUP, sn0) + spill_64clean(ASI_LDSTBI_AIUP, ASI_AIUP, sn0) .endm .macro spill_32bit_nucleus_not @@ -455,7 +568,7 @@ .endm .macro spill_64bit_nucleus_not - spill_64bit_asi(ASI_N,not) + spill_64bit_asi(ASI_LDSTBI_N, ASI_N, not) .endm .macro spill_32bit_secondary_so0 @@ -463,7 +576,7 @@ .endm .macro spill_64bit_secondary_so0 - spill_64bit_asi(ASI_AIUS, so0) + spill_64bit_asi(ASI_LDSTBI_AIUS, ASI_AIUS, so0) .endm .macro fill_32bit_primary_fn0 @@ -471,7 +584,7 @@ .endm .macro fill_64bit_primary_fn0 - fill_64bit_asi(ASI_AIUP, fn0) + fill_64bit_asi(ASI_LDSTBI_AIUP, ASI_AIUP, fn0) .endm .macro fill_32bit_nucleus_not @@ -479,7 +592,7 @@ .endm .macro fill_64bit_nucleus_not - fill_64bit_asi(ASI_N, not) + fill_64bit_asi(ASI_LDSTBI_N, ASI_N, not) .endm .macro spill_32bit_tt1_primary_sn1 @@ -748,12 +861,19 @@ tl0_reserved 4 ! 0xbc tl0_fill_n_normal: tl0_reserved 4 ! 0xc0 +tl0_fill_1_normal: fill_32bit_primary_fn0 ! 0xc4 +tl0_fill_2_normal: fill_64bit_primary_fn0 ! 0xc8 +tl0_fill_3_normal: fill_32bit_primary_fn0 ! 0xcc +tl0_fill_4_normal: fill_64bit_primary_fn0 ! 0xd0 +tl0_fill_5_normal: fill_32bit_nucleus_not ! 0xd4 +tl0_fill_6_normal: fill_64bit_nucleus_not ! 0xd8 +tl0_fill_7_normal: fill_mixed ! 0xdc tl0_fill_n_other_e0: tl0_reserved 32 ! 0xe0-0xff @@ -1074,6 +1194,7 @@ ba,a 3f #endif 4: + membar #Lookaside fill_64bit_rtt(ASI_AIUP) .global rtt_fill_end rtt_fill_end: @@ -1343,6 +1464,8 @@ #define LOADSTORE #LoadStore #define STORESTORE #StoreStore + +#define WORKING #ifdef WORKING #define ENTER LOADLOAD #define EXIT LOADSTORE|STORESTORE @@ -1741,8 +1864,17 @@ bgeu,pn %xcc, 1f nop set fault_rtt_fn1, %g7 - ba,a 2f + ba,a 4f 1: + set fill_slow_start, %g6 + cmp %g7, %g6 + bleu,a,pn %xcc, 2f + nop + set fill_slow_end, %g6 + cmp %g7, %g6 + blu,a,pn %xcc, 3f + nop +2: set tl1_end, %g6 cmp %g7, %g6 bgeu,a,pn %xcc, ptl1_panic @@ -1756,9 +1888,10 @@ cmp %g6, WTRAP_TYPE bne,a,pn %xcc, ptl1_panic mov PTL1_BAD_TRAP, %g1 +3: andn %g7, WTRAP_ALIGN, %g7 add %g7, WTRAP_FAULTOFF, %g7 -2: +4: wrpr %g0, %g7, %tnpc wrpr %g0, 1, %gl rdpr %tt, %g5 @@ -1767,13 +1900,13 @@ ldxa [%g7 + MMFSA_D_ADDR]%asi, %g6 ldxa [%g7 + MMFSA_D_CTX]%asi, %g7 cmp %g5, T_ALIGNMENT - be,pn %xcc, 3f + be,pn %xcc, 5f nop srlx %g6, PAGE_SHIFT, %g6 sllx %g6, PAGE_SHIFT, %g6 ! mask off bottom or %g6, %g7, %g6 done -3: +5: sllx %g7, TRAP_CTX_SHIFT, %g7 or %g7, %g5, %g5 done From owner-p4-projects@FreeBSD.ORG Sun Jun 4 20:28:28 2006 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 10B3116A61E; Sun, 4 Jun 2006 20:28:28 +0000 (UTC) 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 03F9A16A5BA for ; Sun, 4 Jun 2006 20:28:26 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C77DF43D45 for ; Sun, 4 Jun 2006 20:28:25 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k54KQjcw051746 for ; Sun, 4 Jun 2006 20:26:45 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k54KQi8h051743 for perforce@freebsd.org; Sun, 4 Jun 2006 20:26:44 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 4 Jun 2006 20:26:44 GMT Message-Id: <200606042026.k54KQi8h051743@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 98498 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Jun 2006 20:28:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=98498 Change 98498 by kmacy@kmacy_storage:sun4v_work on 2006/06/04 20:26:43 call choosethread instead of mi_switch to reduce the amount of time sched_lock is held when there is little work to be done Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_idle.c#3 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/kern/kern_idle.c#3 (text+ko) ==== @@ -78,7 +78,7 @@ mtx_lock_spin(&sched_lock); td = FIRST_THREAD_IN_PROC(p); TD_SET_CAN_RUN(td); - td->td_flags |= TDF_IDLETD; + atomic_set_int(&td->td_flags, TDF_IDLETD); sched_class(td->td_ksegrp, PRI_IDLE); sched_prio(td, PRI_MAX_IDLE); mtx_unlock_spin(&sched_lock); @@ -118,7 +118,8 @@ #ifdef SMP idle_cpus_mask &= ~mycpu; #endif - mi_switch(SW_VOL, NULL); + if ((td = choosethread()) != curthread) + sched_switch(curthread, td, SW_VOL); #ifdef SMP idle_cpus_mask |= mycpu; #endif From owner-p4-projects@FreeBSD.ORG Sun Jun 4 20:44:50 2006 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 6964216AE47; Sun, 4 Jun 2006 20:44:50 +0000 (UTC) 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 A7FCF16AE3E for ; Sun, 4 Jun 2006 20:44:49 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 37FF043D6A for ; Sun, 4 Jun 2006 20:44:48 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k54Kh79S052478 for ; Sun, 4 Jun 2006 20:43:07 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k54Kh7BB052475 for perforce@freebsd.org; Sun, 4 Jun 2006 20:43:07 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 4 Jun 2006 20:43:07 GMT Message-Id: <200606042043.k54Kh7BB052475@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 98501 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Jun 2006 20:44:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=98501 Change 98501 by kmacy@kmacy_storage:sun4v_work on 2006/06/04 20:43:03 add mnemonics for block initializing store ASIs Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/asi.h#13 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/asi.h#13 (text+ko) ==== @@ -53,13 +53,14 @@ #define ASI_SCRATCHPAD 0x20 #define ASI_MMU_CONTEXTID 0x21 #define ASI_LDTD_AIUP 0x22 /* ASI_LOAD_TWIN_DW_AS_IF_USER_PRIMARY */ +#define ASI_LDSTBI_AIUP 0x22 #define ASI_LDTD_AIUS 0x23 /* ASI_LOAD_TWIN_DW_AS_IF_USER_SECONDARY */ #define ASI_LDSTBI_AIUS 0x23 #define ASI_QUEUE 0x25 #define ASI_LDTD_REAL 0x26 /* ASI_LOAD_TWIN_DW_REAL */ #define ASI_STBI_REAL 0x26 #define ASI_LDTD_N 0x27 /* ASI_LOAD_TWIN_DW_NUCLEUS */ -#define ASI_STBI_N 0x27 +#define ASI_LDSTBI_N 0x27 #define ASI_LDTD_AIUPL 0x2A /* ASI_LD_TWIN_DW_AS_IF_USER_PRIMARY_LITTLE */ #define ASI_LDTD_AIUSL 0x2B /* ASI_LD_TWIN_DW_AS_IF_USER_SECONDARY_LITTLE */ From owner-p4-projects@FreeBSD.ORG Sun Jun 4 20:49:58 2006 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 0C83216AC9D; Sun, 4 Jun 2006 20:49:58 +0000 (UTC) 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 9E6A416ABE8 for ; Sun, 4 Jun 2006 20:49:55 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4F27A43D48 for ; Sun, 4 Jun 2006 20:49:55 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k54KmEBp060415 for ; Sun, 4 Jun 2006 20:48:14 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k54KmE53060412 for perforce@freebsd.org; Sun, 4 Jun 2006 20:48:14 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 4 Jun 2006 20:48:14 GMT Message-Id: <200606042048.k54KmE53060412@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 98502 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Jun 2006 20:50:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=98502 Change 98502 by kmacy@kmacy_storage:sun4v_work on 2006/06/04 20:48:09 force pcpu to be 64-byte aligned Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/pcpu.h#14 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/machdep.c#24 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/pcpu.h#14 (text+ko) ==== @@ -78,7 +78,8 @@ u_int pc_kwbuf_full; \ struct rwindow pc_tsbwbuf[2]; \ u_int pc_node; \ - uint16_t pc_cpulist[MAXCPU] + uint16_t pc_cpulist[MAXCPU]; \ + uint64_t pad[6]; /* XXX SUN4V_FIXME - as we access the *_ra and *_size fields in quick * succession we _really_ want them to be L1 cache line size aligned ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/machdep.c#24 (text+ko) ==== @@ -181,6 +181,7 @@ CTASSERT(sizeof(struct pcb) <= ((KSTACK_PAGES * PAGE_SIZE) / 8)); CTASSERT(sizeof(struct pcpu) <= ((PCPU_PAGES * PAGE_SIZE) / 2)); +CTASSERT((sizeof(struct pcpu) & ((1<<6)-1)) == 0); static void cpu_startup(void *arg) @@ -377,7 +378,9 @@ proc0.p_md.md_utrap = NULL; frame0.tf_tstate = TSTATE_IE | TSTATE_PEF | TSTATE_PRIV; thread0.td_frame = &frame0; - + if ((u_long)thread0.td_frame & 0x3f) { + panic("unaligned frame0"); + } /* * Prime our per-cpu data page for use. Note, we are using it for our * stack, so don't pass the real size (PAGE_SIZE) to pcpu_init or @@ -412,6 +415,11 @@ thread0.td_pcb = (struct pcb *)TLB_PHYS_TO_DIRECT(vtophys((vm_offset_t)thread0.td_pcb)); pc->pc_curpcb = thread0.td_pcb; + if (((thread0.td_pcb->pcb_kstack + SPOFF) & 0x3f) != 0) { + printf("unaligned stack pcb_kstack & 0x3f == 0x%lx\n", + ((thread0.td_pcb->pcb_kstack + SPOFF) & 0x3f)); + } + /* * Update PCPU_REG to point to direct address * to support easy phys <-> virt translation in trap handler @@ -697,10 +705,7 @@ #ifdef SMP cpu_mp_shutdown(); #endif -#ifdef notyet -/* XXX SUN4V_FIXME */ - openfirmware_exit(args); -#endif + OF_exit(); } /* Get current clock frequency for the given cpu id. */ From owner-p4-projects@FreeBSD.ORG Sun Jun 4 20:57:06 2006 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 0545C16A635; Sun, 4 Jun 2006 20:57:06 +0000 (UTC) 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 D02C116A5F3 for ; Sun, 4 Jun 2006 20:57:05 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2CA9043D4C for ; Sun, 4 Jun 2006 20:57:05 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k54KtOrd060712 for ; Sun, 4 Jun 2006 20:55:24 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k54KtO8l060709 for perforce@freebsd.org; Sun, 4 Jun 2006 20:55:24 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 4 Jun 2006 20:55:24 GMT Message-Id: <200606042055.k54KtO8l060709@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 98503 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Jun 2006 20:57:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=98503 Change 98503 by kmacy@kmacy_storage:sun4v_work on 2006/06/04 20:54:32 force trapframe to be 64-byte aligned Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/frame.h#5 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/frame.h#5 (text+ko) ==== @@ -52,11 +52,11 @@ uint64_t tf_wstate; uint64_t tf_asi; uint64_t tf_pad3[1]; -}; +} __aligned(64); /* extra padding can go away once we re-shuffle user-land mcontext */ -#define tf_sp tf_out[6] +#define tf_sp tf_out[6] #define TF_DONE(tf) do { \ tf->tf_tpc = tf->tf_tnpc; \ From owner-p4-projects@FreeBSD.ORG Sun Jun 4 20:57:06 2006 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 2958B16AEB3; Sun, 4 Jun 2006 20:57:06 +0000 (UTC) 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 D81A316A60A for ; Sun, 4 Jun 2006 20:57:05 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8906F43D49 for ; Sun, 4 Jun 2006 20:57:05 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k54KtO5u060718 for ; Sun, 4 Jun 2006 20:55:24 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k54KtOBv060715 for perforce@freebsd.org; Sun, 4 Jun 2006 20:55:24 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 4 Jun 2006 20:55:24 GMT Message-Id: <200606042055.k54KtOBv060715@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 98504 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Jun 2006 20:57:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=98504 Change 98504 by kmacy@kmacy_storage:sun4v_work on 2006/06/04 20:55:13 force stack offsets of 64-bytes in trap handlers Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/asm.h#3 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/asm.h#3 (text+ko) ==== @@ -95,11 +95,11 @@ #define ENTRY(x) _ENTRY(x) #define END(x) .size x, . - x -#define STACK_ALIGN 16 +#define STACK_ALIGN 64 #define SET_SIZE(x) END(x) #define SA(X) (((X)+(STACK_ALIGN-1)) & ~(STACK_ALIGN-1)) #define WINDOWSIZE64 (16*8) -#define MINFRAME64 (WINDOWSIZE64 + 48) +#define MINFRAME64 (WINDOWSIZE64 + 64) #define MINFRAME MINFRAME64 #define REGOFF SA(MINFRAME) From owner-p4-projects@FreeBSD.ORG Sun Jun 4 21:50:40 2006 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 751BE16A759; Sun, 4 Jun 2006 21:50:40 +0000 (UTC) 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 4F86A16A70F for ; Sun, 4 Jun 2006 21:50:40 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F066A43D48 for ; Sun, 4 Jun 2006 21:50:39 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k54LmwFL065222 for ; Sun, 4 Jun 2006 21:48:58 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k54Lmvdl065219 for perforce@freebsd.org; Sun, 4 Jun 2006 21:48:57 GMT (envelope-from marcel@freebsd.org) Date: Sun, 4 Jun 2006 21:48:57 GMT Message-Id: <200606042148.k54Lmvdl065219@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 98506 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Jun 2006 21:50:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=98506 Change 98506 by marcel@marcel_nfs on 2006/06/04 21:48:32 IFC @98499 Affected files ... .. //depot/projects/uart/arm/include/cpuconf.h#6 integrate .. //depot/projects/uart/compat/linprocfs/linprocfs.c#17 integrate .. //depot/projects/uart/conf/NOTES#39 integrate .. //depot/projects/uart/dev/acpica/acpi_hpet.c#2 integrate .. //depot/projects/uart/dev/ath/if_ath.c#30 integrate .. //depot/projects/uart/dev/awi/awi.c#7 integrate .. //depot/projects/uart/dev/dc/dcphy.c#2 integrate .. //depot/projects/uart/dev/dc/if_dc.c#6 integrate .. //depot/projects/uart/dev/dc/if_dcreg.h#3 integrate .. //depot/projects/uart/dev/gem/if_gem.c#8 integrate .. //depot/projects/uart/dev/ipw/if_ipw.c#6 integrate .. //depot/projects/uart/dev/isp/isp_freebsd.h#12 integrate .. //depot/projects/uart/dev/iwi/if_iwi.c#10 integrate .. //depot/projects/uart/dev/lmc/if_lmc.h#2 integrate .. //depot/projects/uart/dev/mpt/mpt.c#17 integrate .. //depot/projects/uart/dev/mpt/mpt.h#14 integrate .. //depot/projects/uart/dev/mpt/mpt_cam.c#15 integrate .. //depot/projects/uart/dev/mpt/mpt_pci.c#19 integrate .. //depot/projects/uart/dev/pccbb/pccbb.c#20 integrate .. //depot/projects/uart/dev/pccbb/pccbb_isa.c#5 integrate .. //depot/projects/uart/dev/pccbb/pccbb_pci.c#10 integrate .. //depot/projects/uart/dev/pccbb/pccbbvar.h#8 integrate .. //depot/projects/uart/dev/ral/rt2560.c#4 integrate .. //depot/projects/uart/dev/ral/rt2661.c#5 integrate .. //depot/projects/uart/dev/safe/safe.c#9 integrate .. //depot/projects/uart/dev/ubsec/ubsec.c#12 integrate .. //depot/projects/uart/dev/usb/if_axe.c#13 integrate .. //depot/projects/uart/dev/usb/if_axereg.h#7 integrate .. //depot/projects/uart/dev/usb/if_ural.c#8 integrate .. //depot/projects/uart/dev/usb/ugen.c#12 integrate .. //depot/projects/uart/dev/wi/if_wi.c#16 integrate .. //depot/projects/uart/geom/geom_gpt.c#7 integrate .. //depot/projects/uart/ia64/conf/NOTES#7 integrate .. //depot/projects/uart/kern/kern_event.c#13 integrate .. //depot/projects/uart/kern/kern_mutex.c#14 integrate .. //depot/projects/uart/kern/kern_synch.c#16 integrate .. //depot/projects/uart/kern/vfs_aio.c#16 integrate .. //depot/projects/uart/kern/vfs_mount.c#25 integrate .. //depot/projects/uart/net/bpf.c#14 integrate .. //depot/projects/uart/net/bpf.h#6 integrate .. //depot/projects/uart/net/bpfdesc.h#7 integrate .. //depot/projects/uart/net/if_disc.c#8 integrate .. //depot/projects/uart/net/if_faith.c#8 integrate .. //depot/projects/uart/net/if_fwsubr.c#8 integrate .. //depot/projects/uart/net/if_gif.c#8 integrate .. //depot/projects/uart/net/if_gre.c#9 integrate .. //depot/projects/uart/net/if_loop.c#9 integrate .. //depot/projects/uart/net/if_media.h#10 integrate .. //depot/projects/uart/net/if_sl.c#7 integrate .. //depot/projects/uart/net/if_stf.c#9 integrate .. //depot/projects/uart/net/if_tun.c#8 integrate .. //depot/projects/uart/net/raw_cb.c#6 integrate .. //depot/projects/uart/net/raw_usrreq.c#8 integrate .. //depot/projects/uart/net80211/ieee80211_input.c#17 integrate .. //depot/projects/uart/netgraph/atm/uni/ng_uni_cust.h#4 integrate .. //depot/projects/uart/netgraph/ng_base.c#12 integrate .. //depot/projects/uart/netgraph/ng_iface.c#10 integrate .. //depot/projects/uart/netinet/in_pcb.c#18 integrate .. //depot/projects/uart/netinet/ip_carp.c#6 integrate .. //depot/projects/uart/netinet/ip_gre.c#7 integrate .. //depot/projects/uart/netinet/tcp_timer.c#14 integrate .. //depot/projects/uart/netinet/tcp_usrreq.c#14 integrate .. //depot/projects/uart/netinet/udp_usrreq.c#19 integrate .. //depot/projects/uart/netipsec/ipsec.c#12 integrate .. //depot/projects/uart/netipsec/ipsec_input.c#7 integrate .. //depot/projects/uart/opencrypto/cryptodev.h#6 integrate .. //depot/projects/uart/opencrypto/cryptosoft.c#8 integrate .. //depot/projects/uart/opencrypto/xform.c#6 integrate .. //depot/projects/uart/sys/mutex.h#12 integrate .. //depot/projects/uart/ufs/ffs/ffs_vfsops.c#25 integrate Differences ... ==== //depot/projects/uart/arm/include/cpuconf.h#6 (text+ko) ==== @@ -34,7 +34,7 @@ * 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/cpuconf.h,v 1.6 2006/05/31 13:06:08 cognet Exp $ + * $FreeBSD: src/sys/arm/include/cpuconf.h,v 1.7 2006/06/02 09:39:06 cognet Exp $ * */ @@ -72,7 +72,7 @@ #endif #define ARM_NARCH (ARM_ARCH_4 + ARM_ARCH_5) -#if ARM_NARCH == 0 && !defined(KLD_MODULE) +#if ARM_NARCH == 0 && !defined(KLD_MODULE) && defined(_KERNEL) #error ARM_NARCH is 0 #endif @@ -120,7 +120,7 @@ #define ARM_NMMUS (ARM_MMU_MEMC + ARM_MMU_GENERIC + \ ARM_MMU_SA1 + ARM_MMU_XSCALE) -#if ARM_NMMUS == 0 && !defined(KLD_MODULE) +#if ARM_NMMUS == 0 && !defined(KLD_MODULE) && defined(_KERNEL) #error ARM_NMMUS is 0 #endif ==== //depot/projects/uart/compat/linprocfs/linprocfs.c#17 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.93 2006/05/12 05:04:40 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.94 2006/06/02 13:01:25 des Exp $"); #include #include @@ -222,9 +222,9 @@ default: class = 0; break; -#else +#else /* __amd64__ */ default: - class = 6; + class = 15; break; #endif } ==== //depot/projects/uart/conf/NOTES#39 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1364 2006/05/15 20:03:10 marius Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1365 2006/06/03 23:30:16 kris Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -352,16 +352,18 @@ options KTRACE_REQUEST_POOL=101 # -# KTR is a kernel tracing mechanism imported from BSD/OS. Currently it -# has no userland interface aside from a few sysctl's. It is enabled with -# the KTR option. KTR_ENTRIES defines the number of entries in the circular -# trace buffer. KTR_COMPILE defines the mask of events to compile into the -# kernel as defined by the KTR_* constants in . KTR_MASK defines the -# initial value of the ktr_mask variable which determines at runtime what -# events to trace. KTR_CPUMASK determines which CPU's log events, with -# bit X corresponding to cpu X. KTR_VERBOSE enables dumping of KTR events -# to the console by default. This functionality can be toggled via the -# debug.ktr_verbose sysctl and defaults to off if KTR_VERBOSE is not defined. +# KTR is a kernel tracing mechanism imported from BSD/OS. Currently +# it has no userland interface aside from a few sysctl's. It is +# enabled with the KTR option. KTR_ENTRIES defines the number of +# entries in the circular trace buffer; it must be a power of two. +# KTR_COMPILE defines the mask of events to compile into the kernel as +# defined by the KTR_* constants in . KTR_MASK defines the +# initial value of the ktr_mask variable which determines at runtime +# what events to trace. KTR_CPUMASK determines which CPU's log +# events, with bit X corresponding to cpu X. KTR_VERBOSE enables +# dumping of KTR events to the console by default. This functionality +# can be toggled via the debug.ktr_verbose sysctl and defaults to off +# if KTR_VERBOSE is not defined. # options KTR options KTR_ENTRIES=1024 ==== //depot/projects/uart/dev/acpica/acpi_hpet.c#2 (text+ko) ==== @@ -25,18 +25,18 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_hpet.c,v 1.3 2005/11/01 20:41:43 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_hpet.c,v 1.4 2006/06/04 08:04:19 njl Exp $"); #include "opt_acpi.h" #include +#include #include #include #include #include #include -#include + #include -#include "acpi_if.h" #include ACPI_SERIAL_DECL(hpet, "ACPI HPET support"); @@ -47,11 +47,20 @@ struct acpi_hpet_softc { device_t dev; - struct resource *res[1]; + struct resource *mem_res; ACPI_HANDLE handle; }; -static unsigned hpet_get_timecount(struct timecounter *tc); +static u_int hpet_get_timecount(struct timecounter *tc); +static void acpi_hpet_test(struct acpi_hpet_softc *sc); + +static char *hpet_ids[] = { "PNP0103", NULL }; + +#define HPET_MEM_WIDTH 0x400 /* Expected memory region size */ +#define HPET_OFFSET_INFO 0 /* Location of info in region */ +#define HPET_OFFSET_PERIOD 4 /* Location of period (1/hz) */ +#define HPET_OFFSET_ENABLE 0x10 /* Location of enable word */ +#define HPET_OFFSET_VALUE 0xf0 /* Location of actual timer value */ struct timecounter hpet_timecounter = { .tc_get_timecount = hpet_get_timecount, @@ -60,40 +69,36 @@ .tc_quality = -200, }; -static char *hpet_ids[] = { "PNP0103", NULL }; - -static unsigned +static u_int hpet_get_timecount(struct timecounter *tc) { struct acpi_hpet_softc *sc; sc = tc->tc_priv; - return (bus_read_4(sc->res[0], 0xf0)); + return (bus_read_4(sc->mem_res, HPET_OFFSET_VALUE)); } static int acpi_hpet_probe(device_t dev) { + ACPI_FUNCTION_TRACE((char *)(uintptr_t) __func__); + if (acpi_disabled("hpet") || ACPI_ID_PROBE(device_get_parent(dev), dev, hpet_ids) == NULL || device_get_unit(dev) != 0) return (ENXIO); - device_set_desc(dev, "HPET - High Precision Event Timers"); + device_set_desc(dev, "High Precision Event Timer"); return (0); } -static struct resource_spec hpet_res_spec[] = { - { SYS_RES_MEMORY, 0, RF_ACTIVE}, - { -1, 0, 0} -}; - static int acpi_hpet_attach(device_t dev) { - struct acpi_hpet_softc *sc; - int error; - uint32_t u; + struct acpi_hpet_softc *sc; + int rid; + uint32_t val; + uintmax_t freq; ACPI_FUNCTION_TRACE((char *)(uintptr_t) __func__); @@ -101,27 +106,58 @@ sc->dev = dev; sc->handle = acpi_get_handle(dev); - error = bus_alloc_resources(dev, hpet_res_spec, sc->res); - if (error) - return (error); + rid = 0; + sc->mem_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, + RF_ACTIVE); + if (sc->mem_res == NULL) + return (ENOMEM); + + /* Validate that we can access the whole region. */ + if (rman_get_size(sc->mem_res) < HPET_MEM_WIDTH) { + device_printf(dev, "memory region width %ld too small\n", + rman_get_size(sc->mem_res)); + bus_free_resource(dev, SYS_RES_MEMORY, sc->mem_res); + return (ENXIO); + } + + /* Read basic statistics about the timer. */ + val = bus_read_4(sc->mem_res, HPET_OFFSET_PERIOD); + freq = (1000000000000000LL + val / 2) / val; + if (bootverbose) { + val = bus_read_4(sc->mem_res, HPET_OFFSET_INFO); + device_printf(dev, + "vend: 0x%x rev: 0x%x num: %d hz: %jd opts:%s%s\n", + val >> 16, val & 0xff, (val >> 18) & 0xf, freq, + ((val >> 15) & 1) ? " leg_route" : "", + ((val >> 13) & 1) ? " count_size" : ""); + } + + /* Be sure it is enabled. */ + bus_write_4(sc->mem_res, HPET_OFFSET_ENABLE, 1); + + if (testenv("debug.acpi.hpet_test")) + acpi_hpet_test(sc); - u = bus_read_4(sc->res[0], 0x0); - device_printf(dev, "Vendor: 0x%x\n", u >> 16); - device_printf(dev, "Leg_Route_Cap: %d\n", (u >> 15) & 1); - device_printf(dev, "Count_Size_Cap: %d\n", (u >> 13) & 1); - device_printf(dev, "Num_Tim_Cap: %d\n", (u >> 18) & 0xf); - device_printf(dev, "Rev_id: 0x%x\n", u & 0xff); + hpet_timecounter.tc_frequency = freq; + hpet_timecounter.tc_priv = sc; + tc_init(&hpet_timecounter); - u = bus_read_4(sc->res[0], 0x4); - device_printf(dev, "Period: %d fs (%jd Hz)\n", - u, (intmax_t)((1000000000000000LL + u / 2) / u)); + return (0); +} - hpet_timecounter.tc_frequency = (1000000000000000LL + u / 2) / u; +static int +acpi_hpet_detach(device_t dev) +{ + ACPI_FUNCTION_TRACE((char *)(uintptr_t) __func__); - bus_write_4(sc->res[0], 0x10, 1); + /* XXX Without a tc_remove() function, we can't detach. */ + return (EBUSY); +} -#if 0 - { +/* Print some basic latency/rate information to assist in debugging. */ +static void +acpi_hpet_test(struct acpi_hpet_softc *sc) +{ int i; uint32_t u1, u2; struct bintime b0, b1, b2; @@ -130,47 +166,21 @@ binuptime(&b0); binuptime(&b0); binuptime(&b1); - u1 = bus_read_4(sc->res[0], 0xf0); + u1 = bus_read_4(sc->mem_res, HPET_OFFSET_VALUE); for (i = 1; i < 1000; i++) - u2 = bus_read_4(sc->res[0], 0xf0); + u2 = bus_read_4(sc->mem_res, HPET_OFFSET_VALUE); binuptime(&b2); - u2 = bus_read_4(sc->res[0], 0xf0); + u2 = bus_read_4(sc->mem_res, HPET_OFFSET_VALUE); bintime_sub(&b2, &b1); bintime_sub(&b1, &b0); bintime_sub(&b2, &b1); bintime2timespec(&b2, &ts); - device_printf(dev, "%ld.%09ld: %u ... %u = %u\n", + device_printf(sc->dev, "%ld.%09ld: %u ... %u = %u\n", (long)ts.tv_sec, ts.tv_nsec, u1, u2, u2 - u1); - device_printf(dev, "time per call: %ld ns\n", ts.tv_nsec / 1000); - } -#endif - - device_printf(sc->dev, "HPET attach\n"); - - hpet_timecounter.tc_priv = sc; - - tc_init(&hpet_timecounter); - - return (0); -} - -static int -acpi_hpet_detach(device_t dev) -{ - ACPI_FUNCTION_TRACE((char *)(uintptr_t) __func__); - -#if 1 - return (EBUSY); -#else - struct acpi_hpet_softc *sc = device_get_softc(dev); - bus_release_resources(dev, hpet_res_spec, sc->res); - - device_printf(sc->dev, "HPET detach\n"); - return (0); -#endif + device_printf(sc->dev, "time per call: %ld ns\n", ts.tv_nsec / 1000); } static device_method_t acpi_hpet_methods[] = { ==== //depot/projects/uart/dev/ath/if_ath.c#30 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.144 2006/05/08 20:11:09 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.146 2006/06/02 23:14:38 sam Exp $"); /* * Driver for the Atheros Wireless LAN controller. @@ -2905,7 +2905,7 @@ * pass decrypt+mic errors but others may be * interesting (e.g. crc). */ - if (sc->sc_drvbpf != NULL && + if (bpf_peers_present(sc->sc_drvbpf) && (ds->ds_rxstat.rs_status & sc->sc_monpass)) { bus_dmamap_sync(sc->sc_dmat, bf->bf_dmamap, BUS_DMASYNC_POSTREAD); @@ -2936,7 +2936,8 @@ sc->sc_stats.ast_ant_rx[ds->ds_rxstat.rs_antenna]++; - if (sc->sc_drvbpf != NULL && !ath_rx_tap(sc, m, ds, tsf, nf)) { + if (bpf_peers_present(sc->sc_drvbpf) && + !ath_rx_tap(sc, m, ds, tsf, nf)) { m_freem(m); /* XXX reclaim */ goto rx_next; } @@ -3634,9 +3635,9 @@ ieee80211_dump_pkt(mtod(m0, caddr_t), m0->m_len, sc->sc_hwmap[txrate].ieeerate, -1); - if (ic->ic_rawbpf) + if (bpf_peers_present(ic->ic_rawbpf)) bpf_mtap(ic->ic_rawbpf, m0); - if (sc->sc_drvbpf) { + if (bpf_peers_present(sc->sc_drvbpf)) { u_int64_t tsf = ath_hal_gettsf64(ah); sc->sc_tx_th.wt_tsf = htole64(tsf); ==== //depot/projects/uart/dev/awi/awi.c#7 (text+ko) ==== @@ -89,7 +89,7 @@ __KERNEL_RCSID(0, "$NetBSD: awi.c,v 1.62 2004/01/16 14:13:15 onoe Exp $"); #endif #ifdef __FreeBSD__ -__FBSDID("$FreeBSD: src/sys/dev/awi/awi.c,v 1.42 2005/08/13 00:30:26 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/awi/awi.c,v 1.43 2006/06/02 23:14:39 sam Exp $"); #endif #include "opt_inet.h" @@ -796,8 +796,7 @@ } IFQ_DEQUEUE(&ifp->if_snd, m0); #if NBPFILTER > 0 - if (ifp->if_bpf) - bpf_mtap(ifp->if_bpf, m0); + BPF_MTAP(ifp, m0); #endif if ((ifp->if_flags & IFF_LINK0) || sc->sc_adhoc_ap) m0 = awi_ether_encap(sc, m0); @@ -839,7 +838,7 @@ ifp->if_opackets++; } #if NBPFILTER > 0 - if (ic->ic_rawbpf) + if (bpf_peers_present(ic->ic_rawbpf)) bpf_mtap(ic->ic_rawbpf, m0); #endif if (dowep) { ==== //depot/projects/uart/dev/dc/dcphy.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/dc/dcphy.c,v 1.30 2005/10/18 06:09:42 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/dc/dcphy.c,v 1.31 2006/06/03 20:37:56 jhb Exp $"); /* * Pseudo-driver for internal NWAY support on DEC 21143 and workalike @@ -141,6 +141,7 @@ struct mii_attach_args *ma; struct mii_data *mii; struct dc_softc *dc_sc; + device_t brdev; sc = device_get_softc(dev); ma = device_get_ivars(dev); @@ -166,8 +167,8 @@ CSR_WRITE_4(dc_sc, DC_10BTSTAT, 0); CSR_WRITE_4(dc_sc, DC_10BTCTRL, 0); - switch(pci_read_config(device_get_parent(sc->mii_dev), - DC_PCI_CSID, 4)) { + brdev = device_get_parent(sc->mii_dev); + switch (pci_get_subdevice(brdev) << 16 | pci_get_subvendor(brdev)) { case COMPAQ_PRESARIO_ID: /* Example of how to only allow 10Mbps modes. */ sc->mii_capabilities = BMSR_ANEG|BMSR_10TFDX|BMSR_10THDX; ==== //depot/projects/uart/dev/dc/if_dc.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/dc/if_dc.c,v 1.181 2006/05/12 05:04:41 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/dc/if_dc.c,v 1.182 2006/06/03 20:41:55 jhb Exp $"); /* * DEC "tulip" clone ethernet driver. Supports the DEC/Intel 21143 @@ -150,78 +150,76 @@ * Various supported device vendors/types and their names. */ static struct dc_type dc_devs[] = { - { DC_VENDORID_DEC, DC_DEVICEID_21143, + { DC_DEVID(DC_VENDORID_DEC, DC_DEVICEID_21143), 0, "Intel 21143 10/100BaseTX" }, - { DC_VENDORID_DAVICOM, DC_DEVICEID_DM9009, + { DC_DEVID(DC_VENDORID_DAVICOM, DC_DEVICEID_DM9009), 0, "Davicom DM9009 10/100BaseTX" }, - { DC_VENDORID_DAVICOM, DC_DEVICEID_DM9100, + { DC_DEVID(DC_VENDORID_DAVICOM, DC_DEVICEID_DM9100), 0, "Davicom DM9100 10/100BaseTX" }, - { DC_VENDORID_DAVICOM, DC_DEVICEID_DM9102, + { DC_DEVID(DC_VENDORID_DAVICOM, DC_DEVICEID_DM9102), DC_REVISION_DM9102A, + "Davicom DM9102A 10/100BaseTX" }, + { DC_DEVID(DC_VENDORID_DAVICOM, DC_DEVICEID_DM9102), 0, "Davicom DM9102 10/100BaseTX" }, - { DC_VENDORID_DAVICOM, DC_DEVICEID_DM9102, - "Davicom DM9102A 10/100BaseTX" }, - { DC_VENDORID_ADMTEK, DC_DEVICEID_AL981, + { DC_DEVID(DC_VENDORID_ADMTEK, DC_DEVICEID_AL981), 0, "ADMtek AL981 10/100BaseTX" }, - { DC_VENDORID_ADMTEK, DC_DEVICEID_AN985, + { DC_DEVID(DC_VENDORID_ADMTEK, DC_DEVICEID_AN985), 0, "ADMtek AN985 10/100BaseTX" }, - { DC_VENDORID_ADMTEK, DC_DEVICEID_ADM9511, + { DC_DEVID(DC_VENDORID_ADMTEK, DC_DEVICEID_ADM9511), 0, "ADMtek ADM9511 10/100BaseTX" }, - { DC_VENDORID_ADMTEK, DC_DEVICEID_ADM9513, + { DC_DEVID(DC_VENDORID_ADMTEK, DC_DEVICEID_ADM9513), 0, "ADMtek ADM9513 10/100BaseTX" }, - { DC_VENDORID_ADMTEK, DC_DEVICEID_FA511, + { DC_DEVID(DC_VENDORID_ADMTEK, DC_DEVICEID_FA511), 0, "Netgear FA511 10/100BaseTX" }, - { DC_VENDORID_ASIX, DC_DEVICEID_AX88140A, + { DC_DEVID(DC_VENDORID_ASIX, DC_DEVICEID_AX88140A), DC_REVISION_88141, + "ASIX AX88141 10/100BaseTX" }, + { DC_DEVID(DC_VENDORID_ASIX, DC_DEVICEID_AX88140A), 0, "ASIX AX88140A 10/100BaseTX" }, - { DC_VENDORID_ASIX, DC_DEVICEID_AX88140A, - "ASIX AX88141 10/100BaseTX" }, - { DC_VENDORID_MX, DC_DEVICEID_98713, + { DC_DEVID(DC_VENDORID_MX, DC_DEVICEID_98713), DC_REVISION_98713A, + "Macronix 98713A 10/100BaseTX" }, + { DC_DEVID(DC_VENDORID_MX, DC_DEVICEID_98713), 0, "Macronix 98713 10/100BaseTX" }, - { DC_VENDORID_MX, DC_DEVICEID_98713, - "Macronix 98713A 10/100BaseTX" }, - { DC_VENDORID_CP, DC_DEVICEID_98713_CP, + { DC_DEVID(DC_VENDORID_CP, DC_DEVICEID_98713_CP), DC_REVISION_98713A, "Compex RL100-TX 10/100BaseTX" }, - { DC_VENDORID_CP, DC_DEVICEID_98713_CP, + { DC_DEVID(DC_VENDORID_CP, DC_DEVICEID_98713_CP), 0, "Compex RL100-TX 10/100BaseTX" }, - { DC_VENDORID_MX, DC_DEVICEID_987x5, + { DC_DEVID(DC_VENDORID_MX, DC_DEVICEID_987x5), DC_REVISION_98725, + "Macronix 98725 10/100BaseTX" }, + { DC_DEVID(DC_VENDORID_MX, DC_DEVICEID_987x5), DC_REVISION_98715AEC_C, + "Macronix 98715AEC-C 10/100BaseTX" }, + { DC_DEVID(DC_VENDORID_MX, DC_DEVICEID_987x5), 0, "Macronix 98715/98715A 10/100BaseTX" }, - { DC_VENDORID_MX, DC_DEVICEID_987x5, - "Macronix 98715AEC-C 10/100BaseTX" }, - { DC_VENDORID_MX, DC_DEVICEID_987x5, - "Macronix 98725 10/100BaseTX" }, - { DC_VENDORID_MX, DC_DEVICEID_98727, + { DC_DEVID(DC_VENDORID_MX, DC_DEVICEID_98727), 0, "Macronix 98727/98732 10/100BaseTX" }, - { DC_VENDORID_LO, DC_DEVICEID_82C115, + { DC_DEVID(DC_VENDORID_LO, DC_DEVICEID_82C115), 0, "LC82C115 PNIC II 10/100BaseTX" }, - { DC_VENDORID_LO, DC_DEVICEID_82C168, + { DC_DEVID(DC_VENDORID_LO, DC_DEVICEID_82C168), DC_REVISION_82C169, + "82c169 PNIC 10/100BaseTX" }, + { DC_DEVID(DC_VENDORID_LO, DC_DEVICEID_82C168), 0, "82c168 PNIC 10/100BaseTX" }, - { DC_VENDORID_LO, DC_DEVICEID_82C168, - "82c169 PNIC 10/100BaseTX" }, - { DC_VENDORID_ACCTON, DC_DEVICEID_EN1217, + { DC_DEVID(DC_VENDORID_ACCTON, DC_DEVICEID_EN1217), 0, "Accton EN1217 10/100BaseTX" }, - { DC_VENDORID_ACCTON, DC_DEVICEID_EN2242, + { DC_DEVID(DC_VENDORID_ACCTON, DC_DEVICEID_EN2242), 0, "Accton EN2242 MiniPCI 10/100BaseTX" }, - { DC_VENDORID_XIRCOM, DC_DEVICEID_X3201, + { DC_DEVID(DC_VENDORID_XIRCOM, DC_DEVICEID_X3201), 0, "Xircom X3201 10/100BaseTX" }, - { DC_VENDORID_DLINK, DC_DEVICEID_DRP32TXD, + { DC_DEVID(DC_VENDORID_DLINK, DC_DEVICEID_DRP32TXD), 0, "Neteasy DRP-32TXD Cardbus 10/100" }, - { DC_VENDORID_ABOCOM, DC_DEVICEID_FE2500, + { DC_DEVID(DC_VENDORID_ABOCOM, DC_DEVICEID_FE2500), 0, "Abocom FE2500 10/100BaseTX" }, - { DC_VENDORID_ABOCOM, DC_DEVICEID_FE2500MX, + { DC_DEVID(DC_VENDORID_ABOCOM, DC_DEVICEID_FE2500MX), 0, "Abocom FE2500MX 10/100BaseTX" }, - { DC_VENDORID_CONEXANT, DC_DEVICEID_RS7112, + { DC_DEVID(DC_VENDORID_CONEXANT, DC_DEVICEID_RS7112), 0, "Conexant LANfinity MiniPCI 10/100BaseTX" }, - { DC_VENDORID_HAWKING, DC_DEVICEID_HAWKING_PN672TX, + { DC_DEVID(DC_VENDORID_HAWKING, DC_DEVICEID_HAWKING_PN672TX), 0, "Hawking CB102 CardBus 10/100" }, - { DC_VENDORID_PLANEX, DC_DEVICEID_FNW3602T, + { DC_DEVID(DC_VENDORID_PLANEX, DC_DEVICEID_FNW3602T), 0, "PlaneX FNW-3602-T CardBus 10/100" }, - { DC_VENDORID_3COM, DC_DEVICEID_3CSOHOB, + { DC_DEVID(DC_VENDORID_3COM, DC_DEVICEID_3CSOHOB), 0, "3Com OfficeConnect 10/100B" }, - { DC_VENDORID_MICROSOFT, DC_DEVICEID_MSMN120, + { DC_DEVID(DC_VENDORID_MICROSOFT, DC_DEVICEID_MSMN120), 0, "Microsoft MN-120 CardBus 10/100" }, - { DC_VENDORID_MICROSOFT, DC_DEVICEID_MSMN130, + { DC_DEVID(DC_VENDORID_MICROSOFT, DC_DEVICEID_MSMN130), 0, "Microsoft MN-130 10/100" }, - { DC_VENDORID_MICROSOFT, DC_DEVICEID_MSMN130_FAKE, - "Microsoft MN-130 10/100" }, { 0, 0, NULL } }; @@ -1003,7 +1001,7 @@ struct ifmedia *ifm; int rev; - rev = pci_read_config(dev, DC_PCI_CFRV, 4) & 0xFF; + rev = pci_get_revid(dev); sc = device_get_softc(dev); mii = device_get_softc(sc->dc_miibus); @@ -1560,50 +1558,16 @@ dc_devtype(device_t dev) { struct dc_type *t; - u_int32_t rev; + u_int32_t devid; + u_int8_t rev; t = dc_devs; + devid = pci_get_devid(dev); + rev = pci_get_revid(dev); while (t->dc_name != NULL) { - if ((pci_get_vendor(dev) == t->dc_vid) && - (pci_get_device(dev) == t->dc_did)) { - /* Check the PCI revision */ - rev = pci_read_config(dev, DC_PCI_CFRV, 4) & 0xFF; - if (t->dc_did == DC_DEVICEID_98713 && - rev >= DC_REVISION_98713A) - t++; - if (t->dc_did == DC_DEVICEID_98713_CP && - rev >= DC_REVISION_98713A) - t++; - if (t->dc_did == DC_DEVICEID_987x5 && - rev >= DC_REVISION_98715AEC_C) - t++; - if (t->dc_did == DC_DEVICEID_987x5 && - rev >= DC_REVISION_98725) - t++; - if (t->dc_did == DC_DEVICEID_AX88140A && - rev >= DC_REVISION_88141) - t++; - if (t->dc_did == DC_DEVICEID_82C168 && - rev >= DC_REVISION_82C169) - t++; - if (t->dc_did == DC_DEVICEID_DM9102 && - rev >= DC_REVISION_DM9102A) - t++; - /* - * The Microsoft MN-130 has a device ID of 0x0002, - * which happens to be the same as the PNIC 82c168. - * To keep dc_attach() from getting confused, we - * pretend its ID is something different. - * XXX: ideally, dc_attach() should be checking - * vendorid+deviceid together to avoid such - * collisions. - */ - if (t->dc_vid == DC_VENDORID_MICROSOFT && - t->dc_did == DC_DEVICEID_MSMN130) - t++; + if (devid == t->dc_devid && rev >= t->dc_minrev) return (t); - } t++; } @@ -1881,53 +1845,55 @@ /* Need this info to decide on a chip type. */ sc->dc_info = dc_devtype(dev); - revision = pci_read_config(dev, DC_PCI_CFRV, 4) & 0x000000FF; + revision = pci_get_revid(dev); /* Get the eeprom width, but PNIC and XIRCOM have diff eeprom */ - if (sc->dc_info->dc_did != DC_DEVICEID_82C168 && - sc->dc_info->dc_did != DC_DEVICEID_X3201) + if (sc->dc_info->dc_devid != + DC_DEVID(DC_VENDORID_LO, DC_DEVICEID_82C168) && + sc->dc_info->dc_devid != + DC_DEVID(DC_VENDORID_XIRCOM, DC_DEVICEID_X3201)) dc_eeprom_width(sc); - switch (sc->dc_info->dc_did) { - case DC_DEVICEID_21143: + switch (sc->dc_info->dc_devid) { + case DC_DEVID(DC_VENDORID_DEC, DC_DEVICEID_21143): sc->dc_type = DC_TYPE_21143; sc->dc_flags |= DC_TX_POLL | DC_TX_USE_TX_INTR; sc->dc_flags |= DC_REDUCED_MII_POLL; /* Save EEPROM contents so we can parse them later. */ dc_read_srom(sc, sc->dc_romwidth); break; - case DC_DEVICEID_DM9009: - case DC_DEVICEID_DM9100: - case DC_DEVICEID_DM9102: + case DC_DEVID(DC_VENDORID_DAVICOM, DC_DEVICEID_DM9009): + case DC_DEVID(DC_VENDORID_DAVICOM, DC_DEVICEID_DM9100): + case DC_DEVID(DC_VENDORID_DAVICOM, DC_DEVICEID_DM9102): sc->dc_type = DC_TYPE_DM9102; sc->dc_flags |= DC_TX_COALESCE | DC_TX_INTR_ALWAYS; sc->dc_flags |= DC_REDUCED_MII_POLL | DC_TX_STORENFWD; sc->dc_flags |= DC_TX_ALIGN; sc->dc_pmode = DC_PMODE_MII; + /* Increase the latency timer value. */ - command = pci_read_config(dev, DC_PCI_CFLT, 4); - command &= 0xFFFF00FF; - command |= 0x00008000; - pci_write_config(dev, DC_PCI_CFLT, command, 4); + pci_write_config(dev, PCIR_LATTIMER, 0x80, 1); break; - case DC_DEVICEID_AL981: + case DC_DEVID(DC_VENDORID_ADMTEK, DC_DEVICEID_AL981): sc->dc_type = DC_TYPE_AL981; sc->dc_flags |= DC_TX_USE_TX_INTR; sc->dc_flags |= DC_TX_ADMTEK_WAR; sc->dc_pmode = DC_PMODE_MII; dc_read_srom(sc, sc->dc_romwidth); break; - case DC_DEVICEID_AN985: - case DC_DEVICEID_ADM9511: - case DC_DEVICEID_ADM9513: - case DC_DEVICEID_DRP32TXD: - case DC_DEVICEID_FA511: - case DC_DEVICEID_FE2500: - case DC_DEVICEID_EN2242: - case DC_DEVICEID_HAWKING_PN672TX: - case DC_DEVICEID_3CSOHOB: - case DC_DEVICEID_MSMN120: - case DC_DEVICEID_MSMN130_FAKE: /* XXX avoid collision with PNIC*/ + case DC_DEVID(DC_VENDORID_ADMTEK, DC_DEVICEID_AN985): + case DC_DEVID(DC_VENDORID_ADMTEK, DC_DEVICEID_ADM9511): + case DC_DEVID(DC_VENDORID_ADMTEK, DC_DEVICEID_ADM9513): + case DC_DEVID(DC_VENDORID_DLINK, DC_DEVICEID_DRP32TXD): + case DC_DEVID(DC_VENDORID_ADMTEK, DC_DEVICEID_FA511): + case DC_DEVID(DC_VENDORID_ABOCOM, DC_DEVICEID_FE2500): + case DC_DEVID(DC_VENDORID_ABOCOM, DC_DEVICEID_FE2500MX): + case DC_DEVID(DC_VENDORID_ACCTON, DC_DEVICEID_EN2242): + case DC_DEVID(DC_VENDORID_HAWKING, DC_DEVICEID_HAWKING_PN672TX): + case DC_DEVID(DC_VENDORID_PLANEX, DC_DEVICEID_FNW3602T): + case DC_DEVID(DC_VENDORID_3COM, DC_DEVICEID_3CSOHOB): + case DC_DEVID(DC_VENDORID_MICROSOFT, DC_DEVICEID_MSMN120): + case DC_DEVID(DC_VENDORID_MICROSOFT, DC_DEVICEID_MSMN130): sc->dc_type = DC_TYPE_AN985; sc->dc_flags |= DC_64BIT_HASH; sc->dc_flags |= DC_TX_USE_TX_INTR; @@ -1935,8 +1901,8 @@ sc->dc_pmode = DC_PMODE_MII; /* Don't read SROM for - auto-loaded on reset */ break; - case DC_DEVICEID_98713: - case DC_DEVICEID_98713_CP: + case DC_DEVID(DC_VENDORID_MX, DC_DEVICEID_98713): + case DC_DEVID(DC_VENDORID_CP, DC_DEVICEID_98713_CP): if (revision < DC_REVISION_98713A) { sc->dc_type = DC_TYPE_98713; } @@ -1947,8 +1913,8 @@ sc->dc_flags |= DC_REDUCED_MII_POLL; sc->dc_flags |= DC_TX_POLL | DC_TX_USE_TX_INTR; break; - case DC_DEVICEID_987x5: - case DC_DEVICEID_EN1217: + case DC_DEVID(DC_VENDORID_MX, DC_DEVICEID_987x5): + case DC_DEVID(DC_VENDORID_ACCTON, DC_DEVICEID_EN1217): /* * Macronix MX98715AEC-C/D/E parts have only a * 128-bit hash table. We need to deal with these @@ -1963,17 +1929,17 @@ sc->dc_flags |= DC_TX_POLL | DC_TX_USE_TX_INTR; sc->dc_flags |= DC_REDUCED_MII_POLL | DC_21143_NWAY; break; - case DC_DEVICEID_98727: + case DC_DEVID(DC_VENDORID_MX, DC_DEVICEID_98727): sc->dc_type = DC_TYPE_987x5; sc->dc_flags |= DC_TX_POLL | DC_TX_USE_TX_INTR; sc->dc_flags |= DC_REDUCED_MII_POLL | DC_21143_NWAY; break; - case DC_DEVICEID_82C115: + case DC_DEVID(DC_VENDORID_LO, DC_DEVICEID_82C115): sc->dc_type = DC_TYPE_PNICII; sc->dc_flags |= DC_TX_POLL | DC_TX_USE_TX_INTR | DC_128BIT_HASH; sc->dc_flags |= DC_REDUCED_MII_POLL | DC_21143_NWAY; break; - case DC_DEVICEID_82C168: + case DC_DEVID(DC_VENDORID_LO, DC_DEVICEID_82C168): sc->dc_type = DC_TYPE_PNIC; sc->dc_flags |= DC_TX_STORENFWD | DC_TX_INTR_ALWAYS; sc->dc_flags |= DC_PNIC_RX_BUG_WAR; @@ -1981,13 +1947,13 @@ if (revision < DC_REVISION_82C169) sc->dc_pmode = DC_PMODE_SYM; break; - case DC_DEVICEID_AX88140A: + case DC_DEVID(DC_VENDORID_ASIX, DC_DEVICEID_AX88140A): sc->dc_type = DC_TYPE_ASIX; sc->dc_flags |= DC_TX_USE_TX_INTR | DC_TX_INTR_FIRSTFRAG; sc->dc_flags |= DC_REDUCED_MII_POLL; sc->dc_pmode = DC_PMODE_MII; break; - case DC_DEVICEID_X3201: + case DC_DEVID(DC_VENDORID_XIRCOM, DC_DEVICEID_X3201): sc->dc_type = DC_TYPE_XIRCOM; sc->dc_flags |= DC_TX_INTR_ALWAYS | DC_TX_COALESCE | DC_TX_ALIGN; @@ -1998,7 +1964,7 @@ */ sc->dc_pmode = DC_PMODE_MII; break; - case DC_DEVICEID_RS7112: + case DC_DEVID(DC_VENDORID_CONEXANT, DC_DEVICEID_RS7112): sc->dc_type = DC_TYPE_CONEXANT; sc->dc_flags |= DC_TX_INTR_ALWAYS; sc->dc_flags |= DC_REDUCED_MII_POLL; @@ -2006,7 +1972,8 @@ dc_read_srom(sc, sc->dc_romwidth); break; default: - device_printf(dev, "unknown device: %x\n", sc->dc_info->dc_did); + device_printf(dev, "unknown device: %x\n", + sc->dc_info->dc_devid); break; } @@ -2014,8 +1981,7 @@ if (DC_IS_DAVICOM(sc)) sc->dc_cachesize = 0; else - sc->dc_cachesize = pci_read_config(dev, - DC_PCI_CFLT, 4) & 0xFF; + sc->dc_cachesize = pci_get_cachelnsz(dev); /* Reset the adapter. */ dc_reset(sc); @@ -2249,7 +2215,8 @@ * LEDs, and twiddling these bits has adverse effects * on them. (I.e. you suddenly can't get a link.) */ - if (pci_read_config(dev, DC_PCI_CSID, 4) != 0x80281033) + if (!(pci_get_subvendor(dev) == 0x1033 && + pci_get_subdevice(dev) == 0x8028)) sc->dc_flags |= DC_TULIP_LEDS; error = 0; } ==== //depot/projects/uart/dev/dc/if_dcreg.h#3 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/dc/if_dcreg.h,v 1.48 2006/03/16 20:00:39 jhb Exp $ + * $FreeBSD: src/sys/dev/dc/if_dcreg.h,v 1.49 2006/06/03 20:41:55 jhb Exp $ */ /* @@ -512,8 +512,8 @@ struct dc_type { - u_int16_t dc_vid; - u_int16_t dc_did; + u_int32_t dc_devid; + u_int8_t dc_minrev; char *dc_name; }; @@ -1004,58 +1004,22 @@ #define DC_DEVICEID_MSMN120 0x0001 #define DC_DEVICEID_MSMN130 0x0002 -#define DC_DEVICEID_MSMN130_FAKE 0xFFF2 + +#define DC_DEVID(vendor, device) ((device) << 16 | (vendor)) /* * PCI low memory base and low I/O base register, and * other PCI registers. */ -#define DC_PCI_CFID 0x00 /* Id */ -#define DC_PCI_CFCS 0x04 /* Command and status */ -#define DC_PCI_CFRV 0x08 /* Revision */ -#define DC_PCI_CFLT 0x0C /* Latency timer */ -#define DC_PCI_CFBIO 0x10 /* Base I/O address */ -#define DC_PCI_CFBMA 0x14 /* Base memory address */ -#define DC_PCI_CCIS 0x28 /* Card info struct */ -#define DC_PCI_CSID 0x2C /* Subsystem ID */ -#define DC_PCI_CBER 0x30 /* Expansion ROM base address */ -#define DC_PCI_CCAP 0x34 /* Caps pointer - PD/TD chip only */ -#define DC_PCI_CFIT 0x3C /* Interrupt */ +#define DC_PCI_CFBIO PCIR_BAR(0) /* Base I/O address */ +#define DC_PCI_CFBMA PCIR_BAR(1) /* Base memory address */ #define DC_PCI_CFDD 0x40 /* Device and driver area */ #define DC_PCI_CWUA0 0x44 /* Wake-Up LAN addr 0 */ #define DC_PCI_CWUA1 0x48 /* Wake-Up LAN addr 1 */ #define DC_PCI_SOP0 0x4C /* SecureON passwd 0 */ #define DC_PCI_SOP1 0x50 /* SecureON passwd 1 */ #define DC_PCI_CWUC 0x54 /* Configuration Wake-Up cmd */ -#define DC_PCI_CCID 0xDC /* Capability ID - PD/TD only */ -#define DC_PCI_CPMC 0xE0 /* Pwrmgmt ctl & sts - PD/TD only */ - -/* PCI ID register */ -#define DC_CFID_VENDOR 0x0000FFFF -#define DC_CFID_DEVICE 0xFFFF0000 - -/* PCI command/status register */ -#define DC_CFCS_IOSPACE 0x00000001 /* I/O space enable */ -#define DC_CFCS_MEMSPACE 0x00000002 /* memory space enable */ -#define DC_CFCS_BUSMASTER 0x00000004 /* bus master enable */ -#define DC_CFCS_MWI_ENB 0x00000010 /* mem write and inval enable */ -#define DC_CFCS_PARITYERR_ENB 0x00000040 /* parity error enable */ -#define DC_CFCS_SYSERR_ENB 0x00000100 /* system error enable */ -#define DC_CFCS_NEWCAPS 0x00100000 /* new capabilities */ -#define DC_CFCS_FAST_B2B 0x00800000 /* fast back-to-back capable */ -#define DC_CFCS_DATAPARITY 0x01000000 /* Parity error report */ -#define DC_CFCS_DEVSELTIM 0x06000000 /* devsel timing */ -#define DC_CFCS_TGTABRT 0x10000000 /* received target abort */ -#define DC_CFCS_MASTERABRT 0x20000000 /* received master abort */ -#define DC_CFCS_SYSERR 0x40000000 /* asserted system error */ -#define DC_CFCS_PARITYERR 0x80000000 /* asserted parity error */ - -/* PCI revision register */ -#define DC_CFRV_STEPPING 0x0000000F -#define DC_CFRV_REVISION 0x000000F0 -#define DC_CFRV_SUBCLASS 0x00FF0000 -#define DC_CFRV_BASECLASS 0xFF000000 #define DC_21143_PB_REV 0x00000030 #define DC_21143_TB_REV 0x00000030 @@ -1064,48 +1028,6 @@ #define DC_21143_PD_REV 0x00000041 #define DC_21143_TD_REV 0x00000041 -/* PCI latency timer register */ -#define DC_CFLT_CACHELINESIZE 0x000000FF -#define DC_CFLT_LATENCYTIMER 0x0000FF00 - -/* PCI subsystem ID register */ -#define DC_CSID_VENDOR 0x0000FFFF -#define DC_CSID_DEVICE 0xFFFF0000 - -/* PCI cababilities pointer */ -#define DC_CCAP_OFFSET 0x000000FF - -/* PCI interrupt config register */ -#define DC_CFIT_INTLINE 0x000000FF -#define DC_CFIT_INTPIN 0x0000FF00 -#define DC_CFIT_MIN_GNT 0x00FF0000 -#define DC_CFIT_MAX_LAT 0xFF000000 - -/* PCI capability register */ -#define DC_CCID_CAPID 0x000000FF -#define DC_CCID_NEXTPTR 0x0000FF00 -#define DC_CCID_PM_VERS 0x00070000 -#define DC_CCID_PME_CLK 0x00080000 -#define DC_CCID_DVSPEC_INT 0x00200000 -#define DC_CCID_STATE_D1 0x02000000 -#define DC_CCID_STATE_D2 0x04000000 -#define DC_CCID_PME_D0 0x08000000 -#define DC_CCID_PME_D1 0x10000000 -#define DC_CCID_PME_D2 0x20000000 -#define DC_CCID_PME_D3HOT 0x40000000 -#define DC_CCID_PME_D3COLD 0x80000000 - -/* PCI power management control/status register */ -#define DC_CPMC_STATE 0x00000003 -#define DC_CPMC_PME_ENB 0x00000100 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jun 4 23:16:33 2006 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 EFFC816A694; Sun, 4 Jun 2006 23:16:32 +0000 (UTC) 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 B25F016A696 for ; Sun, 4 Jun 2006 23:16:32 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8197B43D48 for ; Sun, 4 Jun 2006 23:16:32 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k54NEpOO080119 for ; Sun, 4 Jun 2006 23:14:51 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k54NEpX9080116 for perforce@freebsd.org; Sun, 4 Jun 2006 23:14:51 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 4 Jun 2006 23:14:51 GMT Message-Id: <200606042314.k54NEpX9080116@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 98513 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Jun 2006 23:16:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=98513 Change 98513 by kmacy@kmacy_storage:sun4v_work_test on 2006/06/04 23:14:17 don't keep spinning in pmap_ipi if we have fewer than 32 cpus Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#61 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#61 (text+ko) ==== @@ -1197,15 +1197,16 @@ while (ackmask != curactive) { DELAY(1); i++; - if (i > 100000000) + if (i > 1000000) panic(" ackmask=0x%x active=0x%x\n", ackmask, curactive); } active_total |= curactive; - if ((active = (pmap->pm_tlbactive & ~(active_total|cpumask))) != 0) + if ((active = ((pmap->pm_tlbactive & all_cpus) & ~(active_total|cpumask))) != 0) { + printf("pmap_ipi: retrying"); goto retry; - + } done: return (active_total); } From owner-p4-projects@FreeBSD.ORG Sun Jun 4 23:35:59 2006 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 7516816AC36; Sun, 4 Jun 2006 23:35:59 +0000 (UTC) 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 CEC3016AC20 for ; Sun, 4 Jun 2006 23:35:57 +0000 (UTC) (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 7AA7143D45 for ; Sun, 4 Jun 2006 23:35:57 +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.6/8.13.6) with ESMTP id k54NYGTw080865 for ; Sun, 4 Jun 2006 23:34:16 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k54NYGiZ080862 for perforce@freebsd.org; Sun, 4 Jun 2006 23:34:16 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 4 Jun 2006 23:34:16 GMT Message-Id: <200606042334.k54NYGiZ080862@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 98514 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Jun 2006 23:36:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=98514 Change 98514 by rwatson@rwatson_zoo on 2006/06/04 23:34:06 Integrate OpenBSM 1.0 alpha 6 changes from OpenBSM work branch to TrustedBSD audit3 branch. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditfilterd/auditfilterd.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditfilterd/auditfilterd.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit.h#11 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_filter.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_record.h#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/configure#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/configure.ac#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/audit_submit.3#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_wrappers.c#12 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/auditctl.2#5 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditfilterd/auditfilterd.c#2 (text+ko) ==== @@ -25,10 +25,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditfilterd/auditfilterd.c#1 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditfilterd/auditfilterd.c#2 $ */ #include +#include #include #include @@ -66,12 +67,14 @@ usage(void) { - fprintf(stderr, "auditfilterd [-c conffile] [-d] [-t trailfile]\n"); + fprintf(stderr, "auditfilterd [-c conffile] [-d] [-p pipefile]" + " [-t trailfile]\n"); fprintf(stderr, " -c Specify configuration file (default: %s)\n", AUDITFILTERD_CONFFILE); fprintf(stderr, " -d Debugging mode, don't daemonize\n"); - fprintf(stderr, " -t Specify audit trail file (default: %s)", - AUDITFILTERD_TRAILFILE); + fprintf(stderr, " -p Specify pipe file (default: %s)\n", + AUDITFILTERD_PIPEFILE); + fprintf(stderr, " -t Specify audit trail file (default: none)\n"); exit(-1); } @@ -147,7 +150,7 @@ * them to modules for processing. */ static void -mainloop(const char *conffile, const char *trailfile, FILE *trail_fp) +mainloop_file(const char *conffile, const char *trailfile, FILE *trail_fp) { struct timespec ts; FILE *conf_fp; @@ -184,10 +187,8 @@ * more at the right blocking and signal behavior here. */ reclen = au_read_rec(trail_fp, &buf); - if (reclen == -1) { - sleep(1); + if (reclen == -1) continue; - } if (clock_gettime(CLOCK_REALTIME, &ts) < 0) err(-1, "clock_gettime"); present_bsmrecord(&ts, buf, reclen); @@ -196,16 +197,68 @@ } } +/* + * The main loop spins pulling records out of the record source and passing + * them to modules for processing. This version of the function accepts + * discrete record input from a file descriptor, as opposed to buffered input + * from a file stream. + */ +static void +mainloop_pipe(const char *conffile, const char *pipefile, int pipe_fd) +{ + u_char record[MAX_AUDIT_RECORD_SIZE]; + struct timespec ts; + FILE *conf_fp; + int reclen; + + while (1) { + /* + * On SIGHUP, we reread the configuration file. Unlike with + * a trail file, we don't reopen the pipe, as we don't want + * to miss records which will be flushed if we do. + */ + if (reread_config) { + reread_config = 0; + warnx("rereading configuration"); + conf_fp = fopen(conffile, "r"); + if (conf_fp == NULL) + err(-1, "%s", conffile); + auditfilterd_conf(conffile, conf_fp); + fclose(conf_fp); + } + if (quit) { + warnx("quitting"); + break; + } + + /* + * For now, be relatively unrobust about incomplete records, + * but in the future will want to do better. Need to look + * more at the right blocking and signal behavior here. + */ + reclen = read(pipe_fd, record, MAX_AUDIT_RECORD_SIZE); + if (reclen < 0) + continue; + if (clock_gettime(CLOCK_REALTIME, &ts) < 0) + err(-1, "clock_gettime"); + present_bsmrecord(&ts, record, reclen); + present_tokens(&ts, record, reclen); + } +} + int main(int argc, char *argv[]) { - const char *trailfile, *conffile; + const char *pipefile, *trailfile, *conffile; FILE *trail_fp, *conf_fp; + struct stat sb; + int pipe_fd; int ch; conffile = AUDITFILTERD_CONFFILE; - trailfile = AUDITFILTERD_TRAILFILE; - while ((ch = getopt(argc, argv, "c:dt:")) != -1) { + trailfile = NULL; + pipefile = NULL; + while ((ch = getopt(argc, argv, "c:dp:t:")) != -1) { switch (ch) { case 'c': conffile = optarg; @@ -216,9 +269,17 @@ break; case 't': + if (trailfile != NULL || pipefile != NULL) + usage(); trailfile = optarg; break; + case 'p': + if (pipefile != NULL || trailfile != NULL) + usage(); + pipefile = optarg; + break; + default: usage(); } @@ -230,9 +291,26 @@ if (argc != 0) usage(); - trail_fp = fopen(trailfile, "r"); - if (trail_fp == NULL) - err(-1, "%s", trailfile); + /* + * We allow only one of a pipe or a trail to be used. If none is + * specified, we provide a default pipe path. + */ + if (pipefile == NULL && trailfile == NULL) + pipefile = AUDITFILTERD_PIPEFILE; + + if (pipefile != NULL) { + pipe_fd = open(pipefile, O_RDONLY); + if (pipe_fd < 0) + err(-1, "open:%s", pipefile); + if (fstat(pipe_fd, &sb) < 0) + err(-1, "stat: %s", pipefile); + if (!S_ISCHR(sb.st_mode)) + errx(-1, "fstat: %s not device", pipefile); + } else { + trail_fp = fopen(trailfile, "r"); + if (trail_fp == NULL) + err(-1, "%s", trailfile); + } conf_fp = fopen(conffile, "r"); if (conf_fp == NULL) @@ -253,7 +331,10 @@ signal(SIGQUIT, signal_handler); signal(SIGTERM, signal_handler); - mainloop(conffile, trailfile, trail_fp); + if (pipefile != NULL) + mainloop_pipe(conffile, pipefile, pipe_fd); + else + mainloop_file(conffile, trailfile, trail_fp); auditfilterd_conf_shutdown(); return (0); ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditfilterd/auditfilterd.h#2 (text+ko) ==== @@ -25,11 +25,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditfilterd/auditfilterd.h#1 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditfilterd/auditfilterd.h#2 $ */ #define AUDITFILTERD_CONFFILE "/etc/security/audit_filter" -#define AUDITFILTERD_TRAILFILE "/dev/auditpipe" +#define AUDITFILTERD_PIPEFILE "/dev/auditpipe" /* * Limit on the number of arguments that can appear in an audit_filterd ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit.h#11 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit.h#10 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit.h#11 $ */ #ifndef _BSM_AUDIT_H @@ -264,11 +264,11 @@ unsigned int as_version; unsigned int as_numevent; int as_generated; - int as_nonattring; + int as_nonattrib; int as_kernel; int as_audit; int as_auditctl; - int as_enqueu; + int as_enqueue; int as_written; int as_wblocked; int as_rblocked; ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_filter.h#2 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_filter.h#1 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_filter.h#2 $ */ #ifndef _BSM_AUDIT_FILTER_H_ @@ -48,7 +48,7 @@ typedef int (*audit_filter_attach_t)(void **instance, int argc, char *argv[]); typedef int (*audit_filter_reinit_t)(void *instance, int argc, char *argv[]); typedef void (*audit_filter_record_t)(void *instance, struct timespec *ts, - int token_count, const tokenstr_t *tok[]); + int token_count, const tokenstr_t tok[]); typedef void (*audit_filter_bsmrecord_t)(void *instance, struct timespec *ts, void *data, u_int len); typedef void (*audit_filter_detach_t)(void *instance); ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_record.h#8 (text+ko) ==== @@ -30,23 +30,15 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_record.h#7 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_record.h#8 $ */ #ifndef _BSM_AUDIT_RECORD_H_ #define _BSM_AUDIT_RECORD_H_ -/* Various token id types */ - /* - * Values inside the comments are not documented in the BSM pages and - * have been picked up from the header files - */ - -/* - * Values marked as XXX do not have a value defined in the BSM header files + * Token type identifiers. */ - #define AUT_INVALID 0x00 #define AUT_OTHER_FILE32 0x11 #define AUT_OHEADER 0x12 ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/configure#4 (xtext) ==== @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#20 . +# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#22 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for OpenBSM 1.0a5. +# Generated by GNU Autoconf 2.59 for OpenBSM 1.0a6. # # Report bugs to . # @@ -424,8 +424,8 @@ # Identity of this package. PACKAGE_NAME='OpenBSM' PACKAGE_TARNAME='openbsm' -PACKAGE_VERSION='1.0a5' -PACKAGE_STRING='OpenBSM 1.0a5' +PACKAGE_VERSION='1.0a6' +PACKAGE_STRING='OpenBSM 1.0a6' PACKAGE_BUGREPORT='trustedbsd-audit@TrustesdBSD.org' ac_unique_file="bin/auditreduce/auditreduce.c" @@ -955,7 +955,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures OpenBSM 1.0a5 to adapt to many kinds of systems. +\`configure' configures OpenBSM 1.0a6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1021,7 +1021,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OpenBSM 1.0a5:";; + short | recursive ) echo "Configuration of OpenBSM 1.0a6:";; esac cat <<\_ACEOF @@ -1162,7 +1162,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -OpenBSM configure 1.0a5 +OpenBSM configure 1.0a6 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1176,7 +1176,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by OpenBSM $as_me 1.0a5, which was +It was created by OpenBSM $as_me 1.0a6, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -19278,7 +19278,7 @@ # Define the identity of the package. PACKAGE=OpenBSM - VERSION=1.0a5 + VERSION=1.0a6 cat >>confdefs.h <<_ACEOF @@ -23477,7 +23477,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by OpenBSM $as_me 1.0a5, which was +This file was extended by OpenBSM $as_me 1.0a6, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -23540,7 +23540,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -OpenBSM config.status 1.0a5 +OpenBSM config.status 1.0a6 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/configure.ac#4 (text+ko) ==== @@ -2,8 +2,8 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([OpenBSM], [1.0a5], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/configure.ac#3 $]) +AC_INIT([OpenBSM], [1.0a6], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) +AC_REVISION([$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/configure.ac#4 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/audit_submit.3#2 (text+ko) ==== @@ -26,8 +26,10 @@ .\" STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. -.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/audit_submit.3#1 $ -.Dd April 11, 2006 +.\" +.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/audit_submit.3#2 $ +.\" +.Dd May 29, 2006 .Dt audit_submit 3 .Os .Sh NAME @@ -44,12 +46,12 @@ .Nm function provides a generic programming interface for audit record submission. This audit record will contain a header, subject token, an optional text token, -return token, and a trailer. The header will contain the event class specified -by +return token, and a trailer. +The header will contain the event class specified by .Fa au_event . The subject token will be generated based on .Fa au_ctx . -The return token of is dependant on the +The return token is dependant on the .Fa status and .Fa reterr @@ -65,6 +67,19 @@ If .Fa format is NULL, then no text token is created in the audit record. +.Pp +It should be noted that +.Nm +assumes that +.Xr setaudit 2 , +or +.Xr setaudit_addr 2 +has already been called. +As a direct result, the terminal ID for the +subject will be retrieved from the kernel via +.Xr getaudit 2 , +or +.Xr getaudit_addr 2 . .Sh EXAMPLES .Bd -literal -offset indent #include @@ -96,12 +111,13 @@ .Ed .Sh SEE ALSO .Xr auditon 2 , +.Xr getaudit 2 , .Xr libbsm 3 , .Xr stdarg 3 .Sh HISTORY The .Nm -first appeared in OpenBSM version 1.0. +function first appeared in OpenBSM version 1.0. OpenBSM 1.0 was introduced in FreeBSD 7.0. .Sh AUTHORS The ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_wrappers.c#12 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_wrappers.c#11 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_wrappers.c#12 $ */ #ifdef __APPLE__ @@ -62,12 +62,12 @@ int reterr, const char *fmt, ...) { char text[MAX_AUDITSTRING_LEN]; - au_tid_t termid; token_t *token; long acond; va_list ap; pid_t pid; int error, afd; + struct auditinfo ai; if (auditon(A_GETCOND, &acond, sizeof(acond)) < 0) { /* @@ -92,11 +92,16 @@ errno = error; return (-1); } - /* XXX what should we do for termid? */ - bzero(&termid, sizeof(termid)); + if (getaudit(&ai) < 0) { + error = errno; + syslog(LOG_AUTH | LOG_ERR, "audit: getaudit failed: %s", + strerror(errno)); + errno = error; + return (-1); + } pid = getpid(); token = au_to_subject32(auid, geteuid(), getegid(), - getuid(), getgid(), pid, pid, &termid); + getuid(), getgid(), pid, pid, &ai.ai_termid); if (token == NULL) { syslog(LOG_AUTH | LOG_ERR, "audit: unable to build subject token"); ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/man/auditctl.2#5 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/man/auditctl.2#4 $ +.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/man/auditctl.2#5 $ .\" .Dd April 19, 2005 .Dt AUDITCTL 2 @@ -34,7 +34,7 @@ .Sh SYNOPSIS .In bsm/audit.h .Ft int -.Fn auditon "const char *path" +.Fn auditctl "const char *path" .Sh DESCRIPTION The .Fn auditctl From owner-p4-projects@FreeBSD.ORG Mon Jun 5 02:30:41 2006 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 57D0F16A973; Mon, 5 Jun 2006 02:30:41 +0000 (UTC) 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 1001E16A8F4 for ; Mon, 5 Jun 2006 02:30:41 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 193F143D46 for ; Mon, 5 Jun 2006 02:30:40 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k552SwVW099659 for ; Mon, 5 Jun 2006 02:28:58 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k552SpZg099652 for perforce@freebsd.org; Mon, 5 Jun 2006 02:28:51 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 5 Jun 2006 02:28:51 GMT Message-Id: <200606050228.k552SpZg099652@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 98515 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, 05 Jun 2006 02:30:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=98515 Change 98515 by kmacy@kmacy_storage:sun4v_work_test on 2006/06/05 02:28:08 IFC Affected files ... .. //depot/projects/kmacy_sun4v/src/MAINTAINERS#4 integrate .. //depot/projects/kmacy_sun4v/src/Makefile#4 integrate .. //depot/projects/kmacy_sun4v/src/Makefile.inc1#4 integrate .. //depot/projects/kmacy_sun4v/src/contrib/bsnmp/NEWS#4 integrate .. //depot/projects/kmacy_sun4v/src/contrib/bsnmp/gensnmpdef/gensnmpdef.1#3 integrate .. //depot/projects/kmacy_sun4v/src/contrib/bsnmp/gensnmpdef/gensnmpdef.c#3 integrate .. //depot/projects/kmacy_sun4v/src/contrib/bsnmp/gensnmptree/gensnmptree.1#4 integrate .. //depot/projects/kmacy_sun4v/src/contrib/bsnmp/gensnmptree/gensnmptree.c#4 integrate .. //depot/projects/kmacy_sun4v/src/contrib/netcat/atomicio.c#3 integrate .. //depot/projects/kmacy_sun4v/src/contrib/netcat/atomicio.h#1 branch .. //depot/projects/kmacy_sun4v/src/contrib/netcat/nc.1#4 integrate .. //depot/projects/kmacy_sun4v/src/contrib/netcat/netcat.c#3 integrate .. //depot/projects/kmacy_sun4v/src/contrib/netcat/socks.c#3 integrate .. //depot/projects/kmacy_sun4v/src/etc/defaults/rc.conf#4 integrate .. //depot/projects/kmacy_sun4v/src/etc/devd.conf#4 integrate .. //depot/projects/kmacy_sun4v/src/etc/hosts.allow#4 integrate .. //depot/projects/kmacy_sun4v/src/etc/netstart#3 integrate .. //depot/projects/kmacy_sun4v/src/etc/rc.d/Makefile#4 integrate .. //depot/projects/kmacy_sun4v/src/etc/rc.d/bridge#1 branch .. //depot/projects/kmacy_sun4v/src/etc/rc.d/devd#3 integrate .. //depot/projects/kmacy_sun4v/src/etc/rc.d/jail#4 integrate .. //depot/projects/kmacy_sun4v/src/etc/rc.d/netif#3 integrate .. //depot/projects/kmacy_sun4v/src/etc/rc.d/sysctl#3 integrate .. //depot/projects/kmacy_sun4v/src/games/fortune/datfiles/fortunes#4 integrate .. //depot/projects/kmacy_sun4v/src/include/arpa/nameser.h#4 integrate .. //depot/projects/kmacy_sun4v/src/include/glob.h#3 integrate .. //depot/projects/kmacy_sun4v/src/include/netdb.h#4 integrate .. //depot/projects/kmacy_sun4v/src/include/res_update.h#2 integrate .. //depot/projects/kmacy_sun4v/src/include/resolv.h#4 integrate .. //depot/projects/kmacy_sun4v/src/kerberos5/lib/libroken/Makefile#3 integrate .. //depot/projects/kmacy_sun4v/src/lib/csu/common/crtbegin.c#3 delete .. //depot/projects/kmacy_sun4v/src/lib/csu/common/crtend.c#3 delete .. //depot/projects/kmacy_sun4v/src/lib/libatm/Makefile#3 integrate .. //depot/projects/kmacy_sun4v/src/lib/libc/Makefile#4 integrate .. //depot/projects/kmacy_sun4v/src/lib/libc/arm/SYS.h#3 integrate .. //depot/projects/kmacy_sun4v/src/lib/libc/gen/getgrent.c#4 integrate .. //depot/projects/kmacy_sun4v/src/lib/libc/gen/gethostname.c#3 integrate .. //depot/projects/kmacy_sun4v/src/lib/libc/gen/glob.3#3 integrate .. //depot/projects/kmacy_sun4v/src/lib/libc/gen/glob.c#3 integrate .. //depot/projects/kmacy_sun4v/src/lib/libc/gen/signal.3#3 integrate .. //depot/projects/kmacy_sun4v/src/lib/libc/include/isc/list.h#1 branch .. //depot/projects/kmacy_sun4v/src/lib/libc/nameser/Symbol.map#2 integrate .. //depot/projects/kmacy_sun4v/src/lib/libc/nameser/ns_samedomain.c#2 integrate .. //depot/projects/kmacy_sun4v/src/lib/libc/net/Makefile.inc#4 integrate .. //depot/projects/kmacy_sun4v/src/lib/libc/net/Symbol.map#2 integrate .. //depot/projects/kmacy_sun4v/src/lib/libc/net/gai_strerror.3#3 integrate .. //depot/projects/kmacy_sun4v/src/lib/libc/net/gai_strerror.c#3 integrate .. //depot/projects/kmacy_sun4v/src/lib/libc/net/gethostnamadr.c#4 integrate .. //depot/projects/kmacy_sun4v/src/lib/libc/net/getnameinfo.c#4 integrate .. //depot/projects/kmacy_sun4v/src/lib/libc/net/res_mkupdate.c#4 delete .. //depot/projects/kmacy_sun4v/src/lib/libc/net/res_update.c#4 delete .. //depot/projects/kmacy_sun4v/src/lib/libc/resolv/Makefile.inc#2 integrate .. //depot/projects/kmacy_sun4v/src/lib/libc/resolv/Symbol.map#2 integrate .. //depot/projects/kmacy_sun4v/src/lib/libc/resolv/h_errno.c#2 integrate .. //depot/projects/kmacy_sun4v/src/lib/libc/resolv/res_findzonecut.c#1 branch .. //depot/projects/kmacy_sun4v/src/lib/libc/resolv/res_mkupdate.c#1 branch .. //depot/projects/kmacy_sun4v/src/lib/libc/resolv/res_state.c#2 integrate .. //depot/projects/kmacy_sun4v/src/lib/libc/resolv/res_update.c#1 branch .. //depot/projects/kmacy_sun4v/src/lib/libc/stdlib/strtol.3#3 integrate .. //depot/projects/kmacy_sun4v/src/lib/libc/stdlib/strtoul.3#3 integrate .. //depot/projects/kmacy_sun4v/src/lib/libc/sys/truncate.2#3 integrate .. //depot/projects/kmacy_sun4v/src/lib/libc/sys/wait.2#3 integrate .. //depot/projects/kmacy_sun4v/src/lib/libthr/thread/thr_mutex.c#4 integrate .. //depot/projects/kmacy_sun4v/src/lib/libthr/thread/thr_private.h#4 integrate .. //depot/projects/kmacy_sun4v/src/lib/libthr/thread/thr_spec.c#4 integrate .. //depot/projects/kmacy_sun4v/src/lib/libutil/Makefile#3 integrate .. //depot/projects/kmacy_sun4v/src/lib/libutil/kld.c#2 integrate .. //depot/projects/kmacy_sun4v/src/release/doc/en_US.ISO8859-1/installation/common/install.sgml#3 integrate .. //depot/projects/kmacy_sun4v/src/release/doc/en_US.ISO8859-1/installation/common/layout.sgml#3 integrate .. //depot/projects/kmacy_sun4v/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#4 integrate .. //depot/projects/kmacy_sun4v/src/release/pc98/fixit-small_crunch.conf#3 integrate .. //depot/projects/kmacy_sun4v/src/sbin/dhclient/dhclient.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sbin/fsdb/fsdb.8#3 integrate .. //depot/projects/kmacy_sun4v/src/sbin/fsdb/fsdb.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sbin/ipfw/ipfw.8#4 integrate .. //depot/projects/kmacy_sun4v/src/sbin/ipfw/ipfw2.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sbin/mount/mount.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sbin/mount_msdosfs/mount_msdosfs.c#3 integrate .. //depot/projects/kmacy_sun4v/src/share/examples/diskless/clone_root#3 integrate .. //depot/projects/kmacy_sun4v/src/share/man/man4/altq.4#4 integrate .. //depot/projects/kmacy_sun4v/src/share/man/man4/geom.4#3 integrate .. //depot/projects/kmacy_sun4v/src/share/man/man4/ktr.4#3 integrate .. //depot/projects/kmacy_sun4v/src/share/man/man4/lmc.4#4 integrate .. //depot/projects/kmacy_sun4v/src/share/man/man4/sio.4#3 integrate .. //depot/projects/kmacy_sun4v/src/share/man/man5/rc.conf.5#4 integrate .. //depot/projects/kmacy_sun4v/src/share/man/man9/Makefile#4 integrate .. //depot/projects/kmacy_sun4v/src/share/man/man9/crypto.9#4 integrate .. //depot/projects/kmacy_sun4v/src/share/man/man9/device_get_sysctl.9#1 branch .. //depot/projects/kmacy_sun4v/src/share/misc/bsd-family-tree#4 integrate .. //depot/projects/kmacy_sun4v/src/share/misc/iso3166#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/Makefile#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/amd64/amd64/busdma_machdep.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/arm/arm/busdma_machdep.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/arm/arm/elf_trampoline.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/arm/arm/pmap.c#5 integrate .. //depot/projects/kmacy_sun4v/src/sys/arm/include/cpuconf.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/arm/include/cpufunc.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/arm/include/pmap.h#5 integrate .. //depot/projects/kmacy_sun4v/src/sys/arm/sa11x0/assabet_machdep.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/arm/sa11x0/sa11x0_io.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/arm/sa11x0/sa11x0_reg.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/arm/sa11x0/sa11x0_var.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/arm/sa11x0/uart_cpu_sa1110.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/arm/sa11x0/uart_dev_sa1110.c#5 integrate .. //depot/projects/kmacy_sun4v/src/sys/arm/xscale/i80321/iq31244_machdep.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/boot/i386/libi386/biosdisk.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/cam/cam_ccb.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/cam/cam_periph.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/cam/cam_xpt.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/cam/scsi/scsi_all.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/cam/scsi/scsi_target.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/compat/linprocfs/linprocfs.c#5 integrate .. //depot/projects/kmacy_sun4v/src/sys/conf/Makefile.arm#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/conf/NOTES#6 integrate .. //depot/projects/kmacy_sun4v/src/sys/conf/kern.mk#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/conf/kmod.mk#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/acpica/acpi_hpet.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/ahb/ahb.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/ath/if_ath.c#6 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/awi/awi.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/bfe/if_bfe.c#6 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/bfe/if_bfereg.h#5 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/bktr/bktr_os.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/ciss/ciss.c#5 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/dc/dcphy.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/dc/if_dc.c#5 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/dc/if_dcreg.h#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/dcons/dcons_os.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/digi/digi.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/gem/if_gem.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/hifn/hifn7751.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/hme/if_hme.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/ic/ns16550.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/ipw/if_ipw.c#5 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/isp/isp_freebsd.c#5 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/isp/isp_freebsd.h#5 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/isp/isp_pci.c#5 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/isp/isp_tpublic.h#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/isp/ispvar.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/iwi/if_iwi.c#6 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/le/if_le_cbus.c#2 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/lmc/if_lmc.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/mpt/mpt.c#5 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/mpt/mpt.h#6 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/mpt/mpt_cam.c#5 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/mpt/mpt_cam.h#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/mpt/mpt_debug.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/mpt/mpt_pci.c#5 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/mpt/mpt_raid.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/mpt/mpt_raid.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/mpt/mpt_reg.h#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/nve/if_nve.c#6 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/ofw/ofw_console.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/pccbb/pccbb.c#5 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/pccbb/pccbb_isa.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/pccbb/pccbb_pci.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/pccbb/pccbbvar.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/pci/fixup_pci.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/pci/pcireg.h#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/ral/rt2560.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/ral/rt2661.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/re/if_re.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/safe/safe.c#5 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/sio/sio.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/sound/midi/midi.c#1 branch .. //depot/projects/kmacy_sun4v/src/sys/dev/sound/midi/midi.h#1 branch .. //depot/projects/kmacy_sun4v/src/sys/dev/sound/midi/midiq.h#1 branch .. //depot/projects/kmacy_sun4v/src/sys/dev/sound/midi/mpu401.c#1 branch .. //depot/projects/kmacy_sun4v/src/sys/dev/sound/midi/mpu401.h#1 branch .. //depot/projects/kmacy_sun4v/src/sys/dev/sound/midi/mpu_if.m#1 branch .. //depot/projects/kmacy_sun4v/src/sys/dev/sound/midi/mpufoi_if.m#1 branch .. //depot/projects/kmacy_sun4v/src/sys/dev/sound/midi/sequencer.c#1 branch .. //depot/projects/kmacy_sun4v/src/sys/dev/sound/midi/sequencer.h#1 branch .. //depot/projects/kmacy_sun4v/src/sys/dev/sound/midi/synth_if.m#1 branch .. //depot/projects/kmacy_sun4v/src/sys/dev/sound/pci/cmi.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/sound/pci/emu10k1.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/syscons/apm/apm_saver.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/syscons/syscons.c#5 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/uart/uart.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/uart/uart_dbg.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/uart/uart_dev_ns8250.c#5 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/uart/uart_tty.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/ubsec/ubsec.c#5 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/usb/ehci.c#5 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/usb/ehci_pci.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/usb/ehcivar.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/usb/if_axe.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/usb/if_axereg.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/usb/if_ural.c#5 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/usb/ohci.c#5 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/usb/ohci_pci.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/usb/ohcireg.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/usb/ohcivar.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/usb/sl811hs.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/usb/sl811hsvar.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/usb/ugen.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/usb/uhci.c#5 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/usb/uhci_pci.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/usb/uhcivar.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/usb/usb.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/usb/usb_mem.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/usb/usbdi.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/usb/usbdivar.h#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/wi/if_wi.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/zs/zs.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/doc/subsys/Dependencies#1 branch .. //depot/projects/kmacy_sun4v/src/sys/doc/subsys/Doxyfile-cam#1 branch .. //depot/projects/kmacy_sun4v/src/sys/doc/subsys/Doxyfile-crypto#1 branch .. //depot/projects/kmacy_sun4v/src/sys/doc/subsys/Doxyfile-dev_pci#1 branch .. //depot/projects/kmacy_sun4v/src/sys/doc/subsys/Doxyfile-dev_sound#1 branch .. //depot/projects/kmacy_sun4v/src/sys/doc/subsys/Doxyfile-dev_usb#1 branch .. //depot/projects/kmacy_sun4v/src/sys/doc/subsys/Doxyfile-geom#1 branch .. //depot/projects/kmacy_sun4v/src/sys/doc/subsys/Doxyfile-i4b#1 branch .. //depot/projects/kmacy_sun4v/src/sys/doc/subsys/Doxyfile-kern#1 branch .. //depot/projects/kmacy_sun4v/src/sys/doc/subsys/Doxyfile-libkern#1 branch .. //depot/projects/kmacy_sun4v/src/sys/doc/subsys/Doxyfile-linux#1 branch .. //depot/projects/kmacy_sun4v/src/sys/doc/subsys/Doxyfile-net80211#1 branch .. //depot/projects/kmacy_sun4v/src/sys/doc/subsys/Doxyfile-netgraph#1 branch .. //depot/projects/kmacy_sun4v/src/sys/doc/subsys/Doxyfile-netinet#1 branch .. //depot/projects/kmacy_sun4v/src/sys/doc/subsys/Doxyfile-netinet6#1 branch .. //depot/projects/kmacy_sun4v/src/sys/doc/subsys/Doxyfile-netipsec#1 branch .. //depot/projects/kmacy_sun4v/src/sys/doc/subsys/Doxyfile-opencrypto#1 branch .. //depot/projects/kmacy_sun4v/src/sys/doc/subsys/Doxyfile-vm#1 branch .. //depot/projects/kmacy_sun4v/src/sys/doc/subsys/Makefile#1 branch .. //depot/projects/kmacy_sun4v/src/sys/doc/subsys/README#1 branch .. //depot/projects/kmacy_sun4v/src/sys/doc/subsys/common-Doxyfile#1 branch .. //depot/projects/kmacy_sun4v/src/sys/doc/subsys/notreviewed.dox#1 branch .. //depot/projects/kmacy_sun4v/src/sys/fs/msdosfs/msdosfs_vfsops.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/fs/ntfs/ntfs_vfsops.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/fs/nullfs/null_vfsops.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/fs/nwfs/nwfs_io.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/fs/procfs/procfs.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/fs/smbfs/smbfs_io.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/fs/smbfs/smbfs_vnops.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/fs/udf/udf_vfsops.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/gdb/gdb.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/gdb/gdb_cons.c#2 integrate .. //depot/projects/kmacy_sun4v/src/sys/gdb/gdb_main.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/gdb/gdb_packet.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/geom/geom_bsd.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/geom/geom_gpt.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/gnu/fs/xfs/FreeBSD/xfs_frw.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/gnu/fs/xfs/FreeBSD/xfs_fs_subr.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/gnu/fs/xfs/FreeBSD/xfs_iget.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/gnu/fs/xfs/FreeBSD/xfs_ioctl.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/gnu/fs/xfs/xfs_attr.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/gnu/fs/xfs/xfs_bit.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/gnu/fs/xfs/xfs_dfrag.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/gnu/fs/xfs/xfs_dir2_trace.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/gnu/fs/xfs/xfs_inode.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/gnu/fs/xfs/xfs_iomap.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/gnu/fs/xfs/xfs_trans.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/gnu/fs/xfs/xfs_vfsops.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/gnu/fs/xfs/xfs_vnodeops.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/i386/bios/apm.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/i386/bios/apm.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/i386/i386/busdma_machdep.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/i386/i386/initcpu.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/i386/i386/machdep.c#5 integrate .. //depot/projects/kmacy_sun4v/src/sys/i386/i386/ptrace_machdep.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/i386/i386/vm_machdep.c#5 integrate .. //depot/projects/kmacy_sun4v/src/sys/i386/include/md_var.h#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/i386/include/npx.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/i386/isa/npx.c#6 integrate .. //depot/projects/kmacy_sun4v/src/sys/ia64/conf/NOTES#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/ia64/ia64/busdma_machdep.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/ia64/ia64/ssc.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/isofs/cd9660/cd9660_vfsops.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_event.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_exec.c#5 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_exit.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_linker.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_mutex.c#6 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_switch.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_synch.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/subr_disk.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/subr_stack.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/subr_taskqueue.c#5 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/tty_cons.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/uipc_syscalls.c#5 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/vfs_aio.c#5 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/vfs_mount.c#5 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/vfs_subr.c#6 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/vnode_if.src#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/modules/Makefile#6 integrate .. //depot/projects/kmacy_sun4v/src/sys/modules/acpi/acpi/Makefile#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/modules/acpi/acpi_asus/Makefile#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/modules/acpi/acpi_panasonic/Makefile#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/modules/acpi/acpi_toshiba/Makefile#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/modules/acpi/acpi_video/Makefile#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/modules/cpufreq/Makefile#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/modules/fdc/Makefile#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/modules/geom/geom_eli/Makefile#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/modules/mfi/Makefile#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/modules/sound/driver/cmi/Makefile#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/modules/sound/driver/emu10k1/Makefile#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/modules/sound/sound/Makefile#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/net/bpf.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/net/bpf.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/net/bpf_filter.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/net/bpfdesc.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/net/if.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/net/if_disc.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/net/if_faith.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/net/if_fwsubr.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/net/if_gif.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/net/if_gre.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/net/if_loop.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/net/if_media.h#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/net/if_sl.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/net/if_stf.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/net/if_tap.c#5 integrate .. //depot/projects/kmacy_sun4v/src/sys/net/if_tun.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/net/raw_cb.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/net/raw_usrreq.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/net80211/ieee80211_input.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/net80211/ieee80211_node.c#5 integrate .. //depot/projects/kmacy_sun4v/src/sys/netgraph/atm/uni/ng_uni_cust.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/netgraph/ng_base.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/netgraph/ng_iface.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/netinet/in_pcb.c#5 integrate .. //depot/projects/kmacy_sun4v/src/sys/netinet/ip_carp.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/netinet/ip_fw.h#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/netinet/ip_fw2.c#5 integrate .. //depot/projects/kmacy_sun4v/src/sys/netinet/ip_gre.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/netinet/ip_output.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/netinet/raw_ip.c#6 integrate .. //depot/projects/kmacy_sun4v/src/sys/netinet/tcp_timer.c#6 integrate .. //depot/projects/kmacy_sun4v/src/sys/netinet/tcp_usrreq.c#5 integrate .. //depot/projects/kmacy_sun4v/src/sys/netinet/udp_usrreq.c#5 integrate .. //depot/projects/kmacy_sun4v/src/sys/netinet6/in6_src.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/netipsec/ipsec.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/netipsec/ipsec_input.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/nfs4client/nfs4_vfsops.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/nfs4client/nfs4_vnops.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/nfsclient/nfs.h#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/nfsclient/nfs_bio.c#5 integrate .. //depot/projects/kmacy_sun4v/src/sys/nfsclient/nfs_nfsiod.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/nfsclient/nfs_node.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/nfsclient/nfs_socket.c#6 integrate .. //depot/projects/kmacy_sun4v/src/sys/nfsclient/nfs_vfsops.c#5 integrate .. //depot/projects/kmacy_sun4v/src/sys/nfsclient/nfsmount.h#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/opencrypto/criov.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/opencrypto/crypto.c#6 integrate .. //depot/projects/kmacy_sun4v/src/sys/opencrypto/cryptodev.c#5 integrate .. //depot/projects/kmacy_sun4v/src/sys/opencrypto/cryptodev.h#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/opencrypto/cryptosoft.c#5 integrate .. //depot/projects/kmacy_sun4v/src/sys/opencrypto/xform.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/pc98/cbus/sio.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/pci/agp_amd64.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/pci/agp_sis.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/pci/if_rlreg.h#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/posix4/p1003_1b.c#5 integrate .. //depot/projects/kmacy_sun4v/src/sys/security/audit/audit_bsm_klib.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/sparc64/include/pmap.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/sparc64/sparc64/pmap.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/sys/cons.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/sys/elf_common.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/sys/kernel.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/sys/mutex.h#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/sys/queue.h#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/tools/vnode_if.awk#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/ufs/ffs/ffs_vfsops.c#7 integrate .. //depot/projects/kmacy_sun4v/src/sys/ufs/ufs/dinode.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/ufs/ufs/ufs_vnops.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/vm/uma_core.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/vm/vm_extern.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/vm/vm_glue.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/vm/vm_map.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/vm/vm_map.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/vm/vm_meter.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/vm/vm_page.c#5 integrate .. //depot/projects/kmacy_sun4v/src/tools/debugscripts/dot.gdbinit#3 integrate .. //depot/projects/kmacy_sun4v/src/tools/regression/execve/Makefile#1 branch .. //depot/projects/kmacy_sun4v/src/tools/regression/execve/doexec.c#1 branch .. //depot/projects/kmacy_sun4v/src/tools/regression/execve/execve.t#1 branch .. //depot/projects/kmacy_sun4v/src/tools/regression/execve/tests/badinterplen#1 branch .. //depot/projects/kmacy_sun4v/src/tools/regression/execve/tests/devnullscript#1 branch .. //depot/projects/kmacy_sun4v/src/tools/regression/execve/tests/goodaout.c#1 branch .. //depot/projects/kmacy_sun4v/src/tools/regression/execve/tests/goodscript#1 branch .. //depot/projects/kmacy_sun4v/src/tools/regression/execve/tests/nonexistshell#1 branch .. //depot/projects/kmacy_sun4v/src/tools/regression/execve/tests/scriptarg#1 branch .. //depot/projects/kmacy_sun4v/src/tools/regression/execve/tests/scriptarg-nospace#1 branch .. //depot/projects/kmacy_sun4v/src/tools/regression/fifo/fifo_misc/fifo_misc.c#3 integrate .. //depot/projects/kmacy_sun4v/src/tools/regression/ipsec/ipsec.t#1 branch .. //depot/projects/kmacy_sun4v/src/tools/regression/netinet/rawconnect/rawconnect.t#1 branch .. //depot/projects/kmacy_sun4v/src/tools/regression/sockets/sendfile/Makefile#1 branch .. //depot/projects/kmacy_sun4v/src/tools/regression/sockets/sendfile/sendfile.c#1 branch .. //depot/projects/kmacy_sun4v/src/tools/regression/sockets/socketpair/Makefile#3 integrate .. //depot/projects/kmacy_sun4v/src/tools/regression/sockets/unix_cmsg/Makefile#1 branch .. //depot/projects/kmacy_sun4v/src/tools/regression/sockets/unix_cmsg/README#1 branch .. //depot/projects/kmacy_sun4v/src/tools/regression/sockets/unix_cmsg/unix_cmsg.c#1 branch .. //depot/projects/kmacy_sun4v/src/tools/regression/sockets/unix_cmsg/unix_cmsg.t#1 branch .. //depot/projects/kmacy_sun4v/src/tools/tools/README#3 integrate .. //depot/projects/kmacy_sun4v/src/tools/tools/crypto/cryptotest.c#3 integrate .. //depot/projects/kmacy_sun4v/src/tools/tools/recoverdisk/Makefile#4 integrate .. //depot/projects/kmacy_sun4v/src/tools/tools/recoverdisk/recoverdisk.c#4 integrate .. //depot/projects/kmacy_sun4v/src/tools/tools/tinderbox/.cvsignore#2 delete .. //depot/projects/kmacy_sun4v/src/tools/tools/tinderbox/Makefile#3 delete .. //depot/projects/kmacy_sun4v/src/tools/tools/tinderbox/etc/Makefile#3 delete .. //depot/projects/kmacy_sun4v/src/tools/tools/tinderbox/etc/default.rc#3 delete .. //depot/projects/kmacy_sun4v/src/tools/tools/tinderbox/etc/head.rc#4 delete .. //depot/projects/kmacy_sun4v/src/tools/tools/tinderbox/etc/releng_4.rc#3 delete .. //depot/projects/kmacy_sun4v/src/tools/tools/tinderbox/etc/releng_5.rc#3 delete .. //depot/projects/kmacy_sun4v/src/tools/tools/tinderbox/etc/releng_6.rc#4 delete .. //depot/projects/kmacy_sun4v/src/tools/tools/tinderbox/etc/update_head.rc#4 delete .. //depot/projects/kmacy_sun4v/src/tools/tools/tinderbox/etc/update_releng_4.rc#3 delete .. //depot/projects/kmacy_sun4v/src/tools/tools/tinderbox/etc/update_releng_5.rc#3 delete .. //depot/projects/kmacy_sun4v/src/tools/tools/tinderbox/etc/update_releng_6.rc#4 delete .. //depot/projects/kmacy_sun4v/src/tools/tools/tinderbox/powerpc.diff#3 delete .. //depot/projects/kmacy_sun4v/src/tools/tools/tinderbox/tbmaster.1#4 delete .. //depot/projects/kmacy_sun4v/src/tools/tools/tinderbox/tbmaster.pl#4 delete .. //depot/projects/kmacy_sun4v/src/tools/tools/tinderbox/tinderbox.1#4 delete .. //depot/projects/kmacy_sun4v/src/tools/tools/tinderbox/tinderbox.pl#4 delete .. //depot/projects/kmacy_sun4v/src/tools/tools/tinderbox/www/.cvsignore#2 delete .. //depot/projects/kmacy_sun4v/src/tools/tools/tinderbox/www/Makefile#3 delete .. //depot/projects/kmacy_sun4v/src/tools/tools/tinderbox/www/daemon.png.uu#3 delete .. //depot/projects/kmacy_sun4v/src/tools/tools/tinderbox/www/index.cgi#4 delete .. //depot/projects/kmacy_sun4v/src/tools/tools/tinderbox/www/tb.css#3 delete .. //depot/projects/kmacy_sun4v/src/tools/tools/tinderbox/www/valid-css.png.uu#3 delete .. //depot/projects/kmacy_sun4v/src/tools/tools/tinderbox/www/valid-xhtml10.png.uu#3 delete .. //depot/projects/kmacy_sun4v/src/usr.bin/calendar/day.c#3 integrate .. //depot/projects/kmacy_sun4v/src/usr.bin/file/magic.5#3 integrate .. //depot/projects/kmacy_sun4v/src/usr.bin/find/find.1#4 integrate .. //depot/projects/kmacy_sun4v/src/usr.bin/find/function.c#4 integrate .. //depot/projects/kmacy_sun4v/src/usr.bin/id/id.c#3 integrate .. //depot/projects/kmacy_sun4v/src/usr.bin/sed/process.c#3 integrate .. //depot/projects/kmacy_sun4v/src/usr.bin/systat/systat.1#4 integrate .. //depot/projects/kmacy_sun4v/src/usr.bin/vmstat/vmstat.c#3 integrate .. //depot/projects/kmacy_sun4v/src/usr.sbin/bluetooth/hccontrol/hccontrol.8#3 integrate .. //depot/projects/kmacy_sun4v/src/usr.sbin/bluetooth/hccontrol/hccontrol.c#3 integrate .. //depot/projects/kmacy_sun4v/src/usr.sbin/bluetooth/hccontrol/hccontrol.h#3 integrate .. //depot/projects/kmacy_sun4v/src/usr.sbin/bluetooth/hccontrol/node.c#3 integrate .. //depot/projects/kmacy_sun4v/src/usr.sbin/cron/cron/do_command.c#3 integrate .. //depot/projects/kmacy_sun4v/src/usr.sbin/cron/cron/popen.c#3 integrate .. //depot/projects/kmacy_sun4v/src/usr.sbin/gstat/Makefile#3 integrate .. //depot/projects/kmacy_sun4v/src/usr.sbin/gstat/gstat.8#3 integrate .. //depot/projects/kmacy_sun4v/src/usr.sbin/gstat/gstat.c#3 integrate .. //depot/projects/kmacy_sun4v/src/usr.sbin/ipfwpcap/Makefile#3 integrate .. //depot/projects/kmacy_sun4v/src/usr.sbin/ipfwpcap/ipfwpcap.8#1 branch .. //depot/projects/kmacy_sun4v/src/usr.sbin/jail/jail.8#4 integrate .. //depot/projects/kmacy_sun4v/src/usr.sbin/mountd/Makefile#3 integrate .. //depot/projects/kmacy_sun4v/src/usr.sbin/mountd/mountd.c#3 integrate .. //depot/projects/kmacy_sun4v/src/usr.sbin/ngctl/config.c#3 integrate .. //depot/projects/kmacy_sun4v/src/usr.sbin/ngctl/connect.c#3 integrate .. //depot/projects/kmacy_sun4v/src/usr.sbin/ngctl/debug.c#3 integrate .. //depot/projects/kmacy_sun4v/src/usr.sbin/ngctl/dot.c#3 integrate .. //depot/projects/kmacy_sun4v/src/usr.sbin/ngctl/list.c#3 integrate .. //depot/projects/kmacy_sun4v/src/usr.sbin/ngctl/main.c#3 integrate .. //depot/projects/kmacy_sun4v/src/usr.sbin/ngctl/mkpeer.c#3 integrate .. //depot/projects/kmacy_sun4v/src/usr.sbin/ngctl/msg.c#3 integrate .. //depot/projects/kmacy_sun4v/src/usr.sbin/ngctl/name.c#3 integrate .. //depot/projects/kmacy_sun4v/src/usr.sbin/ngctl/ngctl.h#3 integrate .. //depot/projects/kmacy_sun4v/src/usr.sbin/ngctl/rmhook.c#3 integrate .. //depot/projects/kmacy_sun4v/src/usr.sbin/ngctl/show.c#3 integrate .. //depot/projects/kmacy_sun4v/src/usr.sbin/ngctl/shutdown.c#3 integrate .. //depot/projects/kmacy_sun4v/src/usr.sbin/ngctl/status.c#3 integrate .. //depot/projects/kmacy_sun4v/src/usr.sbin/ngctl/types.c#3 integrate .. //depot/projects/kmacy_sun4v/src/usr.sbin/ngctl/write.c#3 integrate .. //depot/projects/kmacy_sun4v/src/usr.sbin/ntp/doc/ntp.conf.5#4 integrate .. //depot/projects/kmacy_sun4v/src/usr.sbin/portsnap/portsnap/portsnap.sh#4 integrate .. //depot/projects/kmacy_sun4v/src/usr.sbin/rpc.lockd/kern.c#3 integrate .. //depot/projects/kmacy_sun4v/src/usr.sbin/sysinstall/dist.c#4 integrate .. //depot/projects/kmacy_sun4v/src/usr.sbin/sysinstall/installUpgrade.c#4 integrate .. //depot/projects/kmacy_sun4v/src/usr.sbin/wpa/hostapd/driver_freebsd.c#4 integrate .. //depot/projects/kmacy_sun4v/src/usr.sbin/ypserv/yp_access.c#3 integrate Differences ... ==== //depot/projects/kmacy_sun4v/src/MAINTAINERS#4 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.131 2006/05/05 20:12:30 rodrigc Exp $ +$FreeBSD: src/MAINTAINERS,v 1.135 2006/06/03 01:52:11 scottl Exp $ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements @@ -20,6 +20,7 @@ subsystem login notes ----------------------------- +kqueue jmg Pre-commit review requested. mergemaster dougb Prefers to pre-approve commits libc/posix1e rwatson Pre-commit review requested. POSIX.1e ACLs rwatson Pre-commit review requested. @@ -41,15 +42,8 @@ cdboot jhb Pre-commit review requested. pxeboot jhb Pre-commit review requested. witness jhb Pre-commit review requested. -twe vkashyap Pre-commit review requested -twa vkashyap Pre-commit review requested -aac scottl Pre-commit review requested -udf scottl Pre-commit review requested. -ips scottl Pre-commit review requested. -iir scottl Pre-commit review requested. -mlx scottl Pre-commit review requested. -mly scottl Pre-commit review requested. -maestro3 scottl Pre-commit review requested. +twe aradford@amcc.com Pre-commit review requested +twa aradford@amcc.com Pre-commit review requested CAM gibbs, ken Pre-commit review requested. send to scsi@freebsd.org devstat(9) ken Pre-commit review requested. ==== //depot/projects/kmacy_sun4v/src/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.329 2006/05/11 18:54:16 jhb Exp $ +# $FreeBSD: src/Makefile,v 1.330 2006/05/26 18:10:06 netchild Exp $ # # The user-driven targets are: # @@ -15,6 +15,7 @@ # reinstallkernel - Reinstall the kernel and the kernel-modules. # reinstallkernel.debug # kernel - buildkernel + installkernel. +# doxygen - Build API documentation of the kernel, needs doxygen. # update - Convenient way to update your source tree (cvs). # check-old - Print a list of old files/directories in the system. # delete-old - Delete obsolete files and directories interactively. @@ -69,10 +70,10 @@ # TGTS= all all-man buildenv buildkernel buildworld check-old checkdpadd \ clean cleandepend cleandir delete-old delete-old-libs depend \ - distribute distributeworld distrib-dirs distribution everything \ - hierarchy install installcheck installkernel installkernel.debug\ - reinstallkernel reinstallkernel.debug installworld \ - kernel-toolchain libraries lint maninstall \ + distribute distributeworld distrib-dirs distribution doxygen \ + everything hierarchy install installcheck installkernel \ + installkernel.debug reinstallkernel reinstallkernel.debug \ + installworld kernel-toolchain libraries lint maninstall \ obj objlink regress rerelease showconfig tags toolchain update \ _worldtmp _legacy _bootstrap-tools _cleanobj _obj \ _build-tools _cross-tools _includes _libraries _depend \ ==== //depot/projects/kmacy_sun4v/src/Makefile.inc1#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.546 2006/05/17 09:33:05 phk Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.547 2006/05/26 18:10:06 netchild Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -17,6 +17,7 @@ # The intended user-driven targets are: # buildworld - rebuild *everything*, including glue to help do upgrades # installworld- install everything built by "buildworld" +# doxygen - build API documentation of the kernel # update - convenient way to update your source tree (eg: cvsup/cvs) # # Standard targets (not defined here) are documented in the makefiles in @@ -711,6 +712,18 @@ ${MAKE} KERNEL=${INSTKERNNAME} ${.TARGET:S/kernel//} # +# doxygen +# +# Build the API documentation with doxygen +# +doxygen: + @if [ ! -x `/usr/bin/which doxygen` ]; then \ + echo "You need doxygen (devel/doxygen) to generate the API documentation of the kernel." | /usr/bin/fmt; \ + exit 1; \ + fi + cd ${.CURDIR}/sys/doc/subsys && ${MAKE} obj all + +# # update # # Update the source tree, by running cvsup and/or running cvs to update to the ==== //depot/projects/kmacy_sun4v/src/contrib/bsnmp/NEWS#4 (text+ko) ==== @@ -1,3 +1,7 @@ +1.12a + Support for ENUM and BITS in gensnmp{tree,def}. Include directives + and typedefs. + 1.12 A couple of man page fixes from various submitters. ==== //depot/projects/kmacy_sun4v/src/contrib/bsnmp/gensnmpdef/gensnmpdef.1#3 (text+ko) ==== @@ -1,5 +1,5 @@ .\" -.\" Copyright (C) 2004-2005 +.\" Copyright (C) 2004-2006 .\" 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.5 2005/10/04 08:46:46 brandt_h Exp $ +.\" $Begemot: gensnmpdef.1 383 2006-05-30 07:40:49Z brandt_h $ .\" -.Dd June 14, 2005 +.Dd May 28, 2006 .Dt GENSNMPDEF 1 .Os .Sh NAME @@ -36,7 +36,7 @@ .Nd "generate a MIB description file from MIBs" .Sh SYNOPSIS .Nm -.Op Fl h +.Op Fl hEe .Op Fl c Ar cut .Ar name Op Ar ... .Sh DESCRIPTION @@ -48,13 +48,28 @@ for feeding it into .Xr gensnmptree 1 . .Pp -The -.Fl c -option specifies the number of initial sub-oids that should be omitted -from the tree. +The following options are available: +.Bl -tag -width indent +.It Fl c Ar cut +Specify the number of initial sub-oids that should be omitted +from the tree in the output. .Xr gensnmptree 1 automatically adds 1.3.6 in front of all OIDs so the default value of 3 is just correct in most cases. +.It Fl E +Generate typedefs for named enumerations. +These are enumerations defined via the TEXTUAL-CONVENTION macro. +The normal tree output is suppressed. +.It Fl e +Generate typedefs for unnamed enumerations. +These are enumerations defined in the SYNTAX clause of an OBJECT-TYPE macro. +The name of the enumeration is formed by appending the string +.Ql Type +to the name of the object. +The normal tree output is suppressed. +.It Fl h +Print a short help text and exit. +.El .Pp .Nm does no attempt on sorting the OID tree so in case of complex and ==== //depot/projects/kmacy_sun4v/src/contrib/bsnmp/gensnmpdef/gensnmpdef.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004 + * Copyright (C) 2004-2006 * Hartmut Brandt. * All rights reserved. * @@ -26,8 +26,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: bsnmp/gensnmpdef/gensnmpdef.c,v 1.3 2004/08/06 08:46:45 brandt Exp $ + * $Begemot: gensnmpdef.c 383 2006-05-30 07:40:49Z brandt_h $ */ +#include + #include #include #include @@ -38,9 +40,13 @@ #include static const char usgtxt[] = -"Usage: gensnmpdef [-h] [-c ] MIB [MIB ...]\n" +"Usage: gensnmpdef [-hEe] [-c ] MIB [MIB ...]\n" "Options:\n" " -c specify the number of initial sub-oids to cut from the oids\n" +" -E extract named enum types. Print a typedef for all enums defined\n" +" in syntax clauses of normal objects. Suppress normal output.\n" +" -e extract unnamed enum types. Print a typedef for all enums defined\n" +" as textual conventions. Suppress normal output.\n" " -h print this help\n" "MIBs are searched according to the libsmi(3) search rules and can\n" "be specified either by path or module name\n"; @@ -48,6 +54,14 @@ static SmiNode *last_node; static u_int cut = 3; +struct tdef { + char *name; + SLIST_ENTRY(tdef) link; +}; + +static SLIST_HEAD(, tdef) tdefs = SLIST_HEAD_INITIALIZER(tdef); +static int do_typedef = 0; + static void print_node(SmiNode *n, u_int level); static void @@ -135,7 +149,7 @@ [SMI_BASETYPE_FLOAT32] = "FLOAT32", [SMI_BASETYPE_FLOAT64] = "FLOAT64", [SMI_BASETYPE_FLOAT128] = "FLOAT128", - [SMI_BASETYPE_ENUM] = "INTEGER", + [SMI_BASETYPE_ENUM] = "ENUM", [SMI_BASETYPE_BITS] = "BITS", }; @@ -152,6 +166,18 @@ }; static void +print_enum(SmiType *t) +{ + SmiNamedNumber *nnum; + + printf(" ("); + for (nnum = smiGetFirstNamedNumber(t); nnum != NULL; + nnum = smiGetNextNamedNumber(nnum)) + printf(" %ld %s", nnum->value.value.integer32, nnum->name); + printf(" )"); +} + +static void print_type(SmiNode *n) { SmiType *type; @@ -168,6 +194,14 @@ } } printf("%s", type_names[type->basetype]); + + if (type->basetype == SMI_BASETYPE_ENUM || + type->basetype == SMI_BASETYPE_BITS) + print_enum(type); + + else if (type->basetype == SMI_BASETYPE_OCTETSTRING && + type->name != NULL) + printf(" | %s", type->name); } static void @@ -359,6 +393,111 @@ printf(")\n"); } +static void +save_typdef(char *name) +{ + struct tdef *t; + t = malloc(sizeof(struct tdef)); + + if (t == NULL) + err(1, NULL); + + memset(t, 0 , sizeof(struct tdef)); + t->name = name; + SLIST_INSERT_HEAD(&tdefs, t, link); +} + +static void +tdefs_cleanup(void) +{ + struct tdef *t; + + while ((t = SLIST_FIRST(&tdefs)) != NULL) { + SLIST_REMOVE_HEAD(&tdefs, link); + free(t); + } +} + +static void +print_enum_typedef(SmiType *t) +{ + SmiNamedNumber *nnum; + + for (nnum = smiGetFirstNamedNumber(t); nnum != NULL; + nnum = smiGetNextNamedNumber(nnum)) { + printf("\t%ld %s\n" , nnum->value.value.integer32, nnum->name); + } +} + +static void +print_stype(SmiNode *n) +{ + SmiType *type; + struct tdef *t = NULL; + + type = smiGetNodeType(n); + assert(type != NULL); + + if (type->basetype == SMI_BASETYPE_ENUM) { + if (do_typedef == 'e' && type->name != NULL) { + SLIST_FOREACH(t, &tdefs, link) { + if (strcmp(t->name, type->name) == 0) + return; + } + save_typdef(type->name); + printf("typedef %s ENUM (\n", type->name); + } else if (do_typedef == 'E' && type->name == NULL) + printf("typedef %sType ENUM (\n", n->name); + else + return; + + print_enum_typedef(type); + printf(")\n\n"); + + } else if (type->basetype == SMI_BASETYPE_BITS) { + if (do_typedef == 'e' && type->name != NULL) { + SLIST_FOREACH(t, &tdefs, link) { + if (strcmp(t->name, type->name) == 0) + return; + } + save_typdef(type->name); + printf("typedef %s BITS (\n", type->name); + } else if (do_typedef == 'E' && type->name == NULL) + printf("typedef %sType BITS (\n", n->name); + else + return; + + print_enum_typedef(type); + printf(")\n\n"); + } +} + +static void +print_typdefs(SmiNode *n) +{ + SmiNode *p; + + p = n; + n = smiGetFirstChildNode(n); + while (n != NULL) { + switch (n->nodekind) { + case SMI_NODEKIND_SCALAR: + case SMI_NODEKIND_COLUMN: + print_stype(n); + break; + case SMI_NODEKIND_COMPLIANCE: + case SMI_NODEKIND_GROUP: + save_node(n); + return; + default: + break; + } + n = smiGetNextChildNode(n); + } + + save_node(p); +} + int main(int argc, char *argv[]) { @@ -373,7 +512,7 @@ smiInit(NULL); - while ((opt = getopt(argc, argv, "c:h")) != -1) + while ((opt = getopt(argc, argv, "c:Eeh")) != -1) switch (opt) { case 'c': @@ -388,6 +527,14 @@ cut = (u_int)u; break; + case 'E': + do_typedef = 'E'; + break; + + case 'e': + do_typedef = 'e'; + break; + case 'h': fprintf(stderr, usgtxt); exit(0); @@ -414,9 +561,12 @@ for (opt = 0; opt < argc; opt++) { n = smiGetFirstNode(mods[opt], SMI_NODEKIND_ANY); for (;;) { - level = open_node(n, level, &last); - print_it(n, level); - last = n; + if (do_typedef == 0) { + level = open_node(n, level, &last); + print_it(n, level); + last = n; + } else + print_typdefs(n); if (last_node == NULL || (n = smiGetNextNode(last_node, SMI_NODEKIND_ANY)) @@ -424,6 +574,10 @@ break; } } - level = close_node(last->oidlen - 1, level - 1); + if (last != NULL && do_typedef == 0) + level = close_node(last->oidlen - 1, level - 1); + else if (do_typedef != 0) + tdefs_cleanup(); + return (0); } ==== //depot/projects/kmacy_sun4v/src/contrib/bsnmp/gensnmptree/gensnmptree.1#4 (text+ko) ==== @@ -2,6 +2,9 @@ .\" Copyright (c) 2001-2005 .\" Fraunhofer Institute for Open Communication Systems (FhG Fokus). .\" All rights reserved. +.\" Copyright (c) 2006 +.\" Hartmut Brandt +.\" All rights reserved. .\" .\" Author: Harti Brandt .\" @@ -26,9 +29,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Begemot: bsnmp/gensnmptree/gensnmptree.1,v 1.7 2006/02/27 09:52:08 brandt_h Exp $ +.\" $Begemot: gensnmptree.1 383 2006-05-30 07:40:49Z brandt_h $ .\" -.Dd February 27, 2006 +.Dd May 26, 2006 .Dt GENSNMPTREE 1 .Os .Sh NAME @@ -36,7 +39,9 @@ .Nd "generate C and header files from a MIB description file" .Sh SYNOPSIS .Nm -.Op Fl helt +.Op Fl dEehlt +.Op Fl I Ar directory +.Op Fl i Ar infile .Op Fl p Ar prefix .Op Ar name Ar ... .Sh DESCRIPTION @@ -49,9 +54,12 @@ daemon or for module writers. The second form may be used by SNMP client program writers. .Pp -If the -.Fl e -option is not used +If none of the options +.Fl e , +.Fl E +or +.FL t +are used .Nm reads a MIB description from its standard input and creates two files: a C-file @@ -61,12 +69,20 @@ during PDU processing and a header file .Ar prefix Ns tree.h -containing appropriate declarations of the callback functions used in this table -and the table itself. +containing appropriate declarations of the callback functions used in this +table, the table itself and definitions for all enums. .Pp -If the -.Fl e -option is specified +The following options are available: +.Bl -tag -width ".Fl E" +.It Fl d +Switch on debugging. +.It Fl E +Extract enumerations and bit constructs. +In this mode the tool emits +a header file that contains for each type given on the command line a +C-enum definition and a preprocessor define that may be used to map +values to strings. +.It Fl e .Nm expects MIB variable names (only the last component) on its command line. It reads a MIB specification from standard input and for each MIB variable @@ -83,13 +99,13 @@ .It Va OID_ Ns Ar name is the last component of the OID. .El -.Pp >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jun 5 03:04:24 2006 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 BD54B16A583; Mon, 5 Jun 2006 03:04:24 +0000 (UTC) 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 7B6DA16A580 for ; Mon, 5 Jun 2006 03:04:24 +0000 (UTC) (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 65AA843D5C for ; Mon, 5 Jun 2006 03:04:23 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5532fUq001253 for ; Mon, 5 Jun 2006 03:02:41 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5532fxG001238 for perforce@freebsd.org; Mon, 5 Jun 2006 03:02:41 GMT (envelope-from peter@freebsd.org) Date: Mon, 5 Jun 2006 03:02:41 GMT Message-Id: <200606050302.k5532fxG001238@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 98516 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, 05 Jun 2006 03:04:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=98516 Change 98516 by peter@peter_daintree on 2006/06/05 03:01:02 EXPERIMENTAL work area for putting the scheduler system on a diet. This is to find out if it is worth it. Affected files ... .. //depot/projects/bike_sched/sys/Makefile#1 branch .. //depot/projects/bike_sched/sys/amd64/Makefile#1 branch .. //depot/projects/bike_sched/sys/amd64/acpica/OsdEnvironment.c#1 branch .. //depot/projects/bike_sched/sys/amd64/acpica/acpi_machdep.c#1 branch .. //depot/projects/bike_sched/sys/amd64/acpica/acpi_wakeup.c#1 branch .. //depot/projects/bike_sched/sys/amd64/acpica/madt.c#1 branch .. //depot/projects/bike_sched/sys/amd64/amd64/amd64_mem.c#1 branch .. //depot/projects/bike_sched/sys/amd64/amd64/apic_vector.S#1 branch .. //depot/projects/bike_sched/sys/amd64/amd64/atomic.c#1 branch .. //depot/projects/bike_sched/sys/amd64/amd64/autoconf.c#1 branch .. //depot/projects/bike_sched/sys/amd64/amd64/bios.c#1 branch .. //depot/projects/bike_sched/sys/amd64/amd64/bpf_jit_machdep.c#1 branch .. //depot/projects/bike_sched/sys/amd64/amd64/bpf_jit_machdep.h#1 branch .. //depot/projects/bike_sched/sys/amd64/amd64/busdma_machdep.c#1 branch .. //depot/projects/bike_sched/sys/amd64/amd64/cpu_switch.S#1 branch .. //depot/projects/bike_sched/sys/amd64/amd64/db_disasm.c#1 branch .. //depot/projects/bike_sched/sys/amd64/amd64/db_interface.c#1 branch .. //depot/projects/bike_sched/sys/amd64/amd64/db_trace.c#1 branch .. //depot/projects/bike_sched/sys/amd64/amd64/dump_machdep.c#1 branch .. //depot/projects/bike_sched/sys/amd64/amd64/elf_machdep.c#1 branch .. //depot/projects/bike_sched/sys/amd64/amd64/exception.S#1 branch .. //depot/projects/bike_sched/sys/amd64/amd64/fpu.c#1 branch .. //depot/projects/bike_sched/sys/amd64/amd64/gdb_machdep.c#1 branch .. //depot/projects/bike_sched/sys/amd64/amd64/genassym.c#1 branch .. //depot/projects/bike_sched/sys/amd64/amd64/identcpu.c#1 branch .. //depot/projects/bike_sched/sys/amd64/amd64/in_cksum.c#1 branch .. //depot/projects/bike_sched/sys/amd64/amd64/initcpu.c#1 branch .. //depot/projects/bike_sched/sys/amd64/amd64/intr_machdep.c#1 branch .. //depot/projects/bike_sched/sys/amd64/amd64/io.c#1 branch .. //depot/projects/bike_sched/sys/amd64/amd64/io_apic.c#1 branch .. //depot/projects/bike_sched/sys/amd64/amd64/legacy.c#1 branch .. //depot/projects/bike_sched/sys/amd64/amd64/local_apic.c#1 branch .. //depot/projects/bike_sched/sys/amd64/amd64/locore.S#1 branch .. //depot/projects/bike_sched/sys/amd64/amd64/machdep.c#1 branch .. //depot/projects/bike_sched/sys/amd64/amd64/mem.c#1 branch .. //depot/projects/bike_sched/sys/amd64/amd64/minidump_machdep.c#1 branch .. //depot/projects/bike_sched/sys/amd64/amd64/mp_machdep.c#1 branch .. //depot/projects/bike_sched/sys/amd64/amd64/mp_watchdog.c#1 branch .. //depot/projects/bike_sched/sys/amd64/amd64/mpboot.S#1 branch .. //depot/projects/bike_sched/sys/amd64/amd64/mptable.c#1 branch .. //depot/projects/bike_sched/sys/amd64/amd64/mptable_pci.c#1 branch .. //depot/projects/bike_sched/sys/amd64/amd64/nexus.c#1 branch .. //depot/projects/bike_sched/sys/amd64/amd64/pmap.c#1 branch .. //depot/projects/bike_sched/sys/amd64/amd64/prof_machdep.c#1 branch .. //depot/projects/bike_sched/sys/amd64/amd64/sigtramp.S#1 branch .. //depot/projects/bike_sched/sys/amd64/amd64/support.S#1 branch .. //depot/projects/bike_sched/sys/amd64/amd64/sys_machdep.c#1 branch .. //depot/projects/bike_sched/sys/amd64/amd64/trap.c#1 branch .. //depot/projects/bike_sched/sys/amd64/amd64/tsc.c#1 branch .. //depot/projects/bike_sched/sys/amd64/amd64/uio_machdep.c#1 branch .. //depot/projects/bike_sched/sys/amd64/amd64/uma_machdep.c#1 branch .. //depot/projects/bike_sched/sys/amd64/amd64/vm_machdep.c#1 branch .. //depot/projects/bike_sched/sys/amd64/compile/.cvsignore#1 branch .. //depot/projects/bike_sched/sys/amd64/conf/.cvsignore#1 branch .. //depot/projects/bike_sched/sys/amd64/conf/DEFAULTS#1 branch .. //depot/projects/bike_sched/sys/amd64/conf/GENERIC#1 branch .. //depot/projects/bike_sched/sys/amd64/conf/GENERIC.hints#1 branch .. //depot/projects/bike_sched/sys/amd64/conf/MAC#1 branch .. //depot/projects/bike_sched/sys/amd64/conf/Makefile#1 branch .. //depot/projects/bike_sched/sys/amd64/conf/NOTES#1 branch .. //depot/projects/bike_sched/sys/amd64/ia32/ia32_exception.S#1 branch .. //depot/projects/bike_sched/sys/amd64/ia32/ia32_reg.c#1 branch .. //depot/projects/bike_sched/sys/amd64/ia32/ia32_signal.c#1 branch .. //depot/projects/bike_sched/sys/amd64/ia32/ia32_sigtramp.S#1 branch .. //depot/projects/bike_sched/sys/amd64/ia32/ia32_syscall.c#1 branch .. //depot/projects/bike_sched/sys/amd64/include/_bus.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/_inttypes.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/_limits.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/_stdint.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/_types.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/acpica_machdep.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/apicreg.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/apicvar.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/asm.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/asmacros.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/atomic.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/bus.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/bus_dma.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/clock.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/cpu.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/cpufunc.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/cputypes.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/db_machdep.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/elf.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/endian.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/exec.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/float.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/floatingpoint.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/fpu.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/frame.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/gdb_machdep.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/ieeefp.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/in_cksum.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/intr_machdep.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/iodev.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/kdb.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/legacyvar.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/limits.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/md_var.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/memdev.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/metadata.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/minidump.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/mp_watchdog.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/mptable.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/mutex.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/param.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/pc/bios.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/pc/display.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/pcb.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/pcb_ext.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/pci_cfgreg.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/pcpu.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/pmap.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/pmc_mdep.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/ppireg.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/proc.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/profile.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/psl.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/ptrace.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/reg.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/reloc.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/resource.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/runq.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/segments.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/setjmp.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/sf_buf.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/sigframe.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/signal.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/smp.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/specialreg.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/stdarg.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/sysarch.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/timerreg.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/trap.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/tss.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/ucontext.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/varargs.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/vmparam.h#1 branch .. //depot/projects/bike_sched/sys/amd64/isa/atpic.c#1 branch .. //depot/projects/bike_sched/sys/amd64/isa/atpic_vector.S#1 branch .. //depot/projects/bike_sched/sys/amd64/isa/clock.c#1 branch .. //depot/projects/bike_sched/sys/amd64/isa/elcr.c#1 branch .. //depot/projects/bike_sched/sys/amd64/isa/icu.h#1 branch .. //depot/projects/bike_sched/sys/amd64/isa/isa.c#1 branch .. //depot/projects/bike_sched/sys/amd64/isa/isa.h#1 branch .. //depot/projects/bike_sched/sys/amd64/isa/isa_dma.c#1 branch .. //depot/projects/bike_sched/sys/amd64/isa/nmi.c#1 branch .. //depot/projects/bike_sched/sys/amd64/linux32/Makefile#1 branch .. //depot/projects/bike_sched/sys/amd64/linux32/linux.h#1 branch .. //depot/projects/bike_sched/sys/amd64/linux32/linux32_dummy.c#1 branch .. //depot/projects/bike_sched/sys/amd64/linux32/linux32_genassym.c#1 branch .. //depot/projects/bike_sched/sys/amd64/linux32/linux32_ipc64.h#1 branch .. //depot/projects/bike_sched/sys/amd64/linux32/linux32_locore.s#1 branch .. //depot/projects/bike_sched/sys/amd64/linux32/linux32_machdep.c#1 branch .. //depot/projects/bike_sched/sys/amd64/linux32/linux32_proto.h#1 branch .. //depot/projects/bike_sched/sys/amd64/linux32/linux32_syscall.h#1 branch .. //depot/projects/bike_sched/sys/amd64/linux32/linux32_sysent.c#1 branch .. //depot/projects/bike_sched/sys/amd64/linux32/linux32_sysvec.c#1 branch .. //depot/projects/bike_sched/sys/amd64/linux32/syscalls.conf#1 branch .. //depot/projects/bike_sched/sys/amd64/linux32/syscalls.master#1 branch .. //depot/projects/bike_sched/sys/amd64/pci/pci_bus.c#1 branch .. //depot/projects/bike_sched/sys/amd64/pci/pci_cfgreg.c#1 branch .. //depot/projects/bike_sched/sys/arm/arm/autoconf.c#1 branch .. //depot/projects/bike_sched/sys/arm/arm/bcopy_page.S#1 branch .. //depot/projects/bike_sched/sys/arm/arm/bcopyinout.S#1 branch .. //depot/projects/bike_sched/sys/arm/arm/bcopyinout_xscale.S#1 branch .. //depot/projects/bike_sched/sys/arm/arm/blockio.S#1 branch .. //depot/projects/bike_sched/sys/arm/arm/bootconfig.c#1 branch .. //depot/projects/bike_sched/sys/arm/arm/bus_space_asm_generic.S#1 branch .. //depot/projects/bike_sched/sys/arm/arm/busdma_machdep.c#1 branch .. //depot/projects/bike_sched/sys/arm/arm/copystr.S#1 branch .. //depot/projects/bike_sched/sys/arm/arm/cpufunc.c#1 branch .. //depot/projects/bike_sched/sys/arm/arm/cpufunc_asm.S#1 branch .. //depot/projects/bike_sched/sys/arm/arm/cpufunc_asm_arm10.S#1 branch .. //depot/projects/bike_sched/sys/arm/arm/cpufunc_asm_arm7tdmi.S#1 branch .. //depot/projects/bike_sched/sys/arm/arm/cpufunc_asm_arm8.S#1 branch .. //depot/projects/bike_sched/sys/arm/arm/cpufunc_asm_arm9.S#1 branch .. //depot/projects/bike_sched/sys/arm/arm/cpufunc_asm_armv4.S#1 branch .. //depot/projects/bike_sched/sys/arm/arm/cpufunc_asm_ixp12x0.S#1 branch .. //depot/projects/bike_sched/sys/arm/arm/cpufunc_asm_sa1.S#1 branch .. //depot/projects/bike_sched/sys/arm/arm/cpufunc_asm_sa11x0.S#1 branch .. //depot/projects/bike_sched/sys/arm/arm/cpufunc_asm_xscale.S#1 branch .. //depot/projects/bike_sched/sys/arm/arm/db_disasm.c#1 branch .. //depot/projects/bike_sched/sys/arm/arm/db_interface.c#1 branch .. //depot/projects/bike_sched/sys/arm/arm/db_trace.c#1 branch .. //depot/projects/bike_sched/sys/arm/arm/disassem.c#1 branch .. //depot/projects/bike_sched/sys/arm/arm/dump_machdep.c#1 branch .. //depot/projects/bike_sched/sys/arm/arm/elf_machdep.c#1 branch .. //depot/projects/bike_sched/sys/arm/arm/elf_trampoline.c#1 branch .. //depot/projects/bike_sched/sys/arm/arm/exception.S#1 branch .. //depot/projects/bike_sched/sys/arm/arm/fiq.c#1 branch .. //depot/projects/bike_sched/sys/arm/arm/fiq_subr.S#1 branch .. //depot/projects/bike_sched/sys/arm/arm/fusu.S#1 branch .. //depot/projects/bike_sched/sys/arm/arm/genassym.c#1 branch .. //depot/projects/bike_sched/sys/arm/arm/identcpu.c#1 branch .. //depot/projects/bike_sched/sys/arm/arm/in_cksum.c#1 branch .. //depot/projects/bike_sched/sys/arm/arm/in_cksum_arm.S#1 branch .. //depot/projects/bike_sched/sys/arm/arm/inckern.S#1 branch .. //depot/projects/bike_sched/sys/arm/arm/intr.c#1 branch .. //depot/projects/bike_sched/sys/arm/arm/irq_dispatch.S#1 branch .. //depot/projects/bike_sched/sys/arm/arm/locore.S#1 branch .. //depot/projects/bike_sched/sys/arm/arm/machdep.c#1 branch .. //depot/projects/bike_sched/sys/arm/arm/mem.c#1 branch .. //depot/projects/bike_sched/sys/arm/arm/nexus.c#1 branch .. //depot/projects/bike_sched/sys/arm/arm/nexus_io.c#1 branch .. //depot/projects/bike_sched/sys/arm/arm/nexus_io_asm.S#1 branch .. //depot/projects/bike_sched/sys/arm/arm/pmap.c#1 branch .. //depot/projects/bike_sched/sys/arm/arm/setcpsr.S#1 branch .. //depot/projects/bike_sched/sys/arm/arm/setstack.s#1 branch .. //depot/projects/bike_sched/sys/arm/arm/support.S#1 branch .. //depot/projects/bike_sched/sys/arm/arm/swtch.S#1 branch .. //depot/projects/bike_sched/sys/arm/arm/sys_machdep.c#1 branch .. //depot/projects/bike_sched/sys/arm/arm/trap.c#1 branch .. //depot/projects/bike_sched/sys/arm/arm/uio_machdep.c#1 branch .. //depot/projects/bike_sched/sys/arm/arm/undefined.c#1 branch .. //depot/projects/bike_sched/sys/arm/arm/vectors.S#1 branch .. //depot/projects/bike_sched/sys/arm/arm/vm_machdep.c#1 branch .. //depot/projects/bike_sched/sys/arm/at91/at91.c#1 branch .. //depot/projects/bike_sched/sys/arm/at91/at91_pdcreg.h#1 branch .. //depot/projects/bike_sched/sys/arm/at91/at91_pio.c#1 branch .. //depot/projects/bike_sched/sys/arm/at91/at91_pioreg.h#1 branch .. //depot/projects/bike_sched/sys/arm/at91/at91_pmc.c#1 branch .. //depot/projects/bike_sched/sys/arm/at91/at91_pmcreg.h#1 branch .. //depot/projects/bike_sched/sys/arm/at91/at91_pmcvar.h#1 branch .. //depot/projects/bike_sched/sys/arm/at91/at91_rtc.c#1 branch .. //depot/projects/bike_sched/sys/arm/at91/at91_rtcreg.h#1 branch .. //depot/projects/bike_sched/sys/arm/at91/at91_spi.c#1 branch .. //depot/projects/bike_sched/sys/arm/at91/at91_spiio.h#1 branch .. //depot/projects/bike_sched/sys/arm/at91/at91_spireg.h#1 branch .. //depot/projects/bike_sched/sys/arm/at91/at91_ssc.c#1 branch .. //depot/projects/bike_sched/sys/arm/at91/at91_sscreg.h#1 branch .. //depot/projects/bike_sched/sys/arm/at91/at91_st.c#1 branch .. //depot/projects/bike_sched/sys/arm/at91/at91_streg.h#1 branch .. //depot/projects/bike_sched/sys/arm/at91/at91_twi.c#1 branch .. //depot/projects/bike_sched/sys/arm/at91/at91_twiio.h#1 branch .. //depot/projects/bike_sched/sys/arm/at91/at91_twireg.h#1 branch .. //depot/projects/bike_sched/sys/arm/at91/at91_usartreg.h#1 branch .. //depot/projects/bike_sched/sys/arm/at91/at91rm92reg.h#1 branch .. //depot/projects/bike_sched/sys/arm/at91/at91var.h#1 branch .. //depot/projects/bike_sched/sys/arm/at91/files.at91#1 branch .. //depot/projects/bike_sched/sys/arm/at91/files.kb920x#1 branch .. //depot/projects/bike_sched/sys/arm/at91/hints.at91rm9200#1 branch .. //depot/projects/bike_sched/sys/arm/at91/hints.at91sam9261#1 branch .. //depot/projects/bike_sched/sys/arm/at91/if_ate.c#1 branch .. //depot/projects/bike_sched/sys/arm/at91/if_atereg.h#1 branch .. //depot/projects/bike_sched/sys/arm/at91/kb920x_machdep.c#1 branch .. //depot/projects/bike_sched/sys/arm/at91/ohci_atmelarm.c#1 branch .. //depot/projects/bike_sched/sys/arm/at91/std.at91#1 branch .. //depot/projects/bike_sched/sys/arm/at91/std.kb920x#1 branch .. //depot/projects/bike_sched/sys/arm/at91/uart_bus_at91usart.c#1 branch .. //depot/projects/bike_sched/sys/arm/at91/uart_cpu_at91rm9200usart.c#1 branch .. //depot/projects/bike_sched/sys/arm/at91/uart_dev_at91usart.c#1 branch .. //depot/projects/bike_sched/sys/arm/compile/.cvsignore#1 branch .. //depot/projects/bike_sched/sys/arm/conf/.cvsignore#1 branch .. //depot/projects/bike_sched/sys/arm/conf/IQ31244#1 branch .. //depot/projects/bike_sched/sys/arm/conf/KB920X#1 branch .. //depot/projects/bike_sched/sys/arm/conf/SIMICS#1 branch .. //depot/projects/bike_sched/sys/arm/conf/SKYEYE#1 branch .. //depot/projects/bike_sched/sys/arm/include/_bus.h#1 branch .. //depot/projects/bike_sched/sys/arm/include/_inttypes.h#1 branch .. //depot/projects/bike_sched/sys/arm/include/_limits.h#1 branch .. //depot/projects/bike_sched/sys/arm/include/_stdint.h#1 branch .. //depot/projects/bike_sched/sys/arm/include/_types.h#1 branch .. //depot/projects/bike_sched/sys/arm/include/armreg.h#1 branch .. //depot/projects/bike_sched/sys/arm/include/asm.h#1 branch .. //depot/projects/bike_sched/sys/arm/include/asmacros.h#1 branch .. //depot/projects/bike_sched/sys/arm/include/atomic.h#1 branch .. //depot/projects/bike_sched/sys/arm/include/blockio.h#1 branch .. //depot/projects/bike_sched/sys/arm/include/bootconfig.h#1 branch .. //depot/projects/bike_sched/sys/arm/include/bus.h#1 branch .. //depot/projects/bike_sched/sys/arm/include/bus_dma.h#1 branch .. //depot/projects/bike_sched/sys/arm/include/clock.h#1 branch .. //depot/projects/bike_sched/sys/arm/include/cpu.h#1 branch .. //depot/projects/bike_sched/sys/arm/include/cpuconf.h#1 branch .. //depot/projects/bike_sched/sys/arm/include/cpufunc.h#1 branch .. //depot/projects/bike_sched/sys/arm/include/db_machdep.h#1 branch .. //depot/projects/bike_sched/sys/arm/include/disassem.h#1 branch .. //depot/projects/bike_sched/sys/arm/include/elf.h#1 branch .. //depot/projects/bike_sched/sys/arm/include/endian.h#1 branch .. //depot/projects/bike_sched/sys/arm/include/exec.h#1 branch .. //depot/projects/bike_sched/sys/arm/include/fiq.h#1 branch .. //depot/projects/bike_sched/sys/arm/include/float.h#1 branch .. //depot/projects/bike_sched/sys/arm/include/floatingpoint.h#1 branch .. //depot/projects/bike_sched/sys/arm/include/fp.h#1 branch .. //depot/projects/bike_sched/sys/arm/include/frame.h#1 branch .. //depot/projects/bike_sched/sys/arm/include/ieee.h#1 branch .. //depot/projects/bike_sched/sys/arm/include/ieeefp.h#1 branch .. //depot/projects/bike_sched/sys/arm/include/in_cksum.h#1 branch .. //depot/projects/bike_sched/sys/arm/include/intr.h#1 branch .. //depot/projects/bike_sched/sys/arm/include/katelib.h#1 branch .. //depot/projects/bike_sched/sys/arm/include/kdb.h#1 branch .. //depot/projects/bike_sched/sys/arm/include/limits.h#1 branch .. //depot/projects/bike_sched/sys/arm/include/machdep.h#1 branch .. //depot/projects/bike_sched/sys/arm/include/md_var.h#1 branch .. //depot/projects/bike_sched/sys/arm/include/memdev.h#1 branch .. //depot/projects/bike_sched/sys/arm/include/metadata.h#1 branch .. //depot/projects/bike_sched/sys/arm/include/mutex.h#1 branch .. //depot/projects/bike_sched/sys/arm/include/param.h#1 branch .. //depot/projects/bike_sched/sys/arm/include/pcb.h#1 branch .. //depot/projects/bike_sched/sys/arm/include/pcpu.h#1 branch .. //depot/projects/bike_sched/sys/arm/include/pmap.h#1 branch .. //depot/projects/bike_sched/sys/arm/include/pmc_mdep.h#1 branch .. //depot/projects/bike_sched/sys/arm/include/proc.h#1 branch .. //depot/projects/bike_sched/sys/arm/include/profile.h#1 branch .. //depot/projects/bike_sched/sys/arm/include/psl.h#1 branch .. //depot/projects/bike_sched/sys/arm/include/pte.h#1 branch .. //depot/projects/bike_sched/sys/arm/include/ptrace.h#1 branch .. //depot/projects/bike_sched/sys/arm/include/reg.h#1 branch .. //depot/projects/bike_sched/sys/arm/include/reloc.h#1 branch .. //depot/projects/bike_sched/sys/arm/include/resource.h#1 branch .. //depot/projects/bike_sched/sys/arm/include/runq.h#1 branch .. //depot/projects/bike_sched/sys/arm/include/setjmp.h#1 branch .. //depot/projects/bike_sched/sys/arm/include/sf_buf.h#1 branch .. //depot/projects/bike_sched/sys/arm/include/sigframe.h#1 branch .. //depot/projects/bike_sched/sys/arm/include/signal.h#1 branch .. //depot/projects/bike_sched/sys/arm/include/smp.h#1 branch .. //depot/projects/bike_sched/sys/arm/include/stdarg.h#1 branch .. //depot/projects/bike_sched/sys/arm/include/swi.h#1 branch .. //depot/projects/bike_sched/sys/arm/include/sysarch.h#1 branch .. //depot/projects/bike_sched/sys/arm/include/trap.h#1 branch .. //depot/projects/bike_sched/sys/arm/include/ucontext.h#1 branch .. //depot/projects/bike_sched/sys/arm/include/undefined.h#1 branch .. //depot/projects/bike_sched/sys/arm/include/utrap.h#1 branch .. //depot/projects/bike_sched/sys/arm/include/vmparam.h#1 branch .. //depot/projects/bike_sched/sys/arm/sa11x0/assabet_machdep.c#1 branch .. //depot/projects/bike_sched/sys/arm/sa11x0/files.sa11x0#1 branch .. //depot/projects/bike_sched/sys/arm/sa11x0/sa11x0.c#1 branch .. //depot/projects/bike_sched/sys/arm/sa11x0/sa11x0_dmacreg.h#1 branch .. //depot/projects/bike_sched/sys/arm/sa11x0/sa11x0_gpioreg.h#1 branch .. //depot/projects/bike_sched/sys/arm/sa11x0/sa11x0_io.c#1 branch .. //depot/projects/bike_sched/sys/arm/sa11x0/sa11x0_io_asm.S#1 branch .. //depot/projects/bike_sched/sys/arm/sa11x0/sa11x0_irq.S#1 branch .. //depot/projects/bike_sched/sys/arm/sa11x0/sa11x0_irqhandler.c#1 branch .. //depot/projects/bike_sched/sys/arm/sa11x0/sa11x0_ost.c#1 branch .. //depot/projects/bike_sched/sys/arm/sa11x0/sa11x0_ostreg.h#1 branch .. //depot/projects/bike_sched/sys/arm/sa11x0/sa11x0_ppcreg.h#1 branch .. //depot/projects/bike_sched/sys/arm/sa11x0/sa11x0_reg.h#1 branch .. //depot/projects/bike_sched/sys/arm/sa11x0/sa11x0_var.h#1 branch .. //depot/projects/bike_sched/sys/arm/sa11x0/std.sa11x0#1 branch .. //depot/projects/bike_sched/sys/arm/sa11x0/uart_bus_sa1110.c#1 branch .. //depot/projects/bike_sched/sys/arm/sa11x0/uart_cpu_sa1110.c#1 branch .. //depot/projects/bike_sched/sys/arm/sa11x0/uart_dev_sa1110.c#1 branch .. //depot/projects/bike_sched/sys/arm/sa11x0/uart_dev_sa1110.h#1 branch .. //depot/projects/bike_sched/sys/arm/xscale/i80321/files.i80321#1 branch .. //depot/projects/bike_sched/sys/arm/xscale/i80321/files.iq31244#1 branch .. //depot/projects/bike_sched/sys/arm/xscale/i80321/i80321.c#1 branch .. //depot/projects/bike_sched/sys/arm/xscale/i80321/i80321_aau.c#1 branch .. //depot/projects/bike_sched/sys/arm/xscale/i80321/i80321_dma.c#1 branch .. //depot/projects/bike_sched/sys/arm/xscale/i80321/i80321_intr.h#1 branch .. //depot/projects/bike_sched/sys/arm/xscale/i80321/i80321_mcu.c#1 branch .. //depot/projects/bike_sched/sys/arm/xscale/i80321/i80321_pci.c#1 branch .. //depot/projects/bike_sched/sys/arm/xscale/i80321/i80321_space.c#1 branch .. //depot/projects/bike_sched/sys/arm/xscale/i80321/i80321_timer.c#1 branch .. //depot/projects/bike_sched/sys/arm/xscale/i80321/i80321_wdog.c#1 branch .. //depot/projects/bike_sched/sys/arm/xscale/i80321/i80321reg.h#1 branch .. //depot/projects/bike_sched/sys/arm/xscale/i80321/i80321var.h#1 branch .. //depot/projects/bike_sched/sys/arm/xscale/i80321/iq31244_7seg.c#1 branch .. //depot/projects/bike_sched/sys/arm/xscale/i80321/iq31244_machdep.c#1 branch .. //depot/projects/bike_sched/sys/arm/xscale/i80321/iq80321.c#1 branch .. //depot/projects/bike_sched/sys/arm/xscale/i80321/iq80321reg.h#1 branch .. //depot/projects/bike_sched/sys/arm/xscale/i80321/iq80321var.h#1 branch .. //depot/projects/bike_sched/sys/arm/xscale/i80321/obio.c#1 branch .. //depot/projects/bike_sched/sys/arm/xscale/i80321/obio_space.c#1 branch .. //depot/projects/bike_sched/sys/arm/xscale/i80321/obiovar.h#1 branch .. //depot/projects/bike_sched/sys/arm/xscale/i80321/std.i80321#1 branch .. //depot/projects/bike_sched/sys/arm/xscale/i80321/std.iq31244#1 branch .. //depot/projects/bike_sched/sys/arm/xscale/i80321/uart_bus_i80321.c#1 branch .. //depot/projects/bike_sched/sys/arm/xscale/i80321/uart_cpu_i80321.c#1 branch .. //depot/projects/bike_sched/sys/arm/xscale/std.xscale#1 branch .. //depot/projects/bike_sched/sys/arm/xscale/xscalereg.h#1 branch .. //depot/projects/bike_sched/sys/arm/xscale/xscalevar.h#1 branch .. //depot/projects/bike_sched/sys/boot/Makefile#1 branch .. //depot/projects/bike_sched/sys/boot/README#1 branch .. //depot/projects/bike_sched/sys/boot/arm/at91/Makefile#1 branch .. //depot/projects/bike_sched/sys/boot/arm/at91/Makefile.inc#1 branch .. //depot/projects/bike_sched/sys/boot/arm/at91/boot0/Makefile#1 branch .. //depot/projects/bike_sched/sys/boot/arm/at91/boot0/README#1 branch .. //depot/projects/bike_sched/sys/boot/arm/at91/boot0/arm_init.s#1 branch .. //depot/projects/bike_sched/sys/boot/arm/at91/boot0/linker.cfg#1 branch .. //depot/projects/bike_sched/sys/boot/arm/at91/boot0/main.c#1 branch .. //depot/projects/bike_sched/sys/boot/arm/at91/boot0iic/Makefile#1 branch .. //depot/projects/bike_sched/sys/boot/arm/at91/boot0iic/doit.c#1 branch .. //depot/projects/bike_sched/sys/boot/arm/at91/boot0iic/main.c#1 branch .. //depot/projects/bike_sched/sys/boot/arm/at91/boot0spi/Makefile#1 branch .. //depot/projects/bike_sched/sys/boot/arm/at91/boot0spi/doit.c#1 branch .. //depot/projects/bike_sched/sys/boot/arm/at91/boot0spi/main.c#1 branch .. //depot/projects/bike_sched/sys/boot/arm/at91/bootiic/Makefile#1 branch .. //depot/projects/bike_sched/sys/boot/arm/at91/bootiic/README#1 branch .. //depot/projects/bike_sched/sys/boot/arm/at91/bootiic/arm_init.S#1 branch .. //depot/projects/bike_sched/sys/boot/arm/at91/bootiic/main.c#1 branch .. //depot/projects/bike_sched/sys/boot/arm/at91/bootspi/Makefile#1 branch .. //depot/projects/bike_sched/sys/boot/arm/at91/bootspi/README#1 branch .. //depot/projects/bike_sched/sys/boot/arm/at91/bootspi/arm_init.s#1 branch .. //depot/projects/bike_sched/sys/boot/arm/at91/bootspi/main.c#1 branch .. //depot/projects/bike_sched/sys/boot/arm/at91/libat91/Makefile#1 branch .. //depot/projects/bike_sched/sys/boot/arm/at91/libat91/at91rm9200.h#1 branch .. //depot/projects/bike_sched/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#1 branch .. //depot/projects/bike_sched/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#1 branch .. //depot/projects/bike_sched/sys/boot/arm/at91/libat91/eeprom.c#1 branch .. //depot/projects/bike_sched/sys/boot/arm/at91/libat91/eeprom.h#1 branch .. //depot/projects/bike_sched/sys/boot/arm/at91/libat91/emac.c#1 branch .. //depot/projects/bike_sched/sys/boot/arm/at91/libat91/emac.h#1 branch .. //depot/projects/bike_sched/sys/boot/arm/at91/libat91/env_vars.c#1 branch .. //depot/projects/bike_sched/sys/boot/arm/at91/libat91/env_vars.h#1 branch .. //depot/projects/bike_sched/sys/boot/arm/at91/libat91/getc.c#1 branch .. //depot/projects/bike_sched/sys/boot/arm/at91/libat91/lib.h#1 branch .. //depot/projects/bike_sched/sys/boot/arm/at91/libat91/loader_prompt.c#1 branch .. //depot/projects/bike_sched/sys/boot/arm/at91/libat91/loader_prompt.h#1 branch .. //depot/projects/bike_sched/sys/boot/arm/at91/libat91/p_string.c#1 branch .. //depot/projects/bike_sched/sys/boot/arm/at91/libat91/p_string.h#1 branch .. //depot/projects/bike_sched/sys/boot/arm/at91/libat91/printf.c#1 branch .. //depot/projects/bike_sched/sys/boot/arm/at91/libat91/putchar.c#1 branch .. //depot/projects/bike_sched/sys/boot/arm/at91/libat91/tag_list.c#1 branch .. //depot/projects/bike_sched/sys/boot/arm/at91/libat91/tag_list.h#1 branch .. //depot/projects/bike_sched/sys/boot/arm/at91/libat91/xmodem.c#1 branch .. //depot/projects/bike_sched/sys/boot/arm/at91/linker.cfg#1 branch .. //depot/projects/bike_sched/sys/boot/common/Makefile.inc#1 branch .. //depot/projects/bike_sched/sys/boot/common/bcache.c#1 branch .. //depot/projects/bike_sched/sys/boot/common/boot.c#1 branch .. //depot/projects/bike_sched/sys/boot/common/bootstrap.h#1 branch .. //depot/projects/bike_sched/sys/boot/common/commands.c#1 branch .. //depot/projects/bike_sched/sys/boot/common/console.c#1 branch .. //depot/projects/bike_sched/sys/boot/common/dev_net.c#1 branch .. //depot/projects/bike_sched/sys/boot/common/dev_net.h#1 branch .. //depot/projects/bike_sched/sys/boot/common/devopen.c#1 branch .. //depot/projects/bike_sched/sys/boot/common/help.common#1 branch .. //depot/projects/bike_sched/sys/boot/common/interp.c#1 branch .. //depot/projects/bike_sched/sys/boot/common/interp_backslash.c#1 branch .. //depot/projects/bike_sched/sys/boot/common/interp_forth.c#1 branch .. //depot/projects/bike_sched/sys/boot/common/interp_parse.c#1 branch .. //depot/projects/bike_sched/sys/boot/common/isapnp.c#1 branch .. //depot/projects/bike_sched/sys/boot/common/isapnp.h#1 branch .. //depot/projects/bike_sched/sys/boot/common/load.c#1 branch .. //depot/projects/bike_sched/sys/boot/common/load_elf.c#1 branch .. //depot/projects/bike_sched/sys/boot/common/load_elf32.c#1 branch .. //depot/projects/bike_sched/sys/boot/common/load_elf32_obj.c#1 branch .. //depot/projects/bike_sched/sys/boot/common/load_elf64.c#1 branch .. //depot/projects/bike_sched/sys/boot/common/load_elf64_obj.c#1 branch .. //depot/projects/bike_sched/sys/boot/common/load_elf_obj.c#1 branch .. //depot/projects/bike_sched/sys/boot/common/loader.8#1 branch .. //depot/projects/bike_sched/sys/boot/common/ls.c#1 branch .. //depot/projects/bike_sched/sys/boot/common/merge_help.awk#1 branch .. //depot/projects/bike_sched/sys/boot/common/misc.c#1 branch .. //depot/projects/bike_sched/sys/boot/common/module.c#1 branch .. //depot/projects/bike_sched/sys/boot/common/newvers.sh#1 branch .. //depot/projects/bike_sched/sys/boot/common/panic.c#1 branch .. //depot/projects/bike_sched/sys/boot/common/pnp.c#1 branch .. //depot/projects/bike_sched/sys/boot/common/pnpdata#1 branch .. //depot/projects/bike_sched/sys/boot/common/reloc_elf.c#1 branch .. //depot/projects/bike_sched/sys/boot/common/reloc_elf32.c#1 branch .. //depot/projects/bike_sched/sys/boot/common/reloc_elf64.c#1 branch .. //depot/projects/bike_sched/sys/boot/common/ufsread.c#1 branch .. //depot/projects/bike_sched/sys/boot/efi/Makefile#1 branch .. //depot/projects/bike_sched/sys/boot/efi/Makefile.inc#1 branch .. //depot/projects/bike_sched/sys/boot/efi/include/README#1 branch .. //depot/projects/bike_sched/sys/boot/efi/include/efi.h#1 branch .. //depot/projects/bike_sched/sys/boot/efi/include/efi_nii.h#1 branch .. //depot/projects/bike_sched/sys/boot/efi/include/efiapi.h#1 branch .. //depot/projects/bike_sched/sys/boot/efi/include/eficon.h#1 branch .. //depot/projects/bike_sched/sys/boot/efi/include/efidebug.h#1 branch .. //depot/projects/bike_sched/sys/boot/efi/include/efidef.h#1 branch .. //depot/projects/bike_sched/sys/boot/efi/include/efidevp.h#1 branch .. //depot/projects/bike_sched/sys/boot/efi/include/efierr.h#1 branch .. //depot/projects/bike_sched/sys/boot/efi/include/efifpswa.h#1 branch .. //depot/projects/bike_sched/sys/boot/efi/include/efifs.h#1 branch .. //depot/projects/bike_sched/sys/boot/efi/include/efilib.h#1 branch .. //depot/projects/bike_sched/sys/boot/efi/include/efinet.h#1 branch .. //depot/projects/bike_sched/sys/boot/efi/include/efipart.h#1 branch .. //depot/projects/bike_sched/sys/boot/efi/include/efiprot.h#1 branch .. //depot/projects/bike_sched/sys/boot/efi/include/efipxebc.h#1 branch .. //depot/projects/bike_sched/sys/boot/efi/include/efiser.h#1 branch .. //depot/projects/bike_sched/sys/boot/efi/include/efistdarg.h#1 branch .. //depot/projects/bike_sched/sys/boot/efi/include/i386/efibind.h#1 branch .. //depot/projects/bike_sched/sys/boot/efi/include/i386/pe.h#1 branch .. //depot/projects/bike_sched/sys/boot/efi/include/ia64/efibind.h#1 branch .. //depot/projects/bike_sched/sys/boot/efi/include/ia64/pe.h#1 branch .. //depot/projects/bike_sched/sys/boot/efi/libefi/Makefile#1 branch .. //depot/projects/bike_sched/sys/boot/efi/libefi/bootinfo.c#1 branch .. //depot/projects/bike_sched/sys/boot/efi/libefi/copy.c#1 branch .. //depot/projects/bike_sched/sys/boot/efi/libefi/delay.c#1 branch .. //depot/projects/bike_sched/sys/boot/efi/libefi/devicename.c#1 branch .. //depot/projects/bike_sched/sys/boot/efi/libefi/efi_console.c#1 branch .. //depot/projects/bike_sched/sys/boot/efi/libefi/efiboot.h#1 branch .. //depot/projects/bike_sched/sys/boot/efi/libefi/efifpswa.c#1 branch .. //depot/projects/bike_sched/sys/boot/efi/libefi/efifs.c#1 branch .. //depot/projects/bike_sched/sys/boot/efi/libefi/efinet.c#1 branch .. //depot/projects/bike_sched/sys/boot/efi/libefi/elf_freebsd.c#1 branch .. //depot/projects/bike_sched/sys/boot/efi/libefi/libefi.c#1 branch .. //depot/projects/bike_sched/sys/boot/efi/libefi/module.c#1 branch .. //depot/projects/bike_sched/sys/boot/efi/libefi/time.c#1 branch .. //depot/projects/bike_sched/sys/boot/ficl/Makefile#1 branch .. //depot/projects/bike_sched/sys/boot/ficl/dict.c#1 branch .. //depot/projects/bike_sched/sys/boot/ficl/ficl.c#1 branch .. //depot/projects/bike_sched/sys/boot/ficl/ficl.h#1 branch .. //depot/projects/bike_sched/sys/boot/ficl/fileaccess.c#1 branch .. //depot/projects/bike_sched/sys/boot/ficl/float.c#1 branch .. //depot/projects/bike_sched/sys/boot/ficl/i386/sysdep.c#1 branch .. //depot/projects/bike_sched/sys/boot/ficl/i386/sysdep.h#1 branch .. //depot/projects/bike_sched/sys/boot/ficl/ia64/sysdep.c#1 branch .. //depot/projects/bike_sched/sys/boot/ficl/ia64/sysdep.h#1 branch .. //depot/projects/bike_sched/sys/boot/ficl/loader.c#1 branch .. //depot/projects/bike_sched/sys/boot/ficl/math64.c#1 branch .. //depot/projects/bike_sched/sys/boot/ficl/math64.h#1 branch .. //depot/projects/bike_sched/sys/boot/ficl/powerpc/sysdep.c#1 branch .. //depot/projects/bike_sched/sys/boot/ficl/powerpc/sysdep.h#1 branch .. //depot/projects/bike_sched/sys/boot/ficl/prefix.c#1 branch .. //depot/projects/bike_sched/sys/boot/ficl/search.c#1 branch .. //depot/projects/bike_sched/sys/boot/ficl/softwords/classes.fr#1 branch .. //depot/projects/bike_sched/sys/boot/ficl/softwords/ficlclass.fr#1 branch .. //depot/projects/bike_sched/sys/boot/ficl/softwords/ficllocal.fr#1 branch .. //depot/projects/bike_sched/sys/boot/ficl/softwords/fileaccess.fr#1 branch .. //depot/projects/bike_sched/sys/boot/ficl/softwords/forml.fr#1 branch .. //depot/projects/bike_sched/sys/boot/ficl/softwords/freebsd.fr#1 branch .. //depot/projects/bike_sched/sys/boot/ficl/softwords/ifbrack.fr#1 branch .. //depot/projects/bike_sched/sys/boot/ficl/softwords/jhlocal.fr#1 branch .. //depot/projects/bike_sched/sys/boot/ficl/softwords/marker.fr#1 branch .. //depot/projects/bike_sched/sys/boot/ficl/softwords/oo.fr#1 branch .. //depot/projects/bike_sched/sys/boot/ficl/softwords/prefix.fr#1 branch .. //depot/projects/bike_sched/sys/boot/ficl/softwords/softcore.awk#1 branch .. //depot/projects/bike_sched/sys/boot/ficl/softwords/softcore.fr#1 branch .. //depot/projects/bike_sched/sys/boot/ficl/softwords/string.fr#1 branch .. //depot/projects/bike_sched/sys/boot/ficl/sparc64/sysdep.c#1 branch .. //depot/projects/bike_sched/sys/boot/ficl/sparc64/sysdep.h#1 branch .. //depot/projects/bike_sched/sys/boot/ficl/stack.c#1 branch .. //depot/projects/bike_sched/sys/boot/ficl/testmain.c#1 branch .. //depot/projects/bike_sched/sys/boot/ficl/tools.c#1 branch .. //depot/projects/bike_sched/sys/boot/ficl/unix.c#1 branch .. //depot/projects/bike_sched/sys/boot/ficl/vm.c#1 branch .. //depot/projects/bike_sched/sys/boot/ficl/words.c#1 branch .. //depot/projects/bike_sched/sys/boot/forth/beastie.4th#1 branch .. //depot/projects/bike_sched/sys/boot/forth/frames.4th#1 branch .. //depot/projects/bike_sched/sys/boot/forth/loader.4th#1 branch .. //depot/projects/bike_sched/sys/boot/forth/loader.4th.8#1 branch .. //depot/projects/bike_sched/sys/boot/forth/loader.conf#1 branch .. //depot/projects/bike_sched/sys/boot/forth/loader.conf.5#1 branch .. //depot/projects/bike_sched/sys/boot/forth/loader.rc#1 branch .. //depot/projects/bike_sched/sys/boot/forth/pnp.4th#1 branch .. //depot/projects/bike_sched/sys/boot/forth/screen.4th#1 branch .. //depot/projects/bike_sched/sys/boot/forth/support.4th#1 branch .. //depot/projects/bike_sched/sys/boot/i386/Makefile#1 branch .. //depot/projects/bike_sched/sys/boot/i386/Makefile.inc#1 branch .. //depot/projects/bike_sched/sys/boot/i386/boot0/Makefile#1 branch .. //depot/projects/bike_sched/sys/boot/i386/boot0/boot0.S#1 branch .. //depot/projects/bike_sched/sys/boot/i386/boot0/boot0ext.S#1 branch .. //depot/projects/bike_sched/sys/boot/i386/boot0ext/Makefile#1 branch .. //depot/projects/bike_sched/sys/boot/i386/boot0sio/Makefile#1 branch .. //depot/projects/bike_sched/sys/boot/i386/boot2/Makefile#1 branch .. //depot/projects/bike_sched/sys/boot/i386/boot2/boot1.S#1 branch .. //depot/projects/bike_sched/sys/boot/i386/boot2/boot2.c#1 branch .. //depot/projects/bike_sched/sys/boot/i386/boot2/lib.h#1 branch .. //depot/projects/bike_sched/sys/boot/i386/boot2/sio.S#1 branch .. //depot/projects/bike_sched/sys/boot/i386/btx/Makefile#1 branch .. //depot/projects/bike_sched/sys/boot/i386/btx/Makefile.inc#1 branch .. //depot/projects/bike_sched/sys/boot/i386/btx/btx/Makefile#1 branch .. //depot/projects/bike_sched/sys/boot/i386/btx/btx/btx.S#1 branch .. //depot/projects/bike_sched/sys/boot/i386/btx/btxldr/Makefile#1 branch .. //depot/projects/bike_sched/sys/boot/i386/btx/btxldr/btxldr.S#1 branch .. //depot/projects/bike_sched/sys/boot/i386/btx/lib/Makefile#1 branch .. //depot/projects/bike_sched/sys/boot/i386/btx/lib/btxcsu.s#1 branch .. //depot/projects/bike_sched/sys/boot/i386/btx/lib/btxsys.s#1 branch .. //depot/projects/bike_sched/sys/boot/i386/btx/lib/btxv86.h#1 branch .. //depot/projects/bike_sched/sys/boot/i386/btx/lib/btxv86.s#1 branch .. //depot/projects/bike_sched/sys/boot/i386/cdboot/Makefile#1 branch .. //depot/projects/bike_sched/sys/boot/i386/cdboot/cdboot.s#1 branch .. //depot/projects/bike_sched/sys/boot/i386/kgzldr/Makefile#1 branch .. //depot/projects/bike_sched/sys/boot/i386/kgzldr/boot.c#1 branch .. //depot/projects/bike_sched/sys/boot/i386/kgzldr/crt.s#1 branch .. //depot/projects/bike_sched/sys/boot/i386/kgzldr/kgzldr.h#1 branch .. //depot/projects/bike_sched/sys/boot/i386/kgzldr/lib.c#1 branch .. //depot/projects/bike_sched/sys/boot/i386/kgzldr/sio.s#1 branch .. //depot/projects/bike_sched/sys/boot/i386/kgzldr/start.s#1 branch .. //depot/projects/bike_sched/sys/boot/i386/libi386/Makefile#1 branch .. //depot/projects/bike_sched/sys/boot/i386/libi386/amd64_tramp.S#1 branch .. //depot/projects/bike_sched/sys/boot/i386/libi386/biosacpi.c#1 branch .. //depot/projects/bike_sched/sys/boot/i386/libi386/bioscd.c#1 branch .. //depot/projects/bike_sched/sys/boot/i386/libi386/biosdisk.c#1 branch .. //depot/projects/bike_sched/sys/boot/i386/libi386/biosmem.c#1 branch .. //depot/projects/bike_sched/sys/boot/i386/libi386/biospci.c#1 branch .. //depot/projects/bike_sched/sys/boot/i386/libi386/biospnp.c#1 branch .. //depot/projects/bike_sched/sys/boot/i386/libi386/biossmap.c#1 branch .. //depot/projects/bike_sched/sys/boot/i386/libi386/bootinfo.c#1 branch .. //depot/projects/bike_sched/sys/boot/i386/libi386/bootinfo32.c#1 branch .. //depot/projects/bike_sched/sys/boot/i386/libi386/bootinfo64.c#1 branch .. //depot/projects/bike_sched/sys/boot/i386/libi386/comconsole.c#1 branch .. //depot/projects/bike_sched/sys/boot/i386/libi386/devicename.c#1 branch .. //depot/projects/bike_sched/sys/boot/i386/libi386/elf32_freebsd.c#1 branch .. //depot/projects/bike_sched/sys/boot/i386/libi386/elf64_freebsd.c#1 branch .. //depot/projects/bike_sched/sys/boot/i386/libi386/i386_copy.c#1 branch .. //depot/projects/bike_sched/sys/boot/i386/libi386/i386_module.c#1 branch .. //depot/projects/bike_sched/sys/boot/i386/libi386/libi386.h#1 branch .. //depot/projects/bike_sched/sys/boot/i386/libi386/nullconsole.c#1 branch .. //depot/projects/bike_sched/sys/boot/i386/libi386/pread.c#1 branch .. //depot/projects/bike_sched/sys/boot/i386/libi386/pxe.c#1 branch .. //depot/projects/bike_sched/sys/boot/i386/libi386/pxe.h#1 branch .. //depot/projects/bike_sched/sys/boot/i386/libi386/pxetramp.s#1 branch .. //depot/projects/bike_sched/sys/boot/i386/libi386/smbios.c#1 branch .. //depot/projects/bike_sched/sys/boot/i386/libi386/time.c#1 branch .. //depot/projects/bike_sched/sys/boot/i386/libi386/vidconsole.c#1 branch .. //depot/projects/bike_sched/sys/boot/i386/loader/Makefile#1 branch .. //depot/projects/bike_sched/sys/boot/i386/loader/conf.c#1 branch .. //depot/projects/bike_sched/sys/boot/i386/loader/help.i386#1 branch .. //depot/projects/bike_sched/sys/boot/i386/loader/loader.rc#1 branch .. //depot/projects/bike_sched/sys/boot/i386/loader/main.c#1 branch .. //depot/projects/bike_sched/sys/boot/i386/loader/version#1 branch .. //depot/projects/bike_sched/sys/boot/i386/mbr/Makefile#1 branch .. //depot/projects/bike_sched/sys/boot/i386/mbr/mbr.s#1 branch .. //depot/projects/bike_sched/sys/boot/i386/pxeldr/Makefile#1 branch .. //depot/projects/bike_sched/sys/boot/i386/pxeldr/pxeboot.8#1 branch .. //depot/projects/bike_sched/sys/boot/i386/pxeldr/pxeldr.S#1 branch .. //depot/projects/bike_sched/sys/boot/ia64/Makefile#1 branch .. //depot/projects/bike_sched/sys/boot/ia64/Makefile.inc#1 branch .. //depot/projects/bike_sched/sys/boot/ia64/efi/Makefile#1 branch .. //depot/projects/bike_sched/sys/boot/ia64/efi/conf.c#1 branch .. //depot/projects/bike_sched/sys/boot/ia64/efi/efimd.c#1 branch .. //depot/projects/bike_sched/sys/boot/ia64/efi/ldscript.ia64#1 branch .. //depot/projects/bike_sched/sys/boot/ia64/efi/main.c#1 branch .. //depot/projects/bike_sched/sys/boot/ia64/efi/start.S#1 branch .. //depot/projects/bike_sched/sys/boot/ia64/efi/version#1 branch .. //depot/projects/bike_sched/sys/boot/ia64/ski/Makefile#1 branch .. //depot/projects/bike_sched/sys/boot/ia64/ski/acpi_stub.c#1 branch .. //depot/projects/bike_sched/sys/boot/ia64/ski/bootinfo.c#1 branch .. //depot/projects/bike_sched/sys/boot/ia64/ski/conf.c#1 branch .. //depot/projects/bike_sched/sys/boot/ia64/ski/copy.c#1 branch .. //depot/projects/bike_sched/sys/boot/ia64/ski/delay.c#1 branch .. //depot/projects/bike_sched/sys/boot/ia64/ski/devicename.c#1 branch .. //depot/projects/bike_sched/sys/boot/ia64/ski/efi_stub.c#1 branch .. //depot/projects/bike_sched/sys/boot/ia64/ski/elf_freebsd.c#1 branch .. //depot/projects/bike_sched/sys/boot/ia64/ski/exit.c#1 branch .. //depot/projects/bike_sched/sys/boot/ia64/ski/ldscript.ia64#1 branch .. //depot/projects/bike_sched/sys/boot/ia64/ski/libski.h#1 branch .. //depot/projects/bike_sched/sys/boot/ia64/ski/main.c#1 branch .. //depot/projects/bike_sched/sys/boot/ia64/ski/pal_stub.S#1 branch .. //depot/projects/bike_sched/sys/boot/ia64/ski/sal_stub.c#1 branch .. //depot/projects/bike_sched/sys/boot/ia64/ski/skiconsole.c#1 branch .. //depot/projects/bike_sched/sys/boot/ia64/ski/skifs.c#1 branch .. //depot/projects/bike_sched/sys/boot/ia64/ski/skiload.cmd#1 branch .. //depot/projects/bike_sched/sys/boot/ia64/ski/ssc.c#1 branch .. //depot/projects/bike_sched/sys/boot/ia64/ski/start.S#1 branch .. //depot/projects/bike_sched/sys/boot/ia64/ski/time.c#1 branch .. //depot/projects/bike_sched/sys/boot/ia64/ski/version#1 branch .. //depot/projects/bike_sched/sys/boot/ofw/Makefile#1 branch .. //depot/projects/bike_sched/sys/boot/ofw/common/Makefile.inc#1 branch .. //depot/projects/bike_sched/sys/boot/ofw/common/main.c#1 branch .. //depot/projects/bike_sched/sys/boot/ofw/libofw/Makefile#1 branch .. //depot/projects/bike_sched/sys/boot/ofw/libofw/devicename.c#1 branch .. //depot/projects/bike_sched/sys/boot/ofw/libofw/elf_freebsd.c#1 branch .. //depot/projects/bike_sched/sys/boot/ofw/libofw/libofw.h#1 branch .. //depot/projects/bike_sched/sys/boot/ofw/libofw/ofw_console.c#1 branch .. //depot/projects/bike_sched/sys/boot/ofw/libofw/ofw_copy.c#1 branch .. //depot/projects/bike_sched/sys/boot/ofw/libofw/ofw_disk.c#1 branch .. //depot/projects/bike_sched/sys/boot/ofw/libofw/ofw_memory.c#1 branch .. //depot/projects/bike_sched/sys/boot/ofw/libofw/ofw_module.c#1 branch .. //depot/projects/bike_sched/sys/boot/ofw/libofw/ofw_net.c#1 branch .. //depot/projects/bike_sched/sys/boot/ofw/libofw/ofw_reboot.c#1 branch .. //depot/projects/bike_sched/sys/boot/ofw/libofw/ofw_time.c#1 branch .. //depot/projects/bike_sched/sys/boot/ofw/libofw/openfirm.c#1 branch .. //depot/projects/bike_sched/sys/boot/ofw/libofw/openfirm.h#1 branch .. //depot/projects/bike_sched/sys/boot/pc98/Makefile#1 branch .. //depot/projects/bike_sched/sys/boot/pc98/Makefile.inc#1 branch .. //depot/projects/bike_sched/sys/boot/pc98/boot0.5/Makefile#1 branch .. //depot/projects/bike_sched/sys/boot/pc98/boot0.5/boot.s#1 branch .. //depot/projects/bike_sched/sys/boot/pc98/boot0.5/boot0.5.s#1 branch .. //depot/projects/bike_sched/sys/boot/pc98/boot0.5/disk.s#1 branch .. //depot/projects/bike_sched/sys/boot/pc98/boot0.5/selector.s#1 branch .. //depot/projects/bike_sched/sys/boot/pc98/boot0.5/start.s#1 branch .. //depot/projects/bike_sched/sys/boot/pc98/boot0.5/support.s#1 branch .. //depot/projects/bike_sched/sys/boot/pc98/boot0.5/syscons.s#1 branch .. //depot/projects/bike_sched/sys/boot/pc98/boot0/Makefile#1 branch .. //depot/projects/bike_sched/sys/boot/pc98/boot0/boot0.s#1 branch .. //depot/projects/bike_sched/sys/boot/pc98/boot2/Makefile#1 branch .. //depot/projects/bike_sched/sys/boot/pc98/boot2/README.serial.98#1 branch .. //depot/projects/bike_sched/sys/boot/pc98/boot2/asm.S#1 branch .. //depot/projects/bike_sched/sys/boot/pc98/boot2/asm.h#1 branch .. //depot/projects/bike_sched/sys/boot/pc98/boot2/bios.S#1 branch .. //depot/projects/bike_sched/sys/boot/pc98/boot2/boot.c#1 branch .. //depot/projects/bike_sched/sys/boot/pc98/boot2/boot.h#1 branch .. //depot/projects/bike_sched/sys/boot/pc98/boot2/boot2.S#1 branch .. //depot/projects/bike_sched/sys/boot/pc98/boot2/dinode.h#1 branch .. //depot/projects/bike_sched/sys/boot/pc98/boot2/disk.c#1 branch .. //depot/projects/bike_sched/sys/boot/pc98/boot2/fs.h#1 branch .. //depot/projects/bike_sched/sys/boot/pc98/boot2/inode.h#1 branch .. //depot/projects/bike_sched/sys/boot/pc98/boot2/io.c#1 branch .. //depot/projects/bike_sched/sys/boot/pc98/boot2/probe_keyboard.c#1 branch .. //depot/projects/bike_sched/sys/boot/pc98/boot2/quota.h#1 branch .. //depot/projects/bike_sched/sys/boot/pc98/boot2/serial.S#1 branch .. //depot/projects/bike_sched/sys/boot/pc98/boot2/serial_16550.S#1 branch .. //depot/projects/bike_sched/sys/boot/pc98/boot2/serial_8251.S#1 branch .. //depot/projects/bike_sched/sys/boot/pc98/boot2/start.S#1 branch .. //depot/projects/bike_sched/sys/boot/pc98/boot2/sys.c#1 branch .. //depot/projects/bike_sched/sys/boot/pc98/boot2/table.c#1 branch .. //depot/projects/bike_sched/sys/boot/pc98/btx/Makefile#1 branch .. //depot/projects/bike_sched/sys/boot/pc98/btx/Makefile.inc#1 branch .. //depot/projects/bike_sched/sys/boot/pc98/btx/btx/Makefile#1 branch .. //depot/projects/bike_sched/sys/boot/pc98/btx/btx/btx.S#1 branch .. //depot/projects/bike_sched/sys/boot/pc98/btx/btxldr/Makefile#1 branch .. //depot/projects/bike_sched/sys/boot/pc98/btx/btxldr/btxldr.S#1 branch .. //depot/projects/bike_sched/sys/boot/pc98/btx/lib/Makefile#1 branch .. //depot/projects/bike_sched/sys/boot/pc98/btx/lib/btxcsu.s#1 branch .. //depot/projects/bike_sched/sys/boot/pc98/btx/lib/btxsys.s#1 branch .. //depot/projects/bike_sched/sys/boot/pc98/btx/lib/btxv86.h#1 branch .. //depot/projects/bike_sched/sys/boot/pc98/btx/lib/btxv86.s#1 branch .. //depot/projects/bike_sched/sys/boot/pc98/cdboot/Makefile#1 branch .. //depot/projects/bike_sched/sys/boot/pc98/cdboot/cdboot.s#1 branch .. //depot/projects/bike_sched/sys/boot/pc98/kgzldr/Makefile#1 branch .. //depot/projects/bike_sched/sys/boot/pc98/kgzldr/crt.s#1 branch .. //depot/projects/bike_sched/sys/boot/pc98/libpc98/Makefile#1 branch .. //depot/projects/bike_sched/sys/boot/pc98/libpc98/bioscd.c#1 branch .. //depot/projects/bike_sched/sys/boot/pc98/libpc98/biosdisk.c#1 branch .. //depot/projects/bike_sched/sys/boot/pc98/libpc98/biosmem.c#1 branch .. //depot/projects/bike_sched/sys/boot/pc98/libpc98/comconsole.c#1 branch .. //depot/projects/bike_sched/sys/boot/pc98/libpc98/i386_module.c#1 branch .. //depot/projects/bike_sched/sys/boot/pc98/libpc98/time.c#1 branch .. //depot/projects/bike_sched/sys/boot/pc98/libpc98/vidconsole.c#1 branch .. //depot/projects/bike_sched/sys/boot/pc98/loader/Makefile#1 branch .. //depot/projects/bike_sched/sys/boot/pc98/loader/conf.c#1 branch .. //depot/projects/bike_sched/sys/boot/pc98/loader/help.pc98#1 branch .. //depot/projects/bike_sched/sys/boot/pc98/loader/main.c#1 branch .. //depot/projects/bike_sched/sys/boot/powerpc/Makefile#1 branch .. //depot/projects/bike_sched/sys/boot/powerpc/loader/Makefile#1 branch .. //depot/projects/bike_sched/sys/boot/powerpc/loader/conf.c#1 branch .. //depot/projects/bike_sched/sys/boot/powerpc/loader/help.ofw#1 branch .. //depot/projects/bike_sched/sys/boot/powerpc/loader/ldscript.powerpc#1 branch .. //depot/projects/bike_sched/sys/boot/powerpc/loader/metadata.c#1 branch .. //depot/projects/bike_sched/sys/boot/powerpc/loader/start.c#1 branch .. //depot/projects/bike_sched/sys/boot/powerpc/loader/version#1 branch .. //depot/projects/bike_sched/sys/boot/sparc64/Makefile#1 branch .. //depot/projects/bike_sched/sys/boot/sparc64/Makefile.inc#1 branch .. //depot/projects/bike_sched/sys/boot/sparc64/boot1/Makefile#1 branch .. //depot/projects/bike_sched/sys/boot/sparc64/boot1/_start.s#1 branch .. //depot/projects/bike_sched/sys/boot/sparc64/boot1/boot1.c#1 branch .. //depot/projects/bike_sched/sys/boot/sparc64/loader/Makefile#1 branch .. //depot/projects/bike_sched/sys/boot/sparc64/loader/help.sparc64#1 branch .. //depot/projects/bike_sched/sys/boot/sparc64/loader/locore.S#1 branch .. //depot/projects/bike_sched/sys/boot/sparc64/loader/main.c#1 branch .. //depot/projects/bike_sched/sys/boot/sparc64/loader/metadata.c#1 branch .. //depot/projects/bike_sched/sys/boot/sparc64/loader/version#1 branch .. //depot/projects/bike_sched/sys/bsm/audit.h#1 branch .. //depot/projects/bike_sched/sys/bsm/audit_internal.h#1 branch .. //depot/projects/bike_sched/sys/bsm/audit_kevents.h#1 branch .. //depot/projects/bike_sched/sys/bsm/audit_record.h#1 branch .. //depot/projects/bike_sched/sys/cam/cam.c#1 branch .. //depot/projects/bike_sched/sys/cam/cam.h#1 branch .. //depot/projects/bike_sched/sys/cam/cam_ccb.h#1 branch .. //depot/projects/bike_sched/sys/cam/cam_debug.h#1 branch .. //depot/projects/bike_sched/sys/cam/cam_periph.c#1 branch .. //depot/projects/bike_sched/sys/cam/cam_periph.h#1 branch .. //depot/projects/bike_sched/sys/cam/cam_queue.c#1 branch .. //depot/projects/bike_sched/sys/cam/cam_queue.h#1 branch .. //depot/projects/bike_sched/sys/cam/cam_sim.c#1 branch .. //depot/projects/bike_sched/sys/cam/cam_sim.h#1 branch .. //depot/projects/bike_sched/sys/cam/cam_xpt.c#1 branch .. //depot/projects/bike_sched/sys/cam/cam_xpt.h#1 branch .. //depot/projects/bike_sched/sys/cam/cam_xpt_periph.h#1 branch .. //depot/projects/bike_sched/sys/cam/cam_xpt_sim.h#1 branch .. //depot/projects/bike_sched/sys/cam/scsi/scsi_all.c#1 branch .. //depot/projects/bike_sched/sys/cam/scsi/scsi_all.h#1 branch .. //depot/projects/bike_sched/sys/cam/scsi/scsi_cd.c#1 branch .. //depot/projects/bike_sched/sys/cam/scsi/scsi_cd.h#1 branch .. //depot/projects/bike_sched/sys/cam/scsi/scsi_ch.c#1 branch .. //depot/projects/bike_sched/sys/cam/scsi/scsi_ch.h#1 branch .. //depot/projects/bike_sched/sys/cam/scsi/scsi_da.c#1 branch .. //depot/projects/bike_sched/sys/cam/scsi/scsi_da.h#1 branch .. //depot/projects/bike_sched/sys/cam/scsi/scsi_dvcfg.h#1 branch .. //depot/projects/bike_sched/sys/cam/scsi/scsi_iu.h#1 branch .. //depot/projects/bike_sched/sys/cam/scsi/scsi_low.c#1 branch .. //depot/projects/bike_sched/sys/cam/scsi/scsi_low.h#1 branch .. //depot/projects/bike_sched/sys/cam/scsi/scsi_low_pisa.c#1 branch .. //depot/projects/bike_sched/sys/cam/scsi/scsi_low_pisa.h#1 branch .. //depot/projects/bike_sched/sys/cam/scsi/scsi_message.h#1 branch .. //depot/projects/bike_sched/sys/cam/scsi/scsi_pass.c#1 branch .. //depot/projects/bike_sched/sys/cam/scsi/scsi_pass.h#1 branch .. //depot/projects/bike_sched/sys/cam/scsi/scsi_pt.c#1 branch .. //depot/projects/bike_sched/sys/cam/scsi/scsi_pt.h#1 branch .. //depot/projects/bike_sched/sys/cam/scsi/scsi_sa.c#1 branch .. //depot/projects/bike_sched/sys/cam/scsi/scsi_sa.h#1 branch .. //depot/projects/bike_sched/sys/cam/scsi/scsi_ses.c#1 branch .. //depot/projects/bike_sched/sys/cam/scsi/scsi_ses.h#1 branch .. //depot/projects/bike_sched/sys/cam/scsi/scsi_targ_bh.c#1 branch .. //depot/projects/bike_sched/sys/cam/scsi/scsi_target.c#1 branch .. //depot/projects/bike_sched/sys/cam/scsi/scsi_targetio.h#1 branch .. //depot/projects/bike_sched/sys/coda/00READ#1 branch .. //depot/projects/bike_sched/sys/coda/README#1 branch .. //depot/projects/bike_sched/sys/coda/TODO#1 branch .. //depot/projects/bike_sched/sys/coda/cnode.h#1 branch .. //depot/projects/bike_sched/sys/coda/coda.h#1 branch .. //depot/projects/bike_sched/sys/coda/coda_fbsd.c#1 branch .. //depot/projects/bike_sched/sys/coda/coda_io.h#1 branch .. //depot/projects/bike_sched/sys/coda/coda_kernel.h#1 branch .. //depot/projects/bike_sched/sys/coda/coda_namecache.c#1 branch .. //depot/projects/bike_sched/sys/coda/coda_namecache.h#1 branch .. //depot/projects/bike_sched/sys/coda/coda_opstats.h#1 branch .. //depot/projects/bike_sched/sys/coda/coda_pioctl.h#1 branch .. //depot/projects/bike_sched/sys/coda/coda_psdev.c#1 branch .. //depot/projects/bike_sched/sys/coda/coda_psdev.h#1 branch .. //depot/projects/bike_sched/sys/coda/coda_subr.c#1 branch .. //depot/projects/bike_sched/sys/coda/coda_subr.h#1 branch .. //depot/projects/bike_sched/sys/coda/coda_venus.c#1 branch .. //depot/projects/bike_sched/sys/coda/coda_venus.h#1 branch .. //depot/projects/bike_sched/sys/coda/coda_vfsops.c#1 branch .. //depot/projects/bike_sched/sys/coda/coda_vfsops.h#1 branch .. //depot/projects/bike_sched/sys/coda/coda_vnops.c#1 branch .. //depot/projects/bike_sched/sys/coda/coda_vnops.h#1 branch .. //depot/projects/bike_sched/sys/compat/freebsd32/Makefile#1 branch .. //depot/projects/bike_sched/sys/compat/freebsd32/freebsd32.h#1 branch .. //depot/projects/bike_sched/sys/compat/freebsd32/freebsd32_misc.c#1 branch .. //depot/projects/bike_sched/sys/compat/freebsd32/freebsd32_proto.h#1 branch .. //depot/projects/bike_sched/sys/compat/freebsd32/freebsd32_syscall.h#1 branch .. //depot/projects/bike_sched/sys/compat/freebsd32/freebsd32_syscalls.c#1 branch .. //depot/projects/bike_sched/sys/compat/freebsd32/freebsd32_sysent.c#1 branch .. //depot/projects/bike_sched/sys/compat/freebsd32/freebsd32_util.h#1 branch .. //depot/projects/bike_sched/sys/compat/freebsd32/syscalls.conf#1 branch .. //depot/projects/bike_sched/sys/compat/freebsd32/syscalls.master#1 branch .. //depot/projects/bike_sched/sys/compat/ia32/ia32_genassym.c#1 branch .. //depot/projects/bike_sched/sys/compat/ia32/ia32_reg.h#1 branch .. //depot/projects/bike_sched/sys/compat/ia32/ia32_signal.h#1 branch .. //depot/projects/bike_sched/sys/compat/ia32/ia32_sysvec.c#1 branch .. //depot/projects/bike_sched/sys/compat/ia32/ia32_util.h#1 branch .. //depot/projects/bike_sched/sys/compat/linprocfs/linprocfs.c#1 branch .. //depot/projects/bike_sched/sys/compat/linsysfs/linsysfs.c#1 branch .. //depot/projects/bike_sched/sys/compat/linux/linux_file.c#1 branch .. //depot/projects/bike_sched/sys/compat/linux/linux_getcwd.c#1 branch .. //depot/projects/bike_sched/sys/compat/linux/linux_ioctl.c#1 branch .. //depot/projects/bike_sched/sys/compat/linux/linux_ioctl.h#1 branch .. //depot/projects/bike_sched/sys/compat/linux/linux_ipc.c#1 branch .. //depot/projects/bike_sched/sys/compat/linux/linux_ipc.h#1 branch .. //depot/projects/bike_sched/sys/compat/linux/linux_mib.c#1 branch .. //depot/projects/bike_sched/sys/compat/linux/linux_mib.h#1 branch .. //depot/projects/bike_sched/sys/compat/linux/linux_misc.c#1 branch .. //depot/projects/bike_sched/sys/compat/linux/linux_signal.c#1 branch .. //depot/projects/bike_sched/sys/compat/linux/linux_signal.h#1 branch .. //depot/projects/bike_sched/sys/compat/linux/linux_socket.c#1 branch .. //depot/projects/bike_sched/sys/compat/linux/linux_socket.h#1 branch .. //depot/projects/bike_sched/sys/compat/linux/linux_stats.c#1 branch .. //depot/projects/bike_sched/sys/compat/linux/linux_sysctl.c#1 branch .. //depot/projects/bike_sched/sys/compat/linux/linux_sysproto.h#1 branch .. //depot/projects/bike_sched/sys/compat/linux/linux_uid16.c#1 branch .. //depot/projects/bike_sched/sys/compat/linux/linux_util.c#1 branch .. //depot/projects/bike_sched/sys/compat/linux/linux_util.h#1 branch .. //depot/projects/bike_sched/sys/compat/ndis/cfg_var.h#1 branch .. //depot/projects/bike_sched/sys/compat/ndis/hal_var.h#1 branch .. //depot/projects/bike_sched/sys/compat/ndis/kern_ndis.c#1 branch .. //depot/projects/bike_sched/sys/compat/ndis/kern_windrv.c#1 branch .. //depot/projects/bike_sched/sys/compat/ndis/ndis_var.h#1 branch .. //depot/projects/bike_sched/sys/compat/ndis/ntoskrnl_var.h#1 branch .. //depot/projects/bike_sched/sys/compat/ndis/pe_var.h#1 branch .. //depot/projects/bike_sched/sys/compat/ndis/resource_var.h#1 branch .. //depot/projects/bike_sched/sys/compat/ndis/subr_hal.c#1 branch .. //depot/projects/bike_sched/sys/compat/ndis/subr_ndis.c#1 branch .. //depot/projects/bike_sched/sys/compat/ndis/subr_ntoskrnl.c#1 branch .. //depot/projects/bike_sched/sys/compat/ndis/subr_pe.c#1 branch .. //depot/projects/bike_sched/sys/compat/ndis/subr_usbd.c#1 branch .. //depot/projects/bike_sched/sys/compat/ndis/usbd_var.h#1 branch .. //depot/projects/bike_sched/sys/compat/ndis/winx32_wrap.S#1 branch .. //depot/projects/bike_sched/sys/compat/ndis/winx64_wrap.S#1 branch .. //depot/projects/bike_sched/sys/compat/netbsd/dvcfg.h#1 branch .. //depot/projects/bike_sched/sys/compat/netbsd/physio_proc.h#1 branch .. //depot/projects/bike_sched/sys/compat/pecoff/imgact_pecoff.c#1 branch .. //depot/projects/bike_sched/sys/compat/pecoff/imgact_pecoff.h#1 branch .. //depot/projects/bike_sched/sys/compat/svr4/Makefile#1 branch .. //depot/projects/bike_sched/sys/compat/svr4/imgact_svr4.c#1 branch .. //depot/projects/bike_sched/sys/compat/svr4/svr4.h#1 branch .. //depot/projects/bike_sched/sys/compat/svr4/svr4_acl.h#1 branch .. //depot/projects/bike_sched/sys/compat/svr4/svr4_dirent.h#1 branch .. //depot/projects/bike_sched/sys/compat/svr4/svr4_errno.h#1 branch .. //depot/projects/bike_sched/sys/compat/svr4/svr4_exec.h#1 branch .. //depot/projects/bike_sched/sys/compat/svr4/svr4_fcntl.c#1 branch .. //depot/projects/bike_sched/sys/compat/svr4/svr4_fcntl.h#1 branch .. //depot/projects/bike_sched/sys/compat/svr4/svr4_filio.c#1 branch .. //depot/projects/bike_sched/sys/compat/svr4/svr4_filio.h#1 branch .. //depot/projects/bike_sched/sys/compat/svr4/svr4_fuser.h#1 branch .. //depot/projects/bike_sched/sys/compat/svr4/svr4_hrt.h#1 branch .. //depot/projects/bike_sched/sys/compat/svr4/svr4_ioctl.c#1 branch .. //depot/projects/bike_sched/sys/compat/svr4/svr4_ioctl.h#1 branch .. //depot/projects/bike_sched/sys/compat/svr4/svr4_ipc.c#1 branch .. //depot/projects/bike_sched/sys/compat/svr4/svr4_ipc.h#1 branch .. //depot/projects/bike_sched/sys/compat/svr4/svr4_misc.c#1 branch .. //depot/projects/bike_sched/sys/compat/svr4/svr4_mman.h#1 branch .. //depot/projects/bike_sched/sys/compat/svr4/svr4_proto.h#1 branch .. //depot/projects/bike_sched/sys/compat/svr4/svr4_resource.c#1 branch .. //depot/projects/bike_sched/sys/compat/svr4/svr4_resource.h#1 branch .. //depot/projects/bike_sched/sys/compat/svr4/svr4_siginfo.h#1 branch .. //depot/projects/bike_sched/sys/compat/svr4/svr4_signal.c#1 branch .. //depot/projects/bike_sched/sys/compat/svr4/svr4_signal.h#1 branch .. //depot/projects/bike_sched/sys/compat/svr4/svr4_socket.c#1 branch .. //depot/projects/bike_sched/sys/compat/svr4/svr4_socket.h#1 branch .. //depot/projects/bike_sched/sys/compat/svr4/svr4_sockio.c#1 branch .. //depot/projects/bike_sched/sys/compat/svr4/svr4_sockio.h#1 branch .. //depot/projects/bike_sched/sys/compat/svr4/svr4_sockmod.h#1 branch .. //depot/projects/bike_sched/sys/compat/svr4/svr4_stat.c#1 branch .. //depot/projects/bike_sched/sys/compat/svr4/svr4_stat.h#1 branch .. //depot/projects/bike_sched/sys/compat/svr4/svr4_statvfs.h#1 branch .. //depot/projects/bike_sched/sys/compat/svr4/svr4_stream.c#1 branch .. //depot/projects/bike_sched/sys/compat/svr4/svr4_stropts.h#1 branch .. //depot/projects/bike_sched/sys/compat/svr4/svr4_syscall.h#1 branch .. //depot/projects/bike_sched/sys/compat/svr4/svr4_syscallnames.c#1 branch .. //depot/projects/bike_sched/sys/compat/svr4/svr4_sysconfig.h#1 branch .. //depot/projects/bike_sched/sys/compat/svr4/svr4_sysent.c#1 branch .. //depot/projects/bike_sched/sys/compat/svr4/svr4_systeminfo.h#1 branch .. //depot/projects/bike_sched/sys/compat/svr4/svr4_sysvec.c#1 branch .. //depot/projects/bike_sched/sys/compat/svr4/svr4_termios.c#1 branch .. //depot/projects/bike_sched/sys/compat/svr4/svr4_termios.h#1 branch .. //depot/projects/bike_sched/sys/compat/svr4/svr4_time.h#1 branch .. //depot/projects/bike_sched/sys/compat/svr4/svr4_timod.h#1 branch .. //depot/projects/bike_sched/sys/compat/svr4/svr4_ttold.c#1 branch .. //depot/projects/bike_sched/sys/compat/svr4/svr4_ttold.h#1 branch .. //depot/projects/bike_sched/sys/compat/svr4/svr4_types.h#1 branch .. //depot/projects/bike_sched/sys/compat/svr4/svr4_ucontext.h#1 branch .. //depot/projects/bike_sched/sys/compat/svr4/svr4_ulimit.h#1 branch .. //depot/projects/bike_sched/sys/compat/svr4/svr4_ustat.h#1 branch .. //depot/projects/bike_sched/sys/compat/svr4/svr4_util.h#1 branch .. //depot/projects/bike_sched/sys/compat/svr4/svr4_utsname.h#1 branch .. //depot/projects/bike_sched/sys/compat/svr4/svr4_wait.h#1 branch .. //depot/projects/bike_sched/sys/compat/svr4/syscalls.conf#1 branch .. //depot/projects/bike_sched/sys/compat/svr4/syscalls.master#1 branch .. //depot/projects/bike_sched/sys/conf/Makefile.amd64#1 branch .. //depot/projects/bike_sched/sys/conf/Makefile.arm#1 branch .. //depot/projects/bike_sched/sys/conf/Makefile.i386#1 branch .. //depot/projects/bike_sched/sys/conf/Makefile.ia64#1 branch .. //depot/projects/bike_sched/sys/conf/Makefile.pc98#1 branch .. //depot/projects/bike_sched/sys/conf/Makefile.powerpc#1 branch .. //depot/projects/bike_sched/sys/conf/Makefile.sparc64#1 branch .. //depot/projects/bike_sched/sys/conf/NOTES#1 branch .. //depot/projects/bike_sched/sys/conf/defines#1 branch .. //depot/projects/bike_sched/sys/conf/files#1 branch .. //depot/projects/bike_sched/sys/conf/files.amd64#1 branch .. //depot/projects/bike_sched/sys/conf/files.arm#1 branch .. //depot/projects/bike_sched/sys/conf/files.i386#1 branch .. //depot/projects/bike_sched/sys/conf/files.ia64#1 branch .. //depot/projects/bike_sched/sys/conf/files.pc98#1 branch .. //depot/projects/bike_sched/sys/conf/files.powerpc#1 branch .. //depot/projects/bike_sched/sys/conf/files.sparc64#1 branch .. //depot/projects/bike_sched/sys/conf/kern.mk#1 branch .. //depot/projects/bike_sched/sys/conf/kern.post.mk#1 branch .. //depot/projects/bike_sched/sys/conf/kern.pre.mk#1 branch .. //depot/projects/bike_sched/sys/conf/kmod.mk#1 branch .. //depot/projects/bike_sched/sys/conf/kmod_syms.awk#1 branch .. //depot/projects/bike_sched/sys/conf/ldscript.amd64#1 branch .. //depot/projects/bike_sched/sys/conf/ldscript.arm#1 branch .. //depot/projects/bike_sched/sys/conf/ldscript.i386#1 branch .. //depot/projects/bike_sched/sys/conf/ldscript.ia64#1 branch .. //depot/projects/bike_sched/sys/conf/ldscript.powerpc#1 branch .. //depot/projects/bike_sched/sys/conf/ldscript.sparc64#1 branch .. //depot/projects/bike_sched/sys/conf/makeLINT.mk#1 branch .. //depot/projects/bike_sched/sys/conf/makeLINT.sed#1 branch .. //depot/projects/bike_sched/sys/conf/newvers.sh#1 branch .. //depot/projects/bike_sched/sys/conf/options#1 branch .. //depot/projects/bike_sched/sys/conf/options.amd64#1 branch .. //depot/projects/bike_sched/sys/conf/options.arm#1 branch .. //depot/projects/bike_sched/sys/conf/options.i386#1 branch .. //depot/projects/bike_sched/sys/conf/options.ia64#1 branch .. //depot/projects/bike_sched/sys/conf/options.pc98#1 branch .. //depot/projects/bike_sched/sys/conf/options.powerpc#1 branch .. //depot/projects/bike_sched/sys/conf/options.sparc64#1 branch .. //depot/projects/bike_sched/sys/conf/systags.sh#1 branch .. //depot/projects/bike_sched/sys/contrib/altq/altq/altq.h#1 branch .. //depot/projects/bike_sched/sys/contrib/altq/altq/altq_cbq.c#1 branch .. //depot/projects/bike_sched/sys/contrib/altq/altq/altq_cbq.h#1 branch .. //depot/projects/bike_sched/sys/contrib/altq/altq/altq_cdnr.c#1 branch .. //depot/projects/bike_sched/sys/contrib/altq/altq/altq_cdnr.h#1 branch .. //depot/projects/bike_sched/sys/contrib/altq/altq/altq_classq.h#1 branch .. //depot/projects/bike_sched/sys/contrib/altq/altq/altq_hfsc.c#1 branch .. //depot/projects/bike_sched/sys/contrib/altq/altq/altq_hfsc.h#1 branch .. //depot/projects/bike_sched/sys/contrib/altq/altq/altq_priq.c#1 branch .. //depot/projects/bike_sched/sys/contrib/altq/altq/altq_priq.h#1 branch .. //depot/projects/bike_sched/sys/contrib/altq/altq/altq_red.c#1 branch .. //depot/projects/bike_sched/sys/contrib/altq/altq/altq_red.h#1 branch .. //depot/projects/bike_sched/sys/contrib/altq/altq/altq_rio.c#1 branch .. //depot/projects/bike_sched/sys/contrib/altq/altq/altq_rio.h#1 branch .. //depot/projects/bike_sched/sys/contrib/altq/altq/altq_rmclass.c#1 branch .. //depot/projects/bike_sched/sys/contrib/altq/altq/altq_rmclass.h#1 branch .. //depot/projects/bike_sched/sys/contrib/altq/altq/altq_rmclass_debug.h#1 branch .. //depot/projects/bike_sched/sys/contrib/altq/altq/altq_subr.c#1 branch .. //depot/projects/bike_sched/sys/contrib/altq/altq/altq_var.h#1 branch .. //depot/projects/bike_sched/sys/contrib/altq/altq/altqconf.h#1 branch .. //depot/projects/bike_sched/sys/contrib/altq/altq/if_altq.h#1 branch .. //depot/projects/bike_sched/sys/contrib/dev/acpica/CHANGES.txt#1 branch .. //depot/projects/bike_sched/sys/contrib/dev/acpica/acapps.h#1 branch .. //depot/projects/bike_sched/sys/contrib/dev/acpica/acconfig.h#1 branch .. //depot/projects/bike_sched/sys/contrib/dev/acpica/acdebug.h#1 branch .. //depot/projects/bike_sched/sys/contrib/dev/acpica/acdisasm.h#1 branch .. //depot/projects/bike_sched/sys/contrib/dev/acpica/acdispat.h#1 branch .. //depot/projects/bike_sched/sys/contrib/dev/acpica/acefi.h#1 branch .. //depot/projects/bike_sched/sys/contrib/dev/acpica/acenv.h#1 branch .. //depot/projects/bike_sched/sys/contrib/dev/acpica/acevents.h#1 branch .. //depot/projects/bike_sched/sys/contrib/dev/acpica/acexcep.h#1 branch .. //depot/projects/bike_sched/sys/contrib/dev/acpica/acfreebsd.h#1 branch .. //depot/projects/bike_sched/sys/contrib/dev/acpica/acgcc.h#1 branch .. //depot/projects/bike_sched/sys/contrib/dev/acpica/acglobal.h#1 branch .. //depot/projects/bike_sched/sys/contrib/dev/acpica/achware.h#1 branch .. //depot/projects/bike_sched/sys/contrib/dev/acpica/acinterp.h#1 branch .. //depot/projects/bike_sched/sys/contrib/dev/acpica/aclocal.h#1 branch .. //depot/projects/bike_sched/sys/contrib/dev/acpica/acmacros.h#1 branch .. //depot/projects/bike_sched/sys/contrib/dev/acpica/acnames.h#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jun 5 03:17:44 2006 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 46E8516A47B; Mon, 5 Jun 2006 03:17:44 +0000 (UTC) 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 F100416A479 for ; Mon, 5 Jun 2006 03:17:43 +0000 (UTC) (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 87B4043D49 for ; Mon, 5 Jun 2006 03:17:43 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k553G101003486 for ; Mon, 5 Jun 2006 03:16:01 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k553FwaP003479 for perforce@freebsd.org; Mon, 5 Jun 2006 03:15:58 GMT (envelope-from peter@freebsd.org) Date: Mon, 5 Jun 2006 03:15:58 GMT Message-Id: <200606050315.k553FwaP003479@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 98517 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, 05 Jun 2006 03:17:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=98517 Change 98517 by peter@peter_daintree on 2006/06/05 03:15:23 Checkpoint my cvs tree. This actually boots. But, it breaks libpthread, hence the name of the branch. I'm submitting this from my laptop running kde/firefox/etc. /etc/libmap.conf:"libpthread.so.1 libthr.so.1" helps. (UP, sched_4bsd, i386 tested.) Affected files ... .. //depot/projects/bike_sched/sys/amd64/amd64/machdep.c#2 edit .. //depot/projects/bike_sched/sys/amd64/amd64/trap.c#2 edit .. //depot/projects/bike_sched/sys/amd64/amd64/vm_machdep.c#2 edit .. //depot/projects/bike_sched/sys/arm/arm/trap.c#2 edit .. //depot/projects/bike_sched/sys/arm/at91/kb920x_machdep.c#2 edit .. //depot/projects/bike_sched/sys/arm/sa11x0/assabet_machdep.c#2 edit .. //depot/projects/bike_sched/sys/arm/xscale/i80321/iq31244_machdep.c#2 edit .. //depot/projects/bike_sched/sys/conf/files#2 edit .. //depot/projects/bike_sched/sys/ddb/db_ps.c#2 edit .. //depot/projects/bike_sched/sys/i386/i386/machdep.c#2 edit .. //depot/projects/bike_sched/sys/i386/i386/sys_machdep.c#2 edit .. //depot/projects/bike_sched/sys/i386/i386/trap.c#2 edit .. //depot/projects/bike_sched/sys/ia64/ia64/machdep.c#2 edit .. //depot/projects/bike_sched/sys/kern/init_main.c#2 edit .. //depot/projects/bike_sched/sys/kern/init_sysent.c#2 edit .. //depot/projects/bike_sched/sys/kern/kern_clock.c#2 edit .. //depot/projects/bike_sched/sys/kern/kern_fork.c#2 edit .. //depot/projects/bike_sched/sys/kern/kern_idle.c#2 edit .. //depot/projects/bike_sched/sys/kern/kern_intr.c#2 edit .. //depot/projects/bike_sched/sys/kern/kern_kse.c#2 delete .. //depot/projects/bike_sched/sys/kern/kern_poll.c#2 edit .. //depot/projects/bike_sched/sys/kern/kern_proc.c#2 edit .. //depot/projects/bike_sched/sys/kern/kern_resource.c#2 edit .. //depot/projects/bike_sched/sys/kern/kern_sig.c#2 edit .. //depot/projects/bike_sched/sys/kern/kern_subr.c#2 edit .. //depot/projects/bike_sched/sys/kern/kern_switch.c#2 edit .. //depot/projects/bike_sched/sys/kern/kern_synch.c#2 edit .. //depot/projects/bike_sched/sys/kern/kern_thr.c#2 edit .. //depot/projects/bike_sched/sys/kern/kern_thread.c#2 edit .. //depot/projects/bike_sched/sys/kern/sched_4bsd.c#2 edit .. //depot/projects/bike_sched/sys/kern/sched_ule.c#2 edit .. //depot/projects/bike_sched/sys/kern/subr_trap.c#2 edit .. //depot/projects/bike_sched/sys/kern/sys_process.c#2 edit .. //depot/projects/bike_sched/sys/kern/syscalls.c#2 edit .. //depot/projects/bike_sched/sys/kern/syscalls.master#2 edit .. //depot/projects/bike_sched/sys/kern/tty.c#2 edit .. //depot/projects/bike_sched/sys/pc98/pc98/machdep.c#2 edit .. //depot/projects/bike_sched/sys/posix4/ksched.c#2 edit .. //depot/projects/bike_sched/sys/powerpc/powerpc/machdep.c#2 edit .. //depot/projects/bike_sched/sys/sparc64/sparc64/machdep.c#2 edit .. //depot/projects/bike_sched/sys/sys/proc.h#2 edit .. //depot/projects/bike_sched/sys/sys/rtprio.h#2 edit .. //depot/projects/bike_sched/sys/sys/sched.h#2 edit .. //depot/projects/bike_sched/sys/sys/syscall.h#2 edit .. //depot/projects/bike_sched/sys/sys/syscall.mk#2 edit .. //depot/projects/bike_sched/sys/sys/sysproto.h#2 edit .. //depot/projects/bike_sched/sys/vm/vm_glue.c#2 edit .. //depot/projects/bike_sched/sys/vm/vm_zeroidle.c#2 edit Differences ... ==== //depot/projects/bike_sched/sys/amd64/amd64/machdep.c#2 (text+ko) ==== @@ -1137,7 +1137,7 @@ * This may be done better later if it gets more high level * components in it. If so just link td->td_proc here. */ - proc_linkup(&proc0, &ksegrp0, &thread0); + proc_linkup(&proc0, &thread0); preload_metadata = (caddr_t)(uintptr_t)(modulep + KERNBASE); preload_bootstrap_relocate(KERNBASE); ==== //depot/projects/bike_sched/sys/amd64/amd64/trap.c#2 (text+ko) ==== @@ -301,8 +301,6 @@ case T_PAGEFLT: /* page fault */ addr = frame.tf_addr; - if (td->td_pflags & TDP_SA) - thread_user_enter(td); i = trap_pfault(&frame, TRUE); if (i == -1) goto userout; @@ -759,8 +757,6 @@ td->td_frame = &frame; if (td->td_ucred != p->p_ucred) cred_update_thread(td); - if (p->p_flag & P_SA) - thread_user_enter(td); params = (caddr_t)frame.tf_rsp + sizeof(register_t); code = frame.tf_rax; orig_tf_rflags = frame.tf_rflags; ==== //depot/projects/bike_sched/sys/amd64/amd64/vm_machdep.c#2 (text+ko) ==== @@ -311,15 +311,6 @@ stack_t *stack) { - /* - * Do any extra cleaning that needs to be done. - * The thread may have optional components - * that are not present in a fresh thread. - * This may be a recycled thread so make it look - * as though it's newly allocated. - */ - cpu_thread_clean(td); - /* * Set the trap frame to point at the beginning of the uts * function. ==== //depot/projects/bike_sched/sys/arm/arm/trap.c#2 (text+ko) ==== @@ -264,8 +264,6 @@ td->td_frame = tf; if (td->td_ucred != td->td_proc->p_ucred) cred_update_thread(td); - if (td->td_pflags & TDP_SA) - thread_user_enter(td); } /* Grab the current pcb */ ==== //depot/projects/bike_sched/sys/arm/at91/kb920x_machdep.c#2 (text) ==== @@ -382,7 +382,7 @@ undefined_handler_address = (u_int)undefinedinstruction_bounce; undefined_init(); - proc_linkup(&proc0, &ksegrp0, &thread0); + proc_linkup(&proc0, &thread0); thread0.td_kstack = kernelstack.pv_va; thread0.td_pcb = (struct pcb *) (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; ==== //depot/projects/bike_sched/sys/arm/sa11x0/assabet_machdep.c#2 (text+ko) ==== @@ -413,7 +413,7 @@ /* Set stack for exception handlers */ - proc_linkup(&proc0, &ksegrp0, &thread0); + proc_linkup(&proc0, &thread0); thread0.td_kstack = kernelstack.pv_va; thread0.td_pcb = (struct pcb *) (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; ==== //depot/projects/bike_sched/sys/arm/xscale/i80321/iq31244_machdep.c#2 (text+ko) ==== @@ -428,7 +428,7 @@ undefined_handler_address = (u_int)undefinedinstruction_bounce; undefined_init(); - proc_linkup(&proc0, &ksegrp0, &thread0); + proc_linkup(&proc0, &thread0); thread0.td_kstack = kernelstack.pv_va; thread0.td_pcb = (struct pcb *) (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; ==== //depot/projects/bike_sched/sys/conf/files#2 (text+ko) ==== @@ -1279,7 +1279,6 @@ kern/kern_idle.c standard kern/kern_intr.c standard kern/kern_jail.c standard -kern/kern_kse.c standard kern/kern_kthread.c standard kern/kern_ktr.c optional ktr kern/kern_ktrace.c standard ==== //depot/projects/bike_sched/sys/ddb/db_ps.c#2 (text+ko) ==== @@ -295,7 +295,6 @@ db_printf("Thread %d at %p:\n", td->td_tid, td); db_printf(" proc (pid %d): %p ", td->td_proc->p_pid, td->td_proc); - db_printf(" ksegrp: %p\n", td->td_ksegrp); if (td->td_name[0] != '\0') db_printf(" name: %s\n", td->td_name); db_printf(" flags: %#x ", td->td_flags); ==== //depot/projects/bike_sched/sys/i386/i386/machdep.c#2 (text+ko) ==== @@ -2071,7 +2071,7 @@ * This may be done better later if it gets more high level * components in it. If so just link td->td_proc here. */ - proc_linkup(&proc0, &ksegrp0, &thread0); + proc_linkup(&proc0, &thread0); metadata_missing = 0; if (bootinfo.bi_modulep) { ==== //depot/projects/bike_sched/sys/i386/i386/sys_machdep.c#2 (text+ko) ==== @@ -233,9 +233,6 @@ 0 /* granularity */ }; - if (td->td_proc->p_flag & P_SA) - return (EINVAL); /* XXXKSE */ -/* XXXKSE All the code below only works in 1:1 needs changing */ ext = (struct pcb_ext *)kmem_alloc(kernel_map, ctob(IOPAGES+1)); if (ext == 0) return (ENOMEM); ==== //depot/projects/bike_sched/sys/i386/i386/trap.c#2 (text+ko) ==== @@ -348,9 +348,6 @@ break; case T_PAGEFLT: /* page fault */ - if (td->td_pflags & TDP_SA) - thread_user_enter(td); - i = trap_pfault(&frame, TRUE, eva); #if defined(I586_CPU) && !defined(NO_F00F_HACK) if (i == -2) { @@ -938,8 +935,6 @@ td->td_frame = &frame; if (td->td_ucred != p->p_ucred) cred_update_thread(td); - if (p->p_flag & P_SA) - thread_user_enter(td); params = (caddr_t)frame.tf_esp + sizeof(int); code = frame.tf_eax; orig_tf_eflags = frame.tf_eflags; ==== //depot/projects/bike_sched/sys/ia64/ia64/machdep.c#2 (text+ko) ==== @@ -767,7 +767,7 @@ msgbufp = (struct msgbuf *)pmap_steal_memory(MSGBUF_SIZE); msgbufinit(msgbufp, MSGBUF_SIZE); - proc_linkup(&proc0, &ksegrp0, &thread0); + proc_linkup(&proc0, &thread0); /* * Init mapping for kernel stack for proc 0 */ ==== //depot/projects/bike_sched/sys/kern/init_main.c#2 (text+ko) ==== @@ -95,7 +95,6 @@ static struct pgrp pgrp0; struct proc proc0; struct thread thread0 __aligned(8); -struct ksegrp ksegrp0; struct vmspace vmspace0; struct proc *initproc; @@ -363,12 +362,10 @@ struct proc *p; unsigned i; struct thread *td; - struct ksegrp *kg; GIANT_REQUIRED; p = &proc0; td = &thread0; - kg = &ksegrp0; /* * Initialize magic number. @@ -376,14 +373,14 @@ p->p_magic = P_MAGIC; /* - * Initialize thread, process and ksegrp structures. + * Initialize thread and process structures. */ procinit(); /* set up proc zone */ - threadinit(); /* set up thead, upcall and KSEGRP zones */ + threadinit(); /* set up UMA zones */ /* * Initialise scheduler resources. - * Add scheduler specific parts to proc, ksegrp, thread as needed. + * Add scheduler specific parts to proc, thread as needed. */ schedinit(); /* scheduler gets its house in order */ /* @@ -420,8 +417,8 @@ STAILQ_INIT(&p->p_ktr); p->p_nice = NZERO; td->td_state = TDS_RUNNING; - kg->kg_pri_class = PRI_TIMESHARE; - kg->kg_user_pri = PUSER; + td->td_pri_class = PRI_TIMESHARE; + td->td_user_pri = PUSER; td->td_priority = PVM; td->td_base_pri = PUSER; td->td_oncpu = 0; ==== //depot/projects/bike_sched/sys/kern/init_sysent.c#2 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/init_sysent.c,v 1.211 2006/03/23 08:48:37 davidxu Exp $ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.213 2006/03/23 08:46:41 davidxu Exp + * $FreeBSD$ + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.215 2006/03/28 14:32:37 des Exp */ #include "opt_compat.h" @@ -408,11 +408,11 @@ { SYF_MPSAFE | AS(eaccess_args), (sy_call_t *)eaccess, AUE_EACCESS }, /* 376 = eaccess */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 377 = afs_syscall */ { AS(nmount_args), (sy_call_t *)nmount, AUE_NMOUNT }, /* 378 = nmount */ - { SYF_MPSAFE | 0, (sy_call_t *)kse_exit, AUE_NULL }, /* 379 = kse_exit */ - { SYF_MPSAFE | AS(kse_wakeup_args), (sy_call_t *)kse_wakeup, AUE_NULL }, /* 380 = kse_wakeup */ - { SYF_MPSAFE | AS(kse_create_args), (sy_call_t *)kse_create, AUE_NULL }, /* 381 = kse_create */ - { SYF_MPSAFE | AS(kse_thr_interrupt_args), (sy_call_t *)kse_thr_interrupt, AUE_NULL }, /* 382 = kse_thr_interrupt */ - { SYF_MPSAFE | AS(kse_release_args), (sy_call_t *)kse_release, AUE_NULL }, /* 383 = kse_release */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 379 = kse_exit */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 380 = kse_wakeup */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 381 = kse_create */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 382 = kse_thr_interrupt */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 383 = kse_release */ { SYF_MPSAFE | AS(__mac_get_proc_args), (sy_call_t *)__mac_get_proc, AUE_NULL }, /* 384 = __mac_get_proc */ { SYF_MPSAFE | AS(__mac_set_proc_args), (sy_call_t *)__mac_set_proc, AUE_NULL }, /* 385 = __mac_set_proc */ { SYF_MPSAFE | AS(__mac_get_fd_args), (sy_call_t *)__mac_get_fd, AUE_NULL }, /* 386 = __mac_get_fd */ @@ -469,7 +469,7 @@ { SYF_MPSAFE | AS(extattr_list_fd_args), (sy_call_t *)extattr_list_fd, AUE_NULL }, /* 437 = extattr_list_fd */ { SYF_MPSAFE | AS(extattr_list_file_args), (sy_call_t *)extattr_list_file, AUE_NULL }, /* 438 = extattr_list_file */ { SYF_MPSAFE | AS(extattr_list_link_args), (sy_call_t *)extattr_list_link, AUE_NULL }, /* 439 = extattr_list_link */ - { SYF_MPSAFE | AS(kse_switchin_args), (sy_call_t *)kse_switchin, AUE_NULL }, /* 440 = kse_switchin */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 440 = kse_switchin */ { SYF_MPSAFE | AS(ksem_timedwait_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 441 = ksem_timedwait */ { SYF_MPSAFE | AS(thr_suspend_args), (sy_call_t *)thr_suspend, AUE_NULL }, /* 442 = thr_suspend */ { SYF_MPSAFE | AS(thr_wake_args), (sy_call_t *)thr_wake, AUE_NULL }, /* 443 = thr_wake */ ==== //depot/projects/bike_sched/sys/kern/kern_clock.c#2 (text+ko) ==== @@ -201,21 +201,17 @@ * Run current process's virtual and profile time, as needed. */ mtx_lock_spin_flags(&sched_lock, MTX_QUIET); - if (p->p_flag & P_SA) { - /* XXXKSE What to do? */ - } else { - pstats = p->p_stats; - if (usermode && - timevalisset(&pstats->p_timer[ITIMER_VIRTUAL].it_value) && - itimerdecr(&pstats->p_timer[ITIMER_VIRTUAL], tick) == 0) { - p->p_sflag |= PS_ALRMPEND; - td->td_flags |= TDF_ASTPENDING; - } - if (timevalisset(&pstats->p_timer[ITIMER_PROF].it_value) && - itimerdecr(&pstats->p_timer[ITIMER_PROF], tick) == 0) { - p->p_sflag |= PS_PROFPEND; - td->td_flags |= TDF_ASTPENDING; - } + pstats = p->p_stats; + if (usermode && + timevalisset(&pstats->p_timer[ITIMER_VIRTUAL].it_value) && + itimerdecr(&pstats->p_timer[ITIMER_VIRTUAL], tick) == 0) { + p->p_sflag |= PS_ALRMPEND; + td->td_flags |= TDF_ASTPENDING; + } + if (timevalisset(&pstats->p_timer[ITIMER_PROF].it_value) && + itimerdecr(&pstats->p_timer[ITIMER_PROF], tick) == 0) { + p->p_sflag |= PS_PROFPEND; + td->td_flags |= TDF_ASTPENDING; } mtx_unlock_spin_flags(&sched_lock, MTX_QUIET); @@ -413,8 +409,6 @@ /* * Charge the time as appropriate. */ - if (p->p_flag & P_SA) - thread_statclock(1); td->td_uticks++; if (p->p_nice > NZERO) cp_time[CP_NICE]++; @@ -438,8 +432,6 @@ td->td_iticks++; cp_time[CP_INTR]++; } else { - if (p->p_flag & P_SA) - thread_statclock(0); td->td_pticks++; td->td_sticks++; if (td != PCPU_GET(idlethread)) ==== //depot/projects/bike_sched/sys/kern/kern_fork.c#2 (text+ko) ==== @@ -205,7 +205,6 @@ struct filedesc *fd; struct filedesc_to_leader *fdtol; struct thread *td2; - struct ksegrp *kg2; struct sigacts *newsigacts; int error; @@ -472,7 +471,6 @@ * then copy the section that is copied directly from the parent. */ td2 = FIRST_THREAD_IN_PROC(p2); - kg2 = FIRST_KSEGRP_IN_PROC(p2); /* Allocate and switch to an alternate kstack if specified. */ if (pages != 0) @@ -485,15 +483,11 @@ __rangeof(struct proc, p_startzero, p_endzero)); bzero(&td2->td_startzero, __rangeof(struct thread, td_startzero, td_endzero)); - bzero(&kg2->kg_startzero, - __rangeof(struct ksegrp, kg_startzero, kg_endzero)); bcopy(&p1->p_startcopy, &p2->p_startcopy, __rangeof(struct proc, p_startcopy, p_endcopy)); bcopy(&td->td_startcopy, &td2->td_startcopy, __rangeof(struct thread, td_startcopy, td_endcopy)); - bcopy(&td->td_ksegrp->kg_startcopy, &kg2->kg_startcopy, - __rangeof(struct ksegrp, kg_startcopy, kg_endcopy)); td2->td_sigstk = td->td_sigstk; td2->td_sigmask = td->td_sigmask; ==== //depot/projects/bike_sched/sys/kern/kern_idle.c#2 (text+ko) ==== @@ -79,7 +79,7 @@ td = FIRST_THREAD_IN_PROC(p); TD_SET_CAN_RUN(td); td->td_flags |= TDF_IDLETD; - sched_class(td->td_ksegrp, PRI_IDLE); + sched_class(td, PRI_IDLE); sched_prio(td, PRI_MAX_IDLE); mtx_unlock_spin(&sched_lock); PROC_UNLOCK(p); ==== //depot/projects/bike_sched/sys/kern/kern_intr.c#2 (text+ko) ==== @@ -296,7 +296,7 @@ panic("kthread_create() failed with %d", error); td = FIRST_THREAD_IN_PROC(p); /* XXXKSE */ mtx_lock_spin(&sched_lock); - td->td_ksegrp->kg_pri_class = PRI_ITHD; + td->td_pri_class = PRI_ITHD; TD_SET_IWAIT(td); mtx_unlock_spin(&sched_lock); td->td_pflags |= TDP_ITHREAD; ==== //depot/projects/bike_sched/sys/kern/kern_poll.c#2 (text+ko) ==== @@ -581,7 +581,7 @@ rtp.prio = RTP_PRIO_MAX; /* lowest priority */ rtp.type = RTP_PRIO_IDLE; mtx_lock_spin(&sched_lock); - rtp_to_pri(&rtp, td->td_ksegrp); + rtp_to_pri(&rtp, td); mtx_unlock_spin(&sched_lock); for (;;) { ==== //depot/projects/bike_sched/sys/kern/kern_proc.c#2 (text+ko) ==== @@ -142,9 +142,6 @@ { struct proc *p; struct thread *td; -#ifdef INVARIANTS - struct ksegrp *kg; -#endif /* INVARIANTS checks go here */ p = (struct proc *)mem; @@ -152,10 +149,7 @@ #ifdef INVARIANTS KASSERT((p->p_numthreads == 1), ("bad number of threads in exiting process")); - KASSERT((p->p_numksegrps == 1), ("free proc with > 1 ksegrp")); KASSERT((td != NULL), ("proc_dtor: bad thread pointer")); - kg = FIRST_KSEGRP_IN_PROC(p); - KASSERT((kg != NULL), ("proc_dtor: bad kg pointer")); KASSERT(STAILQ_EMPTY(&p->p_ktr), ("proc_dtor: non-empty p_ktr")); #endif @@ -178,17 +172,14 @@ { struct proc *p; struct thread *td; - struct ksegrp *kg; p = (struct proc *)mem; p->p_sched = (struct p_sched *)&p[1]; td = thread_alloc(); - kg = ksegrp_alloc(); bzero(&p->p_mtx, sizeof(struct mtx)); mtx_init(&p->p_mtx, "process lock", NULL, MTX_DEF | MTX_DUPOK); p->p_stats = pstats_alloc(); - proc_linkup(p, kg, td); - sched_newproc(p, kg, td); + proc_linkup(p, td); return (0); } @@ -204,7 +195,6 @@ p = (struct proc *)mem; pstats_free(p->p_stats); - ksegrp_free(FIRST_KSEGRP_IN_PROC(p)); thread_free(FIRST_THREAD_IN_PROC(p)); mtx_destroy(&p->p_mtx); if (p->p_ksi != NULL) @@ -760,7 +750,6 @@ static void fill_kinfo_thread(struct thread *td, struct kinfo_proc *kp) { - struct ksegrp *kg; struct proc *p; p = td->td_proc; @@ -800,14 +789,6 @@ kp->ki_stat = SIDL; } - kg = td->td_ksegrp; - - /* things in the KSE GROUP */ - kp->ki_estcpu = kg->kg_estcpu; - kp->ki_slptime = kg->kg_slptime; - kp->ki_pri.pri_user = kg->kg_user_pri; - kp->ki_pri.pri_class = kg->kg_pri_class; - /* Things in the thread */ kp->ki_wchan = td->td_wchan; kp->ki_pri.pri_level = td->td_priority; @@ -820,6 +801,10 @@ kp->ki_pcb = td->td_pcb; kp->ki_kstack = (void *)td->td_kstack; kp->ki_pctcpu = sched_pctcpu(td); + kp->ki_estcpu = td->td_estcpu; + kp->ki_slptime = td->td_slptime; + kp->ki_pri.pri_class = td->td_pri_class; + kp->ki_pri.pri_user = td->td_user_pri; /* We can't get this anymore but ps etc never used it anyway. */ kp->ki_rqindex = 0; ==== //depot/projects/bike_sched/sys/kern/kern_resource.c#2 (text+ko) ==== @@ -292,7 +292,7 @@ { struct proc *curp; struct proc *p; - struct ksegrp *kg; + struct thread *tdp; struct rtprio rtp; int cierror, error; @@ -328,14 +328,14 @@ * as leaving it zero. */ if (uap->pid == 0) { - pri_to_rtp(td->td_ksegrp, &rtp); + pri_to_rtp(td, &rtp); } else { struct rtprio rtp2; rtp.type = RTP_PRIO_IDLE; rtp.prio = RTP_PRIO_MAX; - FOREACH_KSEGRP_IN_PROC(p, kg) { - pri_to_rtp(kg, &rtp2); + FOREACH_THREAD_IN_PROC(p, tdp) { + pri_to_rtp(tdp, &rtp2); if (rtp2.type < rtp.type || (rtp2.type == rtp.type && rtp2.prio < rtp.prio)) { @@ -378,18 +378,17 @@ /* * If we are setting our own priority, set just our - * KSEGRP but if we are doing another process, - * do all the groups on that process. If we + * thread but if we are doing another process, + * do all the threads on that process. If we * specify our own pid we do the latter. */ mtx_lock_spin(&sched_lock); if (uap->pid == 0) { - error = rtp_to_pri(&rtp, td->td_ksegrp); + error = rtp_to_pri(&rtp, td); } else { - FOREACH_KSEGRP_IN_PROC(p, kg) { - if ((error = rtp_to_pri(&rtp, kg)) != 0) { + FOREACH_THREAD_IN_PROC(p, td) { + if ((error = rtp_to_pri(&rtp, td)) != 0) break; - } } } mtx_unlock_spin(&sched_lock); @@ -403,7 +402,7 @@ } int -rtp_to_pri(struct rtprio *rtp, struct ksegrp *kg) +rtp_to_pri(struct rtprio *rtp, struct thread *td) { mtx_assert(&sched_lock, MA_OWNED); @@ -411,43 +410,42 @@ return (EINVAL); switch (RTP_PRIO_BASE(rtp->type)) { case RTP_PRIO_REALTIME: - kg->kg_user_pri = PRI_MIN_REALTIME + rtp->prio; + td->td_user_pri = PRI_MIN_REALTIME + rtp->prio; break; case RTP_PRIO_NORMAL: - kg->kg_user_pri = PRI_MIN_TIMESHARE + rtp->prio; + td->td_user_pri = PRI_MIN_TIMESHARE + rtp->prio; break; case RTP_PRIO_IDLE: - kg->kg_user_pri = PRI_MIN_IDLE + rtp->prio; + td->td_user_pri = PRI_MIN_IDLE + rtp->prio; break; default: return (EINVAL); } - sched_class(kg, rtp->type); - if (curthread->td_ksegrp == kg) { - sched_prio(curthread, kg->kg_user_pri); /* XXX dubious */ - } + sched_class(td, rtp->type); /* XXX fix */ + if (curthread == td) + sched_prio(curthread, td->td_user_pri); /* XXX dubious */ return (0); } void -pri_to_rtp(struct ksegrp *kg, struct rtprio *rtp) +pri_to_rtp(struct thread *td, struct rtprio *rtp) { mtx_assert(&sched_lock, MA_OWNED); - switch (PRI_BASE(kg->kg_pri_class)) { + switch (PRI_BASE(td->td_pri_class)) { case PRI_REALTIME: - rtp->prio = kg->kg_user_pri - PRI_MIN_REALTIME; + rtp->prio = td->td_user_pri - PRI_MIN_REALTIME; break; case PRI_TIMESHARE: - rtp->prio = kg->kg_user_pri - PRI_MIN_TIMESHARE; + rtp->prio = td->td_user_pri - PRI_MIN_TIMESHARE; break; case PRI_IDLE: - rtp->prio = kg->kg_user_pri - PRI_MIN_IDLE; + rtp->prio = td->td_user_pri - PRI_MIN_IDLE; break; default: break; } - rtp->type = kg->kg_pri_class; + rtp->type = td->td_pri_class; } #if defined(COMPAT_43) ==== //depot/projects/bike_sched/sys/kern/kern_sig.c#2 (text+ko) ==== @@ -96,7 +96,6 @@ static struct thread *sigtd(struct proc *p, int sig, int prop); static int kern_sigtimedwait(struct thread *, sigset_t, ksiginfo_t *, struct timespec *); -static int do_tdsignal(struct proc *, struct thread *, int, ksiginfo_t *); static void sigqueue_start(void); static uma_zone_t ksiginfo_zone = NULL; @@ -570,7 +569,7 @@ signotify(struct thread *td) { struct proc *p; - sigset_t set, saved; + sigset_t set; p = td->td_proc; @@ -581,8 +580,6 @@ * previously masked by all threads to our sigqueue. */ set = p->p_sigqueue.sq_signals; - if (p->p_flag & P_SA) - saved = p->p_sigqueue.sq_signals; SIGSETNAND(set, td->td_sigmask); if (! SIGISEMPTY(set)) sigqueue_move_set(&p->p_sigqueue, &td->td_sigqueue, &set); @@ -591,13 +588,6 @@ td->td_flags |= TDF_NEEDSIGCHK | TDF_ASTPENDING; mtx_unlock_spin(&sched_lock); } - if ((p->p_flag & P_SA) && !(p->p_flag & P_SIGEVENT)) { - if (!SIGSETEQ(saved, p->p_sigqueue.sq_signals)) { - /* pending set changed */ - p->p_flag |= P_SIGEVENT; - wakeup(&p->p_siglist); - } - } } int @@ -749,11 +739,6 @@ if (ps->ps_sigact[_SIG_IDX(sig)] == SIG_IGN || (sigprop(sig) & SA_IGNORE && ps->ps_sigact[_SIG_IDX(sig)] == SIG_DFL)) { - if ((p->p_flag & P_SA) && - SIGISMEMBER(p->p_sigqueue.sq_signals, sig)) { - p->p_flag |= P_SIGEVENT; - wakeup(&p->p_siglist); - } /* never to be seen again */ sigqueue_delete_proc(p, sig); if (sig != SIGCONT) @@ -1211,10 +1196,6 @@ continue; if (!SIGISMEMBER(td->td_sigqueue.sq_signals, i)) { if (SIGISMEMBER(p->p_sigqueue.sq_signals, i)) { - if (p->p_flag & P_SA) { - p->p_flag |= P_SIGEVENT; - wakeup(&p->p_siglist); - } sigqueue_move(&p->p_sigqueue, &td->td_sigqueue, i); } else @@ -1887,7 +1868,6 @@ { struct sigacts *ps; struct proc *p; - int error; int sig; int code; @@ -1896,23 +1876,7 @@ code = ksi->ksi_code; KASSERT(_SIG_VALID(sig), ("invalid signal")); - if (td->td_pflags & TDP_SA) { - if (td->td_mailbox == NULL) - thread_user_enter(td); - PROC_LOCK(p); - SIGDELSET(td->td_sigmask, sig); - mtx_lock_spin(&sched_lock); - /* - * Force scheduling an upcall, so UTS has chance to - * process the signal before thread runs again in - * userland. - */ - if (td->td_upcall) - td->td_upcall->ku_flags |= KUF_DOUPCALL; - mtx_unlock_spin(&sched_lock); - } else { - PROC_LOCK(p); - } + PROC_LOCK(p); ps = p->p_sigacts; mtx_lock(&ps->ps_mtx); if ((p->p_flag & P_TRACED) == 0 && SIGISMEMBER(ps->ps_sigcatch, sig) && @@ -1923,27 +1887,8 @@ ktrpsig(sig, ps->ps_sigact[_SIG_IDX(sig)], &td->td_sigmask, code); #endif - if (!(td->td_pflags & TDP_SA)) - (*p->p_sysent->sv_sendsig)(ps->ps_sigact[_SIG_IDX(sig)], + (*p->p_sysent->sv_sendsig)(ps->ps_sigact[_SIG_IDX(sig)], ksi, &td->td_sigmask); - else if (td->td_mailbox == NULL) { - mtx_unlock(&ps->ps_mtx); - /* UTS caused a sync signal */ - p->p_code = code; /* XXX for core dump/debugger */ - p->p_sig = sig; /* XXX to verify code */ - sigexit(td, sig); - } else { - mtx_unlock(&ps->ps_mtx); - SIGADDSET(td->td_sigmask, sig); - PROC_UNLOCK(p); - error = copyout(&ksi->ksi_info, &td->td_mailbox->tm_syncsig, - sizeof(siginfo_t)); - PROC_LOCK(p); - /* UTS memory corrupted */ - if (error) - sigexit(td, SIGSEGV); - mtx_lock(&ps->ps_mtx); - } SIGSETOR(td->td_sigmask, ps->ps_catchmask[_SIG_IDX(sig)]); if (!SIGISMEMBER(ps->ps_signodefer, sig)) SIGADDSET(td->td_sigmask, sig); @@ -2057,25 +2002,6 @@ int tdsignal(struct proc *p, struct thread *td, int sig, ksiginfo_t *ksi) { - sigset_t saved; - int ret; - - if (p->p_flag & P_SA) - saved = p->p_sigqueue.sq_signals; - ret = do_tdsignal(p, td, sig, ksi); - if ((p->p_flag & P_SA) && !(p->p_flag & P_SIGEVENT)) { - if (!SIGSETEQ(saved, p->p_sigqueue.sq_signals)) { - /* pending set changed */ - p->p_flag |= P_SIGEVENT; - wakeup(&p->p_siglist); - } - } - return (ret); -} - -static int -do_tdsignal(struct proc *p, struct thread *td, int sig, ksiginfo_t *ksi) -{ sig_t action; sigqueue_t *sigqueue; int prop; @@ -2086,9 +2012,9 @@ PROC_LOCK_ASSERT(p, MA_OWNED); if (!_SIG_VALID(sig)) - panic("do_tdsignal(): invalid signal"); + panic("tdsignal(): invalid signal"); - KASSERT(ksi == NULL || !KSI_ONQ(ksi), ("do_tdsignal: ksi on queue")); + KASSERT(ksi == NULL || !KSI_ONQ(ksi), ("tdsignal: ksi on queue")); /* * IEEE Std 1003.1-2001: return success when killing a zombie. @@ -2250,11 +2176,6 @@ /* * The process wants to catch it so it needs * to run at least one thread, but which one? - * It would seem that the answer would be to - * run an upcall in the next KSE to run, and - * deliver the signal that way. In a NON KSE - * process, we need to make sure that the - * single thread is runnable asap. * XXXKSE for now however, make them all run. */ goto runfast; @@ -2548,8 +2469,6 @@ */ if (SIGISMEMBER(ps->ps_sigignore, sig) && (traced == 0)) { sigqueue_delete(&td->td_sigqueue, sig); - if (td->td_pflags & TDP_SA) - SIGADDSET(td->td_sigmask, sig); continue; } if (p->p_flag & P_TRACED && (p->p_flag & P_PPWAIT) == 0) { @@ -2560,9 +2479,6 @@ newsig = ptracestop(td, sig); mtx_lock(&ps->ps_mtx); - if (td->td_pflags & TDP_SA) - SIGADDSET(td->td_sigmask, sig); - if (sig != newsig) { ksiginfo_t ksi; /* @@ -2586,8 +2502,6 @@ * signal is being masked, look for other signals. */ SIGADDSET(td->td_sigqueue.sq_signals, sig); - if (td->td_pflags & TDP_SA) - SIGDELSET(td->td_sigmask, sig); if (SIGISMEMBER(td->td_sigmask, sig)) continue; signotify(td); @@ -2750,7 +2664,7 @@ mtx_lock(&ps->ps_mtx); } - if (!(td->td_pflags & TDP_SA) && action == SIG_DFL) { + if (action == SIG_DFL) { /* * Default action, where the default is to kill * the process. (Other cases were ignored above.) @@ -2759,13 +2673,6 @@ sigexit(td, sig); /* NOTREACHED */ } else { - if (td->td_pflags & TDP_SA) { - if (sig == SIGKILL) { - mtx_unlock(&ps->ps_mtx); - sigexit(td, sig); - } - } - /* * If we get here, the signal must be caught. */ @@ -2808,10 +2715,7 @@ p->p_code = 0; p->p_sig = 0; } - if (td->td_pflags & TDP_SA) - thread_signal_add(curthread, &ksi); - else - (*p->p_sysent->sv_sendsig)(action, &ksi, &returnmask); + (*p->p_sysent->sv_sendsig)(action, &ksi, &returnmask); } } ==== //depot/projects/bike_sched/sys/kern/kern_subr.c#2 (text+ko) ==== @@ -430,7 +430,7 @@ td = curthread; mtx_lock_spin(&sched_lock); DROP_GIANT(); - sched_prio(td, td->td_ksegrp->kg_user_pri); /* XXXKSE */ + sched_prio(td, td->td_user_pri); mi_switch(SW_INVOL, NULL); mtx_unlock_spin(&sched_lock); PICKUP_GIANT(); ==== //depot/projects/bike_sched/sys/kern/kern_switch.c#2 (text+ko) ==== @@ -24,67 +24,6 @@ * SUCH DAMAGE. */ -/*** -Here is the logic.. - -If there are N processors, then there are at most N KSEs (kernel -schedulable entities) working to process threads that belong to a -KSEGROUP (kg). If there are X of these KSEs actually running at the -moment in question, then there are at most M (N-X) of these KSEs on -the run queue, as running KSEs are not on the queue. - -Runnable threads are queued off the KSEGROUP in priority order. -If there are M or more threads runnable, the top M threads -(by priority) are 'preassigned' to the M KSEs not running. The KSEs take -their priority from those threads and are put on the run queue. - -The last thread that had a priority high enough to have a KSE associated -with it, AND IS ON THE RUN QUEUE is pointed to by -kg->kg_last_assigned. If no threads queued off the KSEGROUP have KSEs -assigned as all the available KSEs are activly running, or because there -are no threads queued, that pointer is NULL. - -When a KSE is removed from the run queue to become runnable, we know -it was associated with the highest priority thread in the queue (at the head -of the queue). If it is also the last assigned we know M was 1 and must -now be 0. Since the thread is no longer queued that pointer must be -removed from it. Since we know there were no more KSEs available, -(M was 1 and is now 0) and since we are not FREEING our KSE -but using it, we know there are STILL no more KSEs available, we can prove -that the next thread in the ksegrp list will not have a KSE to assign to -it, so we can show that the pointer must be made 'invalid' (NULL). - -The pointer exists so that when a new thread is made runnable, it can -have its priority compared with the last assigned thread to see if -it should 'steal' its KSE or not.. i.e. is it 'earlier' -on the list than that thread or later.. If it's earlier, then the KSE is -removed from the last assigned (which is now not assigned a KSE) -and reassigned to the new thread, which is placed earlier in the list. -The pointer is then backed up to the previous thread (which may or may not -be the new thread). - -When a thread sleeps or is removed, the KSE becomes available and if there -are queued threads that are not assigned KSEs, the highest priority one of -them is assigned the KSE, which is then placed back on the run queue at -the approipriate place, and the kg->kg_last_assigned pointer is adjusted down -to point to it. - -The following diagram shows 2 KSEs and 3 threads from a single process. - - RUNQ: --->KSE---KSE--... (KSEs queued at priorities from threads) - \ \____ - \ \ - KSEGROUP---thread--thread--thread (queued in priority order) - \ / - \_______________/ - (last_assigned) - -The result of this scheme is that the M available KSEs are always -queued at the priorities they have inherrited from the M highest priority -threads for that KSEGROUP. If this situation changes, the KSEs are -reassigned to keep this true. -***/ - #include __FBSDID("$FreeBSD: src/sys/kern/kern_switch.c,v 1.121 2006/06/01 22:45:56 cognet Exp $"); @@ -143,51 +82,35 @@ * Functions that manipulate runnability from a thread perspective. * ************************************************************************/ /* - * Select the KSE that will be run next. From that find the thread, and - * remove it from the KSEGRP's run queue. If there is thread clustering, - * this will be what does it. + * Select the thread that will be run next. */ struct thread * choosethread(void) { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jun 5 03:30:04 2006 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 B3F9D16A5B1; Mon, 5 Jun 2006 03:30:04 +0000 (UTC) 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 8AB8716A523 for ; Mon, 5 Jun 2006 03:30:04 +0000 (UTC) (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 E3CF243D58 for ; Mon, 5 Jun 2006 03:29:59 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k553SHn1006040 for ; Mon, 5 Jun 2006 03:28:17 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k553SHhn006037 for perforce@freebsd.org; Mon, 5 Jun 2006 03:28:17 GMT (envelope-from peter@freebsd.org) Date: Mon, 5 Jun 2006 03:28:17 GMT Message-Id: <200606050328.k553SHhn006037@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 98518 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, 05 Jun 2006 03:30:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=98518 Change 98518 by peter@peter_daintree on 2006/06/05 03:27:52 Clean up some stray loose ends. Affected files ... .. //depot/projects/bike_sched/sys/amd64/amd64/vm_machdep.c#3 edit .. //depot/projects/bike_sched/sys/arm/arm/trap.c#3 edit .. //depot/projects/bike_sched/sys/arm/arm/vm_machdep.c#2 edit .. //depot/projects/bike_sched/sys/i386/i386/vm_machdep.c#2 edit .. //depot/projects/bike_sched/sys/ia64/ia64/trap.c#2 edit .. //depot/projects/bike_sched/sys/kern/kern_thread.c#3 edit .. //depot/projects/bike_sched/sys/powerpc/powerpc/trap.c#2 edit .. //depot/projects/bike_sched/sys/sparc64/sparc64/trap.c#2 edit .. //depot/projects/bike_sched/sys/sys/proc.h#3 edit Differences ... ==== //depot/projects/bike_sched/sys/amd64/amd64/vm_machdep.c#3 (text+ko) ==== @@ -244,8 +244,7 @@ * Initialize machine state (pcb and trap frame) for a new thread about to * upcall. Put enough state in the new thread's PCB to get it to go back * userret(), where we can intercept it again to set the return (upcall) - * Address and stack, along with those from upcals that are from other sources - * such as those generated in thread_userret() itself. + * Address and stack, along with those from upcals that are from other sources. */ void cpu_set_upcall(struct thread *td, struct thread *td0) @@ -302,9 +301,8 @@ } /* - * Set that machine state for performing an upcall that has to - * be done in thread_userret() so that those upcalls generated - * in thread_userret() itself can be done as well. + * Modify the machine state created by cpu_set_upcall() to arrange + * for the new thread to make a specific call as its first act. */ void cpu_set_upcall_kse(struct thread *td, void (*entry)(void *), void *arg, ==== //depot/projects/bike_sched/sys/arm/arm/trap.c#3 (text+ko) ==== @@ -729,8 +729,6 @@ td->td_frame = tf; if (td->td_ucred != td->td_proc->p_ucred) cred_update_thread(td); - if (td->td_proc->p_flag & P_SA) - thread_user_enter(td); } fault_pc = tf->tf_pc; if (td->td_md.md_spinlock_count == 0) { @@ -1002,8 +1000,6 @@ td->td_frame = frame; td->td_pticks = 0; - if (td->td_proc->p_flag & P_SA) - thread_user_enter(td); /* * Make sure the program counter is correctly aligned so we * don't take an alignment fault trying to read the opcode. ==== //depot/projects/bike_sched/sys/arm/arm/vm_machdep.c#2 (text+ko) ==== @@ -256,8 +256,7 @@ * Initialize machine state (pcb and trap frame) for a new thread about to * upcall. Put enough state in the new thread's PCB to get it to go back * userret(), where we can intercept it again to set the return (upcall) - * Address and stack, along with those from upcals that are from other sources - * such as those generated in thread_userret() itself. + * Address and stack, along with those from upcals that are from other sources. */ void cpu_set_upcall(struct thread *td, struct thread *td0) @@ -283,9 +282,8 @@ } /* - * Set that machine state for performing an upcall that has to - * be done in thread_userret() so that those upcalls generated - * in thread_userret() itself can be done as well. + * Modify the machine state created by cpu_set_upcall() to arrange + * for the new thread to make a specific call as its first act. */ void cpu_set_upcall_kse(struct thread *td, void (*entry)(void *), void *arg, ==== //depot/projects/bike_sched/sys/i386/i386/vm_machdep.c#2 (text+ko) ==== @@ -370,8 +370,7 @@ * Initialize machine state (pcb and trap frame) for a new thread about to * upcall. Put enough state in the new thread's PCB to get it to go back * userret(), where we can intercept it again to set the return (upcall) - * Address and stack, along with those from upcals that are from other sources - * such as those generated in thread_userret() itself. + * Address and stack, along with those from upcals that are from other sources. */ void cpu_set_upcall(struct thread *td, struct thread *td0) @@ -439,9 +438,8 @@ } /* - * Set that machine state for performing an upcall that has to - * be done in thread_userret() so that those upcalls generated - * in thread_userret() itself can be done as well. + * Modify the machine state created by cpu_set_upcall() to arrange + * for the new thread to make a specific call as its first act. */ void cpu_set_upcall_kse(struct thread *td, void (*entry)(void *), void *arg, ==== //depot/projects/bike_sched/sys/ia64/ia64/trap.c#2 (text+ko) ==== @@ -955,8 +955,6 @@ td->td_pticks = 0; if (td->td_ucred != p->p_ucred) cred_update_thread(td); - if (p->p_flag & P_SA) - thread_user_enter(td); if (p->p_sysent->sv_prepsyscall) { /* (*p->p_sysent->sv_prepsyscall)(tf, args, &code, ¶ms); */ ==== //depot/projects/bike_sched/sys/kern/kern_thread.c#3 (text+ko) ==== @@ -314,7 +314,6 @@ * exit1() * kse_exit() * thr_exit() - * thread_user_enter() * thread_suspend_check() */ void @@ -392,7 +391,6 @@ * exit1() - clears threading flags before coming here * kse_exit() - treats last thread specially * thr_exit() - treats last thread specially - * thread_user_enter() - only if more exist * thread_suspend_check() - only if more exist */ panic ("thread_exit: Last thread exiting on its own"); ==== //depot/projects/bike_sched/sys/powerpc/powerpc/trap.c#2 (text+ko) ==== @@ -348,9 +348,6 @@ PCPU_LAZY_INC(cnt.v_syscall); - if (p->p_flag & P_SA) - thread_user_enter(td); - code = frame->fixreg[0]; params = (caddr_t)(frame->fixreg + FIRSTARG); n = NARGREG; ==== //depot/projects/bike_sched/sys/sparc64/sparc64/trap.c#2 (text+ko) ==== @@ -529,8 +529,6 @@ td->td_frame = tf; if (td->td_ucred != p->p_ucred) cred_update_thread(td); - if (p->p_flag & P_SA) - thread_user_enter(td); code = tf->tf_global[1]; /* ==== //depot/projects/bike_sched/sys/sys/proc.h#3 (text+ko) ==== @@ -805,8 +805,6 @@ void thread_unsuspend(struct proc *p); void thread_unsuspend_one(struct thread *td); void thread_unthread(struct thread *td); -int thread_userret(struct thread *td, struct trapframe *frame); -void thread_user_enter(struct thread *td); void thread_wait(struct proc *p); struct thread *thread_find(struct proc *p, lwpid_t tid); void thr_exit1(void); From owner-p4-projects@FreeBSD.ORG Mon Jun 5 05:40:57 2006 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 3850716A474; Mon, 5 Jun 2006 05:40:57 +0000 (UTC) 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 1258416A41F for ; Mon, 5 Jun 2006 05:40:57 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B1AA943D4C for ; Mon, 5 Jun 2006 05:40:56 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k555dEFr029210 for ; Mon, 5 Jun 2006 05:39:14 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k555dCNc029207 for perforce@freebsd.org; Mon, 5 Jun 2006 05:39:12 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 5 Jun 2006 05:39:12 GMT Message-Id: <200606050539.k555dCNc029207@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 98521 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, 05 Jun 2006 05:40:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=98521 Change 98521 by kmacy@kmacy_storage:sun4v_work_test on 2006/06/05 05:38:27 fix breakage caused by previous IFC integrate bike_sched fix sun4v bike_sched dependencies Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/amd64/amd64/machdep.c#5 integrate .. //depot/projects/kmacy_sun4v/src/sys/amd64/amd64/trap.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/amd64/amd64/vm_machdep.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/arm/arm/trap.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/arm/arm/vm_machdep.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/arm/at91/kb920x_machdep.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/arm/sa11x0/assabet_machdep.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/arm/xscale/i80321/iq31244_machdep.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/boot/sparc64/loader/main.c#5 integrate .. //depot/projects/kmacy_sun4v/src/sys/conf/files#7 edit .. //depot/projects/kmacy_sun4v/src/sys/conf/options#8 edit .. //depot/projects/kmacy_sun4v/src/sys/ddb/db_ps.c#5 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/em/if_em.c#5 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/isp/isp_pci.c#6 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/mpt/mpt_pci.c#6 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/ofw/openfirm.h#8 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/pci/pci_pci.c#9 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/pci/pcireg.h#5 integrate .. //depot/projects/kmacy_sun4v/src/sys/i386/i386/machdep.c#6 integrate .. //depot/projects/kmacy_sun4v/src/sys/i386/i386/sys_machdep.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/i386/i386/trap.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/i386/i386/vm_machdep.c#6 integrate .. //depot/projects/kmacy_sun4v/src/sys/ia64/ia64/machdep.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/ia64/ia64/trap.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/init_main.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/init_sysent.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_clock.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_fork.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_idle.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_intr.c#5 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_kse.c#3 delete .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_mutex.c#7 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_poll.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_proc.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_resource.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_sig.c#6 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_subr.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_switch.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_synch.c#5 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_thr.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_thread.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/sched_4bsd.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/sched_ule.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/subr_bus.c#8 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/subr_rman.c#5 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/subr_trap.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/sys_process.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/syscalls.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/syscalls.master#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/tty.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/pc98/pc98/machdep.c#6 integrate .. //depot/projects/kmacy_sun4v/src/sys/posix4/ksched.c#5 integrate .. //depot/projects/kmacy_sun4v/src/sys/powerpc/powerpc/machdep.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/powerpc/powerpc/trap.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/sparc64/sparc64/genassym.c#22 edit .. //depot/projects/kmacy_sun4v/src/sys/sparc64/sparc64/machdep.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/sparc64/sparc64/trap.c#5 integrate .. //depot/projects/kmacy_sun4v/src/sys/sun4v/conf/GENERIC#15 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/machdep.c#25 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#62 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/trap.c#13 edit .. //depot/projects/kmacy_sun4v/src/sys/sys/bus.h#6 integrate .. //depot/projects/kmacy_sun4v/src/sys/sys/mutex.h#5 integrate .. //depot/projects/kmacy_sun4v/src/sys/sys/proc.h#5 integrate .. //depot/projects/kmacy_sun4v/src/sys/sys/rtprio.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/sys/sched.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/sys/syscall.h#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/sys/syscall.mk#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/sys/sysproto.h#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/ufs/ffs/ffs_vfsops.c#8 integrate .. //depot/projects/kmacy_sun4v/src/sys/vm/vm_glue.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/vm/vm_zeroidle.c#4 integrate Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/amd64/amd64/machdep.c#5 (text+ko) ==== @@ -1137,7 +1137,7 @@ * This may be done better later if it gets more high level * components in it. If so just link td->td_proc here. */ - proc_linkup(&proc0, &ksegrp0, &thread0); + proc_linkup(&proc0, &thread0); preload_metadata = (caddr_t)(uintptr_t)(modulep + KERNBASE); preload_bootstrap_relocate(KERNBASE); ==== //depot/projects/kmacy_sun4v/src/sys/amd64/amd64/trap.c#4 (text+ko) ==== @@ -301,8 +301,6 @@ case T_PAGEFLT: /* page fault */ addr = frame.tf_addr; - if (td->td_pflags & TDP_SA) - thread_user_enter(td); i = trap_pfault(&frame, TRUE); if (i == -1) goto userout; @@ -759,8 +757,6 @@ td->td_frame = &frame; if (td->td_ucred != p->p_ucred) cred_update_thread(td); - if (p->p_flag & P_SA) - thread_user_enter(td); params = (caddr_t)frame.tf_rsp + sizeof(register_t); code = frame.tf_rax; orig_tf_rflags = frame.tf_rflags; ==== //depot/projects/kmacy_sun4v/src/sys/amd64/amd64/vm_machdep.c#3 (text+ko) ==== @@ -244,8 +244,7 @@ * Initialize machine state (pcb and trap frame) for a new thread about to * upcall. Put enough state in the new thread's PCB to get it to go back * userret(), where we can intercept it again to set the return (upcall) - * Address and stack, along with those from upcals that are from other sources - * such as those generated in thread_userret() itself. + * Address and stack, along with those from upcals that are from other sources. */ void cpu_set_upcall(struct thread *td, struct thread *td0) @@ -302,24 +301,14 @@ } /* - * Set that machine state for performing an upcall that has to - * be done in thread_userret() so that those upcalls generated - * in thread_userret() itself can be done as well. + * Modify the machine state created by cpu_set_upcall() to arrange + * for the new thread to make a specific call as its first act. */ void cpu_set_upcall_kse(struct thread *td, void (*entry)(void *), void *arg, stack_t *stack) { - /* - * Do any extra cleaning that needs to be done. - * The thread may have optional components - * that are not present in a fresh thread. - * This may be a recycled thread so make it look - * as though it's newly allocated. - */ - cpu_thread_clean(td); - /* * Set the trap frame to point at the beginning of the uts * function. ==== //depot/projects/kmacy_sun4v/src/sys/arm/arm/trap.c#4 (text+ko) ==== @@ -264,8 +264,6 @@ td->td_frame = tf; if (td->td_ucred != td->td_proc->p_ucred) cred_update_thread(td); - if (td->td_pflags & TDP_SA) - thread_user_enter(td); } /* Grab the current pcb */ @@ -731,8 +729,6 @@ td->td_frame = tf; if (td->td_ucred != td->td_proc->p_ucred) cred_update_thread(td); - if (td->td_proc->p_flag & P_SA) - thread_user_enter(td); } fault_pc = tf->tf_pc; if (td->td_md.md_spinlock_count == 0) { @@ -1004,8 +1000,6 @@ td->td_frame = frame; td->td_pticks = 0; - if (td->td_proc->p_flag & P_SA) - thread_user_enter(td); /* * Make sure the program counter is correctly aligned so we * don't take an alignment fault trying to read the opcode. ==== //depot/projects/kmacy_sun4v/src/sys/arm/arm/vm_machdep.c#4 (text+ko) ==== @@ -256,8 +256,7 @@ * Initialize machine state (pcb and trap frame) for a new thread about to * upcall. Put enough state in the new thread's PCB to get it to go back * userret(), where we can intercept it again to set the return (upcall) - * Address and stack, along with those from upcals that are from other sources - * such as those generated in thread_userret() itself. + * Address and stack, along with those from upcals that are from other sources. */ void cpu_set_upcall(struct thread *td, struct thread *td0) @@ -283,9 +282,8 @@ } /* - * Set that machine state for performing an upcall that has to - * be done in thread_userret() so that those upcalls generated - * in thread_userret() itself can be done as well. + * Modify the machine state created by cpu_set_upcall() to arrange + * for the new thread to make a specific call as its first act. */ void cpu_set_upcall_kse(struct thread *td, void (*entry)(void *), void *arg, ==== //depot/projects/kmacy_sun4v/src/sys/arm/at91/kb920x_machdep.c#4 (text+ko) ==== @@ -382,7 +382,7 @@ undefined_handler_address = (u_int)undefinedinstruction_bounce; undefined_init(); - proc_linkup(&proc0, &ksegrp0, &thread0); + proc_linkup(&proc0, &thread0); thread0.td_kstack = kernelstack.pv_va; thread0.td_pcb = (struct pcb *) (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; ==== //depot/projects/kmacy_sun4v/src/sys/arm/sa11x0/assabet_machdep.c#4 (text+ko) ==== @@ -413,7 +413,7 @@ /* Set stack for exception handlers */ - proc_linkup(&proc0, &ksegrp0, &thread0); + proc_linkup(&proc0, &thread0); thread0.td_kstack = kernelstack.pv_va; thread0.td_pcb = (struct pcb *) (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; ==== //depot/projects/kmacy_sun4v/src/sys/arm/xscale/i80321/iq31244_machdep.c#4 (text+ko) ==== @@ -428,7 +428,7 @@ undefined_handler_address = (u_int)undefinedinstruction_bounce; undefined_init(); - proc_linkup(&proc0, &ksegrp0, &thread0); + proc_linkup(&proc0, &thread0); thread0.td_kstack = kernelstack.pv_va; thread0.td_pcb = (struct pcb *) (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; ==== //depot/projects/kmacy_sun4v/src/sys/boot/sparc64/loader/main.c#5 (text+ko) ==== ==== //depot/projects/kmacy_sun4v/src/sys/conf/files#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1118 2006/05/18 23:30:47 ambrisko Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1119 2006/05/27 16:32:05 netchild Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -905,6 +905,12 @@ #dev/sound/usb/upcm.c optional snd_upcm usb dev/sound/usb/uaudio.c optional snd_uaudio usb dev/sound/usb/uaudio_pcm.c optional snd_uaudio usb +dev/sound/midi/midi.c optional sound +dev/sound/midi/mpu401.c optional sound +dev/sound/midi/mpu_if.m optional sound +dev/sound/midi/mpufoi_if.m optional sound +dev/sound/midi/sequencer.c optional sound +dev/sound/midi/synth_if.m optional sound dev/sr/if_sr.c optional sr dev/sr/if_sr_pci.c optional sr pci dev/stg/tmc18c30.c optional stg @@ -1273,7 +1279,6 @@ kern/kern_idle.c standard kern/kern_intr.c standard kern/kern_jail.c standard -kern/kern_kse.c standard kern/kern_kthread.c standard kern/kern_ktr.c optional ktr kern/kern_ktrace.c standard @@ -1378,6 +1383,7 @@ kern/uipc_sem.c optional p1003_1b_semaphores kern/uipc_socket.c standard kern/uipc_socket2.c standard +kern/uipc_stub.c optional uipc_stub kern/uipc_syscalls.c standard kern/uipc_usrreq.c standard kern/vfs_aio.c optional vfs_aio ==== //depot/projects/kmacy_sun4v/src/sys/conf/options#8 (text+ko) ==== @@ -168,6 +168,9 @@ P1003_1B_SEMAPHORES opt_posix.h _KPOSIX_PRIORITY_SCHEDULING opt_posix.h +# Sample network protocol +UIPC_STUB opt_dontuse.h + # Do we want the config file compiled into the kernel? INCLUDE_CONFIG_FILE opt_config.h ==== //depot/projects/kmacy_sun4v/src/sys/ddb/db_ps.c#5 (text+ko) ==== @@ -295,7 +295,6 @@ db_printf("Thread %d at %p:\n", td->td_tid, td); db_printf(" proc (pid %d): %p ", td->td_proc->p_pid, td->td_proc); - db_printf(" ksegrp: %p\n", td->td_ksegrp); if (td->td_name[0] != '\0') db_printf(" name: %s\n", td->td_name); db_printf(" flags: %#x ", td->td_flags); ==== //depot/projects/kmacy_sun4v/src/sys/dev/em/if_em.c#5 (text+ko) ==== ==== //depot/projects/kmacy_sun4v/src/sys/dev/isp/isp_pci.c#6 (text+ko) ==== @@ -1346,8 +1346,8 @@ ISP_UNLOCK(isp); if (isp_dma_tag_create(bus_get_dma_tag(pcs->pci_dev), 1, slim, llim, - hlim, NULL, NULL, BUS_SPACE_MAXSIZE, ISP_NSEGS, slim, 0, - &pcs->dmat)) { + hlim, NULL, NULL, BUS_SPACE_MAXSIZE, ISP_NSEGS, slim, 0, + busdma_lock_mutex, &Giant, &pcs->dmat)) { isp_prt(isp, ISP_LOGERR, "could not create master dma tag"); ISP_LOCK(isp); return (1); ==== //depot/projects/kmacy_sun4v/src/sys/dev/mpt/mpt_pci.c#6 (text+ko) ==== ==== //depot/projects/kmacy_sun4v/src/sys/dev/ofw/openfirm.h#8 (text+ko) ==== ==== //depot/projects/kmacy_sun4v/src/sys/dev/pci/pci_pci.c#9 (text+ko) ==== ==== //depot/projects/kmacy_sun4v/src/sys/dev/pci/pcireg.h#5 (text+ko) ==== ==== //depot/projects/kmacy_sun4v/src/sys/i386/i386/machdep.c#6 (text+ko) ==== @@ -2071,7 +2071,7 @@ * This may be done better later if it gets more high level * components in it. If so just link td->td_proc here. */ - proc_linkup(&proc0, &ksegrp0, &thread0); + proc_linkup(&proc0, &thread0); metadata_missing = 0; if (bootinfo.bi_modulep) { ==== //depot/projects/kmacy_sun4v/src/sys/i386/i386/sys_machdep.c#3 (text+ko) ==== @@ -233,9 +233,6 @@ 0 /* granularity */ }; - if (td->td_proc->p_flag & P_SA) - return (EINVAL); /* XXXKSE */ -/* XXXKSE All the code below only works in 1:1 needs changing */ ext = (struct pcb_ext *)kmem_alloc(kernel_map, ctob(IOPAGES+1)); if (ext == 0) return (ENOMEM); ==== //depot/projects/kmacy_sun4v/src/sys/i386/i386/trap.c#3 (text+ko) ==== @@ -348,9 +348,6 @@ break; case T_PAGEFLT: /* page fault */ - if (td->td_pflags & TDP_SA) - thread_user_enter(td); - i = trap_pfault(&frame, TRUE, eva); #if defined(I586_CPU) && !defined(NO_F00F_HACK) if (i == -2) { @@ -938,8 +935,6 @@ td->td_frame = &frame; if (td->td_ucred != p->p_ucred) cred_update_thread(td); - if (p->p_flag & P_SA) - thread_user_enter(td); params = (caddr_t)frame.tf_esp + sizeof(int); code = frame.tf_eax; orig_tf_eflags = frame.tf_eflags; ==== //depot/projects/kmacy_sun4v/src/sys/i386/i386/vm_machdep.c#6 (text+ko) ==== @@ -370,8 +370,7 @@ * Initialize machine state (pcb and trap frame) for a new thread about to * upcall. Put enough state in the new thread's PCB to get it to go back * userret(), where we can intercept it again to set the return (upcall) - * Address and stack, along with those from upcals that are from other sources - * such as those generated in thread_userret() itself. + * Address and stack, along with those from upcals that are from other sources. */ void cpu_set_upcall(struct thread *td, struct thread *td0) @@ -439,9 +438,8 @@ } /* - * Set that machine state for performing an upcall that has to - * be done in thread_userret() so that those upcalls generated - * in thread_userret() itself can be done as well. + * Modify the machine state created by cpu_set_upcall() to arrange + * for the new thread to make a specific call as its first act. */ void cpu_set_upcall_kse(struct thread *td, void (*entry)(void *), void *arg, ==== //depot/projects/kmacy_sun4v/src/sys/ia64/ia64/machdep.c#3 (text+ko) ==== @@ -767,7 +767,7 @@ msgbufp = (struct msgbuf *)pmap_steal_memory(MSGBUF_SIZE); msgbufinit(msgbufp, MSGBUF_SIZE); - proc_linkup(&proc0, &ksegrp0, &thread0); + proc_linkup(&proc0, &thread0); /* * Init mapping for kernel stack for proc 0 */ ==== //depot/projects/kmacy_sun4v/src/sys/ia64/ia64/trap.c#4 (text+ko) ==== @@ -955,8 +955,6 @@ td->td_pticks = 0; if (td->td_ucred != p->p_ucred) cred_update_thread(td); - if (p->p_flag & P_SA) - thread_user_enter(td); if (p->p_sysent->sv_prepsyscall) { /* (*p->p_sysent->sv_prepsyscall)(tf, args, &code, ¶ms); */ ==== //depot/projects/kmacy_sun4v/src/sys/kern/init_main.c#4 (text+ko) ==== @@ -95,7 +95,6 @@ static struct pgrp pgrp0; struct proc proc0; struct thread thread0 __aligned(8); -struct ksegrp ksegrp0; struct vmspace vmspace0; struct proc *initproc; @@ -249,6 +248,30 @@ } #endif +#if defined(VERBOSE_SYSINIT) + if ((*sipp)->subsystem > last) { + verbose = 1; + last = (*sipp)->subsystem; + printf("subsystem %x\n", last); + } + if (verbose) { +#if defined(DDB) + const char *name; + c_db_sym_t sym; + db_expr_t offset; + + sym = db_search_symbol((vm_offset_t)(*sipp)->func, + DB_STGY_PROC, &offset); + db_symbol_values(sym, &name, NULL); + if (name != NULL) + printf(" %s(%p)... ", name, (*sipp)->udata); + else +#endif + printf(" %p(%p)... ", (*sipp)->func, + (*sipp)->udata); + } +#endif + /* Call function */ (*((*sipp)->func))((*sipp)->udata); #if 0 @@ -261,6 +284,11 @@ printf("done.\n"); #endif +#if defined(VERBOSE_SYSINIT) + if (verbose) + printf("done.\n"); +#endif + /* Check off the one we're just done */ (*sipp)->subsystem = SI_SUB_DONE; @@ -369,12 +397,10 @@ struct proc *p; unsigned i; struct thread *td; - struct ksegrp *kg; GIANT_REQUIRED; p = &proc0; td = &thread0; - kg = &ksegrp0; /* * Initialize magic number. @@ -382,14 +408,14 @@ p->p_magic = P_MAGIC; /* - * Initialize thread, process and ksegrp structures. + * Initialize thread and process structures. */ procinit(); /* set up proc zone */ - threadinit(); /* set up thead, upcall and KSEGRP zones */ + threadinit(); /* set up UMA zones */ /* * Initialise scheduler resources. - * Add scheduler specific parts to proc, ksegrp, thread as needed. + * Add scheduler specific parts to proc, thread as needed. */ schedinit(); /* scheduler gets its house in order */ /* @@ -426,8 +452,8 @@ STAILQ_INIT(&p->p_ktr); p->p_nice = NZERO; td->td_state = TDS_RUNNING; - kg->kg_pri_class = PRI_TIMESHARE; - kg->kg_user_pri = PUSER; + td->td_pri_class = PRI_TIMESHARE; + td->td_user_pri = PUSER; td->td_priority = PVM; td->td_base_pri = PUSER; td->td_oncpu = 0; ==== //depot/projects/kmacy_sun4v/src/sys/kern/init_sysent.c#4 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/init_sysent.c,v 1.211 2006/03/23 08:48:37 davidxu Exp $ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.213 2006/03/23 08:46:41 davidxu Exp + * $FreeBSD$ + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.215 2006/03/28 14:32:37 des Exp */ #include "opt_compat.h" @@ -408,11 +408,11 @@ { SYF_MPSAFE | AS(eaccess_args), (sy_call_t *)eaccess, AUE_EACCESS }, /* 376 = eaccess */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 377 = afs_syscall */ { AS(nmount_args), (sy_call_t *)nmount, AUE_NMOUNT }, /* 378 = nmount */ - { SYF_MPSAFE | 0, (sy_call_t *)kse_exit, AUE_NULL }, /* 379 = kse_exit */ - { SYF_MPSAFE | AS(kse_wakeup_args), (sy_call_t *)kse_wakeup, AUE_NULL }, /* 380 = kse_wakeup */ - { SYF_MPSAFE | AS(kse_create_args), (sy_call_t *)kse_create, AUE_NULL }, /* 381 = kse_create */ - { SYF_MPSAFE | AS(kse_thr_interrupt_args), (sy_call_t *)kse_thr_interrupt, AUE_NULL }, /* 382 = kse_thr_interrupt */ - { SYF_MPSAFE | AS(kse_release_args), (sy_call_t *)kse_release, AUE_NULL }, /* 383 = kse_release */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 379 = kse_exit */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 380 = kse_wakeup */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 381 = kse_create */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 382 = kse_thr_interrupt */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 383 = kse_release */ { SYF_MPSAFE | AS(__mac_get_proc_args), (sy_call_t *)__mac_get_proc, AUE_NULL }, /* 384 = __mac_get_proc */ { SYF_MPSAFE | AS(__mac_set_proc_args), (sy_call_t *)__mac_set_proc, AUE_NULL }, /* 385 = __mac_set_proc */ { SYF_MPSAFE | AS(__mac_get_fd_args), (sy_call_t *)__mac_get_fd, AUE_NULL }, /* 386 = __mac_get_fd */ @@ -469,7 +469,7 @@ { SYF_MPSAFE | AS(extattr_list_fd_args), (sy_call_t *)extattr_list_fd, AUE_NULL }, /* 437 = extattr_list_fd */ { SYF_MPSAFE | AS(extattr_list_file_args), (sy_call_t *)extattr_list_file, AUE_NULL }, /* 438 = extattr_list_file */ { SYF_MPSAFE | AS(extattr_list_link_args), (sy_call_t *)extattr_list_link, AUE_NULL }, /* 439 = extattr_list_link */ - { SYF_MPSAFE | AS(kse_switchin_args), (sy_call_t *)kse_switchin, AUE_NULL }, /* 440 = kse_switchin */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 440 = kse_switchin */ { SYF_MPSAFE | AS(ksem_timedwait_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 441 = ksem_timedwait */ { SYF_MPSAFE | AS(thr_suspend_args), (sy_call_t *)thr_suspend, AUE_NULL }, /* 442 = thr_suspend */ { SYF_MPSAFE | AS(thr_wake_args), (sy_call_t *)thr_wake, AUE_NULL }, /* 443 = thr_wake */ ==== //depot/projects/kmacy_sun4v/src/sys/kern/kern_clock.c#4 (text+ko) ==== @@ -201,21 +201,17 @@ * Run current process's virtual and profile time, as needed. */ mtx_lock_spin_flags(&sched_lock, MTX_QUIET); - if (p->p_flag & P_SA) { - /* XXXKSE What to do? */ - } else { - pstats = p->p_stats; - if (usermode && - timevalisset(&pstats->p_timer[ITIMER_VIRTUAL].it_value) && - itimerdecr(&pstats->p_timer[ITIMER_VIRTUAL], tick) == 0) { - p->p_sflag |= PS_ALRMPEND; - td->td_flags |= TDF_ASTPENDING; - } - if (timevalisset(&pstats->p_timer[ITIMER_PROF].it_value) && - itimerdecr(&pstats->p_timer[ITIMER_PROF], tick) == 0) { - p->p_sflag |= PS_PROFPEND; - td->td_flags |= TDF_ASTPENDING; - } + pstats = p->p_stats; + if (usermode && + timevalisset(&pstats->p_timer[ITIMER_VIRTUAL].it_value) && + itimerdecr(&pstats->p_timer[ITIMER_VIRTUAL], tick) == 0) { + p->p_sflag |= PS_ALRMPEND; + td->td_flags |= TDF_ASTPENDING; + } + if (timevalisset(&pstats->p_timer[ITIMER_PROF].it_value) && + itimerdecr(&pstats->p_timer[ITIMER_PROF], tick) == 0) { + p->p_sflag |= PS_PROFPEND; + td->td_flags |= TDF_ASTPENDING; } mtx_unlock_spin_flags(&sched_lock, MTX_QUIET); @@ -413,8 +409,6 @@ /* * Charge the time as appropriate. */ - if (p->p_flag & P_SA) - thread_statclock(1); td->td_uticks++; if (p->p_nice > NZERO) cp_time[CP_NICE]++; @@ -438,8 +432,6 @@ td->td_iticks++; cp_time[CP_INTR]++; } else { - if (p->p_flag & P_SA) - thread_statclock(0); td->td_pticks++; td->td_sticks++; if (td != PCPU_GET(idlethread)) ==== //depot/projects/kmacy_sun4v/src/sys/kern/kern_fork.c#4 (text+ko) ==== @@ -205,7 +205,6 @@ struct filedesc *fd; struct filedesc_to_leader *fdtol; struct thread *td2; - struct ksegrp *kg2; struct sigacts *newsigacts; int error; @@ -472,7 +471,6 @@ * then copy the section that is copied directly from the parent. */ td2 = FIRST_THREAD_IN_PROC(p2); - kg2 = FIRST_KSEGRP_IN_PROC(p2); /* Allocate and switch to an alternate kstack if specified. */ if (pages != 0) @@ -485,15 +483,11 @@ __rangeof(struct proc, p_startzero, p_endzero)); bzero(&td2->td_startzero, __rangeof(struct thread, td_startzero, td_endzero)); - bzero(&kg2->kg_startzero, - __rangeof(struct ksegrp, kg_startzero, kg_endzero)); bcopy(&p1->p_startcopy, &p2->p_startcopy, __rangeof(struct proc, p_startcopy, p_endcopy)); bcopy(&td->td_startcopy, &td2->td_startcopy, __rangeof(struct thread, td_startcopy, td_endcopy)); - bcopy(&td->td_ksegrp->kg_startcopy, &kg2->kg_startcopy, - __rangeof(struct ksegrp, kg_startcopy, kg_endcopy)); td2->td_sigstk = td->td_sigstk; td2->td_sigmask = td->td_sigmask; ==== //depot/projects/kmacy_sun4v/src/sys/kern/kern_idle.c#4 (text+ko) ==== @@ -79,7 +79,7 @@ td = FIRST_THREAD_IN_PROC(p); TD_SET_CAN_RUN(td); atomic_set_int(&td->td_flags, TDF_IDLETD); - sched_class(td->td_ksegrp, PRI_IDLE); + sched_class(td, PRI_IDLE); sched_prio(td, PRI_MAX_IDLE); mtx_unlock_spin(&sched_lock); PROC_UNLOCK(p); ==== //depot/projects/kmacy_sun4v/src/sys/kern/kern_intr.c#5 (text+ko) ==== @@ -296,7 +296,7 @@ panic("kthread_create() failed with %d", error); td = FIRST_THREAD_IN_PROC(p); /* XXXKSE */ mtx_lock_spin(&sched_lock); - td->td_ksegrp->kg_pri_class = PRI_ITHD; + td->td_pri_class = PRI_ITHD; TD_SET_IWAIT(td); mtx_unlock_spin(&sched_lock); td->td_pflags |= TDP_ITHREAD; ==== //depot/projects/kmacy_sun4v/src/sys/kern/kern_mutex.c#7 (text+ko) ==== ==== //depot/projects/kmacy_sun4v/src/sys/kern/kern_poll.c#4 (text+ko) ==== @@ -581,7 +581,7 @@ rtp.prio = RTP_PRIO_MAX; /* lowest priority */ rtp.type = RTP_PRIO_IDLE; mtx_lock_spin(&sched_lock); - rtp_to_pri(&rtp, td->td_ksegrp); + rtp_to_pri(&rtp, td); mtx_unlock_spin(&sched_lock); for (;;) { ==== //depot/projects/kmacy_sun4v/src/sys/kern/kern_proc.c#3 (text+ko) ==== @@ -142,9 +142,6 @@ { struct proc *p; struct thread *td; -#ifdef INVARIANTS - struct ksegrp *kg; -#endif /* INVARIANTS checks go here */ p = (struct proc *)mem; @@ -152,10 +149,7 @@ #ifdef INVARIANTS KASSERT((p->p_numthreads == 1), ("bad number of threads in exiting process")); - KASSERT((p->p_numksegrps == 1), ("free proc with > 1 ksegrp")); KASSERT((td != NULL), ("proc_dtor: bad thread pointer")); - kg = FIRST_KSEGRP_IN_PROC(p); - KASSERT((kg != NULL), ("proc_dtor: bad kg pointer")); KASSERT(STAILQ_EMPTY(&p->p_ktr), ("proc_dtor: non-empty p_ktr")); #endif @@ -178,17 +172,14 @@ { struct proc *p; struct thread *td; - struct ksegrp *kg; p = (struct proc *)mem; p->p_sched = (struct p_sched *)&p[1]; td = thread_alloc(); - kg = ksegrp_alloc(); bzero(&p->p_mtx, sizeof(struct mtx)); mtx_init(&p->p_mtx, "process lock", NULL, MTX_DEF | MTX_DUPOK); p->p_stats = pstats_alloc(); - proc_linkup(p, kg, td); - sched_newproc(p, kg, td); + proc_linkup(p, td); return (0); } @@ -204,7 +195,6 @@ p = (struct proc *)mem; pstats_free(p->p_stats); - ksegrp_free(FIRST_KSEGRP_IN_PROC(p)); thread_free(FIRST_THREAD_IN_PROC(p)); mtx_destroy(&p->p_mtx); if (p->p_ksi != NULL) @@ -760,7 +750,6 @@ static void fill_kinfo_thread(struct thread *td, struct kinfo_proc *kp) { - struct ksegrp *kg; struct proc *p; p = td->td_proc; @@ -800,14 +789,6 @@ kp->ki_stat = SIDL; } - kg = td->td_ksegrp; - - /* things in the KSE GROUP */ - kp->ki_estcpu = kg->kg_estcpu; - kp->ki_slptime = kg->kg_slptime; - kp->ki_pri.pri_user = kg->kg_user_pri; - kp->ki_pri.pri_class = kg->kg_pri_class; - /* Things in the thread */ kp->ki_wchan = td->td_wchan; kp->ki_pri.pri_level = td->td_priority; @@ -820,6 +801,10 @@ kp->ki_pcb = td->td_pcb; kp->ki_kstack = (void *)td->td_kstack; kp->ki_pctcpu = sched_pctcpu(td); + kp->ki_estcpu = td->td_estcpu; + kp->ki_slptime = td->td_slptime; + kp->ki_pri.pri_class = td->td_pri_class; + kp->ki_pri.pri_user = td->td_user_pri; /* We can't get this anymore but ps etc never used it anyway. */ kp->ki_rqindex = 0; ==== //depot/projects/kmacy_sun4v/src/sys/kern/kern_resource.c#4 (text+ko) ==== @@ -292,7 +292,7 @@ { struct proc *curp; struct proc *p; - struct ksegrp *kg; + struct thread *tdp; struct rtprio rtp; int cierror, error; @@ -328,14 +328,14 @@ * as leaving it zero. */ if (uap->pid == 0) { - pri_to_rtp(td->td_ksegrp, &rtp); + pri_to_rtp(td, &rtp); } else { struct rtprio rtp2; rtp.type = RTP_PRIO_IDLE; rtp.prio = RTP_PRIO_MAX; - FOREACH_KSEGRP_IN_PROC(p, kg) { - pri_to_rtp(kg, &rtp2); + FOREACH_THREAD_IN_PROC(p, tdp) { + pri_to_rtp(tdp, &rtp2); if (rtp2.type < rtp.type || (rtp2.type == rtp.type && rtp2.prio < rtp.prio)) { @@ -378,18 +378,17 @@ /* * If we are setting our own priority, set just our - * KSEGRP but if we are doing another process, - * do all the groups on that process. If we + * thread but if we are doing another process, + * do all the threads on that process. If we * specify our own pid we do the latter. */ mtx_lock_spin(&sched_lock); if (uap->pid == 0) { - error = rtp_to_pri(&rtp, td->td_ksegrp); + error = rtp_to_pri(&rtp, td); } else { - FOREACH_KSEGRP_IN_PROC(p, kg) { - if ((error = rtp_to_pri(&rtp, kg)) != 0) { + FOREACH_THREAD_IN_PROC(p, td) { + if ((error = rtp_to_pri(&rtp, td)) != 0) break; - } } } mtx_unlock_spin(&sched_lock); @@ -403,7 +402,7 @@ } int -rtp_to_pri(struct rtprio *rtp, struct ksegrp *kg) +rtp_to_pri(struct rtprio *rtp, struct thread *td) { mtx_assert(&sched_lock, MA_OWNED); @@ -411,43 +410,42 @@ return (EINVAL); switch (RTP_PRIO_BASE(rtp->type)) { case RTP_PRIO_REALTIME: - kg->kg_user_pri = PRI_MIN_REALTIME + rtp->prio; + td->td_user_pri = PRI_MIN_REALTIME + rtp->prio; break; case RTP_PRIO_NORMAL: - kg->kg_user_pri = PRI_MIN_TIMESHARE + rtp->prio; + td->td_user_pri = PRI_MIN_TIMESHARE + rtp->prio; break; case RTP_PRIO_IDLE: - kg->kg_user_pri = PRI_MIN_IDLE + rtp->prio; + td->td_user_pri = PRI_MIN_IDLE + rtp->prio; break; default: return (EINVAL); } - sched_class(kg, rtp->type); - if (curthread->td_ksegrp == kg) { - sched_prio(curthread, kg->kg_user_pri); /* XXX dubious */ - } + sched_class(td, rtp->type); /* XXX fix */ + if (curthread == td) + sched_prio(curthread, td->td_user_pri); /* XXX dubious */ return (0); } void -pri_to_rtp(struct ksegrp *kg, struct rtprio *rtp) +pri_to_rtp(struct thread *td, struct rtprio *rtp) { mtx_assert(&sched_lock, MA_OWNED); - switch (PRI_BASE(kg->kg_pri_class)) { + switch (PRI_BASE(td->td_pri_class)) { case PRI_REALTIME: - rtp->prio = kg->kg_user_pri - PRI_MIN_REALTIME; + rtp->prio = td->td_user_pri - PRI_MIN_REALTIME; break; case PRI_TIMESHARE: - rtp->prio = kg->kg_user_pri - PRI_MIN_TIMESHARE; + rtp->prio = td->td_user_pri - PRI_MIN_TIMESHARE; break; case PRI_IDLE: - rtp->prio = kg->kg_user_pri - PRI_MIN_IDLE; + rtp->prio = td->td_user_pri - PRI_MIN_IDLE; break; default: break; } - rtp->type = kg->kg_pri_class; + rtp->type = td->td_pri_class; } #if defined(COMPAT_43) ==== //depot/projects/kmacy_sun4v/src/sys/kern/kern_sig.c#6 (text+ko) ==== @@ -96,7 +96,6 @@ static struct thread *sigtd(struct proc *p, int sig, int prop); static int kern_sigtimedwait(struct thread *, sigset_t, ksiginfo_t *, struct timespec *); -static int do_tdsignal(struct proc *, struct thread *, int, ksiginfo_t *); static void sigqueue_start(void); static uma_zone_t ksiginfo_zone = NULL; @@ -570,7 +569,7 @@ signotify(struct thread *td) { struct proc *p; - sigset_t set, saved; + sigset_t set; p = td->td_proc; @@ -581,8 +580,6 @@ * previously masked by all threads to our sigqueue. */ set = p->p_sigqueue.sq_signals; - if (p->p_flag & P_SA) - saved = p->p_sigqueue.sq_signals; SIGSETNAND(set, td->td_sigmask); if (! SIGISEMPTY(set)) sigqueue_move_set(&p->p_sigqueue, &td->td_sigqueue, &set); @@ -591,13 +588,6 @@ td->td_flags |= TDF_NEEDSIGCHK | TDF_ASTPENDING; mtx_unlock_spin(&sched_lock); } - if ((p->p_flag & P_SA) && !(p->p_flag & P_SIGEVENT)) { - if (!SIGSETEQ(saved, p->p_sigqueue.sq_signals)) { - /* pending set changed */ - p->p_flag |= P_SIGEVENT; - wakeup(&p->p_siglist); - } - } } int @@ -749,11 +739,6 @@ if (ps->ps_sigact[_SIG_IDX(sig)] == SIG_IGN || (sigprop(sig) & SA_IGNORE && ps->ps_sigact[_SIG_IDX(sig)] == SIG_DFL)) { - if ((p->p_flag & P_SA) && - SIGISMEMBER(p->p_sigqueue.sq_signals, sig)) { - p->p_flag |= P_SIGEVENT; - wakeup(&p->p_siglist); - } /* never to be seen again */ sigqueue_delete_proc(p, sig); if (sig != SIGCONT) @@ -1211,10 +1196,6 @@ continue; if (!SIGISMEMBER(td->td_sigqueue.sq_signals, i)) { if (SIGISMEMBER(p->p_sigqueue.sq_signals, i)) { - if (p->p_flag & P_SA) { - p->p_flag |= P_SIGEVENT; - wakeup(&p->p_siglist); - } sigqueue_move(&p->p_sigqueue, &td->td_sigqueue, i); } else @@ -1887,7 +1868,6 @@ { struct sigacts *ps; struct proc *p; - int error; int sig; int code; @@ -1896,23 +1876,7 @@ code = ksi->ksi_code; KASSERT(_SIG_VALID(sig), ("invalid signal")); - if (td->td_pflags & TDP_SA) { - if (td->td_mailbox == NULL) - thread_user_enter(td); - PROC_LOCK(p); - SIGDELSET(td->td_sigmask, sig); - mtx_lock_spin(&sched_lock); - /* - * Force scheduling an upcall, so UTS has chance to - * process the signal before thread runs again in - * userland. - */ - if (td->td_upcall) - td->td_upcall->ku_flags |= KUF_DOUPCALL; - mtx_unlock_spin(&sched_lock); - } else { - PROC_LOCK(p); - } + PROC_LOCK(p); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jun 5 06:07:12 2006 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 3304D16A4D0; Mon, 5 Jun 2006 06:07:12 +0000 (UTC) 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 C742F16A4CE for ; Mon, 5 Jun 2006 06:07:11 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6CFEF43D46 for ; Mon, 5 Jun 2006 06:07:11 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5565TLI031623 for ; Mon, 5 Jun 2006 06:05:29 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5565F9v031615 for perforce@freebsd.org; Mon, 5 Jun 2006 06:05:15 GMT (envelope-from mjacob@freebsd.org) Date: Mon, 5 Jun 2006 06:05:15 GMT Message-Id: <200606050605.k5565F9v031615@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 98523 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, 05 Jun 2006 06:07:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=98523 Change 98523 by mjacob@mjacob_feral on 2006/06/05 06:05:11 Integrate from mainline. Affected files ... .. //depot/projects/mjscratch/MAINTAINERS#2 integrate .. //depot/projects/mjscratch/Makefile.inc1#2 integrate .. //depot/projects/mjscratch/ObsoleteFiles.inc#2 integrate .. //depot/projects/mjscratch/contrib/bsnmp/NEWS#2 integrate .. //depot/projects/mjscratch/contrib/bsnmp/gensnmpdef/gensnmpdef.1#2 integrate .. //depot/projects/mjscratch/contrib/bsnmp/gensnmpdef/gensnmpdef.c#2 integrate .. //depot/projects/mjscratch/contrib/bsnmp/gensnmptree/gensnmptree.1#2 integrate .. //depot/projects/mjscratch/contrib/bsnmp/gensnmptree/gensnmptree.c#2 integrate .. //depot/projects/mjscratch/contrib/netcat/atomicio.c#2 integrate .. //depot/projects/mjscratch/contrib/netcat/atomicio.h#1 branch .. //depot/projects/mjscratch/contrib/netcat/nc.1#2 integrate .. //depot/projects/mjscratch/contrib/netcat/netcat.c#2 integrate .. //depot/projects/mjscratch/contrib/netcat/socks.c#2 integrate .. //depot/projects/mjscratch/etc/bluetooth/hcsecd.conf#2 integrate .. //depot/projects/mjscratch/etc/defaults/rc.conf#2 integrate .. //depot/projects/mjscratch/etc/devd.conf#2 integrate .. //depot/projects/mjscratch/etc/hosts.allow#2 integrate .. //depot/projects/mjscratch/etc/mtree/BSD.usr.dist#2 integrate .. //depot/projects/mjscratch/etc/netstart#2 integrate .. //depot/projects/mjscratch/etc/rc.d/Makefile#2 integrate .. //depot/projects/mjscratch/etc/rc.d/bridge#1 branch .. //depot/projects/mjscratch/etc/rc.d/devd#2 integrate .. //depot/projects/mjscratch/etc/rc.d/isdnd#2 integrate .. //depot/projects/mjscratch/etc/rc.d/jail#2 integrate .. //depot/projects/mjscratch/etc/rc.d/mdconfig#1 branch .. //depot/projects/mjscratch/etc/rc.d/mdconfig2#1 branch .. //depot/projects/mjscratch/etc/rc.d/moused#2 integrate .. //depot/projects/mjscratch/etc/rc.d/netif#2 integrate .. //depot/projects/mjscratch/etc/rc.d/pcvt#2 delete .. //depot/projects/mjscratch/etc/rc.d/pf#2 integrate .. //depot/projects/mjscratch/etc/rc.d/syscons#2 integrate .. //depot/projects/mjscratch/etc/rc.d/sysctl#2 integrate .. //depot/projects/mjscratch/etc/rc.subr#2 integrate .. //depot/projects/mjscratch/games/fortune/datfiles/fortunes#2 integrate .. //depot/projects/mjscratch/include/arpa/nameser.h#2 integrate .. //depot/projects/mjscratch/include/glob.h#2 integrate .. //depot/projects/mjscratch/include/netdb.h#2 integrate .. //depot/projects/mjscratch/include/res_update.h#2 integrate .. //depot/projects/mjscratch/include/resolv.h#2 integrate .. //depot/projects/mjscratch/kerberos5/lib/libroken/Makefile#2 integrate .. //depot/projects/mjscratch/lib/csu/common/crtbegin.c#2 delete .. //depot/projects/mjscratch/lib/csu/common/crtend.c#2 delete .. //depot/projects/mjscratch/lib/libatm/Makefile#2 integrate .. //depot/projects/mjscratch/lib/libc/Makefile#2 integrate .. //depot/projects/mjscratch/lib/libc/arm/SYS.h#2 integrate .. //depot/projects/mjscratch/lib/libc/gen/getgrent.c#2 integrate .. //depot/projects/mjscratch/lib/libc/gen/gethostname.c#2 integrate .. //depot/projects/mjscratch/lib/libc/gen/glob.3#2 integrate .. //depot/projects/mjscratch/lib/libc/gen/glob.c#2 integrate .. //depot/projects/mjscratch/lib/libc/gen/signal.3#2 integrate .. //depot/projects/mjscratch/lib/libc/include/isc/list.h#1 branch .. //depot/projects/mjscratch/lib/libc/nameser/Symbol.map#2 integrate .. //depot/projects/mjscratch/lib/libc/nameser/ns_samedomain.c#2 integrate .. //depot/projects/mjscratch/lib/libc/net/Makefile.inc#2 integrate .. //depot/projects/mjscratch/lib/libc/net/Symbol.map#2 integrate .. //depot/projects/mjscratch/lib/libc/net/gai_strerror.3#2 integrate .. //depot/projects/mjscratch/lib/libc/net/gai_strerror.c#2 integrate .. //depot/projects/mjscratch/lib/libc/net/gethostnamadr.c#2 integrate .. //depot/projects/mjscratch/lib/libc/net/getnameinfo.c#2 integrate .. //depot/projects/mjscratch/lib/libc/net/res_mkupdate.c#2 delete .. //depot/projects/mjscratch/lib/libc/net/res_update.c#2 delete .. //depot/projects/mjscratch/lib/libc/resolv/Makefile.inc#2 integrate .. //depot/projects/mjscratch/lib/libc/resolv/Symbol.map#2 integrate .. //depot/projects/mjscratch/lib/libc/resolv/h_errno.c#2 integrate .. //depot/projects/mjscratch/lib/libc/resolv/res_findzonecut.c#1 branch .. //depot/projects/mjscratch/lib/libc/resolv/res_mkupdate.c#1 branch .. //depot/projects/mjscratch/lib/libc/resolv/res_state.c#2 integrate .. //depot/projects/mjscratch/lib/libc/resolv/res_update.c#1 branch .. //depot/projects/mjscratch/lib/libc/stdlib/a64l.c#2 integrate .. //depot/projects/mjscratch/lib/libc/stdlib/strtol.3#2 integrate .. //depot/projects/mjscratch/lib/libc/stdlib/strtoul.3#2 integrate .. //depot/projects/mjscratch/lib/libc/sys/truncate.2#2 integrate .. //depot/projects/mjscratch/lib/libc/sys/wait.2#2 integrate .. //depot/projects/mjscratch/lib/libpthread/pthread.map#2 integrate .. //depot/projects/mjscratch/lib/libpthread/thread/thr_symbols.c#2 integrate .. //depot/projects/mjscratch/lib/libthr/thread/thr_mutex.c#2 integrate .. //depot/projects/mjscratch/lib/libthr/thread/thr_private.h#2 integrate .. //depot/projects/mjscratch/lib/libthr/thread/thr_spec.c#2 integrate .. //depot/projects/mjscratch/lib/libthread_db/libpthread_db.c#2 integrate .. //depot/projects/mjscratch/lib/libthread_db/libpthread_db.h#2 integrate .. //depot/projects/mjscratch/lib/libthread_db/libthr_db.c#2 integrate .. //depot/projects/mjscratch/lib/libutil/Makefile#2 integrate .. //depot/projects/mjscratch/lib/libutil/kld.c#2 integrate .. //depot/projects/mjscratch/release/doc/en_US.ISO8859-1/installation/Makefile#2 integrate .. //depot/projects/mjscratch/release/doc/en_US.ISO8859-1/installation/alpha/Makefile#2 delete .. //depot/projects/mjscratch/release/doc/en_US.ISO8859-1/installation/alpha/article.sgml#2 delete .. //depot/projects/mjscratch/release/doc/en_US.ISO8859-1/installation/common/install.sgml#2 integrate .. //depot/projects/mjscratch/release/doc/en_US.ISO8859-1/installation/common/layout.sgml#2 integrate .. //depot/projects/mjscratch/release/doc/en_US.ISO8859-1/relnotes/Makefile#2 integrate .. //depot/projects/mjscratch/release/doc/en_US.ISO8859-1/relnotes/alpha/Makefile#2 delete .. //depot/projects/mjscratch/release/doc/en_US.ISO8859-1/relnotes/alpha/article.sgml#2 delete .. //depot/projects/mjscratch/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#2 integrate .. //depot/projects/mjscratch/release/doc/ru_RU.KOI8-R/hardware/Makefile#2 integrate .. //depot/projects/mjscratch/release/pc98/fixit-small_crunch.conf#2 integrate .. //depot/projects/mjscratch/release/picobsd/build/picobsd#2 integrate .. //depot/projects/mjscratch/sbin/dhclient/dhclient.c#2 integrate .. //depot/projects/mjscratch/sbin/fsdb/fsdb.8#2 integrate .. //depot/projects/mjscratch/sbin/fsdb/fsdb.c#2 integrate .. //depot/projects/mjscratch/sbin/ipfw/ipfw.8#2 integrate .. //depot/projects/mjscratch/sbin/ipfw/ipfw2.c#2 integrate .. //depot/projects/mjscratch/sbin/mount/mount.8#2 integrate .. //depot/projects/mjscratch/sbin/mount/mount.c#2 integrate .. //depot/projects/mjscratch/sbin/mount_msdosfs/mount_msdosfs.c#2 integrate .. //depot/projects/mjscratch/sbin/mount_std/mount_std.8#2 integrate .. //depot/projects/mjscratch/sbin/rcorder/rcorder.c#2 integrate .. //depot/projects/mjscratch/share/examples/diskless/clone_root#2 integrate .. //depot/projects/mjscratch/share/examples/kld/cdev/module/cdevmod.c#2 integrate .. //depot/projects/mjscratch/share/examples/mdoc/example.4#2 integrate .. //depot/projects/mjscratch/share/man/man4/Makefile#2 integrate .. //depot/projects/mjscratch/share/man/man4/acpi_dock.4#1 branch .. //depot/projects/mjscratch/share/man/man4/aha.4#2 integrate .. //depot/projects/mjscratch/share/man/man4/ahb.4#2 integrate .. //depot/projects/mjscratch/share/man/man4/ahc.4#2 integrate .. //depot/projects/mjscratch/share/man/man4/ahd.4#2 integrate .. //depot/projects/mjscratch/share/man/man4/altq.4#2 integrate .. //depot/projects/mjscratch/share/man/man4/arcmsr.4#2 integrate .. //depot/projects/mjscratch/share/man/man4/atkbd.4#2 integrate .. //depot/projects/mjscratch/share/man/man4/ciss.4#2 integrate .. //depot/projects/mjscratch/share/man/man4/geom.4#2 integrate .. //depot/projects/mjscratch/share/man/man4/hptmv.4#2 integrate .. //depot/projects/mjscratch/share/man/man4/ida.4#2 integrate .. //depot/projects/mjscratch/share/man/man4/if_bridge.4#2 integrate .. //depot/projects/mjscratch/share/man/man4/isp.4#2 integrate .. //depot/projects/mjscratch/share/man/man4/ispfw.4#2 integrate .. //depot/projects/mjscratch/share/man/man4/kbdmux.4#2 integrate .. //depot/projects/mjscratch/share/man/man4/ktr.4#2 integrate .. //depot/projects/mjscratch/share/man/man4/lmc.4#2 integrate .. //depot/projects/mjscratch/share/man/man4/mlx.4#2 integrate .. //depot/projects/mjscratch/share/man/man4/mly.4#2 integrate .. //depot/projects/mjscratch/share/man/man4/mpt.4#2 integrate .. //depot/projects/mjscratch/share/man/man4/pcvt.4#2 delete .. //depot/projects/mjscratch/share/man/man4/pst.4#2 integrate .. //depot/projects/mjscratch/share/man/man4/sio.4#2 integrate .. //depot/projects/mjscratch/share/man/man4/splash.4#2 integrate .. //depot/projects/mjscratch/share/man/man4/trm.4#2 integrate .. //depot/projects/mjscratch/share/man/man4/twa.4#2 integrate .. //depot/projects/mjscratch/share/man/man4/twe.4#2 integrate .. //depot/projects/mjscratch/share/man/man4/vkbd.4#2 integrate .. //depot/projects/mjscratch/share/man/man5/Makefile#2 integrate .. //depot/projects/mjscratch/share/man/man5/devfs.5#2 integrate .. //depot/projects/mjscratch/share/man/man5/ext2fs.5#1 branch .. //depot/projects/mjscratch/share/man/man5/linprocfs.5#2 integrate .. //depot/projects/mjscratch/share/man/man5/nsswitch.conf.5#2 integrate .. //depot/projects/mjscratch/share/man/man5/procfs.5#2 integrate .. //depot/projects/mjscratch/share/man/man5/rc.conf.5#2 integrate .. //depot/projects/mjscratch/share/man/man5/src.conf.5#2 integrate .. //depot/projects/mjscratch/share/man/man7/build.7#2 integrate .. //depot/projects/mjscratch/share/man/man7/hier.7#2 integrate .. //depot/projects/mjscratch/share/man/man9/Makefile#2 integrate .. //depot/projects/mjscratch/share/man/man9/crypto.9#2 integrate .. //depot/projects/mjscratch/share/man/man9/device_get_sysctl.9#1 branch .. //depot/projects/mjscratch/share/man/man9/suser.9#2 integrate .. //depot/projects/mjscratch/share/misc/bsd-family-tree#2 integrate .. //depot/projects/mjscratch/share/misc/iso3166#2 integrate .. //depot/projects/mjscratch/share/mk/bsd.own.mk#2 integrate .. //depot/projects/mjscratch/sys/Makefile#2 integrate .. //depot/projects/mjscratch/sys/amd64/amd64/busdma_machdep.c#2 integrate .. //depot/projects/mjscratch/sys/amd64/conf/GENERIC#2 integrate .. //depot/projects/mjscratch/sys/amd64/include/clock.h#2 integrate .. //depot/projects/mjscratch/sys/amd64/include/mutex.h#2 integrate .. //depot/projects/mjscratch/sys/arm/arm/busdma_machdep.c#2 integrate .. //depot/projects/mjscratch/sys/arm/arm/elf_trampoline.c#2 integrate .. //depot/projects/mjscratch/sys/arm/arm/pmap.c#2 integrate .. //depot/projects/mjscratch/sys/arm/at91/at91.c#2 integrate .. //depot/projects/mjscratch/sys/arm/conf/KB920X#2 integrate .. //depot/projects/mjscratch/sys/arm/include/cpuconf.h#2 integrate .. //depot/projects/mjscratch/sys/arm/include/cpufunc.h#2 integrate .. //depot/projects/mjscratch/sys/arm/include/pmap.h#2 integrate .. //depot/projects/mjscratch/sys/arm/sa11x0/assabet_machdep.c#2 integrate .. //depot/projects/mjscratch/sys/arm/sa11x0/sa11x0_io.c#2 integrate .. //depot/projects/mjscratch/sys/arm/sa11x0/sa11x0_reg.h#2 integrate .. //depot/projects/mjscratch/sys/arm/sa11x0/sa11x0_var.h#2 integrate .. //depot/projects/mjscratch/sys/arm/sa11x0/uart_cpu_sa1110.c#2 integrate .. //depot/projects/mjscratch/sys/arm/sa11x0/uart_dev_sa1110.c#2 integrate .. //depot/projects/mjscratch/sys/arm/xscale/i80321/i80321_space.c#2 integrate .. //depot/projects/mjscratch/sys/arm/xscale/i80321/iq31244_machdep.c#2 integrate .. //depot/projects/mjscratch/sys/boot/i386/libi386/biosdisk.c#2 integrate .. //depot/projects/mjscratch/sys/cam/cam_ccb.h#2 integrate .. //depot/projects/mjscratch/sys/cam/cam_periph.c#2 integrate .. //depot/projects/mjscratch/sys/cam/scsi/scsi_all.h#2 integrate .. //depot/projects/mjscratch/sys/compat/linprocfs/linprocfs.c#2 integrate .. //depot/projects/mjscratch/sys/conf/Makefile.arm#2 integrate .. //depot/projects/mjscratch/sys/conf/NOTES#2 integrate .. //depot/projects/mjscratch/sys/conf/files#2 integrate .. //depot/projects/mjscratch/sys/conf/files.amd64#2 integrate .. //depot/projects/mjscratch/sys/conf/files.i386#2 integrate .. //depot/projects/mjscratch/sys/conf/files.pc98#2 integrate .. //depot/projects/mjscratch/sys/conf/kern.mk#2 integrate .. //depot/projects/mjscratch/sys/conf/kmod.mk#2 integrate .. //depot/projects/mjscratch/sys/conf/options#2 integrate .. //depot/projects/mjscratch/sys/conf/options.i386#2 integrate .. //depot/projects/mjscratch/sys/dev/acpica/acpi_hpet.c#2 integrate .. //depot/projects/mjscratch/sys/dev/ahb/ahb.c#2 integrate .. //depot/projects/mjscratch/sys/dev/ath/if_ath.c#2 integrate .. //depot/projects/mjscratch/sys/dev/atkbdc/atkbd.c#2 integrate .. //depot/projects/mjscratch/sys/dev/awi/awi.c#2 integrate .. //depot/projects/mjscratch/sys/dev/bfe/if_bfe.c#2 integrate .. //depot/projects/mjscratch/sys/dev/bfe/if_bfereg.h#2 integrate .. //depot/projects/mjscratch/sys/dev/bktr/bktr_os.c#2 integrate .. //depot/projects/mjscratch/sys/dev/ciss/ciss.c#2 integrate .. //depot/projects/mjscratch/sys/dev/dc/dcphy.c#2 integrate .. //depot/projects/mjscratch/sys/dev/dc/if_dc.c#2 integrate .. //depot/projects/mjscratch/sys/dev/dc/if_dcreg.h#2 integrate .. //depot/projects/mjscratch/sys/dev/dcons/dcons_os.c#2 integrate .. //depot/projects/mjscratch/sys/dev/digi/digi.c#2 integrate .. //depot/projects/mjscratch/sys/dev/drm/drm.h#2 integrate .. //depot/projects/mjscratch/sys/dev/drm/drm_scatter.c#2 integrate .. //depot/projects/mjscratch/sys/dev/drm/i915_drv.c#2 integrate .. //depot/projects/mjscratch/sys/dev/drm/mga_drv.c#2 integrate .. //depot/projects/mjscratch/sys/dev/drm/r300_cmdbuf.c#2 integrate .. //depot/projects/mjscratch/sys/dev/em/if_em_hw.c#2 integrate .. //depot/projects/mjscratch/sys/dev/gem/if_gem.c#2 integrate .. //depot/projects/mjscratch/sys/dev/hifn/hifn7751.c#2 integrate .. //depot/projects/mjscratch/sys/dev/hifn/hifn7751var.h#2 integrate .. //depot/projects/mjscratch/sys/dev/hme/if_hme.c#2 integrate .. //depot/projects/mjscratch/sys/dev/ic/ns16550.h#2 integrate .. //depot/projects/mjscratch/sys/dev/ipw/if_ipw.c#2 integrate .. //depot/projects/mjscratch/sys/dev/isp/isp_freebsd.c#2 integrate .. //depot/projects/mjscratch/sys/dev/isp/isp_freebsd.h#2 integrate .. //depot/projects/mjscratch/sys/dev/isp/isp_pci.c#2 integrate .. //depot/projects/mjscratch/sys/dev/isp/isp_tpublic.h#2 integrate .. //depot/projects/mjscratch/sys/dev/isp/ispvar.h#2 integrate .. //depot/projects/mjscratch/sys/dev/iwi/if_iwi.c#2 integrate .. //depot/projects/mjscratch/sys/dev/le/if_le_cbus.c#1 branch .. //depot/projects/mjscratch/sys/dev/le/if_le_isa.c#1 branch .. //depot/projects/mjscratch/sys/dev/lmc/if_lmc.h#2 integrate .. //depot/projects/mjscratch/sys/dev/mfi/mfi.c#2 integrate .. //depot/projects/mjscratch/sys/dev/mfi/mfi_disk.c#2 integrate .. //depot/projects/mjscratch/sys/dev/mfi/mfi_ioctl.h#2 integrate .. //depot/projects/mjscratch/sys/dev/mfi/mfi_linux.c#1 branch .. //depot/projects/mjscratch/sys/dev/mfi/mfi_pci.c#2 integrate .. //depot/projects/mjscratch/sys/dev/mfi/mfireg.h#2 integrate .. //depot/projects/mjscratch/sys/dev/mfi/mfivar.h#2 integrate .. //depot/projects/mjscratch/sys/dev/mii/ukphy_subr.c#2 integrate .. //depot/projects/mjscratch/sys/dev/mpt/mpt.c#2 integrate .. //depot/projects/mjscratch/sys/dev/mpt/mpt.h#2 integrate .. //depot/projects/mjscratch/sys/dev/mpt/mpt_cam.c#2 integrate .. //depot/projects/mjscratch/sys/dev/mpt/mpt_cam.h#2 integrate .. //depot/projects/mjscratch/sys/dev/mpt/mpt_debug.c#2 integrate .. //depot/projects/mjscratch/sys/dev/mpt/mpt_pci.c#2 integrate .. //depot/projects/mjscratch/sys/dev/mpt/mpt_raid.c#2 integrate .. //depot/projects/mjscratch/sys/dev/mpt/mpt_raid.h#2 integrate .. //depot/projects/mjscratch/sys/dev/mpt/mpt_reg.h#2 integrate .. //depot/projects/mjscratch/sys/dev/nve/if_nve.c#2 integrate .. //depot/projects/mjscratch/sys/dev/ofw/ofw_console.c#2 integrate .. //depot/projects/mjscratch/sys/dev/pccbb/pccbb.c#2 integrate .. //depot/projects/mjscratch/sys/dev/pccbb/pccbb_isa.c#2 integrate .. //depot/projects/mjscratch/sys/dev/pccbb/pccbb_pci.c#2 integrate .. //depot/projects/mjscratch/sys/dev/pccbb/pccbbvar.h#2 integrate .. //depot/projects/mjscratch/sys/dev/pci/fixup_pci.c#2 integrate .. //depot/projects/mjscratch/sys/dev/pci/pcireg.h#2 integrate .. //depot/projects/mjscratch/sys/dev/ral/rt2560.c#2 integrate .. //depot/projects/mjscratch/sys/dev/ral/rt2661.c#2 integrate .. //depot/projects/mjscratch/sys/dev/re/if_re.c#2 integrate .. //depot/projects/mjscratch/sys/dev/safe/safe.c#2 integrate .. //depot/projects/mjscratch/sys/dev/safe/safevar.h#2 integrate .. //depot/projects/mjscratch/sys/dev/sio/sio.c#2 integrate .. //depot/projects/mjscratch/sys/dev/sound/midi/midi.c#1 branch .. //depot/projects/mjscratch/sys/dev/sound/midi/midi.h#1 branch .. //depot/projects/mjscratch/sys/dev/sound/midi/midiq.h#1 branch .. //depot/projects/mjscratch/sys/dev/sound/midi/mpu401.c#1 branch .. //depot/projects/mjscratch/sys/dev/sound/midi/mpu401.h#1 branch .. //depot/projects/mjscratch/sys/dev/sound/midi/mpu_if.m#1 branch .. //depot/projects/mjscratch/sys/dev/sound/midi/mpufoi_if.m#1 branch .. //depot/projects/mjscratch/sys/dev/sound/midi/sequencer.c#1 branch .. //depot/projects/mjscratch/sys/dev/sound/midi/sequencer.h#1 branch .. //depot/projects/mjscratch/sys/dev/sound/midi/synth_if.m#1 branch .. //depot/projects/mjscratch/sys/dev/sound/pci/cmi.c#2 integrate .. //depot/projects/mjscratch/sys/dev/sound/pci/emu10k1.c#2 integrate .. //depot/projects/mjscratch/sys/dev/syscons/apm/apm_saver.c#2 integrate .. //depot/projects/mjscratch/sys/dev/syscons/scvesactl.c#2 integrate .. //depot/projects/mjscratch/sys/dev/syscons/syscons.c#2 integrate .. //depot/projects/mjscratch/sys/dev/uart/uart.h#2 integrate .. //depot/projects/mjscratch/sys/dev/uart/uart_dbg.c#2 integrate .. //depot/projects/mjscratch/sys/dev/uart/uart_dev_ns8250.c#2 integrate .. //depot/projects/mjscratch/sys/dev/uart/uart_tty.c#2 integrate .. //depot/projects/mjscratch/sys/dev/ubsec/ubsec.c#2 integrate .. //depot/projects/mjscratch/sys/dev/ubsec/ubsecvar.h#2 integrate .. //depot/projects/mjscratch/sys/dev/usb/ehci.c#2 integrate .. //depot/projects/mjscratch/sys/dev/usb/ehci_pci.c#2 integrate .. //depot/projects/mjscratch/sys/dev/usb/ehcivar.h#2 integrate .. //depot/projects/mjscratch/sys/dev/usb/if_axe.c#2 integrate .. //depot/projects/mjscratch/sys/dev/usb/if_axereg.h#2 integrate .. //depot/projects/mjscratch/sys/dev/usb/if_ural.c#2 integrate .. //depot/projects/mjscratch/sys/dev/usb/ohci.c#2 integrate .. //depot/projects/mjscratch/sys/dev/usb/ohci_pci.c#2 integrate .. //depot/projects/mjscratch/sys/dev/usb/ohcireg.h#2 integrate .. //depot/projects/mjscratch/sys/dev/usb/ohcivar.h#2 integrate .. //depot/projects/mjscratch/sys/dev/usb/sl811hs.c#2 integrate .. //depot/projects/mjscratch/sys/dev/usb/sl811hsvar.h#2 integrate .. //depot/projects/mjscratch/sys/dev/usb/ugen.c#2 integrate .. //depot/projects/mjscratch/sys/dev/usb/uhci.c#2 integrate .. //depot/projects/mjscratch/sys/dev/usb/uhci_pci.c#2 integrate .. //depot/projects/mjscratch/sys/dev/usb/uhcivar.h#2 integrate .. //depot/projects/mjscratch/sys/dev/usb/usb.c#2 integrate .. //depot/projects/mjscratch/sys/dev/usb/usb_mem.c#2 integrate .. //depot/projects/mjscratch/sys/dev/usb/usbdi.c#2 integrate .. //depot/projects/mjscratch/sys/dev/usb/usbdivar.h#2 integrate .. //depot/projects/mjscratch/sys/dev/wi/if_wi.c#2 integrate .. //depot/projects/mjscratch/sys/dev/zs/zs.c#2 integrate .. //depot/projects/mjscratch/sys/doc/subsys/Dependencies#1 branch .. //depot/projects/mjscratch/sys/doc/subsys/Doxyfile-cam#1 branch .. //depot/projects/mjscratch/sys/doc/subsys/Doxyfile-crypto#1 branch .. //depot/projects/mjscratch/sys/doc/subsys/Doxyfile-dev_pci#1 branch .. //depot/projects/mjscratch/sys/doc/subsys/Doxyfile-dev_sound#1 branch .. //depot/projects/mjscratch/sys/doc/subsys/Doxyfile-dev_usb#1 branch .. //depot/projects/mjscratch/sys/doc/subsys/Doxyfile-geom#1 branch .. //depot/projects/mjscratch/sys/doc/subsys/Doxyfile-i4b#1 branch .. //depot/projects/mjscratch/sys/doc/subsys/Doxyfile-kern#1 branch .. //depot/projects/mjscratch/sys/doc/subsys/Doxyfile-libkern#1 branch .. //depot/projects/mjscratch/sys/doc/subsys/Doxyfile-linux#1 branch .. //depot/projects/mjscratch/sys/doc/subsys/Doxyfile-net80211#1 branch .. //depot/projects/mjscratch/sys/doc/subsys/Doxyfile-netgraph#1 branch .. //depot/projects/mjscratch/sys/doc/subsys/Doxyfile-netinet#1 branch .. //depot/projects/mjscratch/sys/doc/subsys/Doxyfile-netinet6#1 branch .. //depot/projects/mjscratch/sys/doc/subsys/Doxyfile-netipsec#1 branch .. //depot/projects/mjscratch/sys/doc/subsys/Doxyfile-opencrypto#1 branch .. //depot/projects/mjscratch/sys/doc/subsys/Doxyfile-vm#1 branch .. //depot/projects/mjscratch/sys/doc/subsys/Makefile#1 branch .. //depot/projects/mjscratch/sys/doc/subsys/README#1 branch .. //depot/projects/mjscratch/sys/doc/subsys/common-Doxyfile#1 branch .. //depot/projects/mjscratch/sys/doc/subsys/notreviewed.dox#1 branch .. //depot/projects/mjscratch/sys/fs/msdosfs/msdosfs_vfsops.c#2 integrate .. //depot/projects/mjscratch/sys/fs/ntfs/ntfs_vfsops.c#2 integrate .. //depot/projects/mjscratch/sys/fs/nullfs/null_vfsops.c#2 integrate .. //depot/projects/mjscratch/sys/fs/nwfs/nwfs_io.c#2 integrate .. //depot/projects/mjscratch/sys/fs/procfs/procfs.c#2 integrate .. //depot/projects/mjscratch/sys/fs/smbfs/smbfs_io.c#2 integrate .. //depot/projects/mjscratch/sys/fs/smbfs/smbfs_vnops.c#2 integrate .. //depot/projects/mjscratch/sys/fs/udf/udf_vfsops.c#2 integrate .. //depot/projects/mjscratch/sys/gdb/gdb.h#2 integrate .. //depot/projects/mjscratch/sys/gdb/gdb_cons.c#2 integrate .. //depot/projects/mjscratch/sys/gdb/gdb_main.c#2 integrate .. //depot/projects/mjscratch/sys/gdb/gdb_packet.c#2 integrate .. //depot/projects/mjscratch/sys/geom/geom_bsd.c#2 integrate .. //depot/projects/mjscratch/sys/geom/geom_gpt.c#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/ext2fs/ext2_vfsops.c#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/FreeBSD/xfs_frw.c#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/FreeBSD/xfs_fs_subr.c#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/FreeBSD/xfs_iget.c#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/FreeBSD/xfs_ioctl.c#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_attr.c#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_bit.c#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_dfrag.c#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_dir2_trace.c#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_inode.c#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_iomap.c#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_trans.c#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_vfsops.c#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_vnodeops.c#2 integrate .. //depot/projects/mjscratch/sys/i386/bios/apm.c#2 integrate .. //depot/projects/mjscratch/sys/i386/bios/apm.h#2 integrate .. //depot/projects/mjscratch/sys/i386/conf/GENERIC#2 integrate .. //depot/projects/mjscratch/sys/i386/conf/GENERIC.hints#2 integrate .. //depot/projects/mjscratch/sys/i386/conf/NOTES#2 integrate .. //depot/projects/mjscratch/sys/i386/i386/busdma_machdep.c#2 integrate .. //depot/projects/mjscratch/sys/i386/i386/initcpu.c#2 integrate .. //depot/projects/mjscratch/sys/i386/i386/machdep.c#2 integrate .. //depot/projects/mjscratch/sys/i386/i386/ptrace_machdep.c#2 integrate .. //depot/projects/mjscratch/sys/i386/i386/vm_machdep.c#2 integrate .. //depot/projects/mjscratch/sys/i386/include/clock.h#2 integrate .. //depot/projects/mjscratch/sys/i386/include/md_var.h#2 integrate .. //depot/projects/mjscratch/sys/i386/include/mutex.h#2 integrate .. //depot/projects/mjscratch/sys/i386/include/npx.h#2 integrate .. //depot/projects/mjscratch/sys/i386/include/pcvt_ioctl.h#2 delete .. //depot/projects/mjscratch/sys/i386/isa/npx.c#2 integrate .. //depot/projects/mjscratch/sys/i386/isa/pcvt/pcvt_conf.h#2 delete .. //depot/projects/mjscratch/sys/i386/isa/pcvt/pcvt_drv.c#2 delete .. //depot/projects/mjscratch/sys/i386/isa/pcvt/pcvt_ext.c#2 delete .. //depot/projects/mjscratch/sys/i386/isa/pcvt/pcvt_hdr.h#2 delete .. //depot/projects/mjscratch/sys/i386/isa/pcvt/pcvt_kbd.c#2 delete .. //depot/projects/mjscratch/sys/i386/isa/pcvt/pcvt_kbd.h#2 delete .. //depot/projects/mjscratch/sys/i386/isa/pcvt/pcvt_out.c#2 delete .. //depot/projects/mjscratch/sys/i386/isa/pcvt/pcvt_sup.c#2 delete .. //depot/projects/mjscratch/sys/i386/isa/pcvt/pcvt_tbl.h#2 delete .. //depot/projects/mjscratch/sys/i386/isa/pcvt/pcvt_vtf.c#2 delete .. //depot/projects/mjscratch/sys/ia64/conf/GENERIC#2 integrate .. //depot/projects/mjscratch/sys/ia64/conf/NOTES#2 integrate .. //depot/projects/mjscratch/sys/ia64/ia64/busdma_machdep.c#2 integrate .. //depot/projects/mjscratch/sys/ia64/ia64/ssc.c#2 integrate .. //depot/projects/mjscratch/sys/isofs/cd9660/cd9660_vfsops.c#2 integrate .. //depot/projects/mjscratch/sys/kern/kern_conf.c#2 integrate .. //depot/projects/mjscratch/sys/kern/kern_event.c#2 integrate .. //depot/projects/mjscratch/sys/kern/kern_exec.c#2 integrate .. //depot/projects/mjscratch/sys/kern/kern_exit.c#2 integrate .. //depot/projects/mjscratch/sys/kern/kern_linker.c#2 integrate .. //depot/projects/mjscratch/sys/kern/kern_mutex.c#2 integrate .. //depot/projects/mjscratch/sys/kern/kern_switch.c#2 integrate .. //depot/projects/mjscratch/sys/kern/kern_synch.c#2 integrate .. //depot/projects/mjscratch/sys/kern/kern_umtx.c#2 integrate .. //depot/projects/mjscratch/sys/kern/subr_disk.c#2 integrate .. //depot/projects/mjscratch/sys/kern/subr_stack.c#2 integrate .. //depot/projects/mjscratch/sys/kern/subr_taskqueue.c#2 integrate .. //depot/projects/mjscratch/sys/kern/tty_cons.c#2 integrate .. //depot/projects/mjscratch/sys/kern/uipc_syscalls.c#2 integrate .. //depot/projects/mjscratch/sys/kern/vfs_aio.c#2 integrate .. //depot/projects/mjscratch/sys/kern/vfs_mount.c#2 integrate .. //depot/projects/mjscratch/sys/kern/vfs_subr.c#2 integrate .. //depot/projects/mjscratch/sys/kern/vnode_if.src#2 integrate .. //depot/projects/mjscratch/sys/modules/Makefile#2 integrate .. //depot/projects/mjscratch/sys/modules/acpi/acpi/Makefile#2 integrate .. //depot/projects/mjscratch/sys/modules/acpi/acpi_asus/Makefile#2 integrate .. //depot/projects/mjscratch/sys/modules/acpi/acpi_panasonic/Makefile#2 integrate .. //depot/projects/mjscratch/sys/modules/acpi/acpi_toshiba/Makefile#2 integrate .. //depot/projects/mjscratch/sys/modules/acpi/acpi_video/Makefile#2 integrate .. //depot/projects/mjscratch/sys/modules/cpufreq/Makefile#2 integrate .. //depot/projects/mjscratch/sys/modules/fdc/Makefile#2 integrate .. //depot/projects/mjscratch/sys/modules/geom/geom_eli/Makefile#2 integrate .. //depot/projects/mjscratch/sys/modules/le/Makefile#2 integrate .. //depot/projects/mjscratch/sys/modules/mfi/Makefile#2 integrate .. //depot/projects/mjscratch/sys/modules/mfi/mfi_linux/Makefile#1 branch .. //depot/projects/mjscratch/sys/modules/sound/driver/cmi/Makefile#2 integrate .. //depot/projects/mjscratch/sys/modules/sound/driver/emu10k1/Makefile#2 integrate .. //depot/projects/mjscratch/sys/modules/sound/sound/Makefile#2 integrate .. //depot/projects/mjscratch/sys/net/bpf.c#2 integrate .. //depot/projects/mjscratch/sys/net/bpf.h#2 integrate .. //depot/projects/mjscratch/sys/net/bpf_filter.c#2 integrate .. //depot/projects/mjscratch/sys/net/bpfdesc.h#2 integrate .. //depot/projects/mjscratch/sys/net/if.c#2 integrate .. //depot/projects/mjscratch/sys/net/if_bridge.c#2 integrate .. //depot/projects/mjscratch/sys/net/if_disc.c#2 integrate .. //depot/projects/mjscratch/sys/net/if_faith.c#2 integrate .. //depot/projects/mjscratch/sys/net/if_fwsubr.c#2 integrate .. //depot/projects/mjscratch/sys/net/if_gif.c#2 integrate .. //depot/projects/mjscratch/sys/net/if_gre.c#2 integrate .. //depot/projects/mjscratch/sys/net/if_loop.c#2 integrate .. //depot/projects/mjscratch/sys/net/if_media.h#2 integrate .. //depot/projects/mjscratch/sys/net/if_sl.c#2 integrate .. //depot/projects/mjscratch/sys/net/if_stf.c#2 integrate .. //depot/projects/mjscratch/sys/net/if_tap.c#2 integrate .. //depot/projects/mjscratch/sys/net/if_tun.c#2 integrate .. //depot/projects/mjscratch/sys/net/raw_cb.c#2 integrate .. //depot/projects/mjscratch/sys/net/raw_usrreq.c#2 integrate .. //depot/projects/mjscratch/sys/net80211/ieee80211_input.c#2 integrate .. //depot/projects/mjscratch/sys/net80211/ieee80211_node.c#2 integrate .. //depot/projects/mjscratch/sys/netgraph/atm/uni/ng_uni_cust.h#2 integrate .. //depot/projects/mjscratch/sys/netgraph/bluetooth/include/ng_btsocket.h#2 integrate .. //depot/projects/mjscratch/sys/netgraph/bluetooth/include/ng_hci.h#2 integrate .. //depot/projects/mjscratch/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#2 integrate .. //depot/projects/mjscratch/sys/netgraph/ng_base.c#2 integrate .. //depot/projects/mjscratch/sys/netgraph/ng_iface.c#2 integrate .. //depot/projects/mjscratch/sys/netinet/in_pcb.c#2 integrate .. //depot/projects/mjscratch/sys/netinet/ip_carp.c#2 integrate .. //depot/projects/mjscratch/sys/netinet/ip_fw.h#2 integrate .. //depot/projects/mjscratch/sys/netinet/ip_fw2.c#2 integrate .. //depot/projects/mjscratch/sys/netinet/ip_gre.c#2 integrate .. //depot/projects/mjscratch/sys/netinet/ip_mroute.c#2 integrate .. //depot/projects/mjscratch/sys/netinet/ip_output.c#2 integrate .. //depot/projects/mjscratch/sys/netinet/raw_ip.c#2 integrate .. //depot/projects/mjscratch/sys/netinet/tcp_timer.c#2 integrate .. //depot/projects/mjscratch/sys/netinet/tcp_usrreq.c#2 integrate .. //depot/projects/mjscratch/sys/netinet/udp_usrreq.c#2 integrate .. //depot/projects/mjscratch/sys/netinet6/in6_src.c#2 integrate .. //depot/projects/mjscratch/sys/netinet6/udp6_usrreq.c#2 integrate .. //depot/projects/mjscratch/sys/netipsec/ipsec.c#2 integrate .. //depot/projects/mjscratch/sys/netipsec/ipsec_input.c#2 integrate .. //depot/projects/mjscratch/sys/netipsec/key.c#2 integrate .. //depot/projects/mjscratch/sys/netipsec/xform_ah.c#2 integrate .. //depot/projects/mjscratch/sys/netipsec/xform_esp.c#2 integrate .. //depot/projects/mjscratch/sys/nfs4client/nfs4_vfsops.c#2 integrate .. //depot/projects/mjscratch/sys/nfs4client/nfs4_vnops.c#2 integrate .. //depot/projects/mjscratch/sys/nfsclient/nfs.h#2 integrate .. //depot/projects/mjscratch/sys/nfsclient/nfs_bio.c#2 integrate .. //depot/projects/mjscratch/sys/nfsclient/nfs_nfsiod.c#2 integrate .. //depot/projects/mjscratch/sys/nfsclient/nfs_node.c#2 integrate .. //depot/projects/mjscratch/sys/nfsclient/nfs_socket.c#2 integrate .. //depot/projects/mjscratch/sys/nfsclient/nfs_subs.c#2 integrate .. //depot/projects/mjscratch/sys/nfsclient/nfs_vfsops.c#2 integrate .. //depot/projects/mjscratch/sys/nfsclient/nfs_vnops.c#2 integrate .. //depot/projects/mjscratch/sys/nfsclient/nfsmount.h#2 integrate .. //depot/projects/mjscratch/sys/nfsclient/nfsnode.h#2 integrate .. //depot/projects/mjscratch/sys/opencrypto/criov.c#2 integrate .. //depot/projects/mjscratch/sys/opencrypto/crypto.c#2 integrate .. //depot/projects/mjscratch/sys/opencrypto/cryptodev.c#2 integrate .. //depot/projects/mjscratch/sys/opencrypto/cryptodev.h#2 integrate .. //depot/projects/mjscratch/sys/opencrypto/cryptosoft.c#2 integrate .. //depot/projects/mjscratch/sys/opencrypto/cryptosoft.h#2 integrate .. //depot/projects/mjscratch/sys/opencrypto/xform.c#2 integrate .. //depot/projects/mjscratch/sys/opencrypto/xform.h#2 integrate .. //depot/projects/mjscratch/sys/pc98/cbus/sio.c#2 integrate .. //depot/projects/mjscratch/sys/pc98/conf/GENERIC#2 integrate .. //depot/projects/mjscratch/sys/pc98/conf/GENERIC.hints#2 integrate .. //depot/projects/mjscratch/sys/pc98/conf/NOTES#2 integrate .. //depot/projects/mjscratch/sys/pc98/include/pcvt_ioctl.h#2 delete .. //depot/projects/mjscratch/sys/pci/agp_amd64.c#2 integrate .. //depot/projects/mjscratch/sys/pci/agp_sis.c#2 integrate .. //depot/projects/mjscratch/sys/pci/if_rlreg.h#2 integrate .. //depot/projects/mjscratch/sys/posix4/ksched.c#2 integrate .. //depot/projects/mjscratch/sys/posix4/p1003_1b.c#2 integrate .. //depot/projects/mjscratch/sys/security/audit/audit_bsm_klib.c#2 integrate .. //depot/projects/mjscratch/sys/sparc64/include/pmap.h#2 integrate .. //depot/projects/mjscratch/sys/sparc64/sparc64/pmap.c#2 integrate .. //depot/projects/mjscratch/sys/sys/cons.h#2 integrate .. //depot/projects/mjscratch/sys/sys/elf_common.h#2 integrate .. //depot/projects/mjscratch/sys/sys/kernel.h#2 integrate .. //depot/projects/mjscratch/sys/sys/mutex.h#2 integrate .. //depot/projects/mjscratch/sys/sys/proc.h#2 integrate .. //depot/projects/mjscratch/sys/sys/queue.h#2 integrate .. //depot/projects/mjscratch/sys/tools/vnode_if.awk#2 integrate .. //depot/projects/mjscratch/sys/ufs/ffs/ffs_vfsops.c#2 integrate .. //depot/projects/mjscratch/sys/ufs/ufs/dinode.h#2 integrate .. //depot/projects/mjscratch/sys/ufs/ufs/ufs_vnops.c#2 integrate .. //depot/projects/mjscratch/sys/vm/uma_core.c#2 integrate .. //depot/projects/mjscratch/sys/vm/vm_extern.h#2 integrate .. //depot/projects/mjscratch/sys/vm/vm_glue.c#2 integrate .. //depot/projects/mjscratch/sys/vm/vm_map.c#2 integrate .. //depot/projects/mjscratch/sys/vm/vm_map.h#2 integrate .. //depot/projects/mjscratch/sys/vm/vm_meter.c#2 integrate .. //depot/projects/mjscratch/sys/vm/vm_page.c#2 integrate .. //depot/projects/mjscratch/tools/build/options/WITHOUT_PCVT#2 delete .. //depot/projects/mjscratch/tools/build/options/makeman#2 integrate .. //depot/projects/mjscratch/tools/debugscripts/dot.gdbinit#2 integrate .. //depot/projects/mjscratch/tools/make_libdeps.sh#2 integrate .. //depot/projects/mjscratch/tools/regression/execve/Makefile#1 branch .. //depot/projects/mjscratch/tools/regression/execve/doexec.c#1 branch .. //depot/projects/mjscratch/tools/regression/execve/execve.t#1 branch .. //depot/projects/mjscratch/tools/regression/execve/tests/badinterplen#1 branch .. //depot/projects/mjscratch/tools/regression/execve/tests/devnullscript#1 branch .. //depot/projects/mjscratch/tools/regression/execve/tests/goodaout.c#1 branch .. //depot/projects/mjscratch/tools/regression/execve/tests/goodscript#1 branch .. //depot/projects/mjscratch/tools/regression/execve/tests/nonexistshell#1 branch .. //depot/projects/mjscratch/tools/regression/execve/tests/scriptarg#1 branch .. //depot/projects/mjscratch/tools/regression/execve/tests/scriptarg-nospace#1 branch .. //depot/projects/mjscratch/tools/regression/fifo/fifo_misc/fifo_misc.c#2 integrate .. //depot/projects/mjscratch/tools/regression/ipsec/ipsec.t#1 branch .. //depot/projects/mjscratch/tools/regression/netinet/rawconnect/rawconnect.t#1 branch .. //depot/projects/mjscratch/tools/regression/sockets/sendfile/Makefile#1 branch .. //depot/projects/mjscratch/tools/regression/sockets/sendfile/sendfile.c#1 branch .. //depot/projects/mjscratch/tools/regression/sockets/socketpair/Makefile#2 integrate .. //depot/projects/mjscratch/tools/regression/sockets/unix_cmsg/Makefile#1 branch .. //depot/projects/mjscratch/tools/regression/sockets/unix_cmsg/README#1 branch .. //depot/projects/mjscratch/tools/regression/sockets/unix_cmsg/unix_cmsg.c#1 branch .. //depot/projects/mjscratch/tools/regression/sockets/unix_cmsg/unix_cmsg.t#1 branch .. //depot/projects/mjscratch/tools/tools/README#2 integrate .. //depot/projects/mjscratch/tools/tools/crypto/cryptotest.c#2 integrate .. //depot/projects/mjscratch/tools/tools/crypto/ubsecstats.c#2 integrate .. //depot/projects/mjscratch/tools/tools/recoverdisk/Makefile#2 integrate .. //depot/projects/mjscratch/tools/tools/recoverdisk/recoverdisk.c#2 integrate .. //depot/projects/mjscratch/tools/tools/tinderbox/.cvsignore#2 delete .. //depot/projects/mjscratch/tools/tools/tinderbox/Makefile#2 delete .. //depot/projects/mjscratch/tools/tools/tinderbox/etc/Makefile#2 delete .. //depot/projects/mjscratch/tools/tools/tinderbox/etc/default.rc#2 delete .. //depot/projects/mjscratch/tools/tools/tinderbox/etc/head.rc#2 delete .. //depot/projects/mjscratch/tools/tools/tinderbox/etc/releng_4.rc#2 delete .. //depot/projects/mjscratch/tools/tools/tinderbox/etc/releng_5.rc#2 delete .. //depot/projects/mjscratch/tools/tools/tinderbox/etc/releng_6.rc#2 delete .. //depot/projects/mjscratch/tools/tools/tinderbox/etc/update_head.rc#2 delete .. //depot/projects/mjscratch/tools/tools/tinderbox/etc/update_releng_4.rc#2 delete .. //depot/projects/mjscratch/tools/tools/tinderbox/etc/update_releng_5.rc#2 delete .. //depot/projects/mjscratch/tools/tools/tinderbox/etc/update_releng_6.rc#2 delete .. //depot/projects/mjscratch/tools/tools/tinderbox/powerpc.diff#2 delete .. //depot/projects/mjscratch/tools/tools/tinderbox/tbmaster.1#2 delete .. //depot/projects/mjscratch/tools/tools/tinderbox/tbmaster.pl#2 delete .. //depot/projects/mjscratch/tools/tools/tinderbox/tinderbox.1#2 delete .. //depot/projects/mjscratch/tools/tools/tinderbox/tinderbox.pl#2 delete .. //depot/projects/mjscratch/tools/tools/tinderbox/www/.cvsignore#2 delete .. //depot/projects/mjscratch/tools/tools/tinderbox/www/Makefile#2 delete .. //depot/projects/mjscratch/tools/tools/tinderbox/www/daemon.png.uu#2 delete .. //depot/projects/mjscratch/tools/tools/tinderbox/www/index.cgi#2 delete .. //depot/projects/mjscratch/tools/tools/tinderbox/www/tb.css#2 delete .. //depot/projects/mjscratch/tools/tools/tinderbox/www/valid-css.png.uu#2 delete .. //depot/projects/mjscratch/tools/tools/tinderbox/www/valid-xhtml10.png.uu#2 delete .. //depot/projects/mjscratch/usr.bin/calendar/day.c#2 integrate .. //depot/projects/mjscratch/usr.bin/file/magic.5#2 integrate .. //depot/projects/mjscratch/usr.bin/find/find.1#2 integrate .. //depot/projects/mjscratch/usr.bin/find/function.c#2 integrate .. //depot/projects/mjscratch/usr.bin/id/id.c#2 integrate .. //depot/projects/mjscratch/usr.bin/kdump/Makefile#2 integrate .. //depot/projects/mjscratch/usr.bin/kdump/kdump.c#2 integrate .. //depot/projects/mjscratch/usr.bin/kdump/kdump_subr.h#1 branch .. //depot/projects/mjscratch/usr.bin/kdump/mksubr#1 branch .. //depot/projects/mjscratch/usr.bin/rpcgen/rpc_svcout.c#2 integrate .. //depot/projects/mjscratch/usr.bin/sed/process.c#2 integrate .. //depot/projects/mjscratch/usr.bin/systat/systat.1#2 integrate .. //depot/projects/mjscratch/usr.bin/vmstat/vmstat.c#2 integrate .. //depot/projects/mjscratch/usr.sbin/Makefile#2 integrate .. //depot/projects/mjscratch/usr.sbin/bluetooth/hccontrol/hccontrol.8#2 integrate .. //depot/projects/mjscratch/usr.sbin/bluetooth/hccontrol/hccontrol.c#2 integrate .. //depot/projects/mjscratch/usr.sbin/bluetooth/hccontrol/hccontrol.h#2 integrate .. //depot/projects/mjscratch/usr.sbin/bluetooth/hccontrol/node.c#2 integrate .. //depot/projects/mjscratch/usr.sbin/cron/cron/do_command.c#2 integrate .. //depot/projects/mjscratch/usr.sbin/cron/cron/popen.c#2 integrate .. //depot/projects/mjscratch/usr.sbin/gstat/Makefile#2 integrate .. //depot/projects/mjscratch/usr.sbin/gstat/gstat.8#2 integrate .. //depot/projects/mjscratch/usr.sbin/gstat/gstat.c#2 integrate .. //depot/projects/mjscratch/usr.sbin/ipfwpcap/Makefile#2 integrate .. //depot/projects/mjscratch/usr.sbin/ipfwpcap/ipfwpcap.8#1 branch .. //depot/projects/mjscratch/usr.sbin/jail/jail.8#2 integrate .. //depot/projects/mjscratch/usr.sbin/mountd/Makefile#2 integrate .. //depot/projects/mjscratch/usr.sbin/mountd/mountd.c#2 integrate .. //depot/projects/mjscratch/usr.sbin/moused/moused.8#2 integrate .. //depot/projects/mjscratch/usr.sbin/mrouted/cfparse.y#2 integrate .. //depot/projects/mjscratch/usr.sbin/mrouted/config.c#2 integrate .. //depot/projects/mjscratch/usr.sbin/ngctl/config.c#2 integrate .. //depot/projects/mjscratch/usr.sbin/ngctl/connect.c#2 integrate .. //depot/projects/mjscratch/usr.sbin/ngctl/debug.c#2 integrate .. //depot/projects/mjscratch/usr.sbin/ngctl/dot.c#2 integrate .. //depot/projects/mjscratch/usr.sbin/ngctl/list.c#2 integrate .. //depot/projects/mjscratch/usr.sbin/ngctl/main.c#2 integrate .. //depot/projects/mjscratch/usr.sbin/ngctl/mkpeer.c#2 integrate .. //depot/projects/mjscratch/usr.sbin/ngctl/msg.c#2 integrate .. //depot/projects/mjscratch/usr.sbin/ngctl/name.c#2 integrate .. //depot/projects/mjscratch/usr.sbin/ngctl/ngctl.h#2 integrate .. //depot/projects/mjscratch/usr.sbin/ngctl/rmhook.c#2 integrate .. //depot/projects/mjscratch/usr.sbin/ngctl/show.c#2 integrate .. //depot/projects/mjscratch/usr.sbin/ngctl/shutdown.c#2 integrate .. //depot/projects/mjscratch/usr.sbin/ngctl/status.c#2 integrate .. //depot/projects/mjscratch/usr.sbin/ngctl/types.c#2 integrate .. //depot/projects/mjscratch/usr.sbin/ngctl/write.c#2 integrate .. //depot/projects/mjscratch/usr.sbin/ntp/doc/Makefile#2 integrate .. //depot/projects/mjscratch/usr.sbin/ntp/doc/ntp-keygen.8#1 branch .. //depot/projects/mjscratch/usr.sbin/ntp/doc/ntp.conf.5#2 integrate .. //depot/projects/mjscratch/usr.sbin/ntp/doc/ntpd.8#2 integrate .. //depot/projects/mjscratch/usr.sbin/ntp/doc/ntpdate.8#2 integrate .. //depot/projects/mjscratch/usr.sbin/ntp/doc/ntpdc.8#2 integrate .. //depot/projects/mjscratch/usr.sbin/ntp/doc/ntpq.8#2 integrate .. //depot/projects/mjscratch/usr.sbin/pcvt/Makefile#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/Makefile.inc#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/Misc/Doc/Acknowledgements#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/Misc/Doc/Bibliography#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/Misc/Doc/CharGen#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/Misc/Doc/Charsets#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/Misc/Doc/EscapeSequences#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/Misc/Doc/Keyboard.HP#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/Misc/Doc/Keyboard.VT#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/Misc/Doc/Makefile#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/Misc/Doc/NotesAndHints#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/Misc/Etc/Makefile#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/Misc/Etc/Termcap#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/Misc/Etc/Terminfo#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/Misc/Etc/pcvt.el#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/Misc/Etc/pcvt.sh#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/Misc/Etc/xmodmap-german#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/Misc/Makefile#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/Misc/Makefile.inc#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/Misc/README.FIRST#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/cursor/Makefile#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/cursor/cursor.1#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/cursor/cursor.c#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/demo/Makefile#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/demo/README#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/demo/chardemo.vt.gz.uu#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/demo/colors.vt.gz.uu#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/demo/cowscene.vt.gz.uu#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/demo/outerlimit.vt.gz.uu#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/demo/playvt.c#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/demo/sgr.vt.gz.uu#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/demo/twzone.vt.gz.uu#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/demo/xmas.vt.gz.uu#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/fed/Makefile#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/fed/edit.c#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/fed/fed.1#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/fed/fed.c#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/fed/fed.h#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/fed/misc.c#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/fed/select.c#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/fontedit/Makefile#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/fontedit/README#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/fontedit/fontedit.1#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/fontedit/fontedit.c#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/fonts/COPYRIGHT#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/fonts/Makefile#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/fonts/vt100pc.814.uu#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/fonts/vt100sg.814.uu#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/fonts/vt220h.808.uu#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/fonts/vt220h.810.uu#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/fonts/vt220h.814.uu#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/fonts/vt220h.816.uu#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/fonts/vt220l.808.uu#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/fonts/vt220l.810.uu#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/fonts/vt220l.814.uu#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/fonts/vt220l.816.uu#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/ispcvt/Makefile#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/ispcvt/ispcvt.8#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/ispcvt/ispcvt.c#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/kbdio/Makefile#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/kbdio/kbdio.y#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/kbdio/lex.l#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/kcon/Makefile#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/kcon/kcon.1#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/kcon/kcon.c#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/keycap/Makefile#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/keycap/keycap.3#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/keycap/keycap.c#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/keycap/keycap.h#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/keycap/keycap.src#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/keycap/man5/keycap.5#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/loadfont/Makefile#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/loadfont/loadfont.1#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/loadfont/loadfont.c#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/scon/Makefile#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/scon/scon.1#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/scon/scon.c#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/userkeys/Makefile#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/userkeys/vt220keys.1#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/userkeys/vt220keys.c#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/vgaio/CAUTION#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/vgaio/Makefile#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/vgaio/lex.l#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/vgaio/vgaio.8#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/vgaio/vgaio.h#2 delete .. //depot/projects/mjscratch/usr.sbin/pcvt/vgaio/vgaio.y#2 delete .. //depot/projects/mjscratch/usr.sbin/portsnap/portsnap/portsnap.sh#2 integrate .. //depot/projects/mjscratch/usr.sbin/rpc.lockd/kern.c#2 integrate .. //depot/projects/mjscratch/usr.sbin/sysinstall/dist.c#2 integrate .. //depot/projects/mjscratch/usr.sbin/sysinstall/installUpgrade.c#2 integrate .. //depot/projects/mjscratch/usr.sbin/wpa/hostapd/driver_freebsd.c#2 integrate .. //depot/projects/mjscratch/usr.sbin/ypserv/yp_access.c#2 integrate Differences ... ==== //depot/projects/mjscratch/MAINTAINERS#2 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.131 2006/05/05 20:12:30 rodrigc Exp $ +$FreeBSD: src/MAINTAINERS,v 1.135 2006/06/03 01:52:11 scottl Exp $ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements @@ -20,6 +20,7 @@ subsystem login notes ----------------------------- +kqueue jmg Pre-commit review requested. mergemaster dougb Prefers to pre-approve commits libc/posix1e rwatson Pre-commit review requested. POSIX.1e ACLs rwatson Pre-commit review requested. @@ -41,15 +42,8 @@ cdboot jhb Pre-commit review requested. pxeboot jhb Pre-commit review requested. witness jhb Pre-commit review requested. -twe vkashyap Pre-commit review requested -twa vkashyap Pre-commit review requested -aac scottl Pre-commit review requested -udf scottl Pre-commit review requested. -ips scottl Pre-commit review requested. -iir scottl Pre-commit review requested. -mlx scottl Pre-commit review requested. -mly scottl Pre-commit review requested. -maestro3 scottl Pre-commit review requested. +twe aradford@amcc.com Pre-commit review requested +twa aradford@amcc.com Pre-commit review requested CAM gibbs, ken Pre-commit review requested. send to scsi@freebsd.org devstat(9) ken Pre-commit review requested. ==== //depot/projects/mjscratch/Makefile.inc1#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.545 2006/03/31 14:10:35 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.547 2006/05/26 18:10:06 netchild Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -17,6 +17,7 @@ # The intended user-driven targets are: # buildworld - rebuild *everything*, including glue to help do upgrades # installworld- install everything built by "buildworld" +# doxygen - build API documentation of the kernel # update - convenient way to update your source tree (eg: cvsup/cvs) # # Standard targets (not defined here) are documented in the makefiles in @@ -421,7 +422,7 @@ ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} .endif .endfor -.for _dir in usr.sbin/pcvt/keycap usr.bin/lex/lib +.for _dir in usr.bin/lex/lib cd ${.CURDIR}/${_dir}; \ ${LIB32MAKE} DESTDIR=${LIB32TMP} obj .endfor @@ -711,6 +712,18 @@ ${MAKE} KERNEL=${INSTKERNNAME} ${.TARGET:S/kernel//} # +# doxygen +# +# Build the API documentation with doxygen +# +doxygen: + @if [ ! -x `/usr/bin/which doxygen` ]; then \ + echo "You need doxygen (devel/doxygen) to generate the API documentation of the kernel." | /usr/bin/fmt; \ + exit 1; \ + fi + cd ${.CURDIR}/sys/doc/subsys && ${MAKE} obj all + +# # update # # Update the source tree, by running cvsup and/or running cvs to update to the @@ -1010,10 +1023,6 @@ _generic_libs+= usr.bin/lex/lib -.if ${MACHINE} == "i386" -_generic_libs+= usr.sbin/pcvt/keycap -.endif - .for _lib in ${_startup_libs} ${_prebuild_libs:Nlib/libpam} ${_generic_libs} ${_lib}__L: .PHONY .if exists(${.CURDIR}/${_lib}) ==== //depot/projects/mjscratch/ObsoleteFiles.inc#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.35 2006/05/15 20:41:11 maxim Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.37 2006/05/20 00:30:06 marcel 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,59 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20060517: pcvt removed +OLD_FILES+=usr/share/pcvt/README.FIRST +OLD_FILES+=usr/share/pcvt/Etc/xmodmap-german +OLD_FILES+=usr/share/pcvt/Etc/pcvt.sh +OLD_FILES+=usr/share/pcvt/Etc/pcvt.el +OLD_FILES+=usr/share/pcvt/Etc/Terminfo +OLD_FILES+=usr/share/pcvt/Etc/Termcap +OLD_DIRS+=usr/share/pcvt/Etc +OLD_FILES+=usr/share/pcvt/Doc/NotesAndHints +OLD_FILES+=usr/share/pcvt/Doc/Keyboard.VT +OLD_FILES+=usr/share/pcvt/Doc/Keyboard.HP +OLD_FILES+=usr/share/pcvt/Doc/EscapeSequences +OLD_FILES+=usr/share/pcvt/Doc/Charsets +OLD_FILES+=usr/share/pcvt/Doc/CharGen +OLD_FILES+=usr/share/pcvt/Doc/Bibliography +OLD_FILES+=usr/share/pcvt/Doc/Acknowledgements +OLD_DIRS+=usr/share/pcvt/Doc +OLD_DIRS+=usr/share/pcvt +OLD_FILES+=usr/share/misc/pcvtfonts/vt220l.816 +OLD_FILES+=usr/share/misc/pcvtfonts/vt220l.814 +OLD_FILES+=usr/share/misc/pcvtfonts/vt220l.810 +OLD_FILES+=usr/share/misc/pcvtfonts/vt220l.808 +OLD_FILES+=usr/share/misc/pcvtfonts/vt220h.816 +OLD_FILES+=usr/share/misc/pcvtfonts/vt220h.814 +OLD_FILES+=usr/share/misc/pcvtfonts/vt220h.810 +OLD_FILES+=usr/share/misc/pcvtfonts/vt220h.808 +OLD_DIRS+=usr/share/misc/pcvtfonts +OLD_FILES+=usr/share/misc/keycap.pcvt +OLD_FILES+=usr/share/man/man8/ispcvt.8.gz +OLD_FILES+=usr/share/man/man5/keycap.5.gz +OLD_FILES+=usr/share/man/man4/vt.4.gz +OLD_FILES+=usr/share/man/man4/pcvt.4.gz +OLD_FILES+=usr/share/man/man3/kgetstr.3.gz +OLD_FILES+=usr/share/man/man3/kgetnum.3.gz +OLD_FILES+=usr/share/man/man3/kgetflag.3.gz +OLD_FILES+=usr/share/man/man3/kgetent.3.gz +OLD_FILES+=usr/share/man/man3/keycap.3.gz +OLD_FILES+=usr/share/man/man1/vt220keys.1.gz +OLD_FILES+=usr/share/man/man1/scon.1.gz +OLD_FILES+=usr/share/man/man1/loadfont.1.gz +OLD_FILES+=usr/share/man/man1/kcon.1.gz +OLD_FILES+=usr/share/man/man1/fontedit.1.gz +OLD_FILES+=usr/share/man/man1/cursor.1.gz +OLD_FILES+=usr/sbin/vt220keys +OLD_FILES+=usr/sbin/scon +OLD_FILES+=usr/sbin/loadfont +OLD_FILES+=usr/sbin/kcon +OLD_FILES+=usr/sbin/ispcvt +OLD_FILES+=usr/sbin/fontedit +OLD_FILES+=usr/sbin/cursor +OLD_FILES+=usr/lib/libkeycap_p.a +OLD_FILES+=usr/lib/libkeycap.a +OLD_FILES+=usr/include/machine/pcvt_ioctl.h # 20060514: lnc(4) replaced by le(4) OLD_FILES+=usr/share/man/man4/i386/lnc.4.gz # 20060512: remove ip6fw @@ -22,6 +75,8 @@ OLD_FILES+=sbin/ip6fw OLD_FILES+=usr/include/netinet6/ip6_fw.h OLD_FILES+=usr/share/man/man8/ip6fw.8.gz +# 20060424: sab(4) removed +OLD_FILES+=usr/share/man/man4/sab.4.gz # 20060328: remove redundant rc.d script OLD_FILES+=etc/rc.d/ike # 20060127: revert libdisk to static-only ==== //depot/projects/mjscratch/contrib/bsnmp/NEWS#2 (text+ko) ==== @@ -1,3 +1,7 @@ +1.12a + Support for ENUM and BITS in gensnmp{tree,def}. Include directives + and typedefs. + 1.12 A couple of man page fixes from various submitters. ==== //depot/projects/mjscratch/contrib/bsnmp/gensnmpdef/gensnmpdef.1#2 (text+ko) ==== @@ -1,5 +1,5 @@ .\" -.\" Copyright (C) 2004-2005 +.\" Copyright (C) 2004-2006 .\" 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.5 2005/10/04 08:46:46 brandt_h Exp $ +.\" $Begemot: gensnmpdef.1 383 2006-05-30 07:40:49Z brandt_h $ .\" -.Dd June 14, 2005 +.Dd May 28, 2006 .Dt GENSNMPDEF 1 .Os .Sh NAME @@ -36,7 +36,7 @@ .Nd "generate a MIB description file from MIBs" .Sh SYNOPSIS .Nm -.Op Fl h +.Op Fl hEe .Op Fl c Ar cut .Ar name Op Ar ... .Sh DESCRIPTION @@ -48,13 +48,28 @@ for feeding it into .Xr gensnmptree 1 . .Pp -The -.Fl c -option specifies the number of initial sub-oids that should be omitted -from the tree. +The following options are available: +.Bl -tag -width indent +.It Fl c Ar cut +Specify the number of initial sub-oids that should be omitted +from the tree in the output. .Xr gensnmptree 1 automatically adds 1.3.6 in front of all OIDs so the default value of 3 is just correct in most cases. +.It Fl E +Generate typedefs for named enumerations. +These are enumerations defined via the TEXTUAL-CONVENTION macro. +The normal tree output is suppressed. +.It Fl e +Generate typedefs for unnamed enumerations. +These are enumerations defined in the SYNTAX clause of an OBJECT-TYPE macro. +The name of the enumeration is formed by appending the string +.Ql Type +to the name of the object. +The normal tree output is suppressed. +.It Fl h +Print a short help text and exit. +.El .Pp .Nm does no attempt on sorting the OID tree so in case of complex and ==== //depot/projects/mjscratch/contrib/bsnmp/gensnmpdef/gensnmpdef.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004 + * Copyright (C) 2004-2006 * Hartmut Brandt. * All rights reserved. * @@ -26,8 +26,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: bsnmp/gensnmpdef/gensnmpdef.c,v 1.3 2004/08/06 08:46:45 brandt Exp $ + * $Begemot: gensnmpdef.c 383 2006-05-30 07:40:49Z brandt_h $ */ +#include + #include #include #include @@ -38,9 +40,13 @@ #include static const char usgtxt[] = -"Usage: gensnmpdef [-h] [-c ] MIB [MIB ...]\n" +"Usage: gensnmpdef [-hEe] [-c ] MIB [MIB ...]\n" "Options:\n" " -c specify the number of initial sub-oids to cut from the oids\n" +" -E extract named enum types. Print a typedef for all enums defined\n" +" in syntax clauses of normal objects. Suppress normal output.\n" +" -e extract unnamed enum types. Print a typedef for all enums defined\n" +" as textual conventions. Suppress normal output.\n" " -h print this help\n" >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jun 5 06:11:17 2006 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 8C28216A4C8; Mon, 5 Jun 2006 06:11:17 +0000 (UTC) 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 4D40316A4C6 for ; Mon, 5 Jun 2006 06:11:17 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 032BF43D45 for ; Mon, 5 Jun 2006 06:11:17 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5569Y98031815 for ; Mon, 5 Jun 2006 06:09:34 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5569Ywc031812 for perforce@freebsd.org; Mon, 5 Jun 2006 06:09:34 GMT (envelope-from mjacob@freebsd.org) Date: Mon, 5 Jun 2006 06:09:34 GMT Message-Id: <200606050609.k5569Ywc031812@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 98524 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, 05 Jun 2006 06:11:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=98524 Change 98524 by mjacob@mjacob_feral on 2006/06/05 06:08:59 Unsnafu an incomplete integration. Affected files ... .. //depot/projects/mjscratch/sys/cam/cam_xpt.c#2 integrate .. //depot/projects/mjscratch/sys/cam/scsi/scsi_target.c#2 integrate Differences ... ==== //depot/projects/mjscratch/sys/cam/cam_xpt.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.158 2006/01/20 19:21:38 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.159 2006/05/30 22:44:00 mjacob Exp $"); #include #include @@ -3502,8 +3502,7 @@ if ((crs->release_flags & RELSIM_ADJUST_OPENINGS) != 0) { - if ((dev->inq_data.flags & SID_CmdQue) != 0) { - + if (INQ_DATA_TQ_ENABLED(&dev->inq_data)) { /* Don't ever go below one opening */ if (crs->openings > 0) { xpt_dev_ccbq_resize(crs->ccb_h.path, @@ -5991,7 +5990,7 @@ #ifdef CAM_NEW_TRAN_CODE xpt_devise_transport(path); #endif /* CAM_NEW_TRAN_CODE */ - if ((inq_buf->flags & SID_CmdQue) != 0) + if (INQ_DATA_TQ_ENABLED(inq_buf)) softc->action = PROBE_MODE_SENSE; else softc->action = PROBE_SERIAL_NUM; @@ -6416,7 +6415,7 @@ /* SCSI specific sanity checking */ if ((cpi.hba_inquiry & PI_TAG_ABLE) == 0 - || (inq_data->flags & SID_CmdQue) == 0 + || (INQ_DATA_TQ_ENABLED(inq_data)) == 0 || (device->queue_flags & SCP_QUEUE_DQUE) != 0 || (device->quirk->mintags == 0)) { /* @@ -6712,7 +6711,7 @@ } if ((cpi.hba_inquiry & PI_TAG_ABLE) == 0 - || (inq_data->flags & SID_CmdQue) == 0 + || (INQ_DATA_TQ_ENABLED(inq_data)) == 0 || (device->queue_flags & SCP_QUEUE_DQUE) != 0 || (device->quirk->mintags == 0)) { /* ==== //depot/projects/mjscratch/sys/cam/scsi/scsi_target.c#2 (text+ko) ==== @@ -28,7 +28,8 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.68 2005/08/08 19:55:30 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.70 2006/05/24 15:26:07 mjacob Exp $"); + #include #include @@ -40,6 +41,7 @@ #include #include #include +#include #include #include @@ -89,7 +91,6 @@ targ_state state; struct selinfo read_select; struct devstat device_stats; - struct mtx mtx; }; static d_open_t targopen; @@ -157,10 +158,6 @@ }; PERIPHDRIVER_DECLARE(targ, targdriver); -static struct mtx targ_mtx; -#define TARG_LOCK(softc) mtx_lock(&(softc)->mtx) -#define TARG_UNLOCK(softc) mtx_unlock(&(softc)->mtx) - static MALLOC_DEFINE(M_TARG, "TARG", "TARG data"); /* Create softc and initialize it. Only one proc can open each targ device. */ @@ -169,15 +166,12 @@ { struct targ_softc *softc; - mtx_lock(&targ_mtx); if (dev->si_drv1 != 0) { - mtx_unlock(&targ_mtx); return (EBUSY); } /* Mark device busy before any potentially blocking operations */ dev->si_drv1 = (void *)~0; - mtx_unlock(&targ_mtx); /* Create the targ device, allocate its softc, initialize it */ if ((dev->si_flags & SI_NAMED) == 0) { @@ -190,13 +184,12 @@ softc->state = TARG_STATE_OPENED; softc->periph = NULL; softc->path = NULL; - mtx_init(&softc->mtx, devtoname(dev), "targ cdev", MTX_DEF); TAILQ_INIT(&softc->pending_ccb_queue); TAILQ_INIT(&softc->work_queue); TAILQ_INIT(&softc->abort_queue); TAILQ_INIT(&softc->user_ccb_queue); - knlist_init(&softc->read_select.si_note, &softc->mtx, NULL, NULL, NULL); + knlist_init(&softc->read_select.si_note, NULL, NULL, NULL, NULL); return (0); } @@ -209,22 +202,15 @@ int error; softc = (struct targ_softc *)dev->si_drv1; - TARG_LOCK(softc); error = targdisable(softc); if (error == CAM_REQ_CMP) { dev->si_drv1 = 0; - mtx_lock(&targ_mtx); if (softc->periph != NULL) { cam_periph_invalidate(softc->periph); softc->periph = NULL; } - mtx_unlock(&targ_mtx); - TARG_UNLOCK(softc); - mtx_destroy(&softc->mtx); destroy_dev(dev); FREE(softc, M_TARG); - } else { - TARG_UNLOCK(softc); } return (error); } @@ -253,17 +239,13 @@ printf("Couldn't create path, status %#x\n", status); break; } - TARG_LOCK(softc); status = targenable(softc, path, new_lun->grp6_len, new_lun->grp7_len); - TARG_UNLOCK(softc); xpt_free_path(path); break; } case TARGIOCDISABLE: - TARG_LOCK(softc); status = targdisable(softc); - TARG_UNLOCK(softc); break; case TARGIOCDEBUG: { @@ -280,14 +262,11 @@ cdbg.ccb_h.cbfcnp = targdone; /* If no periph available, disallow debugging changes */ - TARG_LOCK(softc); if ((softc->state & TARG_STATE_LUN_ENABLED) == 0) { status = CAM_DEV_NOT_THERE; - TARG_UNLOCK(softc); break; } xpt_action((union ccb *)&cdbg); - TARG_UNLOCK(softc); status = cdbg.ccb_h.status & CAM_STATUS_MASK; #else status = CAM_FUNC_NOTAVAIL; @@ -315,7 +294,6 @@ revents = poll_events & (POLLOUT | POLLWRNORM); if ((poll_events & (POLLIN | POLLRDNORM)) != 0) { /* Poll for read() depends on user and abort queues. */ - TARG_LOCK(softc); if (!TAILQ_EMPTY(&softc->user_ccb_queue) || !TAILQ_EMPTY(&softc->abort_queue)) { revents |= poll_events & (POLLIN | POLLRDNORM); @@ -323,7 +301,6 @@ /* Only sleep if the user didn't poll for write. */ if (revents == 0) selrecord(td, &softc->read_select); - TARG_UNLOCK(softc); } return (revents); @@ -415,7 +392,6 @@ } /* Destroy any periph on our path if it is disabled */ - mtx_lock(&targ_mtx); periph = cam_periph_find(path, "targ"); if (periph != NULL) { struct targ_softc *del_softc; @@ -427,7 +403,6 @@ } else { printf("Requested path still in use by targ%d\n", periph->unit_number); - mtx_unlock(&targ_mtx); status = CAM_LUN_ALRDY_ENA; goto enable_fail; } @@ -436,7 +411,6 @@ /* Create a periph instance attached to this path */ status = cam_periph_alloc(targctor, NULL, targdtor, targstart, "targ", CAM_PERIPH_BIO, path, targasync, 0, softc); - mtx_unlock(&targ_mtx); if (status != CAM_REQ_CMP) { printf("cam_periph_alloc failed, status %#x\n", status); goto enable_fail; @@ -566,11 +540,9 @@ CAM_DEBUG(softc->path, CAM_DEBUG_PERIPH, ("Sent ATIO/INOT (%p)\n", user_ccb)); xpt_action(ccb); - TARG_LOCK(softc); TAILQ_INSERT_TAIL(&softc->pending_ccb_queue, &ccb->ccb_h, periph_links.tqe); - TARG_UNLOCK(softc); break; default: if ((func_code & XPT_FC_QUEUED) != 0) { @@ -581,10 +553,8 @@ descr->user_ccb = user_ccb; descr->priority = priority; descr->func_code = func_code; - TARG_LOCK(softc); TAILQ_INSERT_TAIL(&softc->work_queue, descr, tqe); - TARG_UNLOCK(softc); xpt_schedule(softc->periph, priority); } else { CAM_DEBUG(softc->path, CAM_DEBUG_PERIPH, @@ -629,15 +599,12 @@ softc = (struct targ_softc *)periph->softc; CAM_DEBUG(softc->path, CAM_DEBUG_PERIPH, ("targstart %p\n", start_ccb)); - TARG_LOCK(softc); descr = TAILQ_FIRST(&softc->work_queue); if (descr == NULL) { - TARG_UNLOCK(softc); xpt_release_ccb(start_ccb); } else { TAILQ_REMOVE(&softc->work_queue, descr, tqe); next_descr = TAILQ_FIRST(&softc->work_queue); - TARG_UNLOCK(softc); /* Initiate a transaction using the descr and supplied CCB */ error = targusermerge(softc, descr, start_ccb); @@ -649,9 +616,7 @@ xpt_release_ccb(start_ccb); suword(&descr->user_ccb->ccb_h.status, CAM_REQ_CMP_ERR); - TARG_LOCK(softc); TAILQ_INSERT_TAIL(&softc->abort_queue, descr, tqe); - TARG_UNLOCK(softc); notify_user(softc); } @@ -694,7 +659,6 @@ struct ccb_hdr *ccb_h; cab = (struct ccb_abort *)ccb; - TARG_LOCK(softc); TAILQ_FOREACH(ccb_h, &softc->pending_ccb_queue, periph_links.tqe) { struct targ_cmd_descr *ab_descr; @@ -708,7 +672,6 @@ break; } } - TARG_UNLOCK(softc); /* CCB not found, set appropriate status */ if (ccb_h == NULL) { k_ccbh->status = CAM_PATH_INVALID; @@ -776,10 +739,8 @@ */ CAM_DEBUG(softc->path, CAM_DEBUG_PERIPH, ("sendccb %p\n", ccb)); if (XPT_FC_IS_QUEUED(ccb)) { - TARG_LOCK(softc); TAILQ_INSERT_TAIL(&softc->pending_ccb_queue, ccb_h, periph_links.tqe); - TARG_UNLOCK(softc); } xpt_action(ccb); @@ -795,7 +756,6 @@ CAM_DEBUG(periph->path, CAM_DEBUG_PERIPH, ("targdone %p\n", done_ccb)); softc = (struct targ_softc *)periph->softc; - TARG_LOCK(softc); TAILQ_REMOVE(&softc->pending_ccb_queue, &done_ccb->ccb_h, periph_links.tqe); status = done_ccb->ccb_h.status & CAM_STATUS_MASK; @@ -803,7 +763,6 @@ /* If we're no longer enabled, throw away CCB */ if ((softc->state & TARG_STATE_LUN_ENABLED) == 0) { targfreeccb(softc, done_ccb); - TARG_UNLOCK(softc); return; } /* abort_all_pending() waits for pending queue to be empty */ @@ -817,7 +776,6 @@ case XPT_CONT_TARGET_IO: TAILQ_INSERT_TAIL(&softc->user_ccb_queue, &done_ccb->ccb_h, periph_links.tqe); - TARG_UNLOCK(softc); notify_user(softc); break; default: @@ -839,6 +797,8 @@ union ccb *user_ccb; int read_len, error; + mtx_lock(&Giant); + error = 0; read_len = 0; softc = (struct targ_softc *)dev->si_drv1; @@ -847,12 +807,11 @@ CAM_DEBUG(softc->path, CAM_DEBUG_PERIPH, ("targread\n")); /* If no data is available, wait or return immediately */ - TARG_LOCK(softc); ccb_h = TAILQ_FIRST(user_queue); user_descr = TAILQ_FIRST(abort_queue); while (ccb_h == NULL && user_descr == NULL) { if ((ioflag & IO_NDELAY) == 0) { - error = msleep(user_queue, &softc->mtx, + error = msleep(user_queue, NULL, PRIBIO | PCATCH, "targrd", 0); ccb_h = TAILQ_FIRST(user_queue); user_descr = TAILQ_FIRST(abort_queue); @@ -860,12 +819,11 @@ if (error == ERESTART) { continue; } else { - TARG_UNLOCK(softc); goto read_fail; } } } else { - TARG_UNLOCK(softc); + mtx_unlock(&Giant); return (EAGAIN); } } @@ -877,7 +835,6 @@ if (uio->uio_resid < sizeof(user_ccb)) break; TAILQ_REMOVE(user_queue, ccb_h, periph_links.tqe); - TARG_UNLOCK(softc); descr = (struct targ_cmd_descr *)ccb_h->targ_descr; user_ccb = descr->user_ccb; CAM_DEBUG(softc->path, CAM_DEBUG_PERIPH, @@ -890,7 +847,6 @@ goto read_fail; read_len += sizeof(user_ccb); - TARG_LOCK(softc); ccb_h = TAILQ_FIRST(user_queue); } @@ -899,7 +855,6 @@ if (uio->uio_resid < sizeof(user_ccb)) break; TAILQ_REMOVE(abort_queue, user_descr, tqe); - TARG_UNLOCK(softc); user_ccb = user_descr->user_ccb; CAM_DEBUG(softc->path, CAM_DEBUG_PERIPH, ("targread aborted descr %p (%p)\n", @@ -910,10 +865,8 @@ goto read_fail; read_len += sizeof(user_ccb); - TARG_LOCK(softc); user_descr = TAILQ_FIRST(abort_queue); } - TARG_UNLOCK(softc); /* * If we've successfully read some amount of data, don't report an @@ -924,6 +877,7 @@ error = ENOSPC; read_fail: + mtx_unlock(&Giant); return (error); } @@ -1020,7 +974,6 @@ static void targinit(void) { - mtx_init(&targ_mtx, "targ global", NULL, MTX_DEF); EVENTHANDLER_REGISTER(dev_clone, targclone, 0, 1000); } @@ -1086,7 +1039,7 @@ /* If we aborted at least one pending CCB ok, wait for it. */ if (cab.ccb_h.status == CAM_REQ_CMP) { - msleep(&softc->pending_ccb_queue, &softc->mtx, + msleep(&softc->pending_ccb_queue, NULL, PRIBIO | PCATCH, "tgabrt", 0); } @@ -1105,7 +1058,7 @@ * blocking read(). */ selwakeuppri(&softc->read_select, PRIBIO); - KNOTE_LOCKED(&softc->read_select.si_note, 0); + KNOTE_UNLOCKED(&softc->read_select.si_note, 0); wakeup(&softc->user_ccb_queue); } From owner-p4-projects@FreeBSD.ORG Mon Jun 5 10:32:48 2006 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 AECCE16A4E5; Mon, 5 Jun 2006 10:32:48 +0000 (UTC) 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 8A41616A4DF for ; Mon, 5 Jun 2006 10:32:48 +0000 (UTC) (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 376D843D46 for ; Mon, 5 Jun 2006 10:32:48 +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.6/8.13.6) with ESMTP id k55AV4JZ058784 for ; Mon, 5 Jun 2006 10:31:04 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k55AV42g058781 for perforce@freebsd.org; Mon, 5 Jun 2006 10:31:04 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 5 Jun 2006 10:31:04 GMT Message-Id: <200606051031.k55AV42g058781@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 98532 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, 05 Jun 2006 10:32:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=98532 Change 98532 by rwatson@rwatson_zoo on 2006/06/05 10:30:06 Merge changes from OpenBSM 1.0 alpha 6 into kernel bsm include directory. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#27 integrate .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#12 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#27 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#26 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#27 $ * $FreeBSD: src/sys/bsm/audit.h,v 1.3 2006/03/04 16:54:21 rwatson Exp $ */ @@ -282,11 +282,11 @@ unsigned int as_version; unsigned int as_numevent; int as_generated; - int as_nonattring; + int as_nonattrib; int as_kernel; int as_audit; int as_auditctl; - int as_enqueu; + int as_enqueue; int as_written; int as_wblocked; int as_rblocked; ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#12 (text+ko) ==== @@ -30,23 +30,15 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#11 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#12 $ */ #ifndef _BSM_AUDIT_RECORD_H_ #define _BSM_AUDIT_RECORD_H_ -/* Various token id types */ - /* - * Values inside the comments are not documented in the BSM pages and - * have been picked up from the header files - */ - -/* - * Values marked as XXX do not have a value defined in the BSM header files + * Token type identifiers. */ - #define AUT_INVALID 0x00 #define AUT_OTHER_FILE32 0x11 #define AUT_OHEADER 0x12 From owner-p4-projects@FreeBSD.ORG Mon Jun 5 10:33:56 2006 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 8288716A51A; Mon, 5 Jun 2006 10:33:56 +0000 (UTC) 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 45C5B16A517 for ; Mon, 5 Jun 2006 10:33:56 +0000 (UTC) (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 E545643D45 for ; Mon, 5 Jun 2006 10:33:50 +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.6/8.13.6) with ESMTP id k55AW6GG058895 for ; Mon, 5 Jun 2006 10:32:06 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k55AW6Ro058891 for perforce@freebsd.org; Mon, 5 Jun 2006 10:32:06 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 5 Jun 2006 10:32:06 GMT Message-Id: <200606051032.k55AW6Ro058891@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 98533 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, 05 Jun 2006 10:33:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=98533 Change 98533 by rwatson@rwatson_zoo on 2006/06/05 10:31:46 Remove stale comment. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#15 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#15 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#14 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#15 $ * $FreeBSD: src/sys/security/audit/audit_bsm_token.c,v 1.2 2006/03/04 17:00:55 rwatson Exp $ */ @@ -476,7 +476,6 @@ u_char *dptr = NULL; u_int16_t filelen; u_int32_t timems; - /* XXXRW: else ...? */ filelen = strlen(file); filelen += 1; From owner-p4-projects@FreeBSD.ORG Mon Jun 5 11:53:40 2006 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 6010316A677; Mon, 5 Jun 2006 11:53:39 +0000 (UTC) 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 DD5C816A567 for ; Mon, 5 Jun 2006 11:53:37 +0000 (UTC) (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 7E61543D45 for ; Mon, 5 Jun 2006 11:53:37 +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.6/8.13.6) with ESMTP id k55Bprco065937 for ; Mon, 5 Jun 2006 11:51:53 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k55Bpm75065933 for perforce@freebsd.org; Mon, 5 Jun 2006 11:51:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 5 Jun 2006 11:51:48 GMT Message-Id: <200606051151.k55Bpm75065933@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 98537 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, 05 Jun 2006 11:53:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=98537 Change 98537 by rwatson@rwatson_zoo on 2006/06/05 11:51:25 Integrate TrustedBSD base branch: - bsnmp upgrade - mount fixes - more arm - much cryptoness - loader avoids corrupting UFS on writes - bpf relocking TrustedBSD-related: - OpenBSM 1.0 alpha 6 import. Affected files ... .. //depot/projects/trustedbsd/base/MAINTAINERS#38 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/NEWS#11 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/gensnmpdef/gensnmpdef.1#6 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/gensnmpdef/gensnmpdef.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/gensnmptree/gensnmptree.1#7 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/gensnmptree/gensnmptree.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/HISTORY#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/Makefile.am#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/README#4 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/TODO#3 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/VERSION#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/Makefile.am#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/auditd/auditd.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/auditfilterd/Makefile.am#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/auditfilterd/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/auditfilterd/auditfilterd.8#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/auditfilterd/auditfilterd.c#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/auditfilterd/auditfilterd.h#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/auditfilterd/auditfilterd_conf.c#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/auditreduce/auditreduce.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/bsm/Makefile.am#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/bsm/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/bsm/audit.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/bsm/audit_filter.h#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/bsm/audit_record.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/bsm/libbsm.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/config/config.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/config/config.h.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/configure#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/configure.ac#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/etc/audit_filter#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/Makefile.am#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/au_open.3#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/au_token.3#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/audit_submit.3#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/bsm_audit.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/bsm_io.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/bsm_token.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/bsm_wrappers.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/libbsm.3#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/man/auditctl.2#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/modules/Makefile.am#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/modules/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/modules/auditfilter_noop/Makefile.am#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/modules/auditfilter_noop/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/modules/auditfilter_noop/auditfilter_noop.c#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/test/Makefile.am#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/test/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/test/bsm/Makefile.am#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/test/bsm/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/test/bsm/generate.c#1 branch .. //depot/projects/trustedbsd/base/etc/defaults/rc.conf#54 integrate .. //depot/projects/trustedbsd/base/etc/devd.conf#20 integrate .. //depot/projects/trustedbsd/base/etc/hosts.allow#8 integrate .. //depot/projects/trustedbsd/base/etc/netstart#8 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/Makefile#39 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/bridge#1 branch .. //depot/projects/trustedbsd/base/etc/rc.d/devd#9 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/jail#15 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/netif#14 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/pf#11 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getgrent.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/truncate.2#5 integrate .. //depot/projects/trustedbsd/base/lib/libkvm/kvm_minidump_amd64.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libkvm/kvm_minidump_i386.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_mutex.c#17 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_private.h#20 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_spec.c#4 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#101 integrate .. //depot/projects/trustedbsd/base/release/pc98/fixit-small_crunch.conf#7 integrate .. //depot/projects/trustedbsd/base/sbin/fsdb/fsdb.8#10 integrate .. //depot/projects/trustedbsd/base/sbin/fsdb/fsdb.c#13 integrate .. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw2.c#39 integrate .. //depot/projects/trustedbsd/base/sbin/mount/mount.c#22 integrate .. //depot/projects/trustedbsd/base/sbin/mount_msdosfs/mount_msdosfs.c#12 integrate .. //depot/projects/trustedbsd/base/share/examples/diskless/clone_root#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ktr.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man5/rc.conf.5#59 integrate .. //depot/projects/trustedbsd/base/share/man/man9/crypto.9#8 integrate .. //depot/projects/trustedbsd/base/sys/Makefile#11 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/busdma_machdep.c#15 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/busdma_machdep.c#11 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/elf_trampoline.c#3 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/pmap.c#14 integrate .. //depot/projects/trustedbsd/base/sys/arm/include/cpuconf.h#5 integrate .. //depot/projects/trustedbsd/base/sys/arm/include/cpufunc.h#5 integrate .. //depot/projects/trustedbsd/base/sys/arm/include/pmap.h#12 integrate .. //depot/projects/trustedbsd/base/sys/arm/sa11x0/assabet_machdep.c#7 integrate .. //depot/projects/trustedbsd/base/sys/arm/sa11x0/sa11x0_var.h#3 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/libi386/biosdisk.c#12 integrate .. //depot/projects/trustedbsd/base/sys/cam/cam_xpt.c#25 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_all.h#8 integrate .. //depot/projects/trustedbsd/base/sys/compat/linprocfs/linprocfs.c#32 integrate .. //depot/projects/trustedbsd/base/sys/conf/Makefile.arm#10 integrate .. //depot/projects/trustedbsd/base/sys/conf/NOTES#72 integrate .. //depot/projects/trustedbsd/base/sys/conf/kern.mk#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_hpet.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/ahb/ahb.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/ath/if_ath.c#26 integrate .. //depot/projects/trustedbsd/base/sys/dev/awi/awi.c#22 integrate .. //depot/projects/trustedbsd/base/sys/dev/bfe/if_bfe.c#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/bfe/if_bfereg.h#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/ciss/ciss.c#34 integrate .. //depot/projects/trustedbsd/base/sys/dev/dc/dcphy.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/dc/if_dc.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/dc/if_dcreg.h#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/gem/if_gem.c#25 integrate .. //depot/projects/trustedbsd/base/sys/dev/hifn/hifn7751.c#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/ipw/if_ipw.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_freebsd.c#28 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_freebsd.h#23 integrate .. //depot/projects/trustedbsd/base/sys/dev/iwi/if_iwi.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/lmc/if_lmc.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt.c#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt.h#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_cam.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_cam.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_debug.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_pci.c#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_raid.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_raid.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_reg.h#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/ofw/ofw_console.c#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccbb/pccbb.c#48 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccbb/pccbb_isa.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccbb/pccbb_pci.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccbb/pccbbvar.h#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/pci/pcireg.h#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/ral/rt2560.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/ral/rt2661.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/safe/safe.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/midi/midi.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/midi/sequencer.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/ubsec/ubsec.c#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ehci.c#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_axe.c#22 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_axereg.h#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_ural.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ohci.c#39 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ugen.c#26 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uhci.c#40 integrate .. //depot/projects/trustedbsd/base/sys/dev/wi/if_wi.c#54 integrate .. //depot/projects/trustedbsd/base/sys/doc/subsys/Doxyfile-cam#2 integrate .. //depot/projects/trustedbsd/base/sys/doc/subsys/Doxyfile-crypto#2 integrate .. //depot/projects/trustedbsd/base/sys/doc/subsys/Doxyfile-dev_pci#2 integrate .. //depot/projects/trustedbsd/base/sys/doc/subsys/Doxyfile-dev_sound#2 integrate .. //depot/projects/trustedbsd/base/sys/doc/subsys/Doxyfile-dev_usb#2 integrate .. //depot/projects/trustedbsd/base/sys/doc/subsys/Doxyfile-geom#2 integrate .. //depot/projects/trustedbsd/base/sys/doc/subsys/Doxyfile-i4b#2 integrate .. //depot/projects/trustedbsd/base/sys/doc/subsys/Doxyfile-kern#2 integrate .. //depot/projects/trustedbsd/base/sys/doc/subsys/Doxyfile-libkern#2 integrate .. //depot/projects/trustedbsd/base/sys/doc/subsys/Doxyfile-linux#2 integrate .. //depot/projects/trustedbsd/base/sys/doc/subsys/Doxyfile-net80211#2 integrate .. //depot/projects/trustedbsd/base/sys/doc/subsys/Doxyfile-netgraph#2 integrate .. //depot/projects/trustedbsd/base/sys/doc/subsys/Doxyfile-netinet#2 integrate .. //depot/projects/trustedbsd/base/sys/doc/subsys/Doxyfile-netinet6#2 integrate .. //depot/projects/trustedbsd/base/sys/doc/subsys/Doxyfile-netipsec#2 integrate .. //depot/projects/trustedbsd/base/sys/doc/subsys/Doxyfile-opencrypto#2 integrate .. //depot/projects/trustedbsd/base/sys/doc/subsys/Doxyfile-vm#2 integrate .. //depot/projects/trustedbsd/base/sys/doc/subsys/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sys/doc/subsys/notreviewed.dox#1 branch .. //depot/projects/trustedbsd/base/sys/fs/msdosfs/msdosfs_vfsops.c#33 integrate .. //depot/projects/trustedbsd/base/sys/fs/nullfs/null_vfsops.c#19 integrate .. //depot/projects/trustedbsd/base/sys/fs/smbfs/smbfs_vnops.c#26 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_gpt.c#24 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_frw.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_fs_subr.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_iget.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_ioctl.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_attr.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_bit.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dfrag.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dir2_trace.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_inode.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_iomap.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_trans.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_vfsops.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_vnodeops.c#2 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/busdma_machdep.c#26 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/initcpu.c#17 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/machdep.c#60 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/pmap.c#63 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/ptrace_machdep.c#4 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/vm_machdep.c#49 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/md_var.h#28 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/npx.h#9 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/npx.c#34 integrate .. //depot/projects/trustedbsd/base/sys/ia64/conf/NOTES#7 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/busdma_machdep.c#15 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_event.c#39 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_exit.c#53 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_mutex.c#46 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_switch.c#37 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_synch.c#48 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_disk.c#24 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_stack.c#3 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_aio.c#52 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_mount.c#47 integrate .. //depot/projects/trustedbsd/base/sys/kern/vnode_if.src#29 integrate .. //depot/projects/trustedbsd/base/sys/modules/acpi/acpi/Makefile#10 integrate .. //depot/projects/trustedbsd/base/sys/modules/acpi/acpi_asus/Makefile#7 integrate .. //depot/projects/trustedbsd/base/sys/modules/acpi/acpi_panasonic/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sys/modules/acpi/acpi_toshiba/Makefile#5 integrate .. //depot/projects/trustedbsd/base/sys/modules/acpi/acpi_video/Makefile#6 integrate .. //depot/projects/trustedbsd/base/sys/modules/cpufreq/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sys/modules/fdc/Makefile#7 integrate .. //depot/projects/trustedbsd/base/sys/modules/geom/geom_eli/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sys/modules/mfi/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sys/net/bpf.c#40 integrate .. //depot/projects/trustedbsd/base/sys/net/bpf.h#17 integrate .. //depot/projects/trustedbsd/base/sys/net/bpf_filter.c#9 integrate .. //depot/projects/trustedbsd/base/sys/net/bpfdesc.h#16 integrate .. //depot/projects/trustedbsd/base/sys/net/if.c#44 integrate .. //depot/projects/trustedbsd/base/sys/net/if_disc.c#19 integrate .. //depot/projects/trustedbsd/base/sys/net/if_faith.c#27 integrate .. //depot/projects/trustedbsd/base/sys/net/if_fwsubr.c#9 integrate .. //depot/projects/trustedbsd/base/sys/net/if_gif.c#32 integrate .. //depot/projects/trustedbsd/base/sys/net/if_gre.c#26 integrate .. //depot/projects/trustedbsd/base/sys/net/if_loop.c#31 integrate .. //depot/projects/trustedbsd/base/sys/net/if_media.h#19 integrate .. //depot/projects/trustedbsd/base/sys/net/if_sl.c#22 integrate .. //depot/projects/trustedbsd/base/sys/net/if_stf.c#28 integrate .. //depot/projects/trustedbsd/base/sys/net/if_tap.c#28 integrate .. //depot/projects/trustedbsd/base/sys/net/if_tun.c#32 integrate .. //depot/projects/trustedbsd/base/sys/net/raw_cb.c#13 integrate .. //depot/projects/trustedbsd/base/sys/net/raw_usrreq.c#18 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_input.c#18 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_node.c#18 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/atm/uni/ng_uni_cust.h#5 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_base.c#25 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_iface.c#18 integrate .. //depot/projects/trustedbsd/base/sys/netinet/in_pcb.c#39 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_carp.c#12 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_gre.c#17 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_timer.c#25 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_usrreq.c#34 integrate .. //depot/projects/trustedbsd/base/sys/netinet/udp_usrreq.c#41 integrate .. //depot/projects/trustedbsd/base/sys/netipsec/ipsec.c#12 integrate .. //depot/projects/trustedbsd/base/sys/netipsec/ipsec_input.c#9 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_vfsops.c#46 integrate .. //depot/projects/trustedbsd/base/sys/opencrypto/criov.c#5 integrate .. //depot/projects/trustedbsd/base/sys/opencrypto/crypto.c#16 integrate .. //depot/projects/trustedbsd/base/sys/opencrypto/cryptodev.h#11 integrate .. //depot/projects/trustedbsd/base/sys/opencrypto/cryptosoft.c#11 integrate .. //depot/projects/trustedbsd/base/sys/opencrypto/xform.c#7 integrate .. //depot/projects/trustedbsd/base/sys/pci/agp_amd64.c#6 integrate .. //depot/projects/trustedbsd/base/sys/pci/agp_sis.c#14 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_bsm_klib.c#3 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/include/pmap.h#27 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/pmap.c#55 integrate .. //depot/projects/trustedbsd/base/sys/sys/elf_common.h#6 integrate .. //depot/projects/trustedbsd/base/sys/sys/mutex.h#29 integrate .. //depot/projects/trustedbsd/base/sys/tools/vnode_if.awk#16 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_vfsops.c#51 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_vnops.c#47 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_extern.h#21 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_glue.c#44 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_map.c#48 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_map.h#29 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_meter.c#20 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_page.c#60 integrate .. //depot/projects/trustedbsd/base/tools/regression/execve/Makefile#1 branch .. //depot/projects/trustedbsd/base/tools/regression/execve/doexec.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/execve/execve.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/execve/tests/badinterplen#1 branch .. //depot/projects/trustedbsd/base/tools/regression/execve/tests/devnullscript#1 branch .. //depot/projects/trustedbsd/base/tools/regression/execve/tests/goodaout.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/execve/tests/goodscript#1 branch .. //depot/projects/trustedbsd/base/tools/regression/execve/tests/nonexistshell#1 branch .. //depot/projects/trustedbsd/base/tools/regression/execve/tests/scriptarg#1 branch .. //depot/projects/trustedbsd/base/tools/regression/execve/tests/scriptarg-nospace#1 branch .. //depot/projects/trustedbsd/base/tools/regression/fifo/fifo_misc/fifo_misc.c#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/ipsec/ipsec.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/sockets/unix_cmsg/Makefile#1 branch .. //depot/projects/trustedbsd/base/tools/regression/sockets/unix_cmsg/README#1 branch .. //depot/projects/trustedbsd/base/tools/regression/sockets/unix_cmsg/unix_cmsg.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/sockets/unix_cmsg/unix_cmsg.t#1 branch .. //depot/projects/trustedbsd/base/tools/tools/README#24 integrate .. //depot/projects/trustedbsd/base/tools/tools/recoverdisk/Makefile#5 integrate .. //depot/projects/trustedbsd/base/tools/tools/recoverdisk/recoverdisk.c#5 integrate .. //depot/projects/trustedbsd/base/tools/tools/tinderbox/.cvsignore#2 delete .. //depot/projects/trustedbsd/base/tools/tools/tinderbox/Makefile#5 delete .. //depot/projects/trustedbsd/base/tools/tools/tinderbox/etc/Makefile#8 delete .. //depot/projects/trustedbsd/base/tools/tools/tinderbox/etc/default.rc#6 delete .. //depot/projects/trustedbsd/base/tools/tools/tinderbox/etc/head.rc#4 delete .. //depot/projects/trustedbsd/base/tools/tools/tinderbox/etc/releng_4.rc#8 delete .. //depot/projects/trustedbsd/base/tools/tools/tinderbox/etc/releng_5.rc#7 delete .. //depot/projects/trustedbsd/base/tools/tools/tinderbox/etc/releng_6.rc#5 delete .. //depot/projects/trustedbsd/base/tools/tools/tinderbox/etc/update_head.rc#3 delete .. //depot/projects/trustedbsd/base/tools/tools/tinderbox/etc/update_releng_4.rc#4 delete .. //depot/projects/trustedbsd/base/tools/tools/tinderbox/etc/update_releng_5.rc#4 delete .. //depot/projects/trustedbsd/base/tools/tools/tinderbox/etc/update_releng_6.rc#4 delete .. //depot/projects/trustedbsd/base/tools/tools/tinderbox/powerpc.diff#3 delete .. //depot/projects/trustedbsd/base/tools/tools/tinderbox/tbmaster.1#14 delete .. //depot/projects/trustedbsd/base/tools/tools/tinderbox/tbmaster.pl#24 delete .. //depot/projects/trustedbsd/base/tools/tools/tinderbox/tinderbox.1#11 delete .. //depot/projects/trustedbsd/base/tools/tools/tinderbox/tinderbox.pl#18 delete .. //depot/projects/trustedbsd/base/tools/tools/tinderbox/www/.cvsignore#2 delete .. //depot/projects/trustedbsd/base/tools/tools/tinderbox/www/Makefile#5 delete .. //depot/projects/trustedbsd/base/tools/tools/tinderbox/www/daemon.png.uu#2 delete .. //depot/projects/trustedbsd/base/tools/tools/tinderbox/www/index.cgi#12 delete .. //depot/projects/trustedbsd/base/tools/tools/tinderbox/www/tb.css#4 delete .. //depot/projects/trustedbsd/base/tools/tools/tinderbox/www/valid-css.png.uu#2 delete .. //depot/projects/trustedbsd/base/tools/tools/tinderbox/www/valid-xhtml10.png.uu#2 delete .. //depot/projects/trustedbsd/base/usr.bin/calendar/day.c#7 integrate .. //depot/projects/trustedbsd/base/usr.bin/file/magic.5#7 integrate .. //depot/projects/trustedbsd/base/usr.bin/id/id.c#11 integrate .. //depot/projects/trustedbsd/base/usr.bin/kdump/mkioctls#9 integrate .. //depot/projects/trustedbsd/base/usr.bin/vmstat/vmstat.c#20 integrate .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/hccontrol/hccontrol.c#7 integrate .. //depot/projects/trustedbsd/base/usr.sbin/cron/cron/do_command.c#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/cron/cron/popen.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/jail/jail.8#30 integrate .. //depot/projects/trustedbsd/base/usr.sbin/mountd/mountd.c#14 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ntp/doc/ntp.conf.5#13 integrate .. //depot/projects/trustedbsd/base/usr.sbin/portsnap/portsnap/portsnap.sh#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/installUpgrade.c#11 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ypserv/yp_access.c#5 integrate Differences ... ==== //depot/projects/trustedbsd/base/MAINTAINERS#38 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.132 2006/05/24 16:01:34 wilko Exp $ +$FreeBSD: src/MAINTAINERS,v 1.135 2006/06/03 01:52:11 scottl Exp $ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements @@ -20,6 +20,7 @@ subsystem login notes ----------------------------- +kqueue jmg Pre-commit review requested. mergemaster dougb Prefers to pre-approve commits libc/posix1e rwatson Pre-commit review requested. POSIX.1e ACLs rwatson Pre-commit review requested. @@ -43,13 +44,6 @@ witness jhb Pre-commit review requested. twe aradford@amcc.com Pre-commit review requested twa aradford@amcc.com Pre-commit review requested -aac scottl Pre-commit review requested -udf scottl Pre-commit review requested. -ips scottl Pre-commit review requested. -iir scottl Pre-commit review requested. -mlx scottl Pre-commit review requested. -mly scottl Pre-commit review requested. -maestro3 scottl Pre-commit review requested. CAM gibbs, ken Pre-commit review requested. send to scsi@freebsd.org devstat(9) ken Pre-commit review requested. ==== //depot/projects/trustedbsd/base/contrib/bsnmp/NEWS#11 (text+ko) ==== @@ -1,3 +1,7 @@ +1.12a + Support for ENUM and BITS in gensnmp{tree,def}. Include directives + and typedefs. + 1.12 A couple of man page fixes from various submitters. ==== //depot/projects/trustedbsd/base/contrib/bsnmp/gensnmpdef/gensnmpdef.1#6 (text+ko) ==== @@ -1,5 +1,5 @@ .\" -.\" Copyright (C) 2004-2005 +.\" Copyright (C) 2004-2006 .\" 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.5 2005/10/04 08:46:46 brandt_h Exp $ +.\" $Begemot: gensnmpdef.1 383 2006-05-30 07:40:49Z brandt_h $ .\" -.Dd June 14, 2005 +.Dd May 28, 2006 .Dt GENSNMPDEF 1 .Os .Sh NAME @@ -36,7 +36,7 @@ .Nd "generate a MIB description file from MIBs" .Sh SYNOPSIS .Nm -.Op Fl h +.Op Fl hEe .Op Fl c Ar cut .Ar name Op Ar ... .Sh DESCRIPTION @@ -48,13 +48,28 @@ for feeding it into .Xr gensnmptree 1 . .Pp -The -.Fl c -option specifies the number of initial sub-oids that should be omitted -from the tree. +The following options are available: +.Bl -tag -width indent +.It Fl c Ar cut +Specify the number of initial sub-oids that should be omitted +from the tree in the output. .Xr gensnmptree 1 automatically adds 1.3.6 in front of all OIDs so the default value of 3 is just correct in most cases. +.It Fl E +Generate typedefs for named enumerations. +These are enumerations defined via the TEXTUAL-CONVENTION macro. +The normal tree output is suppressed. +.It Fl e +Generate typedefs for unnamed enumerations. +These are enumerations defined in the SYNTAX clause of an OBJECT-TYPE macro. +The name of the enumeration is formed by appending the string +.Ql Type +to the name of the object. +The normal tree output is suppressed. +.It Fl h +Print a short help text and exit. +.El .Pp .Nm does no attempt on sorting the OID tree so in case of complex and ==== //depot/projects/trustedbsd/base/contrib/bsnmp/gensnmpdef/gensnmpdef.c#4 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004 + * Copyright (C) 2004-2006 * Hartmut Brandt. * All rights reserved. * @@ -26,8 +26,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: bsnmp/gensnmpdef/gensnmpdef.c,v 1.3 2004/08/06 08:46:45 brandt Exp $ + * $Begemot: gensnmpdef.c 383 2006-05-30 07:40:49Z brandt_h $ */ +#include + #include #include #include @@ -38,9 +40,13 @@ #include static const char usgtxt[] = -"Usage: gensnmpdef [-h] [-c ] MIB [MIB ...]\n" +"Usage: gensnmpdef [-hEe] [-c ] MIB [MIB ...]\n" "Options:\n" " -c specify the number of initial sub-oids to cut from the oids\n" +" -E extract named enum types. Print a typedef for all enums defined\n" +" in syntax clauses of normal objects. Suppress normal output.\n" +" -e extract unnamed enum types. Print a typedef for all enums defined\n" +" as textual conventions. Suppress normal output.\n" " -h print this help\n" "MIBs are searched according to the libsmi(3) search rules and can\n" "be specified either by path or module name\n"; @@ -48,6 +54,14 @@ static SmiNode *last_node; static u_int cut = 3; +struct tdef { + char *name; + SLIST_ENTRY(tdef) link; +}; + +static SLIST_HEAD(, tdef) tdefs = SLIST_HEAD_INITIALIZER(tdef); +static int do_typedef = 0; + static void print_node(SmiNode *n, u_int level); static void @@ -135,7 +149,7 @@ [SMI_BASETYPE_FLOAT32] = "FLOAT32", [SMI_BASETYPE_FLOAT64] = "FLOAT64", [SMI_BASETYPE_FLOAT128] = "FLOAT128", - [SMI_BASETYPE_ENUM] = "INTEGER", + [SMI_BASETYPE_ENUM] = "ENUM", [SMI_BASETYPE_BITS] = "BITS", }; @@ -152,6 +166,18 @@ }; static void +print_enum(SmiType *t) +{ + SmiNamedNumber *nnum; + + printf(" ("); + for (nnum = smiGetFirstNamedNumber(t); nnum != NULL; + nnum = smiGetNextNamedNumber(nnum)) + printf(" %ld %s", nnum->value.value.integer32, nnum->name); + printf(" )"); +} + +static void print_type(SmiNode *n) { SmiType *type; @@ -168,6 +194,14 @@ } } printf("%s", type_names[type->basetype]); + + if (type->basetype == SMI_BASETYPE_ENUM || + type->basetype == SMI_BASETYPE_BITS) + print_enum(type); + + else if (type->basetype == SMI_BASETYPE_OCTETSTRING && + type->name != NULL) + printf(" | %s", type->name); } static void @@ -359,6 +393,111 @@ printf(")\n"); } +static void +save_typdef(char *name) +{ + struct tdef *t; + t = malloc(sizeof(struct tdef)); + + if (t == NULL) + err(1, NULL); + + memset(t, 0 , sizeof(struct tdef)); + t->name = name; + SLIST_INSERT_HEAD(&tdefs, t, link); +} + +static void +tdefs_cleanup(void) +{ + struct tdef *t; + + while ((t = SLIST_FIRST(&tdefs)) != NULL) { + SLIST_REMOVE_HEAD(&tdefs, link); + free(t); + } +} + +static void +print_enum_typedef(SmiType *t) +{ + SmiNamedNumber *nnum; + + for (nnum = smiGetFirstNamedNumber(t); nnum != NULL; + nnum = smiGetNextNamedNumber(nnum)) { + printf("\t%ld %s\n" , nnum->value.value.integer32, nnum->name); + } +} + +static void +print_stype(SmiNode *n) +{ + SmiType *type; + struct tdef *t = NULL; + + type = smiGetNodeType(n); + assert(type != NULL); + + if (type->basetype == SMI_BASETYPE_ENUM) { + if (do_typedef == 'e' && type->name != NULL) { + SLIST_FOREACH(t, &tdefs, link) { + if (strcmp(t->name, type->name) == 0) + return; + } + save_typdef(type->name); + printf("typedef %s ENUM (\n", type->name); + } else if (do_typedef == 'E' && type->name == NULL) + printf("typedef %sType ENUM (\n", n->name); + else + return; + + print_enum_typedef(type); + printf(")\n\n"); + + } else if (type->basetype == SMI_BASETYPE_BITS) { + if (do_typedef == 'e' && type->name != NULL) { + SLIST_FOREACH(t, &tdefs, link) { + if (strcmp(t->name, type->name) == 0) + return; + } + save_typdef(type->name); + printf("typedef %s BITS (\n", type->name); + } else if (do_typedef == 'E' && type->name == NULL) + printf("typedef %sType BITS (\n", n->name); + else + return; + + print_enum_typedef(type); + printf(")\n\n"); + } +} + +static void +print_typdefs(SmiNode *n) +{ + SmiNode *p; + + p = n; + n = smiGetFirstChildNode(n); + while (n != NULL) { + switch (n->nodekind) { + case SMI_NODEKIND_SCALAR: + case SMI_NODEKIND_COLUMN: + print_stype(n); + break; + case SMI_NODEKIND_COMPLIANCE: + case SMI_NODEKIND_GROUP: + save_node(n); + return; + default: + break; + } + n = smiGetNextChildNode(n); + } + + save_node(p); +} + int main(int argc, char *argv[]) { @@ -373,7 +512,7 @@ smiInit(NULL); - while ((opt = getopt(argc, argv, "c:h")) != -1) + while ((opt = getopt(argc, argv, "c:Eeh")) != -1) switch (opt) { case 'c': @@ -388,6 +527,14 @@ cut = (u_int)u; break; + case 'E': + do_typedef = 'E'; + break; + + case 'e': + do_typedef = 'e'; + break; + case 'h': fprintf(stderr, usgtxt); exit(0); @@ -414,9 +561,12 @@ for (opt = 0; opt < argc; opt++) { n = smiGetFirstNode(mods[opt], SMI_NODEKIND_ANY); for (;;) { - level = open_node(n, level, &last); - print_it(n, level); - last = n; + if (do_typedef == 0) { + level = open_node(n, level, &last); + print_it(n, level); + last = n; + } else + print_typdefs(n); if (last_node == NULL || (n = smiGetNextNode(last_node, SMI_NODEKIND_ANY)) @@ -424,6 +574,10 @@ break; } } - level = close_node(last->oidlen - 1, level - 1); + if (last != NULL && do_typedef == 0) + level = close_node(last->oidlen - 1, level - 1); + else if (do_typedef != 0) + tdefs_cleanup(); + return (0); } ==== //depot/projects/trustedbsd/base/contrib/bsnmp/gensnmptree/gensnmptree.1#7 (text+ko) ==== @@ -2,6 +2,9 @@ .\" Copyright (c) 2001-2005 .\" Fraunhofer Institute for Open Communication Systems (FhG Fokus). .\" All rights reserved. +.\" Copyright (c) 2006 +.\" Hartmut Brandt +.\" All rights reserved. .\" .\" Author: Harti Brandt .\" @@ -26,9 +29,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Begemot: bsnmp/gensnmptree/gensnmptree.1,v 1.7 2006/02/27 09:52:08 brandt_h Exp $ +.\" $Begemot: gensnmptree.1 383 2006-05-30 07:40:49Z brandt_h $ .\" -.Dd February 27, 2006 +.Dd May 26, 2006 .Dt GENSNMPTREE 1 .Os .Sh NAME @@ -36,7 +39,9 @@ .Nd "generate C and header files from a MIB description file" .Sh SYNOPSIS .Nm -.Op Fl helt +.Op Fl dEehlt +.Op Fl I Ar directory +.Op Fl i Ar infile .Op Fl p Ar prefix .Op Ar name Ar ... .Sh DESCRIPTION @@ -49,9 +54,12 @@ daemon or for module writers. The second form may be used by SNMP client program writers. .Pp -If the -.Fl e -option is not used +If none of the options +.Fl e , +.Fl E +or +.FL t +are used .Nm reads a MIB description from its standard input and creates two files: a C-file @@ -61,12 +69,20 @@ during PDU processing and a header file .Ar prefix Ns tree.h -containing appropriate declarations of the callback functions used in this table -and the table itself. +containing appropriate declarations of the callback functions used in this +table, the table itself and definitions for all enums. .Pp -If the -.Fl e -option is specified +The following options are available: +.Bl -tag -width ".Fl E" +.It Fl d +Switch on debugging. +.It Fl E +Extract enumerations and bit constructs. +In this mode the tool emits +a header file that contains for each type given on the command line a +C-enum definition and a preprocessor define that may be used to map +values to strings. +.It Fl e .Nm expects MIB variable names (only the last component) on its command line. It reads a MIB specification from standard input and for each MIB variable @@ -83,13 +99,13 @@ .It Va OID_ Ns Ar name is the last component of the OID. .El -.Pp -The options are as follows: -.Bl -tag -width ".Fl d Ar argument" .It Fl h Print a short help page. -.It Fl e -Enter extract mode. +.It Fl I Ar directory +Add the named directory to the include path just before the standard include +directories. +.It Fl i Ar infile +Read from the named file instead of standard input. .It Fl l Generate local preprocessor includes. This is used for bootstrapping @@ -103,26 +119,44 @@ .Sh MIBS The syntax of the MIB description file can formally be specified as follows: .Bd -unfilled -offset indent -file := tree | tree file + file := top | top file + + top := tree | typedef | include + + tree := head elements ')' + + entry := head ':' index STRING elements ')' + + leaf := head type STRING ACCESS ')' + + column := head type ACCESS ')' + + type := BASETYPE | BASETYPE '|' subtype | enum | bits + + subtype := STRING + + enum := ENUM '(' value ')' + + bits := BITS '(' value ')' -tree := head elements ')' + value := INT STRING | INT STRING value -entry := head ':' index STRING elements ')' + head := '(' INT STRING -leaf := head TYPE STRING ACCESS ')' + elements := EMPTY | elements element -column := head TYPE ACCESS ')' + element := tree | leaf | column -head := '(' INT STRING + index := type | index type -elements := EMPTY | elements element + typedef := 'typedef' STRING type -element := tree | leaf + include := 'include' filespec -index := TYPE | index TYPE + filespec := '"' STRING '"' | '<' STRING '>' .Ed .Pp -.Ar TYPE +.Ar BASETYPE specifies a SNMP data type and may be one of .Bl -bullet -offset indent -compact .It @@ -163,10 +197,25 @@ is a decimal integer and .Ar STRING is any string starting with a letter or underscore and consisting of -letters, digits and underscores, that is not one of the keywords. +letters, digits, underscores and minuses, that is not one of the keywords. +.Pp +The +.Ar typedef +directive associates a type with a single name. +.Pp +The +.Ar include +directive is replaced by the contents of the named file. .Sh EXAMPLES The following MIB description describes the system group: .Bd -literal -offset indent +include "tc.def" + +typedef AdminStatus ENUM ( + 1 up + 2 down +) + (1 internet (2 mgmt (1 mibII ==== //depot/projects/trustedbsd/base/contrib/bsnmp/gensnmptree/gensnmptree.c#11 (text+ko) ==== @@ -3,7 +3,7 @@ * Fraunhofer Institute for Open Communication Systems (FhG Fokus). * All rights reserved. * - * Copyright (c) 2004 + * Copyright (c) 2004-2006 * Hartmut Brandt. * All rights reserved. * @@ -30,21 +30,35 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: bsnmp/gensnmptree/gensnmptree.c,v 1.44 2006/02/14 09:04:17 brandt_h Exp $ + * $Begemot: gensnmptree.c 383 2006-05-30 07:40:49Z brandt_h $ * * Generate OID table from table description. * * Syntax is: * --------- - * file := tree | tree file + * file := top | top file + * + * top := tree | typedef | include * * tree := head elements ')' * * entry := head ':' index STRING elements ')' * - * leaf := head TYPE STRING ACCESS ')' + * leaf := head type STRING ACCESS ')' + * + * column := head type ACCESS ')' + * + * type := BASETYPE | BASETYPE '|' subtype | enum | bits + * + * subtype := STRING + * + * enum := ENUM '(' value ')' + * + * bits := BITS '(' value ')' + * + * value := optminus INT STRING | optminus INT STRING value * - * column := head TYPE ACCESS ')' + * optminus := '-' | EMPTY * * head := '(' INT STRING * @@ -52,8 +66,13 @@ * * element := tree | leaf | column * - * index := TYPE | index TYPE + * index := type | index type + * + * typedef := 'typedef' STRING type + * + * include := 'include' filespec * + * filespec := '"' STRING '"' | '<' STRING '>' */ #include #include @@ -82,20 +101,27 @@ u_int tree_size; static const char *file_prefix = ""; -static FILE *fp; /* if true generate local include paths */ static int localincs = 0; +/* if true print tokens */ +static int debug; + static const char usgtxt[] = "\ -Generate SNMP tables. Copyright (c) 2001-2002 Fraunhofer Institute for\n\ -Open Communication Systems (FhG Fokus). All rights reserved.\n\ -usage: gensnmptree [-hel] [-p prefix] [name]...\n\ +Generate SNMP tables.\n\ +usage: gensnmptree [-dEehlt] [-I directory] [-i infile] [-p prefix]\n\ + [name]...\n\ options:\n\ + -d debug mode\n\ + -E extract the named enums and bits only\n\ + -e extract the named oids or enums\n\ -h print this info\n\ - -e extrace the named oids\n\ + -I directory add directory to include path\n\ + -i ifile read from the named file instead of stdin\n\ -l generate local include directives\n\ -p prefix prepend prefix to file and variable names\n\ + -t generated a .def file\n\ "; /* @@ -153,6 +179,29 @@ static LIST_HEAD(, func) funcs = LIST_HEAD_INITIALIZER(funcs); +struct enums { + const char *name; + long value; + TAILQ_ENTRY(enums) link; +}; + +struct type { + const char *name; + const char *from_fname; + u_int from_lno; + u_int syntax; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jun 5 12:31:37 2006 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 6F81C16A873; Mon, 5 Jun 2006 12:31:28 +0000 (UTC) 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 4BFA316A501 for ; Mon, 5 Jun 2006 12:31:26 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E968743D5C for ; Mon, 5 Jun 2006 12:31:25 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k55CTgib072386 for ; Mon, 5 Jun 2006 12:29:42 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k55CTgw1072382 for perforce@freebsd.org; Mon, 5 Jun 2006 12:29:42 GMT (envelope-from rdivacky@FreeBSD.org) Date: Mon, 5 Jun 2006 12:29:42 GMT Message-Id: <200606051229.k55CTgw1072382@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 98540 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, 05 Jun 2006 12:31:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=98540 Change 98540 by rdivacky@rdivacky_witten on 2006/06/05 12:29:14 Amd64 version of linuxolator module build. This uses some constant options so it builds but doesnt load if you have kernel without COMPAT_*32 options. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/modules/Makefile#2 edit .. //depot/projects/soc2006/rdivacky_linuxolator/modules/linux/Makefile#2 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/modules/Makefile#2 (text+ko) ==== @@ -468,6 +468,7 @@ _ips= ips _ipw= ipw _iwi= iwi +_linux= linux _mly= mly _ndis= ndis _nve= nve ==== //depot/projects/soc2006/rdivacky_linuxolator/modules/linux/Makefile#2 (text+ko) ==== @@ -1,14 +1,19 @@ # $FreeBSD: src/sys/modules/linux/Makefile,v 1.67 2006/05/05 16:10:45 ambrisko Exp $ -.PATH: ${.CURDIR}/../../compat/linux ${.CURDIR}/../../${MACHINE_ARCH}/linux +.if ${MACHINE_ARCH} == "amd64" +SFX= 32 +CFLAGS+=-DCOMPAT_IA32 -DCOMPAT_LINUX32 +.endif + +.PATH: ${.CURDIR}/../../compat/linux ${.CURDIR}/../../${MACHINE_ARCH}/linux${SFX} KMOD= linux -SRCS= linux_dummy.c linux_file.c linux_getcwd.c linux_ioctl.c linux_ipc.c \ - linux_machdep.c linux_mib.c linux_misc.c linux_signal.c linux_socket.c \ - linux_stats.c linux_sysctl.c linux_sysent.c linux_sysvec.c \ - linux_util.c opt_inet6.h opt_mac.h \ +SRCS= linux${SFX}_dummy.c linux_file.c linux_getcwd.c linux_ioctl.c linux_ipc.c \ + linux${SFX}_machdep.c linux_mib.c linux_misc.c linux_signal.c linux_socket.c \ + linux_stats.c linux_sysctl.c linux${SFX}_sysent.c linux${SFX}_sysvec.c \ + linux_util.c opt_inet6.h opt_mac.h opt_compat.h \ vnode_if.h device_if.h bus_if.h -OBJS= linux_locore.o +OBJS= linux${SFX}_locore.o .if ${MACHINE_ARCH} == "i386" SRCS+= linux_ptrace.c linux_uid16.c imgact_linux.c opt_cpu.h @@ -22,19 +27,19 @@ EXPORT_SYMS+= linux_ioctl_register_handler EXPORT_SYMS+= linux_ioctl_unregister_handler -CLEANFILES= linux_assym.h linux_genassym.o +CLEANFILES= linux${SFX}_assym.h linux${SFX}_genassym.o -linux_assym.h: linux_genassym.o +linux${SFX}_assym.h: linux${SFX}_genassym.o .if exists(@) -linux_assym.h: @/kern/genassym.sh +linux${SFX}_assym.h: @/kern/genassym.sh .endif - sh @/kern/genassym.sh linux_genassym.o > ${.TARGET} + sh @/kern/genassym.sh linux${SFX}_genassym.o > ${.TARGET} -linux_locore.o: linux_locore.s linux_assym.h +linux${SFX}_locore.o: linux${SFX}_locore.s linux${SFX}_assym.h ${CC} -c -x assembler-with-cpp -DLOCORE ${CFLAGS} \ ${.IMPSRC} -o ${.TARGET} -linux_genassym.o: linux_genassym.c linux.h @ machine +linux${SFX}_genassym.o: linux${SFX}_genassym.c linux.h @ machine ${CC} -c ${CFLAGS:N-fno-common} ${.IMPSRC} .if !defined(KERNBUILDDIR) From owner-p4-projects@FreeBSD.ORG Mon Jun 5 12:33:31 2006 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 AA6D116AAE5; Mon, 5 Jun 2006 12:33:30 +0000 (UTC) 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 6AEE216AAD6 for ; Mon, 5 Jun 2006 12:33:29 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2F83243D45 for ; Mon, 5 Jun 2006 12:33:29 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k55CVjma072529 for ; Mon, 5 Jun 2006 12:31:45 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k55CVjKr072526 for perforce@freebsd.org; Mon, 5 Jun 2006 12:31:45 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 5 Jun 2006 12:31:45 GMT Message-Id: <200606051231.k55CVjKr072526@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 98541 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, 05 Jun 2006 12:33:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=98541 Change 98541 by hselasky@hselasky_mini_itx on 2006/06/05 12:31:10 Allow HID to parse "const" data. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_hid.c#2 edit .. //depot/projects/usb/src/sys/dev/usb/usb_hid.h#3 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_hid.c#2 (text+ko) ==== @@ -64,9 +64,9 @@ #define MAXUSAGE 100 struct hid_data { - u_char *start; - u_char *end; - u_char *p; + const u_char *start; + const u_char *end; + const u_char *p; struct hid_item cur; int32_t usages[MAXUSAGE]; int nu; @@ -93,13 +93,13 @@ } struct hid_data * -hid_start_parse(void *d, int len, int kindset) +hid_start_parse(const void *d, int len, int kindset) { struct hid_data *s; s = malloc(sizeof *s, M_TEMP, M_WAITOK|M_ZERO); s->start = s->p = d; - s->end = (char *)d + len; + s->end = ((const char *)d) + len; s->kindset = kindset; return (s); } @@ -122,9 +122,9 @@ struct hid_item *c = &s->cur; unsigned int bTag, bType, bSize; u_int32_t oldpos; - u_char *data; + const u_char *data; int32_t dval; - u_char *p; + const u_char *p; struct hid_item *hi; int i; @@ -366,7 +366,7 @@ } int -hid_report_size(void *buf, int len, enum hid_kind k, u_int8_t *idp) +hid_report_size(const void *buf, int len, enum hid_kind k, u_int8_t *idp) { struct hid_data *d; struct hid_item h; @@ -395,7 +395,7 @@ } int -hid_locate(void *desc, int size, u_int32_t u, enum hid_kind k, +hid_locate(const void *desc, int size, u_int32_t u, enum hid_kind k, struct hid_location *loc, u_int32_t *flags) { struct hid_data *d; @@ -417,7 +417,7 @@ } u_long -hid_get_data(u_char *buf, u_int32_t len, struct hid_location *loc) +hid_get_data(const u_char *buf, u_int32_t len, struct hid_location *loc) { u_int hpos = loc->pos; u_int hsize = loc->size; @@ -448,7 +448,7 @@ } int -hid_is_collection(void *desc, int size, u_int32_t usage) +hid_is_collection(const void *desc, int size, u_int32_t usage) { struct hid_data *hd; struct hid_item hi; ==== //depot/projects/usb/src/sys/dev/usb/usb_hid.h#3 (text+ko) ==== @@ -226,7 +226,7 @@ }; extern struct hid_data * -hid_start_parse(void *d, int len, int kindset); +hid_start_parse(const void *d, int len, int kindset); extern void hid_end_parse(struct hid_data *s); @@ -235,18 +235,18 @@ hid_get_item(struct hid_data *s, struct hid_item *h); extern int -hid_report_size(void *buf, int len, enum hid_kind k, u_int8_t *id); +hid_report_size(const void *buf, int len, enum hid_kind k, u_int8_t *id); extern int -hid_locate(void *desc, int size, u_int32_t usage, +hid_locate(const void *desc, int size, u_int32_t usage, enum hid_kind kind, struct hid_location *loc, u_int32_t *flags); extern u_long -hid_get_data(u_char *buf, u_int32_t len, struct hid_location *loc); +hid_get_data(const u_char *buf, u_int32_t len, struct hid_location *loc); extern int -hid_is_collection(void *desc, int size, u_int32_t usage); +hid_is_collection(const void *desc, int size, u_int32_t usage); #endif From owner-p4-projects@FreeBSD.ORG Mon Jun 5 12:46:08 2006 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 1EC1D16A575; Mon, 5 Jun 2006 12:46:06 +0000 (UTC) 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 E3C8116AB2B for ; Mon, 5 Jun 2006 12:46:03 +0000 (UTC) (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 1BACC43D77 for ; Mon, 5 Jun 2006 12:45:52 +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.6/8.13.6) with ESMTP id k55Ci8F8073151 for ; Mon, 5 Jun 2006 12:44:08 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k55Ci1i5073037 for perforce@freebsd.org; Mon, 5 Jun 2006 12:44:01 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 5 Jun 2006 12:44:01 GMT Message-Id: <200606051244.k55Ci1i5073037@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 98542 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, 05 Jun 2006 12:46:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=98542 Change 98542 by rwatson@rwatson_zoo on 2006/06/05 12:43:49 Integrate TrustedBSD audit3 branch: - bsnmp upgrade - mount fixes - more arm - much cryptoness - loader avoids corrupting UFS on writes - bpf relocking TrustedBSD-related: - OpenBSM 1.0 alpha 6 import. Affected files ... .. //depot/projects/trustedbsd/audit3/MAINTAINERS#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/NEWS#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/gensnmpdef/gensnmpdef.1#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/gensnmpdef/gensnmpdef.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/gensnmptree/gensnmptree.1#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/gensnmptree/gensnmptree.c#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/Makefile.am#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/Makefile.in#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/README#13 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/TODO#9 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/VERSION#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/Makefile.am#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/Makefile.in#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.c#10 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditfilterd/Makefile.am#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditfilterd/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditfilterd/auditfilterd.8#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditfilterd/auditfilterd.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditfilterd/auditfilterd.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditfilterd/auditfilterd_conf.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/auditreduce.c#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/Makefile.am#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/Makefile.in#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit.h#12 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_filter.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_record.h#9 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/libbsm.h#11 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/config/config.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/config/config.h.in#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/configure#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/configure.ac#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_filter#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/Makefile.am#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/Makefile.in#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_open.3#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_token.3#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/audit_submit.3#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_audit.c#12 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#14 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#15 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_wrappers.c#13 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/libbsm.3#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/auditctl.2#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/modules/Makefile.am#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/modules/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/modules/auditfilter_noop/Makefile.am#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/modules/auditfilter_noop/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/modules/auditfilter_noop/auditfilter_noop.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/Makefile.am#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/bsm/Makefile.am#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/bsm/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/bsm/generate.c#2 integrate .. //depot/projects/trustedbsd/audit3/etc/defaults/rc.conf#12 integrate .. //depot/projects/trustedbsd/audit3/etc/devd.conf#7 integrate .. //depot/projects/trustedbsd/audit3/etc/hosts.allow#5 integrate .. //depot/projects/trustedbsd/audit3/etc/netstart#4 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/Makefile#12 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/bridge#1 branch .. //depot/projects/trustedbsd/audit3/etc/rc.d/devd#4 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/jail#6 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/netif#7 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/pf#7 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/gen/getgrent.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/truncate.2#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libkvm/kvm_minidump_amd64.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libkvm/kvm_minidump_i386.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_mutex.c#8 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_private.h#9 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_spec.c#4 integrate .. //depot/projects/trustedbsd/audit3/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#10 integrate .. //depot/projects/trustedbsd/audit3/release/pc98/fixit-small_crunch.conf#3 integrate .. //depot/projects/trustedbsd/audit3/sbin/fsdb/fsdb.8#4 integrate .. //depot/projects/trustedbsd/audit3/sbin/fsdb/fsdb.c#6 integrate .. //depot/projects/trustedbsd/audit3/sbin/ipfw/ipfw2.c#8 integrate .. //depot/projects/trustedbsd/audit3/sbin/mount/mount.c#6 integrate .. //depot/projects/trustedbsd/audit3/sbin/mount_msdosfs/mount_msdosfs.c#5 integrate .. //depot/projects/trustedbsd/audit3/share/examples/diskless/clone_root#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/ktr.4#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man5/rc.conf.5#11 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/crypto.9#4 integrate .. //depot/projects/trustedbsd/audit3/sys/Makefile#6 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/busdma_machdep.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/busdma_machdep.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/elf_trampoline.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/pmap.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/include/cpuconf.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/include/cpufunc.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/include/pmap.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/sa11x0/assabet_machdep.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/sa11x0/sa11x0_var.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/i386/libi386/biosdisk.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/cam/cam_xpt.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/cam/scsi/scsi_all.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/linprocfs/linprocfs.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/Makefile.arm#7 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/NOTES#12 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/kern.mk#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpica/acpi_hpet.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ahb/ahb.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ath/if_ath.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/awi/awi.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/bfe/if_bfe.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/bfe/if_bfereg.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ciss/ciss.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/dc/dcphy.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/dc/if_dc.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/dc/if_dcreg.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/gem/if_gem.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/hifn/hifn7751.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ipw/if_ipw.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/isp_freebsd.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/isp_freebsd.h#9 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/iwi/if_iwi.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/lmc/if_lmc.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpt.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpt.h#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpt_cam.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpt_cam.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpt_debug.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpt_pci.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpt_raid.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpt_raid.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpt_reg.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ofw/ofw_console.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/pccbb/pccbb.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/pccbb/pccbb_isa.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/pccbb/pccbb_pci.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/pccbb/pccbbvar.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/pci/pcireg.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ral/rt2560.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ral/rt2661.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/safe/safe.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/midi/midi.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/midi/sequencer.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ubsec/ubsec.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/ehci.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/if_axe.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/if_axereg.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/if_ural.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/ohci.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/ugen.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/uhci.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/wi/if_wi.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/doc/subsys/Doxyfile-cam#2 integrate .. //depot/projects/trustedbsd/audit3/sys/doc/subsys/Doxyfile-crypto#2 integrate .. //depot/projects/trustedbsd/audit3/sys/doc/subsys/Doxyfile-dev_pci#2 integrate .. //depot/projects/trustedbsd/audit3/sys/doc/subsys/Doxyfile-dev_sound#2 integrate .. //depot/projects/trustedbsd/audit3/sys/doc/subsys/Doxyfile-dev_usb#2 integrate .. //depot/projects/trustedbsd/audit3/sys/doc/subsys/Doxyfile-geom#2 integrate .. //depot/projects/trustedbsd/audit3/sys/doc/subsys/Doxyfile-i4b#2 integrate .. //depot/projects/trustedbsd/audit3/sys/doc/subsys/Doxyfile-kern#2 integrate .. //depot/projects/trustedbsd/audit3/sys/doc/subsys/Doxyfile-libkern#2 integrate .. //depot/projects/trustedbsd/audit3/sys/doc/subsys/Doxyfile-linux#2 integrate .. //depot/projects/trustedbsd/audit3/sys/doc/subsys/Doxyfile-net80211#2 integrate .. //depot/projects/trustedbsd/audit3/sys/doc/subsys/Doxyfile-netgraph#2 integrate .. //depot/projects/trustedbsd/audit3/sys/doc/subsys/Doxyfile-netinet#2 integrate .. //depot/projects/trustedbsd/audit3/sys/doc/subsys/Doxyfile-netinet6#2 integrate .. //depot/projects/trustedbsd/audit3/sys/doc/subsys/Doxyfile-netipsec#2 integrate .. //depot/projects/trustedbsd/audit3/sys/doc/subsys/Doxyfile-opencrypto#2 integrate .. //depot/projects/trustedbsd/audit3/sys/doc/subsys/Doxyfile-vm#2 integrate .. //depot/projects/trustedbsd/audit3/sys/doc/subsys/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sys/doc/subsys/notreviewed.dox#1 branch .. //depot/projects/trustedbsd/audit3/sys/fs/msdosfs/msdosfs_vfsops.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/nullfs/null_vfsops.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/smbfs/smbfs_vnops.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/geom_gpt.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/FreeBSD/xfs_frw.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/FreeBSD/xfs_fs_subr.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/FreeBSD/xfs_iget.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/FreeBSD/xfs_ioctl.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_attr.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_bit.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_dfrag.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_dir2_trace.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_inode.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_iomap.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_trans.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_vfsops.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_vnodeops.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/busdma_machdep.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/initcpu.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/machdep.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/pmap.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/ptrace_machdep.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/vm_machdep.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/include/md_var.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/include/npx.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/isa/npx.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/ia64/conf/NOTES#5 integrate .. //depot/projects/trustedbsd/audit3/sys/ia64/ia64/busdma_machdep.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_event.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_exit.c#17 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_mutex.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_switch.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_synch.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/subr_disk.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/subr_stack.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_aio.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_mount.c#14 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vnode_if.src#8 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/acpi/acpi/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/acpi/acpi_asus/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/acpi/acpi_panasonic/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/acpi/acpi_toshiba/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/acpi/acpi_video/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/cpufreq/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/fdc/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/geom/geom_eli/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/mfi/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sys/net/bpf.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/net/bpf.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/net/bpf_filter.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/net/bpfdesc.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_disc.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_faith.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_fwsubr.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_gif.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_gre.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_loop.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_media.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_sl.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_stf.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_tap.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_tun.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/net/raw_cb.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/net/raw_usrreq.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/net80211/ieee80211_input.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/net80211/ieee80211_node.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/netgraph/atm/uni/ng_uni_cust.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/netgraph/ng_base.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/netgraph/ng_iface.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/in_pcb.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/ip_carp.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/ip_gre.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_timer.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_usrreq.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/udp_usrreq.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/netipsec/ipsec.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/netipsec/ipsec_input.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/nfsclient/nfs_vfsops.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/opencrypto/criov.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/opencrypto/crypto.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/opencrypto/cryptodev.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/opencrypto/cryptosoft.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/opencrypto/xform.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/agp_amd64.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/agp_sis.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_klib.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/sparc64/include/pmap.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/sparc64/sparc64/pmap.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/elf_common.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/mutex.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/tools/vnode_if.awk#6 integrate .. //depot/projects/trustedbsd/audit3/sys/ufs/ffs/ffs_vfsops.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/ufs/ufs/ufs_vnops.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_extern.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_glue.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_map.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_map.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_meter.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_page.c#10 integrate .. //depot/projects/trustedbsd/audit3/tools/regression/execve/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/execve/doexec.c#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/execve/execve.t#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/execve/tests/badinterplen#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/execve/tests/devnullscript#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/execve/tests/goodaout.c#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/execve/tests/goodscript#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/execve/tests/nonexistshell#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/execve/tests/scriptarg#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/execve/tests/scriptarg-nospace#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/fifo/fifo_misc/fifo_misc.c#2 integrate .. //depot/projects/trustedbsd/audit3/tools/regression/ipsec/ipsec.t#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/sockets/unix_cmsg/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/sockets/unix_cmsg/README#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/sockets/unix_cmsg/unix_cmsg.c#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/sockets/unix_cmsg/unix_cmsg.t#1 branch .. //depot/projects/trustedbsd/audit3/tools/tools/README#7 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/recoverdisk/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/recoverdisk/recoverdisk.c#5 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/tinderbox/.cvsignore#2 delete .. //depot/projects/trustedbsd/audit3/tools/tools/tinderbox/Makefile#2 delete .. //depot/projects/trustedbsd/audit3/tools/tools/tinderbox/etc/Makefile#4 delete .. //depot/projects/trustedbsd/audit3/tools/tools/tinderbox/etc/default.rc#5 delete .. //depot/projects/trustedbsd/audit3/tools/tools/tinderbox/etc/head.rc#4 delete .. //depot/projects/trustedbsd/audit3/tools/tools/tinderbox/etc/releng_4.rc#5 delete .. //depot/projects/trustedbsd/audit3/tools/tools/tinderbox/etc/releng_5.rc#5 delete .. //depot/projects/trustedbsd/audit3/tools/tools/tinderbox/etc/releng_6.rc#5 delete .. //depot/projects/trustedbsd/audit3/tools/tools/tinderbox/etc/update_head.rc#3 delete .. //depot/projects/trustedbsd/audit3/tools/tools/tinderbox/etc/update_releng_4.rc#4 delete .. //depot/projects/trustedbsd/audit3/tools/tools/tinderbox/etc/update_releng_5.rc#4 delete .. //depot/projects/trustedbsd/audit3/tools/tools/tinderbox/etc/update_releng_6.rc#4 delete .. //depot/projects/trustedbsd/audit3/tools/tools/tinderbox/powerpc.diff#2 delete .. //depot/projects/trustedbsd/audit3/tools/tools/tinderbox/tbmaster.1#7 delete .. //depot/projects/trustedbsd/audit3/tools/tools/tinderbox/tbmaster.pl#8 delete .. //depot/projects/trustedbsd/audit3/tools/tools/tinderbox/tinderbox.1#7 delete .. //depot/projects/trustedbsd/audit3/tools/tools/tinderbox/tinderbox.pl#8 delete .. //depot/projects/trustedbsd/audit3/tools/tools/tinderbox/www/.cvsignore#2 delete .. //depot/projects/trustedbsd/audit3/tools/tools/tinderbox/www/Makefile#2 delete .. //depot/projects/trustedbsd/audit3/tools/tools/tinderbox/www/daemon.png.uu#2 delete .. //depot/projects/trustedbsd/audit3/tools/tools/tinderbox/www/index.cgi#5 delete .. //depot/projects/trustedbsd/audit3/tools/tools/tinderbox/www/tb.css#2 delete .. //depot/projects/trustedbsd/audit3/tools/tools/tinderbox/www/valid-css.png.uu#2 delete .. //depot/projects/trustedbsd/audit3/tools/tools/tinderbox/www/valid-xhtml10.png.uu#2 delete .. //depot/projects/trustedbsd/audit3/usr.bin/calendar/day.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/file/magic.5#5 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/id/id.c#4 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/kdump/mkioctls#4 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/vmstat/vmstat.c#6 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/bluetooth/hccontrol/hccontrol.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/cron/cron/do_command.c#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/cron/cron/popen.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/jail/jail.8#7 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/mountd/mountd.c#6 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/ntp/doc/ntp.conf.5#6 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/portsnap/portsnap/portsnap.sh#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/installUpgrade.c#5 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/ypserv/yp_access.c#2 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/MAINTAINERS#8 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.132 2006/05/24 16:01:34 wilko Exp $ +$FreeBSD: src/MAINTAINERS,v 1.135 2006/06/03 01:52:11 scottl Exp $ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements @@ -20,6 +20,7 @@ subsystem login notes ----------------------------- +kqueue jmg Pre-commit review requested. mergemaster dougb Prefers to pre-approve commits libc/posix1e rwatson Pre-commit review requested. POSIX.1e ACLs rwatson Pre-commit review requested. @@ -43,13 +44,6 @@ witness jhb Pre-commit review requested. twe aradford@amcc.com Pre-commit review requested twa aradford@amcc.com Pre-commit review requested -aac scottl Pre-commit review requested -udf scottl Pre-commit review requested. -ips scottl Pre-commit review requested. -iir scottl Pre-commit review requested. -mlx scottl Pre-commit review requested. -mly scottl Pre-commit review requested. -maestro3 scottl Pre-commit review requested. CAM gibbs, ken Pre-commit review requested. send to scsi@freebsd.org devstat(9) ken Pre-commit review requested. ==== //depot/projects/trustedbsd/audit3/contrib/bsnmp/NEWS#6 (text+ko) ==== @@ -1,3 +1,7 @@ +1.12a + Support for ENUM and BITS in gensnmp{tree,def}. Include directives + and typedefs. + 1.12 A couple of man page fixes from various submitters. ==== //depot/projects/trustedbsd/audit3/contrib/bsnmp/gensnmpdef/gensnmpdef.1#5 (text+ko) ==== @@ -1,5 +1,5 @@ .\" -.\" Copyright (C) 2004-2005 +.\" Copyright (C) 2004-2006 .\" 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.5 2005/10/04 08:46:46 brandt_h Exp $ +.\" $Begemot: gensnmpdef.1 383 2006-05-30 07:40:49Z brandt_h $ .\" -.Dd June 14, 2005 +.Dd May 28, 2006 .Dt GENSNMPDEF 1 .Os .Sh NAME @@ -36,7 +36,7 @@ .Nd "generate a MIB description file from MIBs" .Sh SYNOPSIS .Nm -.Op Fl h +.Op Fl hEe .Op Fl c Ar cut .Ar name Op Ar ... .Sh DESCRIPTION @@ -48,13 +48,28 @@ for feeding it into .Xr gensnmptree 1 . .Pp -The -.Fl c -option specifies the number of initial sub-oids that should be omitted -from the tree. +The following options are available: +.Bl -tag -width indent +.It Fl c Ar cut +Specify the number of initial sub-oids that should be omitted +from the tree in the output. .Xr gensnmptree 1 automatically adds 1.3.6 in front of all OIDs so the default value of 3 is just correct in most cases. +.It Fl E +Generate typedefs for named enumerations. +These are enumerations defined via the TEXTUAL-CONVENTION macro. +The normal tree output is suppressed. +.It Fl e +Generate typedefs for unnamed enumerations. +These are enumerations defined in the SYNTAX clause of an OBJECT-TYPE macro. +The name of the enumeration is formed by appending the string +.Ql Type +to the name of the object. +The normal tree output is suppressed. +.It Fl h +Print a short help text and exit. +.El .Pp .Nm does no attempt on sorting the OID tree so in case of complex and ==== //depot/projects/trustedbsd/audit3/contrib/bsnmp/gensnmpdef/gensnmpdef.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004 + * Copyright (C) 2004-2006 * Hartmut Brandt. * All rights reserved. * @@ -26,8 +26,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: bsnmp/gensnmpdef/gensnmpdef.c,v 1.3 2004/08/06 08:46:45 brandt Exp $ + * $Begemot: gensnmpdef.c 383 2006-05-30 07:40:49Z brandt_h $ */ +#include + #include #include #include @@ -38,9 +40,13 @@ #include static const char usgtxt[] = -"Usage: gensnmpdef [-h] [-c ] MIB [MIB ...]\n" +"Usage: gensnmpdef [-hEe] [-c ] MIB [MIB ...]\n" "Options:\n" " -c specify the number of initial sub-oids to cut from the oids\n" +" -E extract named enum types. Print a typedef for all enums defined\n" +" in syntax clauses of normal objects. Suppress normal output.\n" +" -e extract unnamed enum types. Print a typedef for all enums defined\n" +" as textual conventions. Suppress normal output.\n" " -h print this help\n" "MIBs are searched according to the libsmi(3) search rules and can\n" "be specified either by path or module name\n"; @@ -48,6 +54,14 @@ static SmiNode *last_node; static u_int cut = 3; +struct tdef { + char *name; + SLIST_ENTRY(tdef) link; +}; + +static SLIST_HEAD(, tdef) tdefs = SLIST_HEAD_INITIALIZER(tdef); +static int do_typedef = 0; + static void print_node(SmiNode *n, u_int level); static void @@ -135,7 +149,7 @@ [SMI_BASETYPE_FLOAT32] = "FLOAT32", [SMI_BASETYPE_FLOAT64] = "FLOAT64", [SMI_BASETYPE_FLOAT128] = "FLOAT128", - [SMI_BASETYPE_ENUM] = "INTEGER", + [SMI_BASETYPE_ENUM] = "ENUM", [SMI_BASETYPE_BITS] = "BITS", }; @@ -152,6 +166,18 @@ }; static void +print_enum(SmiType *t) +{ + SmiNamedNumber *nnum; + + printf(" ("); + for (nnum = smiGetFirstNamedNumber(t); nnum != NULL; + nnum = smiGetNextNamedNumber(nnum)) + printf(" %ld %s", nnum->value.value.integer32, nnum->name); + printf(" )"); +} + +static void print_type(SmiNode *n) { SmiType *type; @@ -168,6 +194,14 @@ } } printf("%s", type_names[type->basetype]); + + if (type->basetype == SMI_BASETYPE_ENUM || + type->basetype == SMI_BASETYPE_BITS) + print_enum(type); + + else if (type->basetype == SMI_BASETYPE_OCTETSTRING && + type->name != NULL) + printf(" | %s", type->name); } static void @@ -359,6 +393,111 @@ printf(")\n"); } +static void +save_typdef(char *name) +{ + struct tdef *t; + t = malloc(sizeof(struct tdef)); + + if (t == NULL) + err(1, NULL); + + memset(t, 0 , sizeof(struct tdef)); + t->name = name; + SLIST_INSERT_HEAD(&tdefs, t, link); +} + +static void +tdefs_cleanup(void) +{ + struct tdef *t; + + while ((t = SLIST_FIRST(&tdefs)) != NULL) { + SLIST_REMOVE_HEAD(&tdefs, link); + free(t); + } +} + +static void +print_enum_typedef(SmiType *t) +{ + SmiNamedNumber *nnum; + + for (nnum = smiGetFirstNamedNumber(t); nnum != NULL; + nnum = smiGetNextNamedNumber(nnum)) { + printf("\t%ld %s\n" , nnum->value.value.integer32, nnum->name); + } +} + +static void +print_stype(SmiNode *n) +{ + SmiType *type; + struct tdef *t = NULL; + + type = smiGetNodeType(n); + assert(type != NULL); + + if (type->basetype == SMI_BASETYPE_ENUM) { + if (do_typedef == 'e' && type->name != NULL) { + SLIST_FOREACH(t, &tdefs, link) { + if (strcmp(t->name, type->name) == 0) + return; + } + save_typdef(type->name); + printf("typedef %s ENUM (\n", type->name); + } else if (do_typedef == 'E' && type->name == NULL) + printf("typedef %sType ENUM (\n", n->name); + else + return; + + print_enum_typedef(type); + printf(")\n\n"); + + } else if (type->basetype == SMI_BASETYPE_BITS) { + if (do_typedef == 'e' && type->name != NULL) { + SLIST_FOREACH(t, &tdefs, link) { + if (strcmp(t->name, type->name) == 0) + return; + } + save_typdef(type->name); + printf("typedef %s BITS (\n", type->name); + } else if (do_typedef == 'E' && type->name == NULL) + printf("typedef %sType BITS (\n", n->name); + else + return; + + print_enum_typedef(type); + printf(")\n\n"); + } +} + +static void +print_typdefs(SmiNode *n) +{ + SmiNode *p; + + p = n; + n = smiGetFirstChildNode(n); + while (n != NULL) { + switch (n->nodekind) { + case SMI_NODEKIND_SCALAR: + case SMI_NODEKIND_COLUMN: + print_stype(n); + break; + case SMI_NODEKIND_COMPLIANCE: + case SMI_NODEKIND_GROUP: + save_node(n); + return; + default: + break; + } + n = smiGetNextChildNode(n); + } + + save_node(p); +} + int main(int argc, char *argv[]) { @@ -373,7 +512,7 @@ smiInit(NULL); - while ((opt = getopt(argc, argv, "c:h")) != -1) + while ((opt = getopt(argc, argv, "c:Eeh")) != -1) switch (opt) { case 'c': @@ -388,6 +527,14 @@ cut = (u_int)u; break; + case 'E': + do_typedef = 'E'; + break; + + case 'e': + do_typedef = 'e'; + break; + case 'h': fprintf(stderr, usgtxt); exit(0); @@ -414,9 +561,12 @@ for (opt = 0; opt < argc; opt++) { n = smiGetFirstNode(mods[opt], SMI_NODEKIND_ANY); for (;;) { - level = open_node(n, level, &last); - print_it(n, level); - last = n; + if (do_typedef == 0) { + level = open_node(n, level, &last); + print_it(n, level); + last = n; + } else + print_typdefs(n); if (last_node == NULL || (n = smiGetNextNode(last_node, SMI_NODEKIND_ANY)) @@ -424,6 +574,10 @@ break; } } - level = close_node(last->oidlen - 1, level - 1); + if (last != NULL && do_typedef == 0) + level = close_node(last->oidlen - 1, level - 1); + else if (do_typedef != 0) + tdefs_cleanup(); + return (0); } ==== //depot/projects/trustedbsd/audit3/contrib/bsnmp/gensnmptree/gensnmptree.1#6 (text+ko) ==== @@ -2,6 +2,9 @@ .\" Copyright (c) 2001-2005 .\" Fraunhofer Institute for Open Communication Systems (FhG Fokus). .\" All rights reserved. +.\" Copyright (c) 2006 +.\" Hartmut Brandt +.\" All rights reserved. .\" .\" Author: Harti Brandt .\" @@ -26,9 +29,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Begemot: bsnmp/gensnmptree/gensnmptree.1,v 1.7 2006/02/27 09:52:08 brandt_h Exp $ +.\" $Begemot: gensnmptree.1 383 2006-05-30 07:40:49Z brandt_h $ .\" -.Dd February 27, 2006 +.Dd May 26, 2006 .Dt GENSNMPTREE 1 .Os .Sh NAME @@ -36,7 +39,9 @@ .Nd "generate C and header files from a MIB description file" .Sh SYNOPSIS .Nm -.Op Fl helt +.Op Fl dEehlt +.Op Fl I Ar directory +.Op Fl i Ar infile .Op Fl p Ar prefix .Op Ar name Ar ... .Sh DESCRIPTION @@ -49,9 +54,12 @@ daemon or for module writers. The second form may be used by SNMP client program writers. .Pp -If the -.Fl e -option is not used +If none of the options +.Fl e , +.Fl E +or +.FL t +are used .Nm reads a MIB description from its standard input and creates two files: a C-file @@ -61,12 +69,20 @@ during PDU processing and a header file .Ar prefix Ns tree.h -containing appropriate declarations of the callback functions used in this table -and the table itself. +containing appropriate declarations of the callback functions used in this +table, the table itself and definitions for all enums. .Pp -If the -.Fl e -option is specified +The following options are available: +.Bl -tag -width ".Fl E" +.It Fl d +Switch on debugging. +.It Fl E +Extract enumerations and bit constructs. +In this mode the tool emits +a header file that contains for each type given on the command line a +C-enum definition and a preprocessor define that may be used to map +values to strings. +.It Fl e .Nm expects MIB variable names (only the last component) on its command line. It reads a MIB specification from standard input and for each MIB variable @@ -83,13 +99,13 @@ .It Va OID_ Ns Ar name is the last component of the OID. .El -.Pp -The options are as follows: -.Bl -tag -width ".Fl d Ar argument" .It Fl h Print a short help page. -.It Fl e -Enter extract mode. +.It Fl I Ar directory +Add the named directory to the include path just before the standard include +directories. +.It Fl i Ar infile +Read from the named file instead of standard input. .It Fl l Generate local preprocessor includes. This is used for bootstrapping @@ -103,26 +119,44 @@ .Sh MIBS The syntax of the MIB description file can formally be specified as follows: .Bd -unfilled -offset indent -file := tree | tree file + file := top | top file + + top := tree | typedef | include + + tree := head elements ')' + + entry := head ':' index STRING elements ')' + + leaf := head type STRING ACCESS ')' + + column := head type ACCESS ')' + + type := BASETYPE | BASETYPE '|' subtype | enum | bits + + subtype := STRING + + enum := ENUM '(' value ')' + + bits := BITS '(' value ')' -tree := head elements ')' + value := INT STRING | INT STRING value -entry := head ':' index STRING elements ')' + head := '(' INT STRING -leaf := head TYPE STRING ACCESS ')' + elements := EMPTY | elements element -column := head TYPE ACCESS ')' + element := tree | leaf | column -head := '(' INT STRING + index := type | index type -elements := EMPTY | elements element + typedef := 'typedef' STRING type -element := tree | leaf + include := 'include' filespec -index := TYPE | index TYPE + filespec := '"' STRING '"' | '<' STRING '>' .Ed .Pp -.Ar TYPE +.Ar BASETYPE specifies a SNMP data type and may be one of .Bl -bullet -offset indent -compact .It @@ -163,10 +197,25 @@ is a decimal integer and .Ar STRING is any string starting with a letter or underscore and consisting of -letters, digits and underscores, that is not one of the keywords. +letters, digits, underscores and minuses, that is not one of the keywords. +.Pp +The +.Ar typedef +directive associates a type with a single name. +.Pp +The +.Ar include +directive is replaced by the contents of the named file. .Sh EXAMPLES The following MIB description describes the system group: .Bd -literal -offset indent +include "tc.def" + +typedef AdminStatus ENUM ( + 1 up + 2 down +) + (1 internet (2 mgmt (1 mibII ==== //depot/projects/trustedbsd/audit3/contrib/bsnmp/gensnmptree/gensnmptree.c#6 (text+ko) ==== @@ -3,7 +3,7 @@ * Fraunhofer Institute for Open Communication Systems (FhG Fokus). * All rights reserved. * - * Copyright (c) 2004 + * Copyright (c) 2004-2006 * Hartmut Brandt. * All rights reserved. * @@ -30,21 +30,35 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: bsnmp/gensnmptree/gensnmptree.c,v 1.44 2006/02/14 09:04:17 brandt_h Exp $ + * $Begemot: gensnmptree.c 383 2006-05-30 07:40:49Z brandt_h $ * * Generate OID table from table description. * * Syntax is: * --------- - * file := tree | tree file + * file := top | top file + * + * top := tree | typedef | include * * tree := head elements ')' * * entry := head ':' index STRING elements ')' * - * leaf := head TYPE STRING ACCESS ')' + * leaf := head type STRING ACCESS ')' + * + * column := head type ACCESS ')' + * + * type := BASETYPE | BASETYPE '|' subtype | enum | bits + * + * subtype := STRING + * + * enum := ENUM '(' value ')' + * + * bits := BITS '(' value ')' + * + * value := optminus INT STRING | optminus INT STRING value * - * column := head TYPE ACCESS ')' + * optminus := '-' | EMPTY * * head := '(' INT STRING * @@ -52,8 +66,13 @@ * * element := tree | leaf | column * - * index := TYPE | index TYPE + * index := type | index type + * + * typedef := 'typedef' STRING type + * + * include := 'include' filespec * + * filespec := '"' STRING '"' | '<' STRING '>' */ #include #include @@ -82,20 +101,27 @@ u_int tree_size; static const char *file_prefix = ""; -static FILE *fp; /* if true generate local include paths */ static int localincs = 0; +/* if true print tokens */ +static int debug; + static const char usgtxt[] = "\ -Generate SNMP tables. Copyright (c) 2001-2002 Fraunhofer Institute for\n\ -Open Communication Systems (FhG Fokus). All rights reserved.\n\ -usage: gensnmptree [-hel] [-p prefix] [name]...\n\ +Generate SNMP tables.\n\ +usage: gensnmptree [-dEehlt] [-I directory] [-i infile] [-p prefix]\n\ + [name]...\n\ options:\n\ + -d debug mode\n\ + -E extract the named enums and bits only\n\ + -e extract the named oids or enums\n\ -h print this info\n\ - -e extrace the named oids\n\ + -I directory add directory to include path\n\ + -i ifile read from the named file instead of stdin\n\ -l generate local include directives\n\ -p prefix prepend prefix to file and variable names\n\ + -t generated a .def file\n\ "; /* @@ -153,6 +179,29 @@ static LIST_HEAD(, func) funcs = LIST_HEAD_INITIALIZER(funcs); +struct enums { + const char *name; + long value; + TAILQ_ENTRY(enums) link; +}; + +struct type { + const char *name; + const char *from_fname; + u_int from_lno; + u_int syntax; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jun 5 12:48:59 2006 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 079E516A869; Mon, 5 Jun 2006 12:48:59 +0000 (UTC) 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 E17D316A866 for ; Mon, 5 Jun 2006 12:48:56 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9E3BC43D46 for ; Mon, 5 Jun 2006 12:48:56 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k55ClCCo083192 for ; Mon, 5 Jun 2006 12:47:12 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k55ClCbp083189 for perforce@freebsd.org; Mon, 5 Jun 2006 12:47:12 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 5 Jun 2006 12:47:12 GMT Message-Id: <200606051247.k55ClCbp083189@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 98543 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, 05 Jun 2006 12:49:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=98543 Change 98543 by hselasky@hselasky_mini_itx on 2006/06/05 12:47:03 Commit of the new "cdev" abstraction layer, USB cdev, that can be used to create devices under /dev/... . The USB cdev abstraction layer handles everything related to waiting for devices to close during detach, and so can save the programmer some headache when programming USB device drivers. The abstraction layer resides in the file "usb_cdev.c" and is rather complicated. This is due to the fact that it allows two threads to open each device. One read thread, and one write thread. The API of the USB cdev layer is not frozen yet: usb_cdev_sleep(..): This function is used when the code wants to sleep during "open()" or "ioctl()". usb_cdev_wakeup(..): This function is used to wakeup a sleeping thread. usb_cdev_attach(..): Attach a new USB CDEV. usb_cdev_detach(..): Detach a USB CDEV. usb_cdev_put_data(..): Write data to a USB CDEV. usb_cdev_put_data_error(..): Signal permanent write error. usb_cdev_get_data(..): Read data from a USB CDEV. usb_cdev_get_data_error(..): Signal permanent read error. Affected files ... .. //depot/projects/usb/src/sys/conf/files#5 edit .. //depot/projects/usb/src/sys/dev/usb/usb_cdev.c#1 add .. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#7 edit Differences ... ==== //depot/projects/usb/src/sys/conf/files#5 (text+ko) ==== @@ -989,6 +989,7 @@ dev/usb/usb_if.m optional usb dev/usb/usb_quirks.c optional usb dev/usb/usb_hid.c optional usb +dev/usb/usb_cdev.c optional usb dev/usb/ugen.c optional ugen dev/usb/ulpt.c optional ulpt dev/usb/ums.c optional ums ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.h#7 (text+ko) ==== @@ -704,7 +704,18 @@ usbd_do_request_flags(struct usbd_device *udev, usb_device_request_t *req, void *data, u_int32_t flags, int *actlen, u_int32_t timeout); - +void +usbd_fill_get_report(usb_device_request_t *req, u_int8_t iface_no, + u_int8_t type, u_int8_t id, u_int16_t size); +void +usbd_fill_set_report(usb_device_request_t *req, u_int8_t iface_no, + u_int8_t type, u_int8_t id, u_int16_t size); +void +usbd_clear_stall_tr_setup(struct usbd_xfer *xfer1, + struct usbd_xfer *xfer2); +void +usbd_clear_stall_tr_transferred(struct usbd_xfer *xfer1, + struct usbd_xfer *xfer2); void usbd_clearstall_callback(struct usbd_xfer *xfer); @@ -930,4 +941,132 @@ #define POINTER_TO_UNSIGNED(ptr) \ (((u_int8_t *)(ptr)) - ((u_int8_t *)0)) +/* routines from "usb_cdev.c" */ + +struct usb_cdev; +struct cdev; +struct mtx; + +extern int32_t +usb_cdev_sleep(struct usb_cdev *sc, int32_t fflags); + +extern void +usb_cdev_wakeup(struct usb_cdev *sc); + +extern int32_t +usb_cdev_attach(struct usb_cdev *sc, + void *priv_sc, + struct mtx *priv_mtx, + const char **pp_dev, + uid_t _uid, + gid_t _gid, + int _perms, + u_int32_t rd_size, + u_int16_t rd_packets, + u_int32_t wr_size, + u_int16_t wr_packets); + +extern void +usb_cdev_detach(struct usb_cdev *sc); + +extern void +usb_cdev_put_data(struct usb_cdev *sc, u_int8_t *buf, u_int32_t len, + u_int8_t what); +extern void +usb_cdev_put_data_error(struct usb_cdev *sc); + +extern u_int8_t +usb_cdev_get_data(struct usb_cdev *sc, u_int8_t *buf, u_int32_t len, + u_int32_t *actlen, u_int8_t what); +extern void +usb_cdev_get_data_error(struct usb_cdev *sc); + + +typedef int32_t (usb_cdev_open_t)(struct usb_cdev *sc, int32_t fflags, + int32_t mode, struct thread *td); +typedef int32_t (usb_cdev_ioctl_t)(struct usb_cdev *sc, u_long cmd, caddr_t addr, + int32_t fflags, struct thread *td); + +typedef void (usb_cdev_cmd_t)(struct usb_cdev *sc); + +struct usb_cdev { + + struct usbd_ifqueue sc_rdq_free; + struct usbd_ifqueue sc_rdq_used; + struct usbd_ifqueue sc_wrq_free; + struct usbd_ifqueue sc_wrq_used; + struct selinfo sc_read_sel; + struct selinfo sc_write_sel; + + /* various pointers */ + + void * sc_rdq_pointer; + void * sc_wrq_pointer; + struct mtx * sc_mtx_ptr; + void * sc_priv_ptr; +#define USB_CDEV_COUNT 4 + struct cdev * sc_cdev[USB_CDEV_COUNT]; + struct cdev * sc_last_cdev; + struct proc * sc_async_rd; /* process that wants SIGIO */ + struct proc * sc_async_wr; /* process that wants SIGIO */ + + /* multiplexer functions */ + + usb_cdev_open_t * sc_open; + usb_cdev_ioctl_t * sc_ioctl; + usb_cdev_cmd_t * sc_start_read; + usb_cdev_cmd_t * sc_stop_read; + usb_cdev_cmd_t * sc_start_write; + usb_cdev_cmd_t * sc_stop_write; + + u_int32_t sc_cur_context; + u_int32_t sc_flags; + + /* synchronization flags */ + +#define USB_CDEV_FLAG_GONE 0x00000001 +#define USB_CDEV_FLAG_FLUSHING_WRITE 0x00000002 + +#define USB_CDEV_FLAG_OPEN_READ 0x00000004 +#define USB_CDEV_FLAG_OPEN_WRITE 0x00000008 + +#define USB_CDEV_FLAG_SLEEP_READ 0x00000010 +#define USB_CDEV_FLAG_SLEEP_WRITE 0x00000020 + +#define USB_CDEV_FLAG_SLEEP_IOCTL_RD 0x00000040 +#define USB_CDEV_FLAG_SLEEP_IOCTL_WR 0x00000080 + +#define USB_CDEV_FLAG_WAKEUP_READ 0x00000100 +#define USB_CDEV_FLAG_WAKEUP_WRITE 0x00000200 + +#define USB_CDEV_FLAG_WAKEUP_IOCTL_RD 0x00000400 +#define USB_CDEV_FLAG_WAKEUP_IOCTL_WR 0x00000800 + +#define USB_CDEV_FLAG_SELECT_READ 0x00001000 +#define USB_CDEV_FLAG_SELECT_WRITE 0x00002000 + +#define USB_CDEV_FLAG_CLOSING_READ 0x00004000 +#define USB_CDEV_FLAG_CLOSING_WRITE 0x00008000 + +#define USB_CDEV_FLAG_ERROR_READ 0x00010000 /* can be set to indicate error */ +#define USB_CDEV_FLAG_ERROR_WRITE 0x00020000 /* can be set to indicate error */ + + /* other flags */ + +#define USB_CDEV_FLAG_FWD_SHORT 0x00040000 /* can be set to forward short transfers */ +#define USB_CDEV_FLAG_READ_ONLY 0x00080000 /* device is read only */ +#define USB_CDEV_FLAG_WRITE_ONLY 0x00100000 /* device is read only */ +#define USB_CDEV_FLAG_WAKEUP_RD_IMMED 0x00200000 /* wakeup read thread immediately */ +#define USB_CDEV_FLAG_WAKEUP_WR_IMMED 0x00400000 /* wakeup write thread immediately */ + + u_int8_t sc_wakeup_read; /* dummy */ + u_int8_t sc_wakeup_write; /* dummy */ + u_int8_t sc_wakeup_flush; /* dummy */ + u_int8_t sc_wakeup_close_read; /* dummy */ + u_int8_t sc_wakeup_close_write; /* dummy */ + u_int8_t sc_wakeup_detach; /* dummy */ + u_int8_t sc_wakeup_ioctl; /* dummy */ + u_int8_t sc_wakeup_ioctl_rdwr; /* dummy */ +}; + #endif /* _USB_SUBR_H_ */ From owner-p4-projects@FreeBSD.ORG Mon Jun 5 12:50:01 2006 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 1728C16A61A; Mon, 5 Jun 2006 12:50:01 +0000 (UTC) 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 B51BA16A611 for ; Mon, 5 Jun 2006 12:49:58 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6750743D55 for ; Mon, 5 Jun 2006 12:49:58 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k55CmEMx083772 for ; Mon, 5 Jun 2006 12:48:14 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k55CmEZT083769 for perforce@freebsd.org; Mon, 5 Jun 2006 12:48:14 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 5 Jun 2006 12:48:14 GMT Message-Id: <200606051248.k55CmEZT083769@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 98544 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, 05 Jun 2006 12:50:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=98544 Change 98544 by hselasky@hselasky_mini_itx on 2006/06/05 12:47:48 Commit reworked UHID driver. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/uhid.c#4 edit .. //depot/projects/usb/src/sys/dev/usb/usb_rdesc.h#1 add .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#3 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/uhid.c#4 (text+ko) ==== @@ -1,0 +1,846 @@ +/* $NetBSD: uhid.c,v 1.46 2001/11/13 06:24:55 lukem Exp $ */ + +/* Also already merged from NetBSD: + * $NetBSD: uhid.c,v 1.54 2002/09/23 05:51:21 simonb Exp $ + */ + +/*- + * Copyright (c) 1998 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Lennart Augustsson (lennart@augustsson.net) at + * Carlstedt Research & Technology. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the NetBSD + * Foundation, Inc. and its contributors. + * 4. Neither the name of The NetBSD Foundation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +/* + * HID spec: http://www.usb.org/developers/devclass_docs/HID1_11.pdf + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include + +#include "usbdevs.h" + +__FBSDID("$FreeBSD: src/sys/dev/usb/uhid.c $"); + +#ifdef USB_DEBUG +#define DPRINTF(n,fmt,...) \ + do { if (uhid_debug > (n)) { \ + printf("%s: " fmt, __FUNCTION__,## __VA_ARGS__); } } while (0) + +static int uhid_debug = 0; +SYSCTL_NODE(_hw_usb, OID_AUTO, uhid, CTLFLAG_RW, 0, "USB uhid"); +SYSCTL_INT(_hw_usb_uhid, OID_AUTO, debug, CTLFLAG_RW, + &uhid_debug, 0, "uhid debug level"); +#else +#define DPRINTF(...) +#endif + +/* temporary compile hacks for old USB systems: */ + +#ifndef UQ_HID_IGNORE +#define UQ_HID_IGNORE 0 +#endif + +#ifndef USB_PRODUCT_WACOM_GRAPHIRE3_4X5 +#define USB_PRODUCT_WACOM_GRAPHIRE3_4X5 0 +#endif + +#define UHID_N_TRANSFER 5 /* units */ +#define UHID_BSIZE 1024 /* bytes, buffer size */ +#define UHID_FRAME_NUM 50 /* bytes, frame number */ + +struct uhid_softc { + struct usb_cdev sc_cdev; + struct mtx sc_mtx; + + struct usbd_xfer * sc_xfer[UHID_N_TRANSFER]; + void * sc_repdesc_ptr; + + u_int32_t sc_isize; + u_int32_t sc_osize; + u_int32_t sc_fsize; + u_int32_t sc_repdesc_size; + u_int32_t sc_transfer_len; + + u_int8_t sc_transfer_buf[sizeof(usb_device_request_t) + UHID_BSIZE]; + u_int8_t sc_iface_no; + u_int8_t sc_iid; + u_int8_t sc_oid; + u_int8_t sc_fid; + u_int8_t sc_wakeup_detach; + u_int8_t sc_flags; +#define UHID_FLAG_IMMED 0x01 /* set if read should be immediate */ +#define UHID_FLAG_INTR_STALLED 0x02 /* set if interrup transfer stalled */ +#define UHID_FLAG_STATIC_DESC 0x04 /* set if report descriptors are static */ +#define UHID_FLAG_COMMAND_ERR 0x08 /* set if control transfer had an error */ +#define UHID_FLAG_WAIT_USB 0x10 /* set if should wait for USB */ +}; + +static u_int8_t uhid_xb360gp_report_descr[] = { UHID_XB360GP_REPORT_DESCR() }; +static u_int8_t uhid_graphire_report_descr[] = { UHID_GRAPHIRE_REPORT_DESCR() }; +static u_int8_t uhid_graphire3_4x5_report_descr[] = { UHID_GRAPHIRE3_4X5_REPORT_DESCR() }; + +static void +uhid_intr_callback(struct usbd_xfer *xfer) +{ + struct uhid_softc *sc = xfer->priv_sc; + struct usbd_mbuf *m; + + USBD_CHECK_STATUS(xfer); + + tr_transferred: + DPRINTF(0, "transferred!\n"); + + if (xfer->actlen == sc->sc_isize) { + usb_cdev_put_data(&(sc->sc_cdev), + xfer->buffer, xfer->actlen, 1); + } else { + /* ignore it */ + DPRINTF(0, "ignored short transfer, %d bytes\n", + xfer->actlen); + } + + tr_setup: + USBD_IF_POLL(&(sc->sc_cdev.sc_rdq_free), m); + + if ((!(sc->sc_flags & (UHID_FLAG_INTR_STALLED))) && m) { + xfer->length = sc->sc_isize; + usbd_start_hardware(xfer); + } + return; + + tr_error: + if (xfer->error != USBD_CANCELLED) { + /* try to clear stall first */ + usbd_transfer_start(sc->sc_xfer[1]); + } + return; +} + +static void +uhid_intr_clear_stall_callback(struct usbd_xfer *xfer) +{ + struct uhid_softc *sc = xfer->priv_sc; + USBD_CHECK_STATUS(xfer); + + tr_setup: + /* start clear stall */ + sc->sc_flags |= UHID_FLAG_INTR_STALLED; + usbd_clear_stall_tr_setup(xfer, sc->sc_xfer[0]); + return; + + tr_transferred: + usbd_clear_stall_tr_transferred(xfer, sc->sc_xfer[0]); + + sc->sc_flags &= ~UHID_FLAG_INTR_STALLED; + usbd_transfer_start(sc->sc_xfer[0]); + return; + + tr_error: + /* bomb out */ + sc->sc_flags &= ~UHID_FLAG_INTR_STALLED; + usb_cdev_put_data_error(&(sc->sc_cdev)); + return; +} + +static void +uhid_write_callback(struct usbd_xfer *xfer) +{ + struct uhid_softc *sc = xfer->priv_sc; + usb_device_request_t *req = xfer->buffer; + u_int32_t size = sc->sc_osize; + u_int32_t actlen; + u_int8_t id; + + USBD_CHECK_STATUS(xfer); + + tr_transferred: + tr_setup: + /* try to extract the ID byte */ + if (sc->sc_oid) { + + if (usb_cdev_get_data(&(sc->sc_cdev), &id, 1, &actlen, 0)) { + if (actlen != 1) { + goto tr_error; + } + } else { + return; + } + if (size) { + size--; + } + } else { + id = 0; + } + + if (usb_cdev_get_data(&(sc->sc_cdev), req->bData, + UHID_BSIZE, &actlen, 1)) { + if (actlen != size) { + goto tr_error; + } + usbd_fill_set_report + (req, sc->sc_iface_no, + UHID_OUTPUT_REPORT, id, size); + + xfer->length = sizeof(*req) + size; + + usbd_start_hardware(xfer); + } + return; + + tr_error: + /* bomb out */ + usb_cdev_get_data_error(&(sc->sc_cdev)); + return; +} + +static void +uhid_read_callback(struct usbd_xfer *xfer) +{ + struct uhid_softc *sc = xfer->priv_sc; + usb_device_request_t *req = xfer->buffer; + struct usbd_mbuf *m; + + USBD_CHECK_STATUS(xfer); + + tr_transferred: + usb_cdev_put_data(&(sc->sc_cdev), req->bData, sc->sc_isize, 1); + return; + + tr_setup: + USBD_IF_POLL(&(sc->sc_cdev.sc_rdq_free), m); + + if (m) { + usbd_fill_get_report + (req, sc->sc_iface_no, UHID_INPUT_REPORT, + sc->sc_iid, sc->sc_isize); + + xfer->length = sizeof(*req) + sc->sc_isize; + + usbd_start_hardware(xfer); + } + return; + + tr_error: + /* bomb out */ + usb_cdev_put_data_error(&(sc->sc_cdev)); + return; +} + +static void +uhid_ioctl_callback(struct usbd_xfer *xfer) +{ + struct uhid_softc *sc = xfer->priv_sc; + + USBD_CHECK_STATUS(xfer); + + tr_transferred: + bcopy(xfer->buffer, sc->sc_transfer_buf, sc->sc_transfer_len); + sc->sc_flags &= ~UHID_FLAG_COMMAND_ERR; + usb_cdev_wakeup(&(sc->sc_cdev)); + return; + + tr_error: + DPRINTF(0, "error=%s\n", usbd_errstr(xfer->error)); + sc->sc_flags |= UHID_FLAG_COMMAND_ERR; + usb_cdev_wakeup(&(sc->sc_cdev)); + return; + + tr_setup: + bcopy(sc->sc_transfer_buf, xfer->buffer, sc->sc_transfer_len); + xfer->length = sc->sc_transfer_len; + usbd_start_hardware(xfer); + return; +} + +static const struct usbd_config uhid_config[UHID_N_TRANSFER] = { + + [0] = { + .type = UE_INTERRUPT, + .endpoint = -1, /* any */ + .direction = UE_DIR_IN, + .flags = USBD_SHORT_XFER_OK, + .bufsize = UHID_BSIZE, /* bytes */ + .callback = &uhid_intr_callback, + }, + + [1] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = -1, + .bufsize = sizeof(usb_device_request_t), + .callback = &uhid_intr_clear_stall_callback, + .timeout = 1000, /* 1 second */ + }, + + [2] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = -1, + .bufsize = sizeof(usb_device_request_t) + UHID_BSIZE, + .callback = &uhid_write_callback, + .timeout = 1000, /* 1 second */ + }, + + [3] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = -1, + .bufsize = sizeof(usb_device_request_t) + UHID_BSIZE, + .callback = &uhid_read_callback, + .timeout = 1000, /* 1 second */ + }, + + [4] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = -1, + .bufsize = sizeof(usb_device_request_t) + UHID_BSIZE, + .callback = &uhid_ioctl_callback, + .timeout = 1000, /* 1 second */ + }, +}; + +static void +uhid_start_read(struct usb_cdev *cdev) +{ + struct uhid_softc *sc = cdev->sc_priv_ptr; + + if (sc->sc_flags & UHID_FLAG_IMMED) { + usbd_transfer_start(sc->sc_xfer[3]); + } else { + usbd_transfer_start(sc->sc_xfer[0]); + } + return; +} + +static void +uhid_stop_read(struct usb_cdev *cdev) +{ + struct uhid_softc *sc = cdev->sc_priv_ptr; + + usbd_transfer_stop(sc->sc_xfer[3]); + usbd_transfer_stop(sc->sc_xfer[0]); + return; +} + +static void +uhid_start_write(struct usb_cdev *cdev) +{ + struct uhid_softc *sc = cdev->sc_priv_ptr; + + usbd_transfer_start(sc->sc_xfer[2]); + return; +} + +static void +uhid_stop_write(struct usb_cdev *cdev) +{ + struct uhid_softc *sc = cdev->sc_priv_ptr; + + usbd_transfer_stop(sc->sc_xfer[2]); + return; +} + +static int32_t +uhid_do_control_transfer(struct uhid_softc *sc, int32_t fflags) +{ + int32_t error; + + sc->sc_flags |= UHID_FLAG_COMMAND_ERR; + + usbd_transfer_start(sc->sc_xfer[4]); + + error = usb_cdev_sleep(&(sc->sc_cdev), fflags); + + usbd_transfer_stop(sc->sc_xfer[4]); + + if (error) { + return error; + } + + if (sc->sc_flags & UHID_FLAG_COMMAND_ERR) { + return ENXIO; + } + return 0; +} + +static int32_t +uhid_get_report(struct uhid_softc *sc, int32_t fflags, + u_int8_t type, u_int8_t id, void *data, u_int16_t len) +{ + usb_device_request_t *req = (void *)(sc->sc_transfer_buf); + int error; + + if (len > UHID_BSIZE) { + len = UHID_BSIZE; + } + + usbd_fill_get_report + (req, sc->sc_iface_no, type, id, len); + + sc->sc_transfer_len = sizeof(*req) + len; + + error = uhid_do_control_transfer(sc, fflags); + + if (data) { + bcopy(req->bData, data, len); + } + return error; +} + +static int32_t +uhid_set_report(struct uhid_softc *sc, int32_t fflags, + u_int8_t type, u_int8_t id, void *data, u_int16_t len) +{ + usb_device_request_t *req = (void *)(sc->sc_transfer_buf); + + if (len > UHID_BSIZE) { + len = UHID_BSIZE; + } + + usbd_fill_set_report + (req, sc->sc_iface_no, type, id, len); + + bcopy(data, req->bData, len); + + sc->sc_transfer_len = sizeof(*req) + len; + + return uhid_do_control_transfer(sc, fflags); +} + +static int32_t +uhid_open(struct usb_cdev *cdev, int32_t fflags, + int32_t devtype, struct thread *td) +{ + struct uhid_softc *sc = cdev->sc_priv_ptr; + + if (fflags & FREAD) { + /* reset flags */ + sc->sc_flags &= ~UHID_FLAG_IMMED; + } + return 0; +} + +static int32_t +uhid_ioctl(struct usb_cdev *cdev, u_long cmd, caddr_t addr, + int32_t fflags, struct thread *td) +{ + struct uhid_softc *sc = cdev->sc_priv_ptr; + struct usb_ctl_report_desc *rd; + struct usb_ctl_report *re; + u_int32_t size; + int32_t error = 0; + u_int8_t id; + + switch (cmd) { + case USB_GET_REPORT_DESC: + rd = (void *)addr; + size = min(sc->sc_repdesc_size, sizeof(rd->ucrd_data)); + rd->ucrd_size = size; + bcopy(sc->sc_repdesc_ptr, rd->ucrd_data, size); + break; + + case USB_SET_IMMED: + + if (!(fflags & FREAD)) { + error = EPERM; + goto done; + } + + if (*(int *)addr) { + + /* do a test read */ + + error = uhid_get_report(sc, fflags, UHID_INPUT_REPORT, + sc->sc_iid, NULL, sc->sc_isize); + if (error) { + goto done; + } + sc->sc_flags |= UHID_FLAG_IMMED; + } else { + sc->sc_flags &= ~UHID_FLAG_IMMED; + } + break; + + case USB_GET_REPORT: + + if (!(fflags & FREAD)) { + error = EPERM; + goto done; + } + + re = (void *)addr; + switch (re->ucr_report) { + case UHID_INPUT_REPORT: + size = sc->sc_isize; + id = sc->sc_iid; + break; + case UHID_OUTPUT_REPORT: + size = sc->sc_osize; + id = sc->sc_oid; + break; + case UHID_FEATURE_REPORT: + size = sc->sc_fsize; + id = sc->sc_fid; + break; + default: + error = EINVAL; + goto done; + } + error = uhid_get_report(sc, fflags, re->ucr_report, id, + re->ucr_data, size); + if (error) { + goto done; + } + break; + + case USB_SET_REPORT: + + if (!(fflags & FWRITE)) { + error = EPERM; + goto done; + } + + re = (void *)addr; + switch (re->ucr_report) { + case UHID_INPUT_REPORT: + size = sc->sc_isize; + id = sc->sc_iid; + break; + case UHID_OUTPUT_REPORT: + size = sc->sc_osize; + id = sc->sc_oid; + break; + case UHID_FEATURE_REPORT: + size = sc->sc_fsize; + id = sc->sc_fid; + break; + default: + return (EINVAL); + } + error = uhid_set_report(sc, fflags, re->ucr_report, id, + re->ucr_data, size); + if (error) { + goto done; + } + break; + + case USB_GET_REPORT_ID: + *(int *)addr = 0; /* XXX: we only support reportid 0? */ + break; + + default: + error = EINVAL; + break; + } + + done: + return error; +} + +static device_probe_t uhid_probe; +static device_attach_t uhid_attach; +static device_detach_t uhid_detach; + +static int +uhid_probe(device_t dev) +{ + struct usb_attach_arg *uaa = device_get_ivars(dev); + usb_interface_descriptor_t *id; + + DPRINTF(10, "\n"); + + if (uaa->iface == NULL) { + return UMATCH_NONE; + } + + id = usbd_get_interface_descriptor(uaa->iface); + if (id == NULL) { + return UMATCH_NONE; + } + + if (id->bInterfaceClass != UICLASS_HID) { + + /* the Xbox 360 gamepad doesn't use the HID class */ + + if ((id->bInterfaceClass != UICLASS_VENDOR) || + (id->bInterfaceSubClass != UISUBCLASS_XBOX360_CONTROLLER) || + (id->bInterfaceProtocol != UIPROTO_XBOX360_GAMEPAD)) { + return UMATCH_NONE; + } + } + + if (usbd_get_quirks(uaa->device)->uq_flags & UQ_HID_IGNORE) { + return UMATCH_NONE; + } + + return UMATCH_IFACECLASS_GENERIC; +} + +static void +uhid_detach_complete(struct usbd_memory_info *info) +{ + struct uhid_softc *sc = info->priv_sc; + + mtx_lock(&(sc->sc_mtx)); + + if (sc->sc_flags & UHID_FLAG_WAIT_USB) { + sc->sc_flags &= ~UHID_FLAG_WAIT_USB; + wakeup(&(sc->sc_wakeup_detach)); + } + + mtx_unlock(&(sc->sc_mtx)); + + return; +} + +static int +uhid_attach(device_t dev) +{ + struct usb_attach_arg *uaa = device_get_ivars(dev); + struct uhid_softc *sc = device_get_softc(dev); + usb_interface_descriptor_t *id = + usbd_get_interface_descriptor(uaa->iface); + const char * p_buf[2]; + int32_t unit = device_get_unit(dev); + int32_t error = 0; + char buf[16]; + + DPRINTF(10, "sc=%p\n", sc); + + if (sc == NULL) { + return ENOMEM; + } + + usbd_set_desc(dev, uaa->device); + + mtx_init(&(sc->sc_mtx), "uhid lock", NULL, MTX_DEF|MTX_RECURSE); + + sc->sc_iface_no = uaa->iface->idesc->bInterfaceNumber; + + error = usbd_transfer_setup(uaa->device, uaa->iface_index, + sc->sc_xfer, uhid_config, UHID_N_TRANSFER, + sc, &(sc->sc_mtx), &(uhid_detach_complete)); + if (error) { + DPRINTF(0, "error=%s\n", usbd_errstr(error)) ; + goto detach; + } + + sc->sc_flags |= UHID_FLAG_WAIT_USB; + + if (uaa->vendor == USB_VENDOR_WACOM) { + + /* the report descriptor for the Wacom Graphire is broken */ + + if (uaa->product == USB_PRODUCT_WACOM_GRAPHIRE) { + + sc->sc_repdesc_size = sizeof(uhid_graphire_report_descr); + sc->sc_repdesc_ptr = uhid_graphire_report_descr; + sc->sc_flags |= UHID_FLAG_STATIC_DESC; + + } else if (uaa->product == USB_PRODUCT_WACOM_GRAPHIRE3_4X5) { + + static u_int8_t reportbuf[] = { 2, 2, 2 }; + + /* + * The Graphire3 needs 0x0202 to be written to + * feature report ID 2 before it'll start + * returning digitizer data. + */ + error = usbreq_set_report + (uaa->device, uaa->iface_index, + UHID_FEATURE_REPORT, 2, + reportbuf, sizeof(reportbuf)); + + if (error) { + DPRINTF(0, "set report failed, error=%s (ignored)\n", + usbd_errstr(error)); + } + + sc->sc_repdesc_size = sizeof(uhid_graphire3_4x5_report_descr); + sc->sc_repdesc_ptr = uhid_graphire3_4x5_report_descr; + sc->sc_flags |= UHID_FLAG_STATIC_DESC; + } + } else if ((id->bInterfaceClass == UICLASS_VENDOR) && + (id->bInterfaceSubClass == UISUBCLASS_XBOX360_CONTROLLER) && + (id->bInterfaceProtocol == UIPROTO_XBOX360_GAMEPAD)) { + + /* the Xbox 360 gamepad has no report descriptor */ + sc->sc_repdesc_size = sizeof(uhid_xb360gp_report_descr); + sc->sc_repdesc_ptr = uhid_xb360gp_report_descr; + sc->sc_flags |= UHID_FLAG_STATIC_DESC; + } + + if (sc->sc_repdesc_ptr == NULL) { + + error = usbreq_read_report_desc + (uaa->device, uaa->iface_index, + &(sc->sc_repdesc_ptr), &(sc->sc_repdesc_size), M_USBDEV); + + if (error) { + device_printf(dev, "no report descriptor\n"); + goto detach; + } + } + + error = usbreq_set_idle(uaa->device, uaa->iface_index, 0, 0); + + if (error) { + DPRINTF(0, "set idle failed, error=%s (ignored)\n", + usbd_errstr(error)); + } + + sc->sc_isize = hid_report_size + (sc->sc_repdesc_ptr, sc->sc_repdesc_size, hid_input, &sc->sc_iid); + + sc->sc_osize = hid_report_size + (sc->sc_repdesc_ptr, sc->sc_repdesc_size, hid_output, &sc->sc_oid); + + sc->sc_fsize = hid_report_size + (sc->sc_repdesc_ptr, sc->sc_repdesc_size, hid_feature, &sc->sc_fid); + + if (sc->sc_isize > UHID_BSIZE) { + DPRINTF(0, "input size is too large, " + "%d bytes (truncating)\n", + sc->sc_isize); + sc->sc_isize = UHID_BSIZE; + } + if (sc->sc_osize > UHID_BSIZE) { + DPRINTF(0, "output size is too large, " + "%d bytes (truncating)\n", + sc->sc_osize); + sc->sc_osize = UHID_BSIZE; + } + if (sc->sc_fsize > UHID_BSIZE) { + DPRINTF(0, "feature size is too large, " + "%d bytes (truncating)\n", + sc->sc_fsize); + sc->sc_fsize = UHID_BSIZE; + } + + snprintf(buf, sizeof(buf), "uhid%d", unit); + + p_buf[0] = buf; + p_buf[1] = NULL; + + sc->sc_cdev.sc_start_read = &uhid_start_read; + sc->sc_cdev.sc_start_write = &uhid_start_write; + sc->sc_cdev.sc_stop_read = &uhid_stop_read; + sc->sc_cdev.sc_stop_write = &uhid_stop_write; + sc->sc_cdev.sc_open = &uhid_open; + sc->sc_cdev.sc_ioctl = &uhid_ioctl; + sc->sc_cdev.sc_flags |= (USB_CDEV_FLAG_FWD_SHORT| + USB_CDEV_FLAG_WAKEUP_RD_IMMED| + USB_CDEV_FLAG_WAKEUP_WR_IMMED); + + /* make the buffers one byte larger than maximum so + * that one can detect too large read/writes and + * short transfers: + */ + error = usb_cdev_attach(&(sc->sc_cdev), sc, &(sc->sc_mtx), p_buf, + UID_ROOT, GID_OPERATOR, 0644, + sc->sc_isize+1, UHID_FRAME_NUM, + sc->sc_osize+1, UHID_FRAME_NUM); + if (error) { + goto detach; + } + return 0; /* success */ + + detach: + uhid_detach(dev); + return ENOMEM; +} + +static int +uhid_detach(device_t dev) +{ + struct uhid_softc *sc = device_get_softc(dev); + int32_t error; + + usb_cdev_detach(&(sc->sc_cdev)); + + usbd_transfer_unsetup(sc->sc_xfer, UHID_N_TRANSFER); + + if (sc->sc_repdesc_ptr) { + if (!(sc->sc_flags & UHID_FLAG_STATIC_DESC)) { + free(sc->sc_repdesc_ptr, M_USBDEV); + } + } + + mtx_lock(&(sc->sc_mtx)); + while (sc->sc_flags & UHID_FLAG_WAIT_USB) { + + error = msleep(&(sc->sc_wakeup_detach), &(sc->sc_mtx), + PRIBIO, "uhid_sync", 0); + } + mtx_unlock(&(sc->sc_mtx)); + + mtx_destroy(&(sc->sc_mtx)); + + return 0; +} + +static devclass_t uhid_devclass; + +static device_method_t uhid_methods[] = { + DEVMETHOD(device_probe, uhid_probe), + DEVMETHOD(device_attach, uhid_attach), + DEVMETHOD(device_detach, uhid_detach), + { 0, 0 } +}; + +static driver_t uhid_driver = { + .name = "uhid", + .methods = uhid_methods, + .size = sizeof(struct uhid_softc), +}; + +DRIVER_MODULE(uhid, uhub, uhid_driver, uhid_devclass, usbd_driver_load, 0); +MODULE_DEPEND(uhid, usb, 1, 1, 1); ==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#3 (text+ko) ==== @@ -45,6 +45,7 @@ #include #include #include +#include __FBSDID("$FreeBSD: src/sys/dev/usb2/usb_transfer.c $"); @@ -1056,42 +1057,93 @@ } void -usbd_clearstall_callback(struct usbd_xfer *xfer) +usbd_fill_get_report(usb_device_request_t *req, u_int8_t iface_no, + u_int8_t type, u_int8_t id, u_int16_t size) +{ + req->bmRequestType = UT_READ_CLASS_INTERFACE; + req->bRequest = UR_GET_REPORT; + USETW2(req->wValue, type, id); + USETW(req->wIndex, iface_no); + USETW(req->wLength, size); + return; +} + +void +usbd_fill_set_report(usb_device_request_t *req, u_int8_t iface_no, + u_int8_t type, u_int8_t id, u_int16_t size) +{ + req->bmRequestType = UT_WRITE_CLASS_INTERFACE; + req->bRequest = UR_SET_REPORT; + USETW2(req->wValue, type, id); + USETW(req->wIndex, iface_no); + USETW(req->wLength, size); + return; +} + +void +usbd_clear_stall_tr_setup(struct usbd_xfer *xfer1, + struct usbd_xfer *xfer2) { - usb_device_request_t *req; - USBD_CHECK_STATUS(xfer); + usb_device_request_t *req = xfer1->buffer; + + mtx_assert(xfer1->priv_mtx, MA_OWNED); + mtx_assert(xfer2->priv_mtx, MA_OWNED); - tr_setup: - req = xfer->buffer; + /* setup a clear-stall packet */ - /* setup a CLEAR STALL packet */ req->bmRequestType = UT_WRITE_ENDPOINT; req->bRequest = UR_CLEAR_FEATURE; USETW(req->wValue, UF_ENDPOINT_HALT); - req->wIndex[0] = ((struct usbd_xfer *)(xfer->priv_sc))->pipe - ->edesc->bEndpointAddress; + req->wIndex[0] = xfer2->pipe->edesc->bEndpointAddress; req->wIndex[1] = 0; USETW(req->wLength, 0); - usbd_start_hardware(xfer); + usbd_start_hardware(xfer1); + return; +} + +void +usbd_clear_stall_tr_transferred(struct usbd_xfer *xfer1, + struct usbd_xfer *xfer2) +{ + mtx_assert(xfer1->priv_mtx, MA_OWNED); + mtx_assert(xfer2->priv_mtx, MA_OWNED); + + mtx_lock(xfer2->usb_mtx); + + /* + * clear any stall and make sure + * that DATA0 toggle will be + * used next: + */ + + xfer2->pipe->clearstall = 0; + xfer2->pipe->toggle_next = 0; + + mtx_unlock(xfer2->usb_mtx); + + return; +} + +void +usbd_clearstall_callback(struct usbd_xfer *xfer) +{ + USBD_CHECK_STATUS(xfer); + + tr_setup: + usbd_clear_stall_tr_setup(xfer, xfer->priv_sc); return; tr_transferred: tr_error: PRINTFN(3,("xfer=%p\n", xfer)); - /* clear any stall and make sure DATA0 - * toggle will be used next - * - * NOTE: some devices reject this command, + /* NOTE: some devices reject this command, * so ignore a STALL */ - xfer = xfer->priv_sc; + usbd_clear_stall_tr_transferred(xfer, xfer->priv_sc); - xfer->pipe->clearstall = 0; - xfer->pipe->toggle_next = 0; - - usbd_start_hardware(xfer); + usbd_start_hardware(xfer->priv_sc); return; } From owner-p4-projects@FreeBSD.ORG Mon Jun 5 12:59:26 2006 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 BAF8816A5B8; Mon, 5 Jun 2006 12:59:26 +0000 (UTC) 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 8E9EF16A56C for ; Mon, 5 Jun 2006 12:59:24 +0000 (UTC) (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 1185A43D6D for ; Mon, 5 Jun 2006 12:59:12 +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.6/8.13.6) with ESMTP id k55CvSFB084352 for ; Mon, 5 Jun 2006 12:57:28 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k55CvSi5084349 for perforce@freebsd.org; Mon, 5 Jun 2006 12:57:28 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 5 Jun 2006 12:57:28 GMT Message-Id: <200606051257.k55CvSi5084349@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 98546 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, 05 Jun 2006 12:59:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=98546 Change 98546 by rwatson@rwatson_zoo on 2006/06/05 12:56:49 Remove gratuitous white space diff between OpenBSM and src/sys/bsm. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#10 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#10 (text+ko) ==== @@ -34,7 +34,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#9 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#10 $ * $FreeBSD: src/sys/bsm/audit_internal.h,v 1.2 2006/03/04 16:54:21 rwatson Exp $ */ @@ -69,7 +69,6 @@ typedef struct au_record au_record_t; - /* We could determined the header and trailer sizes by * defining appropriate structures. We hold off that approach * till we have a consistant way of using structures for all tokens. From owner-p4-projects@FreeBSD.ORG Mon Jun 5 13:01:21 2006 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 4918916A593; Mon, 5 Jun 2006 13:01:21 +0000 (UTC) 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 8245816AC9D for ; Mon, 5 Jun 2006 13:01:17 +0000 (UTC) (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 A2ADB43D70 for ; Mon, 5 Jun 2006 13:01:16 +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.6/8.13.6) with ESMTP id k55CxWXF084480 for ; Mon, 5 Jun 2006 12:59:32 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k55CxWCa084477 for perforce@freebsd.org; Mon, 5 Jun 2006 12:59:32 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 5 Jun 2006 12:59:32 GMT Message-Id: <200606051259.k55CxWCa084477@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 98547 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, 05 Jun 2006 13:01:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=98547 Change 98547 by rwatson@rwatson_zoo on 2006/06/05 12:58:35 Add $FreeBSD$ from CVS merge of this file so relative versions can be tracked more easily. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#13 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#13 (text+ko) ==== @@ -30,7 +30,8 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#12 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#13 $ + * $FreeBSD: src/sys/bsm/audit_record.h,v 1.1 2006/02/01 19:54:22 rwatson Exp $ */ #ifndef _BSM_AUDIT_RECORD_H_ From owner-p4-projects@FreeBSD.ORG Mon Jun 5 13:29:05 2006 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 6E23F16AF05; Mon, 5 Jun 2006 13:29:05 +0000 (UTC) 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 8978816A9CA for ; Mon, 5 Jun 2006 13:29:03 +0000 (UTC) (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 0ADC943D6E for ; Mon, 5 Jun 2006 13:28:58 +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.6/8.13.6) with ESMTP id k55DREHk087579 for ; Mon, 5 Jun 2006 13:27:14 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k55DRCi0087576 for perforce@freebsd.org; Mon, 5 Jun 2006 13:27:12 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 5 Jun 2006 13:27:12 GMT Message-Id: <200606051327.k55DRCi0087576@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 98552 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, 05 Jun 2006 13:29:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=98552 Change 98552 by rwatson@rwatson_zoo on 2006/06/05 13:26:20 Integrate TrustedBSD base branch from FreeBSD CVS to loop back various audit-related changes: - Merge OpenBSM 1.0 alpha 6 changes into src/sys/bsm, src/sys/security/audit. - Audit accounting setup. Affected files ... .. //depot/projects/trustedbsd/base/sys/bsm/audit.h#4 integrate .. //depot/projects/trustedbsd/base/sys/bsm/audit_record.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpi_support/acpi_panasonic.c#5 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_acct.c#29 integrate .. //depot/projects/trustedbsd/base/sys/pc98/pc98/machdep.c#11 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_bsm.c#4 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_bsm_token.c#3 integrate Differences ... ==== //depot/projects/trustedbsd/base/sys/bsm/audit.h#4 (text+ko) ==== @@ -30,8 +30,8 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/base/sys/bsm/audit.h#3 $ - * $FreeBSD: src/sys/bsm/audit.h,v 1.3 2006/03/04 16:54:21 rwatson Exp $ + * $P4: //depot/projects/trustedbsd/base/sys/bsm/audit.h#4 $ + * $FreeBSD: src/sys/bsm/audit.h,v 1.4 2006/06/05 12:55:45 rwatson Exp $ */ #ifndef _BSM_AUDIT_H @@ -282,11 +282,11 @@ unsigned int as_version; unsigned int as_numevent; int as_generated; - int as_nonattring; + int as_nonattrib; int as_kernel; int as_audit; int as_auditctl; - int as_enqueu; + int as_enqueue; int as_written; int as_wblocked; int as_rblocked; ==== //depot/projects/trustedbsd/base/sys/bsm/audit_record.h#2 (text) ==== @@ -30,24 +30,16 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#8 $ - * $FreeBSD: src/sys/bsm/audit_record.h,v 1.1 2006/02/01 19:54:22 rwatson Exp $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#13 $ + * $FreeBSD: src/sys/bsm/audit_record.h,v 1.2 2006/06/05 13:00:52 rwatson Exp $ */ #ifndef _BSM_AUDIT_RECORD_H_ #define _BSM_AUDIT_RECORD_H_ -/* Various token id types */ - /* - * Values inside the comments are not documented in the BSM pages and - * have been picked up from the header files + * Token type identifiers. */ - -/* - * Values marked as XXX do not have a value defined in the BSM header files - */ - #define AUT_INVALID 0x00 #define AUT_OTHER_FILE32 0x11 #define AUT_OHEADER 0x12 @@ -188,13 +180,19 @@ /* data-types for the arbitrary token */ #define AUR_BYTE 0 +#define AUR_CHAR AUR_BYTE #define AUR_SHORT 1 -#define AUR_LONG 2 +#define AUR_INT32 2 +#define AUR_INT AUR_INT +#define AUR_INT64 3 /* ... and their sizes */ #define AUR_BYTE_SIZE sizeof(u_char) +#define AUR_CHAR_SIZE AUR_BYTE_SIZE #define AUR_SHORT_SIZE sizeof(uint16_t) -#define AUR_LONG_SIZE sizeof(uint32_t) +#define AUR_INT32_SIZE sizeof(uint32_t) +#define AUR_INT_SIZE AUR_INT32_SIZE +#define AUR_INT64_SIZE sizeof(uint64_t) /* Modifiers for the header token */ #define PAD_NOTATTR 0x4000 /* nonattributable event */ @@ -231,24 +229,18 @@ int au_write(int d, token_t *m); int au_close(int d, int keep, short event); int au_close_buffer(int d, short event, u_char *buffer, size_t *buflen); +int au_close_token(token_t *tok, u_char *buffer, size_t *buflen); -#if defined(KERNEL) || defined(_KERNEL) token_t *au_to_file(char *file, struct timeval tm); -#else -token_t *au_to_file(char *file); -#endif -#if defined(KERNEL) || defined(_KERNEL) -token_t *au_to_header(int rec_size, au_event_t e_type, au_emod_t e_mod, +token_t *au_to_header32_tm(int rec_size, au_event_t e_type, au_emod_t e_mod, struct timeval tm); -token_t *au_to_header32(int rec_size, au_event_t e_type, au_emod_t e_mod, - struct timeval tm); -#else +#if !defined(KERNEL) && !defined(_KERNEL) token_t *au_to_header(int rec_size, au_event_t e_type, au_emod_t e_mod); token_t *au_to_header32(int rec_size, au_event_t e_type, au_emod_t e_mod); +token_t *au_to_header64(int rec_size, au_event_t e_type, au_emod_t e_mod); #endif -token_t *au_to_header64(int rec_size, au_event_t e_type, au_emod_t e_mod); token_t *au_to_me(void); token_t *au_to_arg(char n, char *text, uint32_t v); token_t *au_to_arg32(char n, char *text, uint32_t v); ==== //depot/projects/trustedbsd/base/sys/dev/acpi_support/acpi_panasonic.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_panasonic.c,v 1.9 2005/09/11 18:39:00 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_panasonic.c,v 1.10 2006/06/05 11:55:20 nyan Exp $"); #include "opt_acpi.h" #include @@ -413,8 +413,11 @@ acpi_panasonic_hkey_action(struct acpi_panasonic_softc *sc, ACPI_HANDLE h, UINT32 key) { + struct acpi_softc *acpi_sc; int arg, max, min; + acpi_sc = acpi_device_get_parent_softc(sc->dev); + ACPI_SERIAL_ASSERT(panasonic); switch (key) { case 1: @@ -450,6 +453,10 @@ arg = 1; hkey_sound_mute(h, HKEY_SET, &arg); break; + case 7: + /* Suspend. */ + acpi_SetSleepState(acpi_sc, ACPI_STATE_S3); + break; } } ==== //depot/projects/trustedbsd/base/sys/kern/kern_acct.c#29 (text+ko) ==== @@ -42,7 +42,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_acct.c,v 1.81 2006/03/28 21:26:59 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_acct.c,v 1.82 2006/06/05 13:02:34 rwatson Exp $"); #include "opt_mac.h" @@ -171,8 +171,8 @@ * appending and make sure it's a 'normal'. */ if (uap->path != NULL) { - NDINIT(&nd, LOOKUP, NOFOLLOW | MPSAFE, UIO_USERSPACE, - uap->path, td); + NDINIT(&nd, LOOKUP, NOFOLLOW | MPSAFE | AUDITVNODE1, + UIO_USERSPACE, uap->path, td); flags = FWRITE | O_APPEND; error = vn_open(&nd, &flags, 0, -1); if (error) ==== //depot/projects/trustedbsd/base/sys/pc98/pc98/machdep.c#11 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/pc98/pc98/machdep.c,v 1.375 2006/05/11 17:29:23 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/pc98/pc98/machdep.c,v 1.376 2006/06/05 11:53:36 nyan Exp $"); #include "opt_atalk.h" #include "opt_compat.h" @@ -2540,6 +2540,10 @@ bcopy(&mcp->mc_fpstate, addr, sizeof(mcp->mc_fpstate)); } #ifdef DEV_NPX +#ifdef CPU_ENABLE_SSE + if (cpu_fxsr) + addr->sv_xmm.sv_env.en_mxcsr &= cpu_mxcsr_mask; +#endif /* * XXX we violate the dubious requirement that npxsetregs() * be called with interrupts disabled. ==== //depot/projects/trustedbsd/base/sys/security/audit/audit_bsm.c#4 (text) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/security/audit/audit_bsm.c,v 1.4 2006/03/19 17:34:00 rwatson Exp $ + * $FreeBSD: src/sys/security/audit/audit_bsm.c,v 1.5 2006/06/05 13:13:02 rwatson Exp $ */ #include @@ -122,7 +122,7 @@ /* Create the header token */ tm.tv_usec = ctime->tv_nsec / 1000; tm.tv_sec = ctime->tv_sec; - hdr = au_to_header32(tot_rec_size, event, 0, tm); + hdr = au_to_header32_tm(tot_rec_size, event, 0, tm); TAILQ_INSERT_HEAD(&rec->token_q, hdr, tokens); trail = au_to_trailer(tot_rec_size); ==== //depot/projects/trustedbsd/base/sys/security/audit/audit_bsm_token.c#3 (text) ==== @@ -30,12 +30,13 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#9 $ - * $FreeBSD: src/sys/security/audit/audit_bsm_token.c,v 1.2 2006/03/04 17:00:55 rwatson Exp $ + * $P4: //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#15 $ + * $FreeBSD: src/sys/security/audit/audit_bsm_token.c,v 1.3 2006/06/05 13:13:02 rwatson Exp $ */ #include #include +#include #include #include @@ -208,6 +209,7 @@ /* Determine the size of the basic unit. */ switch (unit_type) { case AUR_BYTE: + /* case AUR_CHAR: */ datasize = AUR_BYTE_SIZE; break; @@ -215,8 +217,13 @@ datasize = AUR_SHORT_SIZE; break; - case AUR_LONG: - datasize = AUR_LONG_SIZE; + case AUR_INT32: + /* case AUR_INT: */ + datasize = AUR_INT32_SIZE; + break; + + case AUR_INT64: + datasize = AUR_INT64_SIZE; break; default: @@ -225,7 +232,7 @@ totdata = datasize * unit_count; - GET_TOKEN_AREA(t, dptr, totdata + 4 * sizeof(u_char)); + GET_TOKEN_AREA(t, dptr, 4 * sizeof(u_char) + totdata); ADD_U_CHAR(dptr, AUT_DATA); ADD_U_CHAR(dptr, unit_print); @@ -299,10 +306,10 @@ token_t *t; u_char *dptr = NULL; - GET_TOKEN_AREA(t, dptr, sizeof(u_char) + sizeof(u_int32_t)); + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + sizeof(uint32_t)); ADD_U_CHAR(dptr, AUT_IN_ADDR); - ADD_U_INT32(dptr, internet_addr->s_addr); + ADD_MEM(dptr, &internet_addr->s_addr, sizeof(uint32_t)); return (t); } @@ -319,11 +326,11 @@ u_char *dptr = NULL; u_int32_t type = AF_INET6; - GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 5 * sizeof(u_int32_t)); + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 5 * sizeof(uint32_t)); ADD_U_CHAR(dptr, AUT_IN_ADDR_EX); ADD_U_INT32(dptr, type); - ADD_MEM(dptr, internet_addr, sizeof(*internet_addr)); + ADD_MEM(dptr, internet_addr, 5 * sizeof(uint32_t)); return (t); } @@ -463,25 +470,13 @@ * file pathname N bytes + 1 terminating NULL byte */ token_t * -#if defined(KERNEL) || defined(_KERNEL) au_to_file(char *file, struct timeval tm) -#else -au_to_file(char *file) -#endif { token_t *t; u_char *dptr = NULL; u_int16_t filelen; u_int32_t timems; -#if !defined(KERNEL) && !defined(_KERNEL) - struct timeval tm; - struct timezone tzp; - if (gettimeofday(&tm, &tzp) == -1) - return (NULL); -#endif - /* XXXRW: else ...? */ - filelen = strlen(file); filelen += 1; @@ -578,7 +573,7 @@ ADD_U_INT32(dptr, pid); ADD_U_INT32(dptr, sid); ADD_U_INT32(dptr, tid->port); - ADD_U_INT32(dptr, tid->machine); + ADD_MEM(dptr, &tid->machine, sizeof(u_int32_t)); return (t); } @@ -822,19 +817,26 @@ { token_t *t; u_char *dptr = NULL; + uint16_t family; - GET_TOKEN_AREA(t, dptr, 3 * sizeof(u_char) + sizeof(u_int16_t) + - sizeof(u_int32_t)); + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 2 * sizeof(uint16_t) + + sizeof(uint32_t)); ADD_U_CHAR(dptr, AUT_SOCKINET32); /* - * In Darwin, sin_family is one octet, but BSM defines the token - * to store two. So we copy in a 0 first. + * BSM defines the family field as 16 bits, but many operating + * systems have an 8-bit sin_family field. Extend to 16 bits before + * writing into the token. Assume that both the port and the address + * in the sockaddr_in are already in network byte order, but family + * is in local byte order. + * + * XXXRW: Should a name space conversion be taking place on the value + * of sin_family? */ - ADD_U_CHAR(dptr, 0); - ADD_U_CHAR(dptr, so->sin_family); - ADD_U_INT16(dptr, so->sin_port); - ADD_U_INT32(dptr, so->sin_addr.s_addr); + family = so->sin_family; + ADD_U_INT16(dptr, family); + ADD_MEM(dptr, &so->sin_port, sizeof(uint16_t)); + ADD_MEM(dptr, &so->sin_addr.s_addr, sizeof(uint32_t)); return (t); @@ -858,7 +860,7 @@ ADD_U_CHAR(dptr, so->sin6_family); ADD_U_INT16(dptr, so->sin6_port); - ADD_MEM(dptr, &so->sin6_addr, sizeof(so->sin6_addr)); + ADD_MEM(dptr, &so->sin6_addr, 4 * sizeof(uint32_t)); return (t); @@ -902,7 +904,7 @@ ADD_U_INT32(dptr, pid); ADD_U_INT32(dptr, sid); ADD_U_INT32(dptr, tid->port); - ADD_U_INT32(dptr, tid->machine); + ADD_MEM(dptr, &tid->machine, sizeof(u_int32_t)); return (t); } @@ -1088,24 +1090,12 @@ * milliseconds of time 4 bytes/8 bytes (32-bit/64-bit value) */ token_t * -#if defined(KERNEL) || defined(_KERNEL) -au_to_header32(int rec_size, au_event_t e_type, au_emod_t e_mod, +au_to_header32_tm(int rec_size, au_event_t e_type, au_emod_t e_mod, struct timeval tm) -#else -au_to_header32(int rec_size, au_event_t e_type, au_emod_t e_mod) -#endif { token_t *t; u_char *dptr = NULL; u_int32_t timems; -#if !defined(KERNEL) && !defined(_KERNEL) - struct timeval tm; - struct timezone tzp; - - if (gettimeofday(&tm, &tzp) == -1) - return (NULL); -#endif - /* XXXRW: else ...? */ GET_TOKEN_AREA(t, dptr, sizeof(u_char) + sizeof(u_int32_t) + sizeof(u_char) + 2 * sizeof(u_int16_t) + 2 * sizeof(u_int32_t)); @@ -1124,30 +1114,6 @@ return (t); } -token_t * -au_to_header64(__unused int rec_size, __unused au_event_t e_type, - __unused au_emod_t e_mod) -{ - - return (NULL); -} - -token_t * -#if defined(KERNEL) || defined(_KERNEL) -au_to_header(int rec_size, au_event_t e_type, au_emod_t e_mod, - struct timeval tm) -{ - - return (au_to_header32(rec_size, e_type, e_mod, tm)); -} -#else -au_to_header(int rec_size, au_event_t e_type, au_emod_t e_mod) -{ - - return (au_to_header32(rec_size, e_type, e_mod)); -} -#endif - /* * token ID 1 byte * trailer magic number 2 bytes From owner-p4-projects@FreeBSD.ORG Mon Jun 5 13:31:05 2006 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 8AA7C16A86F; Mon, 5 Jun 2006 13:31:05 +0000 (UTC) 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 5DBC016A789 for ; Mon, 5 Jun 2006 13:31:02 +0000 (UTC) (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 17C5343D48 for ; Mon, 5 Jun 2006 13:31:02 +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.6/8.13.6) with ESMTP id k55DTIRZ087782 for ; Mon, 5 Jun 2006 13:29:18 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k55DTHGE087779 for perforce@freebsd.org; Mon, 5 Jun 2006 13:29:17 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 5 Jun 2006 13:29:17 GMT Message-Id: <200606051329.k55DTHGE087779@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 98553 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, 05 Jun 2006 13:31:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=98553 Change 98553 by rwatson@rwatson_zoo on 2006/06/05 13:28:21 Integrate TrustedBSD audit3 branch to loop back various audit-related changes: - Merge OpenBSM 1.0 alpha 6 changes into src/sys/bsm, src/sys/security/audit. - Audit accounting setup. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#28 integrate .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#14 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpi_support/acpi_panasonic.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_acct.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/pc98/pc98/machdep.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm.c#14 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#16 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#28 (text+ko) ==== @@ -30,8 +30,8 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#27 $ - * $FreeBSD: src/sys/bsm/audit.h,v 1.3 2006/03/04 16:54:21 rwatson Exp $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#28 $ + * $FreeBSD: src/sys/bsm/audit.h,v 1.4 2006/06/05 12:55:45 rwatson Exp $ */ #ifndef _BSM_AUDIT_H ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#14 (text+ko) ==== @@ -30,8 +30,8 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#13 $ - * $FreeBSD: src/sys/bsm/audit_record.h,v 1.1 2006/02/01 19:54:22 rwatson Exp $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#14 $ + * $FreeBSD: src/sys/bsm/audit_record.h,v 1.2 2006/06/05 13:00:52 rwatson Exp $ */ #ifndef _BSM_AUDIT_RECORD_H_ ==== //depot/projects/trustedbsd/audit3/sys/dev/acpi_support/acpi_panasonic.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_panasonic.c,v 1.9 2005/09/11 18:39:00 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_panasonic.c,v 1.10 2006/06/05 11:55:20 nyan Exp $"); #include "opt_acpi.h" #include @@ -413,8 +413,11 @@ acpi_panasonic_hkey_action(struct acpi_panasonic_softc *sc, ACPI_HANDLE h, UINT32 key) { + struct acpi_softc *acpi_sc; int arg, max, min; + acpi_sc = acpi_device_get_parent_softc(sc->dev); + ACPI_SERIAL_ASSERT(panasonic); switch (key) { case 1: @@ -450,6 +453,10 @@ arg = 1; hkey_sound_mute(h, HKEY_SET, &arg); break; + case 7: + /* Suspend. */ + acpi_SetSleepState(acpi_sc, ACPI_STATE_S3); + break; } } ==== //depot/projects/trustedbsd/audit3/sys/kern/kern_acct.c#11 (text+ko) ==== @@ -42,7 +42,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_acct.c,v 1.81 2006/03/28 21:26:59 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_acct.c,v 1.82 2006/06/05 13:02:34 rwatson Exp $"); #include "opt_mac.h" ==== //depot/projects/trustedbsd/audit3/sys/pc98/pc98/machdep.c#6 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/pc98/pc98/machdep.c,v 1.375 2006/05/11 17:29:23 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/pc98/pc98/machdep.c,v 1.376 2006/06/05 11:53:36 nyan Exp $"); #include "opt_atalk.h" #include "opt_compat.h" @@ -2540,6 +2540,10 @@ bcopy(&mcp->mc_fpstate, addr, sizeof(mcp->mc_fpstate)); } #ifdef DEV_NPX +#ifdef CPU_ENABLE_SSE + if (cpu_fxsr) + addr->sv_xmm.sv_env.en_mxcsr &= cpu_mxcsr_mask; +#endif /* * XXX we violate the dubious requirement that npxsetregs() * be called with interrupts disabled. ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm.c#14 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/security/audit/audit_bsm.c,v 1.4 2006/03/19 17:34:00 rwatson Exp $ + * $FreeBSD: src/sys/security/audit/audit_bsm.c,v 1.5 2006/06/05 13:13:02 rwatson Exp $ */ #include ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#16 (text+ko) ==== @@ -30,8 +30,8 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#15 $ - * $FreeBSD: src/sys/security/audit/audit_bsm_token.c,v 1.2 2006/03/04 17:00:55 rwatson Exp $ + * $P4: //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#16 $ + * $FreeBSD: src/sys/security/audit/audit_bsm_token.c,v 1.3 2006/06/05 13:13:02 rwatson Exp $ */ #include From owner-p4-projects@FreeBSD.ORG Mon Jun 5 15:18:14 2006 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 71D9616A5E2; Mon, 5 Jun 2006 15:18:13 +0000 (UTC) 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 D627016A513 for ; Mon, 5 Jun 2006 15:18:12 +0000 (UTC) (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 7EE2A43D48 for ; Mon, 5 Jun 2006 15:18:12 +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.6/8.13.6) with ESMTP id k55FGSDl097261 for ; Mon, 5 Jun 2006 15:16:28 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k55FGR44097257 for perforce@freebsd.org; Mon, 5 Jun 2006 15:16:27 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 5 Jun 2006 15:16:27 GMT Message-Id: <200606051516.k55FGR44097257@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 98565 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, 05 Jun 2006 15:18:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=98565 Change 98565 by rwatson@rwatson_zoo on 2006/06/05 15:15:58 Integrate TrustedBSD base branch from FreeBSD CVS to loop back audit work: - audit_submit.3 hooked up. - Audit additional VFS system call arguments. - Audit cleanup and per-audit pipe preselection. Also: - USB cleanup. Affected files ... .. //depot/projects/trustedbsd/base/lib/libbsm/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ugen.c#27 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_syscalls.c#69 integrate .. //depot/projects/trustedbsd/base/sys/nfsserver/nfs_serv.c#41 integrate .. //depot/projects/trustedbsd/base/sys/nfsserver/nfs_srvsubs.c#23 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit.c#6 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_bsm_klib.c#4 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_ioctl.h#2 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_pipe.c#5 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_private.h#5 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_worker.c#2 integrate Differences ... ==== //depot/projects/trustedbsd/base/lib/libbsm/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/lib/libbsm/Makefile,v 1.1 2006/02/02 10:05:39 rwatson Exp $ +# $FreeBSD: src/lib/libbsm/Makefile,v 1.2 2006/06/05 12:53:44 rwatson Exp $ # OPENBSMDIR= ${.CURDIR}/../../contrib/openbsm @@ -40,7 +40,8 @@ au_io.3 \ au_mask.3 \ au_token.3 \ - au_user.3 + au_user.3 \ + audit_submit.3 # # It seems like maybe some of these should be installed separately, since ==== //depot/projects/trustedbsd/base/sys/dev/usb/ugen.c#27 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $NetBSD: ugen.c,v 1.59 2002/07/11 21:14:28 augustss Exp $ */ +/* $NetBSD: ugen.c,v 1.79 2006/03/01 12:38:13 yamt Exp $ */ /* Also already merged from NetBSD: * $NetBSD: ugen.c,v 1.61 2002/09/23 05:51:20 simonb Exp $ @@ -8,7 +8,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/ugen.c,v 1.105 2006/06/03 10:37:42 iedowse Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/ugen.c,v 1.106 2006/06/05 14:44:39 iedowse Exp $"); /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -284,6 +284,9 @@ ugen_make_devnodes(sc); #endif + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, + USBDEV(sc->sc_dev)); + USB_ATTACH_SUCCESS_RETURN; } @@ -322,9 +325,11 @@ Static void ugen_destroy_devnodes(struct ugen_softc *sc) { - int endptno; + int endptno, prev_sc_dying; struct cdev *dev; + prev_sc_dying = sc->sc_dying; + sc->sc_dying = 1; /* destroy all devices for the other (existing) endpoints as well */ for (endptno = 1; endptno < USB_MAX_ENDPOINTS; endptno++) { if (sc->sc_endpoints[endptno][IN].sc != NULL || @@ -341,9 +346,17 @@ dev = sc->sc_endpoints[endptno][IN].dev; else dev = sc->sc_endpoints[endptno][OUT].dev; - destroy_dev(dev); + + KASSERT(dev != NULL, + ("ugen_destroy_devnodes: NULL dev")); + if(dev != NULL) + destroy_dev(dev); + + sc->sc_endpoints[endptno][IN].sc = NULL; + sc->sc_endpoints[endptno][OUT].sc = NULL; } } + sc->sc_dying = prev_sc_dying; } #endif @@ -378,9 +391,10 @@ return (err); /* store an array of endpoint descriptors to clear if the configuration * change succeeds - these aren't available afterwards */ - nendpt_cache = malloc(sizeof(u_int8_t) * niface, M_TEMP, M_WAITOK); + nendpt_cache = malloc(sizeof(u_int8_t) * niface, M_TEMP, M_WAITOK | + M_ZERO); sce_cache_arr = malloc(sizeof(struct ugen_endpoint **) * niface, M_TEMP, - M_WAITOK); + M_WAITOK | M_ZERO); niface_cache = niface; for (ifaceno = 0; ifaceno < niface; ifaceno++) { @@ -727,13 +741,12 @@ sce->state |= UGEN_ASLP; DPRINTFN(5, ("ugenread: sleep on %p\n", sce)); error = tsleep(sce, PZERO | PCATCH, "ugenri", 0); + sce->state &= ~UGEN_ASLP; DPRINTFN(5, ("ugenread: woke, error=%d\n", error)); if (sc->sc_dying) error = EIO; - if (error) { - sce->state &= ~UGEN_ASLP; + if (error) break; - } } splx(s); @@ -793,13 +806,12 @@ sce->state |= UGEN_ASLP; DPRINTFN(5, ("ugenread: sleep on %p\n", sce)); error = tsleep(sce, PZERO | PCATCH, "ugenri", 0); + sce->state &= ~UGEN_ASLP; DPRINTFN(5, ("ugenread: woke, error=%d\n", error)); if (sc->sc_dying) error = EIO; - if (error) { - sce->state &= ~UGEN_ASLP; + if (error) break; - } } while (sce->cur != sce->fill && uio->uio_resid > 0 && !error) { @@ -837,6 +849,9 @@ USB_GET_SC(ugen, UGENUNIT(dev), sc); + if (sc->sc_dying) + return (EIO); + UGEN_DEV_REF(dev, sc); error = ugen_do_read(sc, endpt, uio, flag); UGEN_DEV_RELE(dev, sc); @@ -938,6 +953,9 @@ USB_GET_SC(ugen, UGENUNIT(dev), sc); + if (sc->sc_dying) + return (EIO); + UGEN_DEV_REF(dev, sc); error = ugen_do_write(sc, endpt, uio, flag); UGEN_DEV_RELE(dev, sc); @@ -976,6 +994,20 @@ sce = &sc->sc_endpoints[endpt][IN]; if (sce->pipeh) usbd_abort_pipe(sce->pipeh); + if (sce->state & UGEN_ASLP) { + DPRINTFN(5, ("ugenpurge: waking %p\n", sce)); + wakeup(sce); + } + selwakeuppri(&sce->rsel, PZERO); + + sce = &sc->sc_endpoints[endpt][OUT]; + if (sce->pipeh) + usbd_abort_pipe(sce->pipeh); + if (sce->state & UGEN_ASLP) { + DPRINTFN(5, ("ugenpurge: waking %p\n", sce)); + wakeup(sce); + } + selwakeuppri(&sce->rsel, PZERO); } #endif @@ -1001,6 +1033,7 @@ sce = &sc->sc_endpoints[i][dir]; if (sce->pipeh) usbd_abort_pipe(sce->pipeh); + selwakeuppri(&sce->rsel, PZERO); } } @@ -1040,6 +1073,9 @@ destroy_dev(sc->dev); #endif + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, + USBDEV(sc->sc_dev)); + return (0); } @@ -1548,6 +1584,9 @@ USB_GET_SC(ugen, UGENUNIT(dev), sc); + if (sc->sc_dying) + return (EIO); + UGEN_DEV_REF(dev, sc); error = ugen_do_ioctl(sc, endpt, cmd, addr, flag, p); UGEN_DEV_RELE(dev, sc); @@ -1558,43 +1597,57 @@ ugenpoll(struct cdev *dev, int events, usb_proc_ptr p) { struct ugen_softc *sc; - struct ugen_endpoint *sce; + struct ugen_endpoint *sce_in, *sce_out; + usb_endpoint_descriptor_t *edesc; int revents = 0; int s; USB_GET_SC(ugen, UGENUNIT(dev), sc); if (sc->sc_dying) - return (EIO); + return ((events & (POLLIN | POLLOUT | POLLRDNORM | + POLLWRNORM)) | POLLHUP); + /* Do not allow to poll a control endpoint */ + if (UGENENDPOINT(dev) == USB_CONTROL_ENDPOINT) + return (events & (POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM)); + + sce_in = &sc->sc_endpoints[UGENENDPOINT(dev)][IN]; + sce_out = &sc->sc_endpoints[UGENENDPOINT(dev)][OUT]; + edesc = (sce_in->edesc != NULL) ? sce_in->edesc : sce_out->edesc; + KASSERT(edesc != NULL, ("ugenpoll: NULL edesc")); + if (sce_in->edesc == NULL || sce_in->pipeh == NULL) + sce_in = NULL; + if (sce_out->edesc == NULL || sce_out->pipeh == NULL) + sce_out = NULL; - /* XXX always IN */ - sce = &sc->sc_endpoints[UGENENDPOINT(dev)][IN]; -#ifdef DIAGNOSTIC - if (!sce->edesc) { - printf("ugenpoll: no edesc\n"); - return (EIO); - } - if (!sce->pipeh) { - printf("ugenpoll: no pipe\n"); - return (EIO); - } -#endif s = splusb(); - switch (sce->edesc->bmAttributes & UE_XFERTYPE) { + switch (edesc->bmAttributes & UE_XFERTYPE) { case UE_INTERRUPT: - if (events & (POLLIN | POLLRDNORM)) { - if (sce->q.c_cc > 0) + if (sce_in != NULL && (events & (POLLIN | POLLRDNORM))) { + if (sce_in->q.c_cc > 0) revents |= events & (POLLIN | POLLRDNORM); else - selrecord(p, &sce->rsel); + selrecord(p, &sce_in->rsel); + } + if (sce_out != NULL && (events & (POLLOUT | POLLWRNORM))) { + if (sce_out->q.c_cc > 0) + revents |= events & (POLLOUT | POLLWRNORM); + else + selrecord(p, &sce_out->rsel); } break; case UE_ISOCHRONOUS: - if (events & (POLLIN | POLLRDNORM)) { - if (sce->cur != sce->fill) + if (sce_in != NULL && (events & (POLLIN | POLLRDNORM))) { + if (sce_in->cur != sce_in->fill) revents |= events & (POLLIN | POLLRDNORM); else - selrecord(p, &sce->rsel); + selrecord(p, &sce_in->rsel); + } + if (sce_out != NULL && (events & (POLLOUT | POLLWRNORM))) { + if (sce_out->cur != sce_out->fill) + revents |= events & (POLLOUT | POLLWRNORM); + else + selrecord(p, &sce_out->rsel); } break; case UE_BULK: ==== //depot/projects/trustedbsd/base/sys/kern/vfs_syscalls.c#69 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.414 2006/03/31 03:54:19 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.415 2006/06/05 13:34:23 rwatson Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -183,6 +183,8 @@ int error; struct nameidata nd; + AUDIT_ARG(cmd, uap->cmd); + AUDIT_ARG(uid, uap->uid); if (jailed(td->td_ucred) && !prison_quotas) return (EPERM); NDINIT(&nd, LOOKUP, FOLLOW | MPSAFE | AUDITVNODE1, @@ -1303,6 +1305,7 @@ struct nameidata nd; int vfslocked; + AUDIT_ARG(mode, mode); restart: bwillwrite(); NDINIT(&nd, CREATE, LOCKPARENT | SAVENAME | MPSAFE | AUDITVNODE1, @@ -1518,6 +1521,7 @@ if ((error = copyinstr(path, syspath, MAXPATHLEN, NULL)) != 0) goto out; } + AUDIT_ARG(text, syspath); restart: bwillwrite(); NDINIT(&nd, CREATE, LOCKPARENT | SAVENAME | MPSAFE | AUDITVNODE1, ==== //depot/projects/trustedbsd/base/sys/nfsserver/nfs_serv.c#41 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_serv.c,v 1.164 2006/03/31 03:54:19 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_serv.c,v 1.165 2006/06/05 14:48:02 kib Exp $"); /* * nfs version 2 and 3 server calls to vnode ops @@ -570,6 +570,10 @@ error = lookup(&ind); ind.ni_dvp = NULL; + if (ind.ni_cnd.cn_flags & GIANTHELD) { + mtx_unlock(&Giant); + ind.ni_cnd.cn_flags &= ~GIANTHELD; + } if (error == 0) { /* @@ -1918,6 +1922,10 @@ error = lookup(&nd); nd.ni_dvp = NULL; + if (nd.ni_cnd.cn_flags & GIANTHELD) { + mtx_unlock(&Giant); + nd.ni_cnd.cn_flags &= ~GIANTHELD; + } if (error) goto ereply; @@ -2145,6 +2153,10 @@ error = lookup(&nd); nd.ni_dvp = NULL; + if (nd.ni_cnd.cn_flags & GIANTHELD) { + mtx_unlock(&Giant); + nd.ni_cnd.cn_flags &= ~GIANTHELD; + } if (error) goto out; @@ -2886,6 +2898,10 @@ error = lookup(&nd); nd.ni_dvp = NULL; + if (nd.ni_cnd.cn_flags & GIANTHELD) { + mtx_unlock(&Giant); + nd.ni_cnd.cn_flags &= ~GIANTHELD; + } if (error == 0) { bzero((caddr_t)fhp, sizeof(nfh)); ==== //depot/projects/trustedbsd/base/sys/nfsserver/nfs_srvsubs.c#23 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_srvsubs.c,v 1.140 2006/04/02 04:24:57 cel Exp $"); +__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_srvsubs.c,v 1.141 2006/06/05 14:48:02 kib Exp $"); /* * These functions support the macros and help fiddle mbuf chains for @@ -876,6 +876,10 @@ } if (!lockleaf) cnp->cn_flags &= ~LOCKLEAF; + if (cnp->cn_flags & GIANTHELD) { + mtx_unlock(&Giant); + cnp->cn_flags &= ~GIANTHELD; + } /* * nfs_namei() guarentees that fields will not contain garbage ==== //depot/projects/trustedbsd/base/sys/security/audit/audit.c#6 (text) ==== @@ -27,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/security/audit/audit.c,v 1.12 2006/03/19 17:34:00 rwatson Exp $ + * $FreeBSD: src/sys/security/audit/audit.c,v 1.15 2006/06/05 14:48:17 rwatson Exp $ */ #include @@ -136,16 +136,14 @@ * either new records are in the queue, or a log replacement is taking * place. */ -struct cv audit_cv; +struct cv audit_worker_cv; /* - * 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. - * - * XXXRW: This description is incorrect. + * Condition variable to flag when crossing the low watermark, meaning that + * threads blocked due to hitting the high watermark can wake up and continue + * to commit records. */ -struct cv audit_commit_cv; +struct cv audit_watermark_cv; /* * Condition variable for auditing threads wait on when in fail-stop mode. @@ -239,11 +237,11 @@ audit_qctrl.aq_minfree = AU_FS_MINFREE; mtx_init(&audit_mtx, "audit_mtx", NULL, MTX_DEF); - cv_init(&audit_cv, "audit_cv"); - cv_init(&audit_commit_cv, "audit_commit_cv"); + cv_init(&audit_worker_cv, "audit_worker_cv"); + cv_init(&audit_watermark_cv, "audit_watermark_cv"); cv_init(&audit_fail_cv, "audit_fail_cv"); - audit_record_zone = uma_zcreate("audit_record_zone", + audit_record_zone = uma_zcreate("audit_record", sizeof(struct kaudit_record), audit_record_ctor, audit_record_dtor, NULL, NULL, UMA_ALIGN_PTR, 0); @@ -334,6 +332,9 @@ void audit_commit(struct kaudit_record *ar, int error, int retval) { + au_event_t event; + au_class_t class; + au_id_t auid; int sorf; struct au_mask *aumask; @@ -379,14 +380,18 @@ break; } - if (au_preselect(ar->k_ar.ar_event, aumask, sorf) != 0) - ar->k_ar_commit |= AR_COMMIT_KERNEL; + auid = ar->k_ar.ar_subj_auid; + event = ar->k_ar.ar_event; + class = au_event_class(event); - /* - * XXXRW: Why is this necessary? Should we ever accept a record that - * we're not willing to commit? - */ - if ((ar->k_ar_commit & (AR_COMMIT_USER | AR_COMMIT_KERNEL)) == 0) { + ar->k_ar_commit |= AR_COMMIT_KERNEL; + if (au_preselect(event, class, aumask, sorf) != 0) + ar->k_ar_commit |= AR_PRESELECT_TRAIL; + if (audit_pipe_preselect(auid, event, class, sorf, + ar->k_ar_commit & AR_PRESELECT_TRAIL) != 0) + ar->k_ar_commit |= AR_PRESELECT_PIPE; + if ((ar->k_ar_commit & (AR_PRESELECT_TRAIL | AR_PRESELECT_PIPE)) == + 0) { mtx_lock(&audit_mtx); audit_pre_q_len--; mtx_unlock(&audit_mtx); @@ -427,7 +432,7 @@ while (audit_q_len >= audit_qctrl.aq_hiwater) { AUDIT_PRINTF(("audit_commit: sleeping to wait for " "audit queue to drain below high water mark\n")); - cv_wait(&audit_commit_cv, &audit_mtx); + cv_wait(&audit_watermark_cv, &audit_mtx); AUDIT_PRINTF(("audit_commit: woke up waiting for " "audit queue draining\n")); } @@ -435,7 +440,7 @@ TAILQ_INSERT_TAIL(&audit_q, ar, k_q); audit_q_len++; audit_pre_q_len--; - cv_signal(&audit_cv); + cv_signal(&audit_worker_cv); mtx_unlock(&audit_mtx); } @@ -448,8 +453,10 @@ void audit_syscall_enter(unsigned short code, struct thread *td) { - int audit_event; struct au_mask *aumask; + au_class_t class; + au_event_t event; + au_id_t auid; KASSERT(td->td_ar == NULL, ("audit_syscall_enter: td->td_ar != NULL")); @@ -466,15 +473,16 @@ if (code >= td->td_proc->p_sysent->sv_size) return; - audit_event = td->td_proc->p_sysent->sv_table[code].sy_auevent; - if (audit_event == AUE_NULL) + event = td->td_proc->p_sysent->sv_table[code].sy_auevent; + if (event == AUE_NULL) return; /* * Check which audit mask to use; either the kernel non-attributable * event mask or the process audit mask. */ - if (td->td_proc->p_au->ai_auid == AU_DEFAUDITID) + auid = td->td_proc->p_au->ai_auid; + if (auid == AU_DEFAUDITID) aumask = &audit_nae_mask; else aumask = &td->td_proc->p_au->ai_mask; @@ -483,8 +491,8 @@ * Allocate an audit record, if preselection allows it, and store * in the thread for later use. */ - if (au_preselect(audit_event, aumask, - AU_PRS_FAILURE | AU_PRS_SUCCESS)) { + class = au_event_class(event); + if (au_preselect(event, class, aumask, AU_PRS_BOTH)) { /* * If we're out of space and need to suspend unprivileged * processes, do that here rather than trying to allocate @@ -501,8 +509,10 @@ cv_wait(&audit_fail_cv, &audit_mtx); panic("audit_failing_stop: thread continued"); } - td->td_ar = audit_new(audit_event, td); - } else + td->td_ar = audit_new(event, td); + } else if (audit_pipe_preselect(auid, event, class, AU_PRS_BOTH, 0)) + td->td_ar = audit_new(event, td); + else td->td_ar = NULL; } ==== //depot/projects/trustedbsd/base/sys/security/audit/audit_bsm_klib.c#4 (text) ==== @@ -27,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/security/audit/audit_bsm_klib.c,v 1.3 2006/06/01 15:38:30 csjp Exp $ + * $FreeBSD: src/sys/security/audit/audit_bsm_klib.c,v 1.4 2006/06/05 14:48:17 rwatson Exp $ */ #include @@ -154,24 +154,21 @@ * event is part of against the given mask. */ int -au_preselect(au_event_t event, au_mask_t *mask_p, int sorf) +au_preselect(au_event_t event, au_class_t class, au_mask_t *mask_p, int sorf) { au_class_t effmask = 0; - au_class_t ae_class; if (mask_p == NULL) return (-1); - ae_class = au_event_class(event); - /* * Perform the actual check of the masks against the event. */ if (sorf & AU_PRS_SUCCESS) - effmask |= (mask_p->am_success & ae_class); + effmask |= (mask_p->am_success & class); if (sorf & AU_PRS_FAILURE) - effmask |= (mask_p->am_failure & ae_class); + effmask |= (mask_p->am_failure & class); if (effmask) return (1); ==== //depot/projects/trustedbsd/base/sys/security/audit/audit_ioctl.h#2 (text) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/security/audit/audit_ioctl.h,v 1.2 2006/03/19 17:34:00 rwatson Exp $ + * $FreeBSD: src/sys/security/audit/audit_ioctl.h,v 1.3 2006/06/05 14:48:17 rwatson Exp $ */ #ifndef _SECURITY_AUDIT_AUDIT_IOCTL_H_ @@ -34,6 +34,25 @@ #define AUDITPIPE_IOBASE 'A' /* + * Data structures used for complex ioctl arguments. Do not change existing + * structures, add new revised ones to be used by new ioctls, and keep the + * old structures and ioctls for backwards compatibility. + */ +struct auditpipe_ioctl_preselect { + au_id_t aip_auid; + au_mask_t aip_mask; +}; + +/* + * Possible modes of operation for audit pipe preselection. + */ +#define AUDITPIPE_PRESELECT_MODE_TRAIL 1 /* Global audit trail. */ +#define AUDITPIPE_PRESELECT_MODE_LOCAL 2 /* Local audit trail. */ +#ifdef NOTYET +#define AUDITPIPE_PRESELECT_MODE_PRIORITY 3 /* Prioritized trail. */ +#endif + +/* * Ioctls to read and control the behavior of individual audit pipe devices. */ #define AUDITPIPE_GET_QLEN _IOR(AUDITPIPE_IOBASE, 1, u_int) @@ -41,6 +60,19 @@ #define AUDITPIPE_SET_QLIMIT _IOW(AUDITPIPE_IOBASE, 3, u_int) #define AUDITPIPE_GET_QLIMIT_MIN _IOR(AUDITPIPE_IOBASE, 4, u_int) #define AUDITPIPE_GET_QLIMIT_MAX _IOR(AUDITPIPE_IOBASE, 5, u_int) +#define AUDITPIPE_GET_PRESELECT_FLAGS _IOR(AUDITPIPE_IOBASE, 6, au_mask_t) +#define AUDITPIPE_SET_PRESELECT_FLAGS _IOW(AUDITPIPE_IOBASE, 7, au_mask_t) +#define AUDITPIPE_GET_PRESELECT_NAFLAGS _IOR(AUDITPIPE_IOBASE, 8, au_mask_t) +#define AUDITPIPE_SET_PRESELECT_NAFLAGS _IOW(AUDITPIPE_IOBASE, 9, au_mask_t) +#define AUDITPIPE_GET_PRESELECT_AUID _IOR(AUDITPIPE_IOBASE, 10, \ + struct auditpipe_ioctl_preselect) +#define AUDITPIPE_SET_PRESELECT_AUID _IOW(AUDITPIPE_IOBASE, 11, \ + struct auditpipe_ioctl_preselect) +#define AUDITPIPE_DELETE_PRESELECT_AUID _IOW(AUDITPIPE_IOBASE, 12, au_id_t) +#define AUDITPIPE_FLUSH_PRESELECT_AUID _IO(AUDITPIPE_IOBASE, 13) +#define AUDITPIPE_GET_PRESELECT_MODE _IOR(AUDITPIPE_IOBASE, 14, int) +#define AUDITPIPE_SET_PRESELECT_MODE _IOW(AUDITPIPE_IOBASE, 15, int) +#define AUDITPIPE_FLUSH _IO(AUDITPIPE_IOBASE, 16) /* * Ioctls to retrieve audit pipe statistics. ==== //depot/projects/trustedbsd/base/sys/security/audit/audit_pipe.c#5 (text) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/security/audit/audit_pipe.c,v 1.6 2006/03/19 15:39:03 rwatson Exp $ + * $FreeBSD: src/sys/security/audit/audit_pipe.c,v 1.7 2006/06/05 14:48:17 rwatson Exp $ */ #include @@ -55,7 +55,8 @@ * Implementation of a clonable special device providing a live stream of BSM * audit data. This is a "tee" of the data going to the file. It provides * unreliable but timely access to audit events. Consumers of this interface - * should be very careful to avoid introducing event cycles. + * should be very careful to avoid introducing event cycles. Consumers may + * express interest via a set of preselection ioctls. */ /* @@ -64,6 +65,8 @@ static MALLOC_DEFINE(M_AUDIT_PIPE, "audit_pipe", "Audit pipes"); static MALLOC_DEFINE(M_AUDIT_PIPE_ENTRY, "audit_pipeent", "Audit pipe entries and buffers"); +static MALLOC_DEFINE(M_AUDIT_PIPE_PRESELECT, "audit_pipe_preselect", + "Audit pipe preselection structure"); /* * Audit pipe buffer parameters. @@ -82,6 +85,23 @@ }; /* + * Audit pipes allow processes to express "interest" in the set of records + * that are delivered via the pipe. They do this in a similar manner to the + * mechanism for audit trail configuration, by expressing two global masks, + * and optionally expressing per-auid masks. The following data structure is + * the per-auid mask description. The global state is stored in the audit + * pipe data structure. + * + * We may want to consider a more space/time-efficient data structure once + * usage patterns for per-auid specifications are clear. + */ +struct audit_pipe_preselect { + au_id_t app_auid; + au_mask_t app_mask; + TAILQ_ENTRY(audit_pipe_preselect) app_list; +}; + +/* * Description of an individual audit_pipe. Consists largely of a bounded * length queue. */ @@ -102,21 +122,38 @@ u_int64_t ap_drops; /* Records dropped. */ u_int64_t ap_truncates; /* Records too long. */ + /* + * Fields relating to pipe interest: global masks for unmatched + * processes (attributable, non-attributable), and a list of specific + * interest specifications by auid. + */ + int ap_preselect_mode; + au_mask_t ap_preselect_flags; + au_mask_t ap_preselect_naflags; + TAILQ_HEAD(, audit_pipe_preselect) ap_preselect_list; + + /* + * Current pending record list. + */ TAILQ_HEAD(, audit_pipe_entry) ap_queue; + /* + * Global pipe list. + */ TAILQ_ENTRY(audit_pipe) ap_list; }; /* - * Global list of audit pipes, mutex to protect it and the pipes. Finder + * Global list of audit pipes, mutex to protect it and the pipes. Finer * grained locking may be desirable at some point. */ static TAILQ_HEAD(, audit_pipe) audit_pipe_list; static struct mtx audit_pipe_mtx; /* - * This CV is used to wakeup on an audit record write. Eventually, it should - * probably be per-pipe. + * This CV is used to wakeup on an audit record write. Eventually, it might + * be per-pipe to avoid unnecessary wakeups when several pipes with different + * preselection masks are present. */ static struct cv audit_pipe_cv; @@ -138,7 +175,7 @@ static struct cdevsw audit_pipe_cdevsw = { .d_version = D_VERSION, - .d_flags = D_PSEUDO, + .d_flags = D_PSEUDO | D_NEEDGIANT, .d_open = audit_pipe_open, .d_close = audit_pipe_close, .d_read = audit_pipe_read, @@ -167,7 +204,185 @@ } /* - * Apparent individual record to a queue -- allocate queue-local buffer, and + * Find an audit pipe preselection specification for an auid, if any. + */ +static struct audit_pipe_preselect * +audit_pipe_preselect_find(struct audit_pipe *ap, au_id_t auid) +{ + struct audit_pipe_preselect *app; + + mtx_assert(&audit_pipe_mtx, MA_OWNED); + + TAILQ_FOREACH(app, &ap->ap_preselect_list, app_list) { + if (app->app_auid == auid) + return (app); + } + return (NULL); +} + +/* + * Query the per-pipe mask for a specific auid. + */ +static int +audit_pipe_preselect_get(struct audit_pipe *ap, au_id_t auid, + au_mask_t *maskp) +{ + struct audit_pipe_preselect *app; + int error; + + mtx_lock(&audit_pipe_mtx); + app = audit_pipe_preselect_find(ap, auid); + if (app != NULL) { + *maskp = app->app_mask; + error = 0; + } else + error = ENOENT; + mtx_unlock(&audit_pipe_mtx); + return (error); +} + +/* + * Set the per-pipe mask for a specific auid. Add a new entry if needed; + * otherwise, update the current entry. + */ +static void +audit_pipe_preselect_set(struct audit_pipe *ap, au_id_t auid, au_mask_t mask) +{ + struct audit_pipe_preselect *app, *app_new; + + /* + * Pessimistically assume that the auid doesn't already have a mask + * set, and allocate. We will free it if it is unneeded. + */ + app_new = malloc(sizeof(*app_new), M_AUDIT_PIPE_PRESELECT, M_WAITOK); + mtx_lock(&audit_pipe_mtx); + app = audit_pipe_preselect_find(ap, auid); + if (app == NULL) { + app = app_new; + app_new = NULL; + app->app_auid = auid; + TAILQ_INSERT_TAIL(&ap->ap_preselect_list, app, app_list); + } + app->app_mask = mask; + mtx_unlock(&audit_pipe_mtx); + if (app_new != NULL) + free(app_new, M_AUDIT_PIPE_PRESELECT); +} + +/* + * Delete a per-auid mask on an audit pipe. + */ +static int +audit_pipe_preselect_delete(struct audit_pipe *ap, au_id_t auid) +{ + struct audit_pipe_preselect *app; + int error; + + mtx_lock(&audit_pipe_mtx); + app = audit_pipe_preselect_find(ap, auid); + if (app != NULL) { + TAILQ_REMOVE(&ap->ap_preselect_list, app, app_list); + error = 0; + } else + error = ENOENT; + mtx_unlock(&audit_pipe_mtx); + if (app != NULL) + free(app, M_AUDIT_PIPE_PRESELECT); + return (error); +} + +/* + * Delete all per-auid masks on an audit pipe. + */ +static void +audit_pipe_preselect_flush_locked(struct audit_pipe *ap) +{ + struct audit_pipe_preselect *app; + + mtx_assert(&audit_pipe_mtx, MA_OWNED); + + while ((app = TAILQ_FIRST(&ap->ap_preselect_list)) != NULL) { + TAILQ_REMOVE(&ap->ap_preselect_list, app, app_list); + free(app, M_AUDIT_PIPE_PRESELECT); + } +} + +static void +audit_pipe_preselect_flush(struct audit_pipe *ap) +{ + + mtx_lock(&audit_pipe_mtx); + audit_pipe_preselect_flush_locked(ap); + mtx_unlock(&audit_pipe_mtx); +} + +/* + * Determine whether a specific audit pipe matches a record with these + * properties. Algorithm is as follows: + * + * - If the pipe is configured to track the default trail configuration, then + * use the results of global preselection matching. + * - If not, search for a specifically configured auid entry matching the + * event. If an entry is found, use that. + * - Otherwise, use the default flags or naflags configured for the pipe. + */ +static int +audit_pipe_preselect_check(struct audit_pipe *ap, au_id_t auid, + au_event_t event, au_class_t class, int sorf, int trail_preselect) +{ + struct audit_pipe_preselect *app; + + mtx_assert(&audit_pipe_mtx, MA_OWNED); + + switch (ap->ap_preselect_mode) { + case AUDITPIPE_PRESELECT_MODE_TRAIL: + return (trail_preselect); + + case AUDITPIPE_PRESELECT_MODE_LOCAL: + app = audit_pipe_preselect_find(ap, auid); + if (app == NULL) { + if (auid == AU_DEFAUDITID) + return (au_preselect(event, class, + &ap->ap_preselect_naflags, sorf)); + else + return (au_preselect(event, class, + &ap->ap_preselect_flags, sorf)); + } else + return (au_preselect(event, class, &app->app_mask, + sorf)); + + default: + panic("audit_pipe_preselect_check: mode %d", + ap->ap_preselect_mode); + } + + return (0); +} + +/* + * Determine whether there exists a pipe interested in a record with specific + * properties. + */ +int +audit_pipe_preselect(au_id_t auid, au_event_t event, au_class_t class, + int sorf, int trail_preselect) +{ + struct audit_pipe *ap; + + mtx_lock(&audit_pipe_mtx); + TAILQ_FOREACH(ap, &audit_pipe_list, ap_list) { + if (audit_pipe_preselect_check(ap, auid, event, class, sorf, + trail_preselect)) { + mtx_unlock(&audit_pipe_mtx); + return (1); + } + } + mtx_unlock(&audit_pipe_mtx); + return (0); +} + +/* + * Append individual record to a queue -- allocate queue-local buffer, and * add to the queue. We try to drop from the head of the queue so that more * recent events take precedence over older ones, but if allocation fails we * do drop the new event. @@ -219,7 +434,38 @@ * interface, which arranges for them to be delivered to pipe queues. */ void -audit_pipe_submit(void *record, u_int record_len) +audit_pipe_submit(au_id_t auid, au_event_t event, au_class_t class, int sorf, + int trail_select, void *record, u_int record_len) +{ + struct audit_pipe *ap; + + /* + * Lockless read to avoid mutex overhead if pipes are not in use. + */ + if (TAILQ_FIRST(&audit_pipe_list) == NULL) + return; + + mtx_lock(&audit_pipe_mtx); + TAILQ_FOREACH(ap, &audit_pipe_list, ap_list) { + if (audit_pipe_preselect_check(ap, auid, event, class, sorf, + trail_select)) + audit_pipe_append(ap, record, record_len); + } + audit_pipe_records++; + mtx_unlock(&audit_pipe_mtx); + cv_signal(&audit_pipe_cv); +} + +/* + * audit_pipe_submit_user(): the same as audit_pipe_submit(), except that + * since we don't currently have selection information available, it is + * delivered to the pipe unconditionally. + * + * XXXRW: This is a bug. The BSM check routine for submitting a user record >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jun 5 15:21:23 2006 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 63D0116A894; Mon, 5 Jun 2006 15:21:21 +0000 (UTC) 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 52F4C16A89F for ; Mon, 5 Jun 2006 15:21:18 +0000 (UTC) (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 F257543D45 for ; Mon, 5 Jun 2006 15:21:17 +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.6/8.13.6) with ESMTP id k55FJXta097559 for ; Mon, 5 Jun 2006 15:19:33 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k55FJXNu097556 for perforce@freebsd.org; Mon, 5 Jun 2006 15:19:33 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 5 Jun 2006 15:19:33 GMT Message-Id: <200606051519.k55FJXNu097556@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 98567 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, 05 Jun 2006 15:21:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=98567 Change 98567 by rwatson@rwatson_zoo on 2006/06/05 15:19:11 Integrate TrustedBSD audit3 branch from TrustedBSD base to loop back audit work: - audit_submit.3 hooked up. - Audit additional VFS system call arguments. - Audit cleanup and per-audit pipe preselection. Also: - USB cleanup. Affected files ... .. //depot/projects/trustedbsd/audit3/lib/libbsm/Makefile#18 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/ugen.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_syscalls.c#32 integrate .. //depot/projects/trustedbsd/audit3/sys/nfsserver/nfs_serv.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/nfsserver/nfs_srvsubs.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#30 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_klib.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_ioctl.h#13 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#25 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_private.h#29 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_worker.c#13 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/lib/libbsm/Makefile#18 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD$ +# $FreeBSD: src/lib/libbsm/Makefile,v 1.2 2006/06/05 12:53:44 rwatson Exp $ # OPENBSMDIR= ${.CURDIR}/../../contrib/openbsm ==== //depot/projects/trustedbsd/audit3/sys/dev/usb/ugen.c#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $NetBSD: ugen.c,v 1.59 2002/07/11 21:14:28 augustss Exp $ */ +/* $NetBSD: ugen.c,v 1.79 2006/03/01 12:38:13 yamt Exp $ */ /* Also already merged from NetBSD: * $NetBSD: ugen.c,v 1.61 2002/09/23 05:51:20 simonb Exp $ @@ -8,7 +8,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/ugen.c,v 1.105 2006/06/03 10:37:42 iedowse Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/ugen.c,v 1.106 2006/06/05 14:44:39 iedowse Exp $"); /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -284,6 +284,9 @@ ugen_make_devnodes(sc); #endif + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, + USBDEV(sc->sc_dev)); + USB_ATTACH_SUCCESS_RETURN; } @@ -322,9 +325,11 @@ Static void ugen_destroy_devnodes(struct ugen_softc *sc) { - int endptno; + int endptno, prev_sc_dying; struct cdev *dev; + prev_sc_dying = sc->sc_dying; + sc->sc_dying = 1; /* destroy all devices for the other (existing) endpoints as well */ for (endptno = 1; endptno < USB_MAX_ENDPOINTS; endptno++) { if (sc->sc_endpoints[endptno][IN].sc != NULL || @@ -341,9 +346,17 @@ dev = sc->sc_endpoints[endptno][IN].dev; else dev = sc->sc_endpoints[endptno][OUT].dev; - destroy_dev(dev); + + KASSERT(dev != NULL, + ("ugen_destroy_devnodes: NULL dev")); + if(dev != NULL) + destroy_dev(dev); + + sc->sc_endpoints[endptno][IN].sc = NULL; + sc->sc_endpoints[endptno][OUT].sc = NULL; } } + sc->sc_dying = prev_sc_dying; } #endif @@ -378,9 +391,10 @@ return (err); /* store an array of endpoint descriptors to clear if the configuration * change succeeds - these aren't available afterwards */ - nendpt_cache = malloc(sizeof(u_int8_t) * niface, M_TEMP, M_WAITOK); + nendpt_cache = malloc(sizeof(u_int8_t) * niface, M_TEMP, M_WAITOK | + M_ZERO); sce_cache_arr = malloc(sizeof(struct ugen_endpoint **) * niface, M_TEMP, - M_WAITOK); + M_WAITOK | M_ZERO); niface_cache = niface; for (ifaceno = 0; ifaceno < niface; ifaceno++) { @@ -727,13 +741,12 @@ sce->state |= UGEN_ASLP; DPRINTFN(5, ("ugenread: sleep on %p\n", sce)); error = tsleep(sce, PZERO | PCATCH, "ugenri", 0); + sce->state &= ~UGEN_ASLP; DPRINTFN(5, ("ugenread: woke, error=%d\n", error)); if (sc->sc_dying) error = EIO; - if (error) { - sce->state &= ~UGEN_ASLP; + if (error) break; - } } splx(s); @@ -793,13 +806,12 @@ sce->state |= UGEN_ASLP; DPRINTFN(5, ("ugenread: sleep on %p\n", sce)); error = tsleep(sce, PZERO | PCATCH, "ugenri", 0); + sce->state &= ~UGEN_ASLP; DPRINTFN(5, ("ugenread: woke, error=%d\n", error)); if (sc->sc_dying) error = EIO; - if (error) { - sce->state &= ~UGEN_ASLP; + if (error) break; - } } while (sce->cur != sce->fill && uio->uio_resid > 0 && !error) { @@ -837,6 +849,9 @@ USB_GET_SC(ugen, UGENUNIT(dev), sc); + if (sc->sc_dying) + return (EIO); + UGEN_DEV_REF(dev, sc); error = ugen_do_read(sc, endpt, uio, flag); UGEN_DEV_RELE(dev, sc); @@ -938,6 +953,9 @@ USB_GET_SC(ugen, UGENUNIT(dev), sc); + if (sc->sc_dying) + return (EIO); + UGEN_DEV_REF(dev, sc); error = ugen_do_write(sc, endpt, uio, flag); UGEN_DEV_RELE(dev, sc); @@ -976,6 +994,20 @@ sce = &sc->sc_endpoints[endpt][IN]; if (sce->pipeh) usbd_abort_pipe(sce->pipeh); + if (sce->state & UGEN_ASLP) { + DPRINTFN(5, ("ugenpurge: waking %p\n", sce)); + wakeup(sce); + } + selwakeuppri(&sce->rsel, PZERO); + + sce = &sc->sc_endpoints[endpt][OUT]; + if (sce->pipeh) + usbd_abort_pipe(sce->pipeh); + if (sce->state & UGEN_ASLP) { + DPRINTFN(5, ("ugenpurge: waking %p\n", sce)); + wakeup(sce); + } + selwakeuppri(&sce->rsel, PZERO); } #endif @@ -1001,6 +1033,7 @@ sce = &sc->sc_endpoints[i][dir]; if (sce->pipeh) usbd_abort_pipe(sce->pipeh); + selwakeuppri(&sce->rsel, PZERO); } } @@ -1040,6 +1073,9 @@ destroy_dev(sc->dev); #endif + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, + USBDEV(sc->sc_dev)); + return (0); } @@ -1548,6 +1584,9 @@ USB_GET_SC(ugen, UGENUNIT(dev), sc); + if (sc->sc_dying) + return (EIO); + UGEN_DEV_REF(dev, sc); error = ugen_do_ioctl(sc, endpt, cmd, addr, flag, p); UGEN_DEV_RELE(dev, sc); @@ -1558,43 +1597,57 @@ ugenpoll(struct cdev *dev, int events, usb_proc_ptr p) { struct ugen_softc *sc; - struct ugen_endpoint *sce; + struct ugen_endpoint *sce_in, *sce_out; + usb_endpoint_descriptor_t *edesc; int revents = 0; int s; USB_GET_SC(ugen, UGENUNIT(dev), sc); if (sc->sc_dying) - return (EIO); + return ((events & (POLLIN | POLLOUT | POLLRDNORM | + POLLWRNORM)) | POLLHUP); + /* Do not allow to poll a control endpoint */ + if (UGENENDPOINT(dev) == USB_CONTROL_ENDPOINT) + return (events & (POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM)); + + sce_in = &sc->sc_endpoints[UGENENDPOINT(dev)][IN]; + sce_out = &sc->sc_endpoints[UGENENDPOINT(dev)][OUT]; + edesc = (sce_in->edesc != NULL) ? sce_in->edesc : sce_out->edesc; + KASSERT(edesc != NULL, ("ugenpoll: NULL edesc")); + if (sce_in->edesc == NULL || sce_in->pipeh == NULL) + sce_in = NULL; + if (sce_out->edesc == NULL || sce_out->pipeh == NULL) + sce_out = NULL; - /* XXX always IN */ - sce = &sc->sc_endpoints[UGENENDPOINT(dev)][IN]; -#ifdef DIAGNOSTIC - if (!sce->edesc) { - printf("ugenpoll: no edesc\n"); - return (EIO); - } - if (!sce->pipeh) { - printf("ugenpoll: no pipe\n"); - return (EIO); - } -#endif s = splusb(); - switch (sce->edesc->bmAttributes & UE_XFERTYPE) { + switch (edesc->bmAttributes & UE_XFERTYPE) { case UE_INTERRUPT: - if (events & (POLLIN | POLLRDNORM)) { - if (sce->q.c_cc > 0) + if (sce_in != NULL && (events & (POLLIN | POLLRDNORM))) { + if (sce_in->q.c_cc > 0) revents |= events & (POLLIN | POLLRDNORM); else - selrecord(p, &sce->rsel); + selrecord(p, &sce_in->rsel); + } + if (sce_out != NULL && (events & (POLLOUT | POLLWRNORM))) { + if (sce_out->q.c_cc > 0) + revents |= events & (POLLOUT | POLLWRNORM); + else + selrecord(p, &sce_out->rsel); } break; case UE_ISOCHRONOUS: - if (events & (POLLIN | POLLRDNORM)) { - if (sce->cur != sce->fill) + if (sce_in != NULL && (events & (POLLIN | POLLRDNORM))) { + if (sce_in->cur != sce_in->fill) revents |= events & (POLLIN | POLLRDNORM); else - selrecord(p, &sce->rsel); + selrecord(p, &sce_in->rsel); + } + if (sce_out != NULL && (events & (POLLOUT | POLLWRNORM))) { + if (sce_out->cur != sce_out->fill) + revents |= events & (POLLOUT | POLLWRNORM); + else + selrecord(p, &sce_out->rsel); } break; case UE_BULK: ==== //depot/projects/trustedbsd/audit3/sys/kern/vfs_syscalls.c#32 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.414 2006/03/31 03:54:19 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.415 2006/06/05 13:34:23 rwatson Exp $"); #include "opt_compat.h" #include "opt_mac.h" ==== //depot/projects/trustedbsd/audit3/sys/nfsserver/nfs_serv.c#8 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_serv.c,v 1.164 2006/03/31 03:54:19 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_serv.c,v 1.165 2006/06/05 14:48:02 kib Exp $"); /* * nfs version 2 and 3 server calls to vnode ops @@ -570,6 +570,10 @@ error = lookup(&ind); ind.ni_dvp = NULL; + if (ind.ni_cnd.cn_flags & GIANTHELD) { + mtx_unlock(&Giant); + ind.ni_cnd.cn_flags &= ~GIANTHELD; + } if (error == 0) { /* @@ -1918,6 +1922,10 @@ error = lookup(&nd); nd.ni_dvp = NULL; + if (nd.ni_cnd.cn_flags & GIANTHELD) { + mtx_unlock(&Giant); + nd.ni_cnd.cn_flags &= ~GIANTHELD; + } if (error) goto ereply; @@ -2145,6 +2153,10 @@ error = lookup(&nd); nd.ni_dvp = NULL; + if (nd.ni_cnd.cn_flags & GIANTHELD) { + mtx_unlock(&Giant); + nd.ni_cnd.cn_flags &= ~GIANTHELD; + } if (error) goto out; @@ -2886,6 +2898,10 @@ error = lookup(&nd); nd.ni_dvp = NULL; + if (nd.ni_cnd.cn_flags & GIANTHELD) { + mtx_unlock(&Giant); + nd.ni_cnd.cn_flags &= ~GIANTHELD; + } if (error == 0) { bzero((caddr_t)fhp, sizeof(nfh)); ==== //depot/projects/trustedbsd/audit3/sys/nfsserver/nfs_srvsubs.c#7 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_srvsubs.c,v 1.140 2006/04/02 04:24:57 cel Exp $"); +__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_srvsubs.c,v 1.141 2006/06/05 14:48:02 kib Exp $"); /* * These functions support the macros and help fiddle mbuf chains for @@ -876,6 +876,10 @@ } if (!lockleaf) cnp->cn_flags &= ~LOCKLEAF; + if (cnp->cn_flags & GIANTHELD) { + mtx_unlock(&Giant); + cnp->cn_flags &= ~GIANTHELD; + } /* * nfs_namei() guarentees that fields will not contain garbage ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#30 (text+ko) ==== @@ -27,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/security/audit/audit.c,v 1.12 2006/03/19 17:34:00 rwatson Exp $ + * $FreeBSD: src/sys/security/audit/audit.c,v 1.15 2006/06/05 14:48:17 rwatson Exp $ */ #include ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_klib.c#11 (text+ko) ==== @@ -27,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/security/audit/audit_bsm_klib.c,v 1.3 2006/06/01 15:38:30 csjp Exp $ + * $FreeBSD: src/sys/security/audit/audit_bsm_klib.c,v 1.4 2006/06/05 14:48:17 rwatson Exp $ */ #include ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_ioctl.h#13 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sys/security/audit/audit_ioctl.h,v 1.3 2006/06/05 14:48:17 rwatson Exp $ */ #ifndef _SECURITY_AUDIT_AUDIT_IOCTL_H_ ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#25 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/security/audit/audit_pipe.c,v 1.6 2006/03/19 15:39:03 rwatson Exp $ + * $FreeBSD: src/sys/security/audit/audit_pipe.c,v 1.7 2006/06/05 14:48:17 rwatson Exp $ */ #include ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_private.h#29 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/security/audit/audit_private.h,v 1.7 2006/03/19 17:34:00 rwatson Exp $ + * $FreeBSD: src/sys/security/audit/audit_private.h,v 1.9 2006/06/05 14:48:17 rwatson Exp $ */ /* ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_worker.c#13 (text+ko) ==== @@ -27,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sys/security/audit/audit_worker.c,v 1.8 2006/06/05 14:48:17 rwatson Exp $ */ #include From owner-p4-projects@FreeBSD.ORG Mon Jun 5 15:38:54 2006 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 448D816AD61; Mon, 5 Jun 2006 15:38:54 +0000 (UTC) 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 15FFA16AD5E for ; Mon, 5 Jun 2006 15:38:53 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CC07643D7C for ; Mon, 5 Jun 2006 15:38:41 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k55FavD0098830 for ; Mon, 5 Jun 2006 15:36:57 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k55Favuf098827 for perforce@freebsd.org; Mon, 5 Jun 2006 15:36:57 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 5 Jun 2006 15:36:57 GMT Message-Id: <200606051536.k55Favuf098827@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 98570 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, 05 Jun 2006 15:38:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=98570 Change 98570 by hselasky@hselasky_mini_itx on 2006/06/05 15:36:05 Converted "ulpt" into using the new "USB cdev". Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ulpt.c#6 edit .. //depot/projects/usb/src/sys/dev/usb/usb_cdev.c#2 edit .. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#8 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ulpt.c#6 (text+ko) ==== @@ -60,7 +60,7 @@ #include #include -__FBSDID("$FreeBSD: src/sys/dev/usb/ulpt.c,v 1.68 2005/11/12 17:39:31 iedowse Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/ulpt.c $"); #ifdef USB_DEBUG #define DPRINTF(n,fmt,...) \ @@ -75,12 +75,10 @@ #define DPRINTF(...) #endif -#define DEV2SC(dev) (dev)->si_drv1 - #define ULPT_BSIZE (1<<17) /* bytes */ #define ULPT_IFQ_MAXLEN 2 /* units */ #define ULPT_WATCHDOG_INTERVAL 5 /* times per second */ -#define ULPT_N_TRANSFER 4 /* units */ +#define ULPT_N_TRANSFER 6 /* units */ #define UR_GET_DEVICE_ID 0x00 #define UR_GET_PORT_STATUS 0x01 @@ -93,54 +91,27 @@ #define LPS_MASK (LPS_SELECT|LPS_NERR|LPS_NOPAPER) struct ulpt_softc { - device_t sc_dev; - struct usbd_device * sc_udev; - struct cdev * sc_cdev_1; - struct cdev * sc_cdev_2; - struct usbd_xfer * sc_xfer[ULPT_N_TRANSFER]; + struct usb_cdev sc_cdev; struct __callout sc_watchdog; struct mtx sc_mtx; - struct usbd_ifqueue sc_rdq_free; - struct usbd_ifqueue sc_rdq_used; - struct usbd_ifqueue sc_wrq_free; - struct usbd_ifqueue sc_wrq_used; - void * sc_mem_ptr_1; /* should be freed at detach */ - void * sc_mem_ptr_2; /* should be freed at detach */ + device_t sc_dev; + struct usbd_xfer * sc_xfer[ULPT_N_TRANSFER]; - u_int32_t sc_flags; -#define ULPT_FLAG_DEV_OPEN 0x00000001 /* device is open */ -#define ULPT_FLAG_NO_READ 0x00000002 /* device has no read endpoint */ -#define ULPT_FLAG_RST_SLP 0x00000004 /* device is sleeping */ -#define ULPT_FLAG_RST_WUP 0x00000008 /* device is waiting for wakeup */ -#define ULPT_FLAG_WR_UIO 0x00000010 /* device is doing I/O */ -#define ULPT_FLAG_RD_UIO 0x00000020 /* device is doing I/O */ -#define ULPT_FLAG_WR_SLP 0x00000040 /* device is sleeping */ -#define ULPT_FLAG_RD_SLP 0x00000080 /* device is sleeping */ -#define ULPT_FLAG_WR_WUP 0x00000100 /* device is waiting for wakeup */ -#define ULPT_FLAG_RD_WUP 0x00000200 /* device is waiting for wakeup */ -#define ULPT_FLAG_CLOSING 0x00000400 /* device is closing */ -#define ULPT_FLAG_GONE 0x00000800 /* device is gone */ -#define ULPT_FLAG_WAIT_USB 0x00001000 /* device is waiting for USB callbacks */ -#define ULPT_FLAG_WAIT_CO 0x00002000 /* device is waiting for callouts */ -#define ULPT_FLAG_DUMP_READ 0x00004000 /* device is not opened for read */ -#define ULPT_FLAG_WR_FLUSH 0x00008000 /* device is flushing write data */ -#define ULPT_FLAG_NO_FLUSH 0x00010000 /* device should not flush write data */ -#define ULPT_FLAG_PIPE_ERR 0x00020000 /* device has signalled an error */ + u_int8_t sc_flags; +#define ULPT_FLAG_NO_READ 0x01 /* device has no read endpoint */ +#define ULPT_FLAG_DUMP_READ 0x02 /* device is not opened for read */ +#define ULPT_FLAG_WAIT_USB 0x04 /* device is waiting for USB callbacks */ +#define ULPT_FLAG_WAIT_CO 0x08 /* device is waiting for callouts */ +#define ULPT_FLAG_READ_STALL 0x10 /* read transfer stalled */ +#define ULPT_FLAG_WRITE_STALL 0x20 /* write transfer stalled */ +#define ULPT_FLAG_RESETTING 0x40 /* device is resetting */ u_int8_t sc_iface_no; u_int8_t sc_last_status; - u_int8_t sc_wakeup_detach; /* dummy */ - u_int8_t sc_wakeup_reset; /* dummy */ - u_int8_t sc_wakeup_read; /* dummy */ - u_int8_t sc_wakeup_write; /* dummy */ - u_int8_t sc_wakeup_flush; /* dummy */ - u_int8_t sc_wakeup_sync_1; /* dummy */ }; -extern cdevsw_t ulpt_cdevsw; - static void ulpt_watchdog(void *__sc) { @@ -154,9 +125,12 @@ usbd_transfer_start(sc->sc_xfer[2]); - if ((sc->sc_flags & (ULPT_FLAG_NO_READ|ULPT_FLAG_DUMP_READ)) && - (sc->sc_flags & (ULPT_FLAG_DEV_OPEN)) && - (!(sc->sc_flags & (ULPT_FLAG_CLOSING)))) { + if ((sc->sc_flags & (ULPT_FLAG_NO_READ| + ULPT_FLAG_DUMP_READ)) && + (!(sc->sc_flags & ULPT_FLAG_RESETTING)) && + (sc->sc_cdev.sc_flags & (USB_CDEV_FLAG_OPEN_READ| + USB_CDEV_FLAG_OPEN_WRITE)) && + (!(sc->sc_cdev.sc_flags & USB_CDEV_FLAG_CLOSING_READ))) { /* start reading of data, if not already started */ @@ -176,56 +150,55 @@ ulpt_write_callback(struct usbd_xfer *xfer) { struct ulpt_softc *sc = xfer->priv_sc; - struct usbd_mbuf *m; + u_int32_t actlen; USBD_CHECK_STATUS(xfer); tr_transferred: tr_setup: - USBD_IF_DEQUEUE(&sc->sc_wrq_used, m); + if (sc->sc_flags & ULPT_FLAG_WRITE_STALL) { + return; + } + if (usb_cdev_get_data(&(sc->sc_cdev), xfer->buffer, + ULPT_BSIZE, &actlen, 0)) { - if (m) { + xfer->length = actlen; + usbd_start_hardware(xfer); + } + return; - if (m->cur_data_len > ULPT_BSIZE) { - /* extra length check */ - m->cur_data_len = ULPT_BSIZE; - } + tr_error: + if (xfer->error != USBD_CANCELLED) { + /* try to clear stall first */ + sc->sc_flags |= ULPT_FLAG_WRITE_STALL; + usbd_transfer_start(sc->sc_xfer[4]); + } + return; +} - bcopy(m->cur_data_ptr, xfer->buffer, m->cur_data_len); - xfer->length = m->cur_data_len; +static void +ulpt_write_clear_stall_callback(struct usbd_xfer *xfer) +{ + struct ulpt_softc *sc = xfer->priv_sc; - USBD_IF_ENQUEUE(&sc->sc_wrq_free, m); + USBD_CHECK_STATUS(xfer); - usbd_start_hardware(xfer); + tr_setup: + /* start clear stall */ + usbd_clear_stall_tr_setup(xfer, sc->sc_xfer[0]); + return; - if (sc->sc_flags & ULPT_FLAG_WR_WUP) { - sc->sc_flags &= ~ULPT_FLAG_WR_WUP; - wakeup(&(sc->sc_wakeup_write)); - } + tr_transferred: + usbd_clear_stall_tr_transferred(xfer, sc->sc_xfer[0]); - } else { - if (sc->sc_flags & ULPT_FLAG_WR_FLUSH) { - sc->sc_flags &= ~ULPT_FLAG_WR_FLUSH; - wakeup(&(sc->sc_wakeup_flush)); - } - } + sc->sc_flags &= ~ULPT_FLAG_WRITE_STALL; + usbd_transfer_start(sc->sc_xfer[0]); return; tr_error: - DPRINTF(0, "error=%s\n", usbd_errstr(xfer->error)); - - sc->sc_flags |= ULPT_FLAG_PIPE_ERR; - - if (sc->sc_flags & ULPT_FLAG_WR_WUP) { - sc->sc_flags &= ~ULPT_FLAG_WR_WUP; - wakeup(&(sc->sc_wakeup_write)); - } - - if (sc->sc_flags & ULPT_FLAG_WR_FLUSH) { - sc->sc_flags &= ~ULPT_FLAG_WR_FLUSH; - wakeup(&(sc->sc_wakeup_flush)); - } - + /* bomb out */ + sc->sc_flags &= ~ULPT_FLAG_WRITE_STALL; + usb_cdev_get_data_error(&(sc->sc_cdev)); return; } @@ -242,45 +215,52 @@ return; } - USBD_IF_DEQUEUE(&sc->sc_rdq_free, m); + usb_cdev_put_data(&(sc->sc_cdev), xfer->buffer, xfer->actlen, 1); + + tr_setup: + if (sc->sc_flags & ULPT_FLAG_READ_STALL) { + return; + } + + USBD_IF_POLL(&sc->sc_cdev.sc_rdq_free, m); if (m) { - USBD_MBUF_RESET(m); + usbd_start_hardware(xfer); + } + return; - if (xfer->actlen > ULPT_BSIZE) { - /* extra length check */ - xfer->actlen = ULPT_BSIZE; - } + tr_error: + if (xfer->error != USBD_CANCELLED) { + /* try to clear stall first */ + sc->sc_flags |= ULPT_FLAG_READ_STALL; + usbd_transfer_start(sc->sc_xfer[5]); + } + return; +} - bcopy(xfer->buffer, m->cur_data_ptr, xfer->actlen); - m->cur_data_len = xfer->actlen; +static void +ulpt_read_clear_stall_callback(struct usbd_xfer *xfer) +{ + struct ulpt_softc *sc = xfer->priv_sc; - USBD_IF_ENQUEUE(&sc->sc_rdq_used, m); - - if (sc->sc_flags & ULPT_FLAG_RD_WUP) { - sc->sc_flags &= ~ULPT_FLAG_RD_WUP; - wakeup(&(sc->sc_wakeup_read)); - } - } + USBD_CHECK_STATUS(xfer); tr_setup: - USBD_IF_POLL(&sc->sc_rdq_free, m); + /* start clear stall */ + usbd_clear_stall_tr_setup(xfer, sc->sc_xfer[1]); + return; - if (m) { - usbd_start_hardware(xfer); - } + tr_transferred: + usbd_clear_stall_tr_transferred(xfer, sc->sc_xfer[1]); + sc->sc_flags &= ~ULPT_FLAG_READ_STALL; + usbd_transfer_start(sc->sc_xfer[1]); return; tr_error: - DPRINTF(0, "error=%s\n", usbd_errstr(xfer->error)); - - sc->sc_flags |= ULPT_FLAG_PIPE_ERR; - - if (sc->sc_flags & ULPT_FLAG_RD_WUP) { - sc->sc_flags &= ~ULPT_FLAG_RD_WUP; - wakeup(&(sc->sc_wakeup_read)); - } + /* bomb out */ + sc->sc_flags &= ~ULPT_FLAG_READ_STALL; + usb_cdev_put_data_error(&(sc->sc_cdev)); return; } @@ -335,6 +315,10 @@ USBD_CHECK_STATUS(xfer); tr_error: + if (xfer->error == USBD_CANCELLED) { + return; + } + if (req->bmRequestType == UT_WRITE_CLASS_OTHER) { /* * There was a mistake in the USB printer 1.0 spec that @@ -354,11 +338,7 @@ } tr_transferred: - if (sc->sc_flags & ULPT_FLAG_RST_WUP) { - sc->sc_flags &= ~ULPT_FLAG_RST_WUP; - - wakeup(&(sc->sc_wakeup_reset)); - } + usb_cdev_wakeup(&(sc->sc_cdev)); return; tr_setup: @@ -409,14 +389,109 @@ .callback = &ulpt_reset_callback, .timeout = 1000, /* 1 second */ }, + + [4] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = -1, + .bufsize = sizeof(usb_device_request_t), + .callback = &ulpt_write_clear_stall_callback, + .timeout = 1000, /* 1 second */ + }, + + [5] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = -1, + .bufsize = sizeof(usb_device_request_t), + .callback = &ulpt_read_clear_stall_callback, + .timeout = 1000, /* 1 second */ + }, }; +static void +ulpt_start_read(struct usb_cdev *cdev) +{ + struct ulpt_softc *sc = cdev->sc_priv_ptr; + usbd_transfer_start(sc->sc_xfer[1]); + return; +} + +static void +ulpt_stop_read(struct usb_cdev *cdev) +{ + struct ulpt_softc *sc = cdev->sc_priv_ptr; + usbd_transfer_stop(sc->sc_xfer[5]); + usbd_transfer_stop(sc->sc_xfer[1]); + return; +} + +static void +ulpt_start_write(struct usb_cdev *cdev) +{ + struct ulpt_softc *sc = cdev->sc_priv_ptr; + usbd_transfer_start(sc->sc_xfer[0]); + return; +} + +static void +ulpt_stop_write(struct usb_cdev *cdev) +{ + struct ulpt_softc *sc = cdev->sc_priv_ptr; + usbd_transfer_stop(sc->sc_xfer[4]); + usbd_transfer_stop(sc->sc_xfer[0]); + return; +} + +static int32_t +ulpt_open(struct usb_cdev *cdev, int32_t fflags, + int32_t devtype, struct thread *td) +{ + u_int8_t prime = ((cdev->sc_last_cdev == cdev->sc_cdev[0]) && + (cdev->sc_first_open)); + struct ulpt_softc *sc = cdev->sc_priv_ptr; + int32_t error = 0; + + if (prime) { + DPRINTF(0, "opening prime device (reset)\n"); + + sc->sc_flags |= ULPT_FLAG_RESETTING; + + usbd_transfer_start(sc->sc_xfer[3]); + + error = usb_cdev_sleep(&(sc->sc_cdev), fflags); + + usbd_transfer_stop(sc->sc_xfer[3]); + + sc->sc_flags &= ~ULPT_FLAG_RESETTING; + + if (error) { + goto done; + } + } + + if (cdev->sc_flags & USB_CDEV_FLAG_OPEN_READ) { + sc->sc_flags &= ~ULPT_FLAG_DUMP_READ; + } else { + sc->sc_flags |= ULPT_FLAG_DUMP_READ; + } + done: + return error; +} + +static int32_t +ulpt_ioctl(struct usb_cdev *cdev, u_long cmd, caddr_t data, + int32_t fflags, struct thread *td) +{ + return ENODEV; +} + + /* prototypes */ static device_probe_t ulpt_probe; static device_attach_t ulpt_attach; static device_detach_t ulpt_detach; -static d_close_t ulpt_close; static int ulpt_probe(device_t dev) @@ -450,7 +525,7 @@ mtx_lock(&(sc->sc_mtx)); - if (sc->sc_flags & ULPT_FLAG_WAIT_USB) { + if (sc->sc_flags & ULPT_FLAG_WAIT_USB) { sc->sc_flags &= ~ULPT_FLAG_WAIT_USB; wakeup(&(sc->sc_wakeup_detach)); } @@ -467,22 +542,19 @@ struct ulpt_softc *sc = device_get_softc(dev); struct usbd_interface *iface_ptr = uaa->iface; usb_interface_descriptor_t *id; + const char * p_buf[3]; int32_t iface_index = uaa->iface_index; int32_t iface_alt_index = 0; int32_t unit = device_get_unit(dev); - usbd_status err; + int32_t error; + char buf_1[16]; + char buf_2[16]; DPRINTF(10, "sc=%p\n", sc); sc->sc_dev = dev; - sc->sc_udev = uaa->device; - sc->sc_rdq_free.ifq_maxlen = ULPT_IFQ_MAXLEN; - sc->sc_rdq_used.ifq_maxlen = ULPT_IFQ_MAXLEN; - sc->sc_wrq_free.ifq_maxlen = ULPT_IFQ_MAXLEN; - sc->sc_wrq_used.ifq_maxlen = ULPT_IFQ_MAXLEN; - - usbd_set_desc(dev, sc->sc_udev); + usbd_set_desc(dev, uaa->device); mtx_init(&(sc->sc_mtx), "ulpt lock", NULL, MTX_DEF|MTX_RECURSE); @@ -494,30 +566,16 @@ sc->sc_flags |= ULPT_FLAG_WAIT_CO; #endif - sc->sc_mem_ptr_1 = - usbd_alloc_mbufs(M_DEVBUF, &(sc->sc_rdq_free), ULPT_BSIZE, ULPT_IFQ_MAXLEN); - - if (sc->sc_mem_ptr_1 == NULL) { - goto detach; - } - - sc->sc_mem_ptr_2 = - usbd_alloc_mbufs(M_DEVBUF, &(sc->sc_wrq_free), ULPT_BSIZE, ULPT_IFQ_MAXLEN); - - if (sc->sc_mem_ptr_2 == NULL) { - goto detach; - } - /* search through all the descriptors looking for bidir mode */ while(iface_alt_index < 32) { - err = usbd_fill_iface_data - (sc->sc_udev, iface_index, iface_alt_index); + error = usbd_fill_iface_data + (uaa->device, iface_index, iface_alt_index); - if (err) { + if (error) { DPRINTF(0, "end of alternate settings, " - "error=%s\n", usbd_errstr(err)); + "error=%s\n", usbd_errstr(error)); goto detach; } @@ -540,29 +598,29 @@ if (iface_alt_index) { - err = usbreq_set_interface - (sc->sc_udev, iface_index, iface_alt_index); + error = usbreq_set_interface + (uaa->device, iface_index, iface_alt_index); - if (err) { + if (error) { DPRINTF(0, "could not set alternate " - "config, error=%s\n", usbd_errstr(err)); + "config, error=%s\n", usbd_errstr(error)); goto detach; } } sc->sc_iface_no = id->bInterfaceNumber; - err = usbd_transfer_setup(sc->sc_udev, iface_index, sc->sc_xfer, - ulpt_config, ULPT_N_TRANSFER, sc, &(sc->sc_mtx), - &ulpt_detach_complete); - if (err) { - DPRINTF(0, "error=%s\n", usbd_errstr(err)) ; + error = usbd_transfer_setup(uaa->device, iface_index, + sc->sc_xfer, ulpt_config, ULPT_N_TRANSFER, + sc, &(sc->sc_mtx), &(ulpt_detach_complete)); + if (error) { + DPRINTF(0, "error=%s\n", usbd_errstr(error)) ; goto detach; } sc->sc_flags |= ULPT_FLAG_WAIT_USB; - if (usbd_get_quirks(sc->sc_udev)->uq_flags & UQ_BROKEN_BIDIR) { + if (usbd_get_quirks(uaa->device)->uq_flags & UQ_BROKEN_BIDIR) { /* this device doesn't handle reading properly. */ sc->sc_flags |= ULPT_FLAG_NO_READ; } @@ -587,9 +645,9 @@ USETW(req.wValue, cd->bConfigurationValue); USETW2(req.wIndex, id->bInterfaceNumber, id->bAlternateSetting); USETW(req.wLength, sizeof devinfo - 1); - err = usbd_do_request_flags(dev, &req, devinfo, USBD_SHORT_XFER_OK, + error = usbd_do_request_flags(dev, &req, devinfo, USBD_SHORT_XFER_OK, &alen, USBD_DEFAULT_TIMEOUT); - if (err) { + if (error) { device_printf(sc->sc_dev, "cannot get device id\n"); } else if (alen <= 2) { device_printf(sc->sc_dev, "empty device id, no " @@ -607,20 +665,33 @@ } #endif - sc->sc_cdev_1 = make_dev - (&ulpt_cdevsw, (2*unit)|0, UID_ROOT, GID_OPERATOR, - 0644, "ulpt%d", unit); + snprintf(buf_1, sizeof(buf_1), "ulpt%d", unit); + snprintf(buf_2, sizeof(buf_2), "unlpt%d", unit); - sc->sc_cdev_2 = make_dev - (&ulpt_cdevsw, (2*unit)|1, UID_ROOT, GID_OPERATOR, - 0644, "unlpt%d", unit); + p_buf[0] = buf_1; + p_buf[1] = buf_2; + p_buf[2] = NULL; - if (sc->sc_cdev_1) { - DEV2SC(sc->sc_cdev_1) = sc; - } + sc->sc_cdev.sc_start_read = &ulpt_start_read; + sc->sc_cdev.sc_start_write = &ulpt_start_write; + sc->sc_cdev.sc_stop_read = &ulpt_stop_read; + sc->sc_cdev.sc_stop_write = &ulpt_stop_write; + sc->sc_cdev.sc_open = &ulpt_open; + sc->sc_cdev.sc_ioctl = &ulpt_ioctl; + sc->sc_cdev.sc_flags |= (USB_CDEV_FLAG_FWD_SHORT| + USB_CDEV_FLAG_WAKEUP_RD_IMMED| + USB_CDEV_FLAG_WAKEUP_WR_IMMED); - if (sc->sc_cdev_2) { - DEV2SC(sc->sc_cdev_2) = sc; + /* make the buffers one byte larger than maximum so + * that one can detect too large read/writes and + * short transfers: + */ + error = usb_cdev_attach(&(sc->sc_cdev), sc, &(sc->sc_mtx), p_buf, + UID_ROOT, GID_OPERATOR, 0644, + ULPT_BSIZE, ULPT_IFQ_MAXLEN, + ULPT_BSIZE, ULPT_IFQ_MAXLEN); + if (error) { + goto detach; } /* start watchdog (returns unlocked) */ @@ -644,51 +715,21 @@ DPRINTF(0, "sc=%p\n", sc); - mtx_lock(&(sc->sc_mtx)); - sc->sc_flags |= ULPT_FLAG_GONE; - mtx_unlock(&(sc->sc_mtx)); - - if (sc->sc_cdev_1) { - - ulpt_close(sc->sc_cdev_1, 0, 0, 0); - - DEV2SC(sc->sc_cdev_1) = NULL; - - destroy_dev(sc->sc_cdev_1); - } - - if (sc->sc_cdev_2) { + usb_cdev_detach(&(sc->sc_cdev)); - ulpt_close(sc->sc_cdev_2, 0, 0, 0); - - DEV2SC(sc->sc_cdev_2) = NULL; - - destroy_dev(sc->sc_cdev_2); - } - mtx_lock(&(sc->sc_mtx)); - __callout_stop(&(sc->sc_watchdog)); - mtx_unlock(&(sc->sc_mtx)); usbd_transfer_unsetup(sc->sc_xfer, ULPT_N_TRANSFER); - if (sc->sc_mem_ptr_1) { - free(sc->sc_mem_ptr_1, M_DEVBUF); - } - - if (sc->sc_mem_ptr_2) { - free(sc->sc_mem_ptr_2, M_DEVBUF); - } - /* wait for callbacks to be aborted */ mtx_lock(&(sc->sc_mtx)); while (sc->sc_flags & (ULPT_FLAG_WAIT_USB|ULPT_FLAG_WAIT_CO)) { error = msleep(&(sc->sc_wakeup_detach), &(sc->sc_mtx), - PRIBIO, "ulpt_sync_2", 0); + PRIBIO, "ulpt_sync", 0); } mtx_unlock(&(sc->sc_mtx)); @@ -697,389 +738,6 @@ return 0; } -static int -ulpt_uiomove(struct ulpt_softc *sc, u_int32_t context_bit, void *cp, int n, - struct uio *uio) -{ - int error; - - sc->sc_flags |= context_bit; - - mtx_unlock(&(sc->sc_mtx)); - - /* "uiomove()" can sleep so one - * needs to make a wrapper, exiting - * the mutex and checking things - */ - error = uiomove(cp, n, uio); - - mtx_lock(&(sc->sc_mtx)); - - sc->sc_flags &= ~context_bit; - - if (sc->sc_flags & ULPT_FLAG_CLOSING) { - wakeup(&(sc->sc_wakeup_sync_1)); - error = EINTR; - } - - if (sc->sc_flags & ULPT_FLAG_PIPE_ERR) { - error = EINTR; - } - - if (error) { - sc->sc_flags |= ULPT_FLAG_NO_FLUSH; - } - - return error; -} - -static int -ulpt_msleep(struct ulpt_softc *sc, u_int32_t context_bit, void *ident) -{ - int error; - - sc->sc_flags |= context_bit; - - error = msleep(ident, &(sc->sc_mtx), PRIBIO|PCATCH, "ulpt_sleep", 0); - - sc->sc_flags &= ~context_bit; - - if (sc->sc_flags & ULPT_FLAG_CLOSING) { - wakeup(&(sc->sc_wakeup_sync_1)); - error = EINTR; - } - - if (sc->sc_flags & ULPT_FLAG_PIPE_ERR) { - error = EINTR; - } - - if (error) { - sc->sc_flags |= ULPT_FLAG_NO_FLUSH; - } - return error; -} - -static int -ulpt_reset(struct ulpt_softc *sc) -{ - DPRINTF(1, "\n"); - - /* start reset, if not already started */ - - usbd_transfer_start(sc->sc_xfer[3]); - - return ulpt_msleep(sc, ULPT_FLAG_RST_SLP|ULPT_FLAG_RST_WUP, - &(sc->sc_wakeup_reset)); -} - -static int -ulpt_open(struct cdev *dev, int flag, int mode, struct thread *td) -{ - u_int8_t no_prime = (minor(dev) & 1); - struct ulpt_softc *sc = DEV2SC(dev); - struct usbd_mbuf *m; - int error = 0; - - DPRINTF(1, "\n"); - - if (sc == NULL) { - return EIO; - } - - mtx_lock(&(sc->sc_mtx)); - - if (sc->sc_flags & - (ULPT_FLAG_DEV_OPEN|ULPT_FLAG_GONE| - ULPT_FLAG_RST_SLP|ULPT_FLAG_RST_WUP)) { - error = EBUSY; - goto done; - } - - if (no_prime == 0) { - error = ulpt_reset(sc); - if (error) { - goto done; - } - } - - /* reset read queue */ - - while(1) { - USBD_IF_DEQUEUE(&(sc->sc_rdq_used), m); - - if (m) { - USBD_IF_ENQUEUE(&(sc->sc_rdq_free), m); - } else { - break; - } - } - - /* reset write queue */ - - while(1) { - USBD_IF_DEQUEUE(&(sc->sc_wrq_used), m); - - if (m) { - USBD_IF_ENQUEUE(&(sc->sc_wrq_free), m); - } else { - break; - } - } - - if (flag & FREAD) { - sc->sc_flags &= ~ULPT_FLAG_DUMP_READ; - } else { - sc->sc_flags |= ULPT_FLAG_DUMP_READ; - } - - sc->sc_flags |= ULPT_FLAG_DEV_OPEN; - - done: - mtx_unlock(&(sc->sc_mtx)); - - DPRINTF(0, "done, error=%d\n", error); - return error; -} - -static int -ulpt_close(struct cdev *dev, int flag, int mode, struct thread *td) -{ - struct ulpt_softc *sc = DEV2SC(dev); - int error; - - DPRINTF(1, "\n"); - - if (sc == NULL) { - return EIO; - } - - mtx_lock(&(sc->sc_mtx)); - - if (sc->sc_flags & (ULPT_FLAG_WR_FLUSH|ULPT_FLAG_CLOSING)) { - goto done; - } - - if (sc->sc_flags & ULPT_FLAG_DEV_OPEN) { - - /* - * wait for data to - * be written to pipe: - */ - - if (!(sc->sc_flags & (ULPT_FLAG_GONE|ULPT_FLAG_NO_FLUSH| - ULPT_FLAG_PIPE_ERR))) { - - sc->sc_flags |= ULPT_FLAG_WR_FLUSH; - - /* start write transfer, if not already started */ - - usbd_transfer_start(sc->sc_xfer[0]); - - while (sc->sc_flags & ULPT_FLAG_WR_FLUSH) { - - error = msleep(&(sc->sc_wakeup_flush), &(sc->sc_mtx), - PRIBIO|PCATCH, "ulpt_sync_0", 0); - if (error) { - break; - } - } - } - - sc->sc_flags |= ULPT_FLAG_CLOSING; - - if (sc->sc_xfer[0]) { - usbd_transfer_stop(sc->sc_xfer[0]); - } - - if (sc->sc_xfer[1]) { - usbd_transfer_stop(sc->sc_xfer[1]); - } - - while (sc->sc_flags & - (ULPT_FLAG_RD_SLP|ULPT_FLAG_RD_WUP|ULPT_FLAG_RD_UIO| - ULPT_FLAG_WR_SLP|ULPT_FLAG_WR_WUP|ULPT_FLAG_WR_UIO| - ULPT_FLAG_RST_SLP|ULPT_FLAG_RST_WUP)) { - - if (sc->sc_flags & ULPT_FLAG_RD_WUP) { - sc->sc_flags &= ~ULPT_FLAG_RD_WUP; - wakeup(&(sc->sc_wakeup_read)); - } - - if (sc->sc_flags & ULPT_FLAG_WR_WUP) { - sc->sc_flags &= ~ULPT_FLAG_WR_WUP; - wakeup(&(sc->sc_wakeup_write)); - } - - if (sc->sc_flags & ULPT_FLAG_RST_WUP) { - sc->sc_flags &= ~ULPT_FLAG_RST_WUP; - wakeup(&(sc->sc_wakeup_reset)); - } - - error = msleep(&(sc->sc_wakeup_sync_1), &(sc->sc_mtx), - PRIBIO, "ulpt_sync_1", 0); - } - - sc->sc_flags &= ~(ULPT_FLAG_DEV_OPEN| - ULPT_FLAG_CLOSING| - ULPT_FLAG_WR_FLUSH| - ULPT_FLAG_NO_FLUSH| - ULPT_FLAG_PIPE_ERR); - } - - done: - mtx_unlock(&(sc->sc_mtx)); - - DPRINTF(0, "closed\n"); - - return 0; -} - -static int -ulpt_write(struct cdev *dev, struct uio *uio, int flags) -{ - struct ulpt_softc *sc = DEV2SC(dev); - struct usbd_mbuf *m; - int error = 0; - int io_len; - - DPRINTF(1, "\n"); - - if (sc == NULL) { - return EIO; - } - - mtx_lock(&(sc->sc_mtx)); - - if(sc->sc_flags & (ULPT_FLAG_CLOSING|ULPT_FLAG_GONE| - ULPT_FLAG_WR_SLP|ULPT_FLAG_WR_UIO| - ULPT_FLAG_PIPE_ERR)) { - error = EIO; - goto done; - } - - while (uio->uio_resid) { - - USBD_IF_DEQUEUE(&sc->sc_wrq_free, m); - - if (m == NULL) { - error = ulpt_msleep(sc, (ULPT_FLAG_WR_SLP|ULPT_FLAG_WR_WUP), - &(sc->sc_wakeup_write)); - if (error) { - break; - } else { - continue; - } - } - - USBD_MBUF_RESET(m); - - io_len = min(m->cur_data_len, uio->uio_resid); - - m->cur_data_len = io_len; - - DPRINTF(1, "transfer %d bytes to %p\n", - io_len, m->cur_data_ptr); - - error = ulpt_uiomove(sc, ULPT_FLAG_WR_UIO, - m->cur_data_ptr, io_len, uio); - - if (error) { - USBD_IF_ENQUEUE(&sc->sc_wrq_free, m); - break; - } else { - USBD_IF_ENQUEUE(&sc->sc_wrq_used, m); - usbd_transfer_start(sc->sc_xfer[0]); - } - } - done: - mtx_unlock(&(sc->sc_mtx)); - - return error; -} - -static int -ulpt_read(struct cdev *dev, struct uio *uio, int flags) -{ - struct ulpt_softc *sc = DEV2SC(dev); - struct usbd_mbuf *m; - int error = 0; - int io_len; - - if (sc == NULL) { - return EIO; - } - - DPRINTF(1, "\n"); - - mtx_lock(&(sc->sc_mtx)); - - if(sc->sc_flags & (ULPT_FLAG_CLOSING|ULPT_FLAG_GONE| - ULPT_FLAG_RD_UIO|ULPT_FLAG_RD_SLP| - ULPT_FLAG_PIPE_ERR)) { - error = EIO; - goto done; - } - - while (uio->uio_resid) { - - USBD_IF_DEQUEUE(&sc->sc_rdq_used, m); - - if (m == NULL) { - - /* start reader thread */ - - usbd_transfer_start(sc->sc_xfer[1]); - - error = ulpt_msleep(sc, (ULPT_FLAG_RD_SLP|ULPT_FLAG_RD_WUP), - &(sc->sc_wakeup_read)); - if (error) { - break; - } else { - continue; - } - } - - io_len = min(m->cur_data_len, uio->uio_resid); - - DPRINTF(1, "transfer %d bytes from %p\n", - io_len, m->cur_data_ptr); - - error = ulpt_uiomove(sc, ULPT_FLAG_RD_UIO, >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jun 5 15:43:52 2006 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 18BA916A7F7; Mon, 5 Jun 2006 15:43:52 +0000 (UTC) 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 53D3116A752 for ; Mon, 5 Jun 2006 15:43:50 +0000 (UTC) (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 EF87B43D46 for ; Mon, 5 Jun 2006 15:43:49 +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.6/8.13.6) with ESMTP id k55Fg5kj099235 for ; Mon, 5 Jun 2006 15:42:05 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k55Fg5YZ099226 for perforce@freebsd.org; Mon, 5 Jun 2006 15:42:05 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 5 Jun 2006 15:42:05 GMT Message-Id: <200606051542.k55Fg5YZ099226@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 98572 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, 05 Jun 2006 15:43:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=98572 Change 98572 by rwatson@rwatson_zoo on 2006/06/05 15:41:59 Integrate TrustedBSD base branch to loop back various audit changes: - audit.4 -> audit.4 + auditpipe.4, documentation of preselection, etc. - Some auditing of mount-related arguments (only simple ones merged). - Use uma_zfree() on audit records. Also merge: - if_le works with vmware again Affected files ... .. //depot/projects/trustedbsd/base/lib/libc/i386/gen/_ctx_start.S#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/Makefile#67 integrate .. //depot/projects/trustedbsd/base/share/man/man4/audit.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/auditpipe.4#1 branch .. //depot/projects/trustedbsd/base/sys/dev/le/if_le_pci.c#3 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_mount.c#48 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit.c#7 integrate Differences ... ==== //depot/projects/trustedbsd/base/lib/libc/i386/gen/_ctx_start.S#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/i386/gen/_ctx_start.S,v 1.3 2004/07/02 14:19:44 davidxu Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/i386/gen/_ctx_start.S,v 1.4 2006/06/05 14:59:33 kib Exp $"); /* * _ctx_start((void *func)(int arg1, ..., argn), @@ -41,10 +41,11 @@ ENTRY(_ctx_start) popl %eax /* get start function */ call *%eax /* call start function */ + PIC_PROLOGUE movl %esi, %esp /* * setup stack for completion routine; * ucp is now at top of stack */ - call _ctx_done /* should never return */ - call abort /* fubar */ + call PIC_PLT(_ctx_done) /* should never return */ + call PIC_PLT(abort) /* fubar */ ret ==== //depot/projects/trustedbsd/base/share/man/man4/Makefile#67 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.351 2006/05/20 06:21:42 brueffer Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.352 2006/06/05 15:26:09 rwatson Exp $ MAN= aac.4 \ acpi.4 \ @@ -29,6 +29,7 @@ atkbd.4 \ atkbdc.4 \ audit.4 \ + auditpipe.4 \ aue.4 \ awi.4 \ axe.4 \ ==== //depot/projects/trustedbsd/base/share/man/man4/audit.4#2 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/audit.4,v 1.6 2006/02/06 20:27:00 rwatson Exp $ +.\" $FreeBSD: src/share/man/man4/audit.4,v 1.7 2006/06/05 15:26:09 rwatson Exp $ .\" -.Dd February 6, 2006 +.Dd May 5, 2006 .Os .Dt AUDIT 4 .Sh NAME @@ -62,37 +62,11 @@ space conditions, and requests to terminate auditing. This device is not intended for use by applications. .Ss Audit Pipe Special Devices -While audit trail files maintained by -.Xr auditd 8 -provide a reliable long-term store for audit log information, current log -files are owned by the audit daemon until terminated making them somewhat -unwieldy for live montoring applications such as host-based intrusion -detection. -For example, the log may be cycled and new records written to a new file -without notice to applications that may be accessing the file. -.Pp -The audit facility provides an audit pipe facility for applications requiring -direct access to live BSM audit data for the purposes of real-time -monitoring. -Audit pipes are available via a clonable special device, -.Pa /dev/auditpipe , -subject to the permissions on the device node, and provide a -.Qq tee -of the audit event stream. -As the device is clonable, more than one instance of the device may be opened -at a time; each device instance will provide access to all records. -.Pp -The audit pipe device provides discreet BSM audit records; if the read buffer -passed by the application is too small to hold the next record in the -sequence, it will be dropped. -Unlike audit data written to the audit trail, the reliability of record -delivery is not guaranteed. -In particular, when an audit pipe queue fills, records will be dropped. -Audit pipe devices are blocking by default, but support non-blocking I/O, -asynchronous I/O using SIGIO, and support for polled operation via -.Xr select 2 -and -.Xr poll 2 . +Audit pipe special devices, discussed in +.Xr auditpipe 4 , +provide a configurable live tracking mechanism to allow applications to +tee the audit trail, as well as to configure custom preselection paramaters +to track users and events in a fine-grained manner. .Sh SEE ALSO .Xr auditreduce 1 , .Xr praudit 1 , @@ -106,6 +80,7 @@ .Xr setaudit 2 , .Xr setauid 2 , .Xr libbsm 3 , +.Xr auditpipe 4 , .Xr audit.log 5 , .Xr audit_class 5 , .Xr audit_control 5 , ==== //depot/projects/trustedbsd/base/sys/dev/le/if_le_pci.c#3 (text+ko) ==== @@ -72,7 +72,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/le/if_le_pci.c,v 1.3 2006/05/16 21:04:01 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/le/if_le_pci.c,v 1.4 2006/06/05 15:14:14 marius Exp $"); #include #include @@ -263,8 +263,16 @@ le_pci_hwreset(struct lance_softc *sc) { - /* Chip is stopped. Set software style to ILACC (32-bit). */ - le_pci_wrbcr(sc, LE_BCR20, LE_B20_SSTYLE_ILACC); + /* + * Chip is stopped. Set software style to PCnet-PCI (32-bit). + * Actually, am79900.c implements ILACC support (hence its + * name) but unfortunately VMware does not. As far as this + * driver is concerned that should not make a difference + * though, as the settings used have the same meaning for + * both, ILACC and PCnet-PCI (note that there would be a + * difference for the ADD_FCS/NO_FCS bit if used). + */ + le_pci_wrbcr(sc, LE_BCR20, LE_B20_SSTYLE_PCNETPCI2); } static void ==== //depot/projects/trustedbsd/base/sys/kern/vfs_mount.c#48 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_mount.c,v 1.226 2006/06/02 20:29:02 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_mount.c,v 1.227 2006/06/05 15:32:07 rwatson Exp $"); #include #include @@ -63,6 +63,8 @@ #include +#include + #include "opt_rootdevname.h" #include "opt_ddb.h" #include "opt_mac.h" @@ -374,6 +376,8 @@ int error; u_int iovcnt; + AUDIT_ARG(fflags, uap->flags); + /* Kick out MNT_ROOTFS early as it is legal internally */ if (uap->flags & MNT_ROOTFS) return (EINVAL); @@ -733,12 +737,15 @@ struct mntarg *ma = NULL; int error; + AUDIT_ARG(fflags, uap->flags); + /* Kick out MNT_ROOTFS early as it is legal internally */ uap->flags &= ~MNT_ROOTFS; fstype = malloc(MFSNAMELEN, M_TEMP, M_WAITOK); error = copyinstr(uap->type, fstype, MFSNAMELEN, NULL); if (!error) { + AUDIT_ARG(text, fstype); mtx_lock(&Giant); /* XXX ? */ vfsp = vfs_byname_kld(fstype, td, &error); mtx_unlock(&Giant); @@ -826,7 +833,8 @@ /* * Get vnode to be covered */ - NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF, UIO_SYSSPACE, fspath, td); + NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF | AUDITVNODE1, UIO_SYSSPACE, + fspath, td); if ((error = namei(&nd)) != 0) return (error); NDFREE(&nd, NDF_ONLY_PNBUF); @@ -1054,6 +1062,7 @@ free(pathbuf, M_TEMP); return (error); } + AUDIT_ARG(upath, td, pathbuf, ARG_UPATH1); if (uap->flags & MNT_BYFSID) { /* Decode the filesystem ID. */ if (sscanf(pathbuf, "FSID:%d:%d", &id0, &id1) != 2) { ==== //depot/projects/trustedbsd/base/sys/security/audit/audit.c#7 (text) ==== @@ -27,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/security/audit/audit.c,v 1.15 2006/06/05 14:48:17 rwatson Exp $ + * $FreeBSD: src/sys/security/audit/audit.c,v 1.16 2006/06/05 15:38:12 rwatson Exp $ */ #include @@ -395,7 +395,7 @@ mtx_lock(&audit_mtx); audit_pre_q_len--; mtx_unlock(&audit_mtx); - uma_zfree(audit_record_zone, ar); + audit_free(ar); return; } @@ -421,7 +421,7 @@ if (audit_suspended || !audit_enabled) { audit_pre_q_len--; mtx_unlock(&audit_mtx); - uma_zfree(audit_record_zone, ar); + audit_free(ar); return; } From owner-p4-projects@FreeBSD.ORG Mon Jun 5 15:53:04 2006 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 89BE316AF3D; Mon, 5 Jun 2006 15:53:04 +0000 (UTC) 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 CA8F816AEFE for ; Mon, 5 Jun 2006 15:53:02 +0000 (UTC) (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 2ECB543D6D for ; Mon, 5 Jun 2006 15:53:02 +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.6/8.13.6) with ESMTP id k55FpHJP010760 for ; Mon, 5 Jun 2006 15:51:17 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k55FpHjG010757 for perforce@freebsd.org; Mon, 5 Jun 2006 15:51:17 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 5 Jun 2006 15:51:17 GMT Message-Id: <200606051551.k55FpHjG010757@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 98574 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, 05 Jun 2006 15:53:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=98574 Change 98574 by rwatson@rwatson_zoo on 2006/06/05 15:50:46 Integrate TrustedBSD base branch to loop back various audit changes: - audit.4 -> audit.4 + auditpipe.4, documentation of preselection, etc. - Some auditing of mount-related arguments (only simple ones merged). - Use uma_zfree() on audit records. Also merge: - if_le works with vmware again Affected files ... .. //depot/projects/trustedbsd/audit3/lib/libc/i386/gen/_ctx_start.S#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/Makefile#11 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/audit.4#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/auditpipe.4#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/le/if_le_pci.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_mount.c#15 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#31 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/lib/libc/i386/gen/_ctx_start.S#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/i386/gen/_ctx_start.S,v 1.3 2004/07/02 14:19:44 davidxu Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/i386/gen/_ctx_start.S,v 1.4 2006/06/05 14:59:33 kib Exp $"); /* * _ctx_start((void *func)(int arg1, ..., argn), @@ -41,10 +41,11 @@ ENTRY(_ctx_start) popl %eax /* get start function */ call *%eax /* call start function */ + PIC_PROLOGUE movl %esi, %esp /* * setup stack for completion routine; * ucp is now at top of stack */ - call _ctx_done /* should never return */ - call abort /* fubar */ + call PIC_PLT(_ctx_done) /* should never return */ + call PIC_PLT(abort) /* fubar */ ret ==== //depot/projects/trustedbsd/audit3/share/man/man4/Makefile#11 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.351 2006/05/20 06:21:42 brueffer Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.352 2006/06/05 15:26:09 rwatson Exp $ MAN= aac.4 \ acpi.4 \ @@ -29,6 +29,7 @@ atkbd.4 \ atkbdc.4 \ audit.4 \ + auditpipe.4 \ aue.4 \ awi.4 \ axe.4 \ ==== //depot/projects/trustedbsd/audit3/share/man/man4/audit.4#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/audit.4,v 1.6 2006/02/06 20:27:00 rwatson Exp $ +.\" $FreeBSD: src/share/man/man4/audit.4,v 1.7 2006/06/05 15:26:09 rwatson Exp $ .\" .Dd May 5, 2006 .Os ==== //depot/projects/trustedbsd/audit3/share/man/man4/auditpipe.4#5 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/sys/dev/le/if_le_pci.c#3 (text+ko) ==== @@ -72,7 +72,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/le/if_le_pci.c,v 1.3 2006/05/16 21:04:01 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/le/if_le_pci.c,v 1.4 2006/06/05 15:14:14 marius Exp $"); #include #include @@ -263,8 +263,16 @@ le_pci_hwreset(struct lance_softc *sc) { - /* Chip is stopped. Set software style to ILACC (32-bit). */ - le_pci_wrbcr(sc, LE_BCR20, LE_B20_SSTYLE_ILACC); + /* + * Chip is stopped. Set software style to PCnet-PCI (32-bit). + * Actually, am79900.c implements ILACC support (hence its + * name) but unfortunately VMware does not. As far as this + * driver is concerned that should not make a difference + * though, as the settings used have the same meaning for + * both, ILACC and PCnet-PCI (note that there would be a + * difference for the ADD_FCS/NO_FCS bit if used). + */ + le_pci_wrbcr(sc, LE_BCR20, LE_B20_SSTYLE_PCNETPCI2); } static void ==== //depot/projects/trustedbsd/audit3/sys/kern/vfs_mount.c#15 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_mount.c,v 1.226 2006/06/02 20:29:02 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_mount.c,v 1.227 2006/06/05 15:32:07 rwatson Exp $"); #include #include @@ -65,6 +65,8 @@ #include +#include + #include "opt_rootdevname.h" #include "opt_ddb.h" #include "opt_mac.h" ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#31 (text+ko) ==== @@ -27,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/security/audit/audit.c,v 1.15 2006/06/05 14:48:17 rwatson Exp $ + * $FreeBSD: src/sys/security/audit/audit.c,v 1.16 2006/06/05 15:38:12 rwatson Exp $ */ #include From owner-p4-projects@FreeBSD.ORG Mon Jun 5 16:10:28 2006 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 3FFE316AB19; Mon, 5 Jun 2006 16:10:27 +0000 (UTC) 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 6A37516A886 for ; Mon, 5 Jun 2006 16:10:24 +0000 (UTC) (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 16CC443D46 for ; Mon, 5 Jun 2006 16:10:24 +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.6/8.13.6) with ESMTP id k55G8ds2012916 for ; Mon, 5 Jun 2006 16:08:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k55G8dW7012913 for perforce@freebsd.org; Mon, 5 Jun 2006 16:08:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 5 Jun 2006 16:08:39 GMT Message-Id: <200606051608.k55G8dW7012913@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 98576 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, 05 Jun 2006 16:10:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=98576 Change 98576 by rwatson@rwatson_zoo on 2006/06/05 16:08:05 Remove mismerge for second include of audit.h. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_mount.c#16 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/kern/vfs_mount.c#16 (text+ko) ==== @@ -59,8 +59,6 @@ #include #include -#include - #include #include From owner-p4-projects@FreeBSD.ORG Mon Jun 5 23:47:56 2006 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 687AE16D88F; Mon, 5 Jun 2006 22:56:03 +0000 (UTC) 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 DCD2E16D62B for ; Mon, 5 Jun 2006 22:14:56 +0000 (UTC) (envelope-from hugo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 663D243D49 for ; Mon, 5 Jun 2006 22:14:54 +0000 (GMT) (envelope-from hugo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k55MD8e3061122 for ; Mon, 5 Jun 2006 22:13:08 GMT (envelope-from hugo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k55MD6Le061112 for perforce@freebsd.org; Mon, 5 Jun 2006 22:13:06 GMT (envelope-from hugo@FreeBSD.org) Date: Mon, 5 Jun 2006 22:13:06 GMT Message-Id: <200606052213.k55MD6Le061112@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hugo@FreeBSD.org using -f From: Hugo Meiland To: Perforce Change Reviews Cc: Subject: PERFORCE change 98608 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, 05 Jun 2006 23:48:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=98608 Change 98608 by hugo@hugo_server2.meiland.nl on 2006/06/05 22:09:46 submission of initial branch and first code for nnpfs subset Affected files ... .. //depot/projects/arla/COPYRIGHT#1 branch .. //depot/projects/arla/LOCKS#1 branch .. //depot/projects/arla/MAINTAINERS#1 branch .. //depot/projects/arla/Makefile#1 branch .. //depot/projects/arla/Makefile.inc1#1 branch .. //depot/projects/arla/ObsoleteFiles.inc#1 branch .. //depot/projects/arla/README#1 branch .. //depot/projects/arla/UPDATING#1 branch .. //depot/projects/arla/bin/Makefile#1 branch .. //depot/projects/arla/bin/Makefile.inc#1 branch .. //depot/projects/arla/bin/cat/Makefile#1 branch .. //depot/projects/arla/bin/cat/cat.1#1 branch .. //depot/projects/arla/bin/cat/cat.c#1 branch .. //depot/projects/arla/bin/chflags/Makefile#1 branch .. //depot/projects/arla/bin/chflags/chflags.1#1 branch .. //depot/projects/arla/bin/chflags/chflags.c#1 branch .. //depot/projects/arla/bin/chio/Makefile#1 branch .. //depot/projects/arla/bin/chio/chio.1#1 branch .. //depot/projects/arla/bin/chio/chio.c#1 branch .. //depot/projects/arla/bin/chio/defs.h#1 branch .. //depot/projects/arla/bin/chio/pathnames.h#1 branch .. //depot/projects/arla/bin/chmod/Makefile#1 branch .. //depot/projects/arla/bin/chmod/chmod.1#1 branch .. //depot/projects/arla/bin/chmod/chmod.c#1 branch .. //depot/projects/arla/bin/cp/Makefile#1 branch .. //depot/projects/arla/bin/cp/cp.1#1 branch .. //depot/projects/arla/bin/cp/cp.c#1 branch .. //depot/projects/arla/bin/cp/extern.h#1 branch .. //depot/projects/arla/bin/cp/utils.c#1 branch .. //depot/projects/arla/bin/csh/Makefile#1 branch .. //depot/projects/arla/bin/csh/USD.doc/csh.1#1 branch .. //depot/projects/arla/bin/csh/USD.doc/csh.2#1 branch .. //depot/projects/arla/bin/csh/USD.doc/csh.3#1 branch .. //depot/projects/arla/bin/csh/USD.doc/csh.4#1 branch .. //depot/projects/arla/bin/csh/USD.doc/csh.a#1 branch .. //depot/projects/arla/bin/csh/USD.doc/csh.g#1 branch .. //depot/projects/arla/bin/csh/USD.doc/tabs#1 branch .. //depot/projects/arla/bin/csh/config.h#1 branch .. //depot/projects/arla/bin/csh/config_p.h#1 branch .. //depot/projects/arla/bin/csh/host.defs#1 branch .. //depot/projects/arla/bin/csh/iconv.h#1 branch .. //depot/projects/arla/bin/csh/iconv_stub.c#1 branch .. //depot/projects/arla/bin/date/Makefile#1 branch .. //depot/projects/arla/bin/date/date.1#1 branch .. //depot/projects/arla/bin/date/date.c#1 branch .. //depot/projects/arla/bin/date/extern.h#1 branch .. //depot/projects/arla/bin/date/netdate.c#1 branch .. //depot/projects/arla/bin/date/vary.c#1 branch .. //depot/projects/arla/bin/date/vary.h#1 branch .. //depot/projects/arla/bin/dd/Makefile#1 branch .. //depot/projects/arla/bin/dd/args.c#1 branch .. //depot/projects/arla/bin/dd/conv.c#1 branch .. //depot/projects/arla/bin/dd/conv_tab.c#1 branch .. //depot/projects/arla/bin/dd/dd.1#1 branch .. //depot/projects/arla/bin/dd/dd.c#1 branch .. //depot/projects/arla/bin/dd/dd.h#1 branch .. //depot/projects/arla/bin/dd/extern.h#1 branch .. //depot/projects/arla/bin/dd/gen.c#1 branch .. //depot/projects/arla/bin/dd/misc.c#1 branch .. //depot/projects/arla/bin/dd/position.c#1 branch .. //depot/projects/arla/bin/dd/ref.ascii#1 branch .. //depot/projects/arla/bin/dd/ref.ebcdic#1 branch .. //depot/projects/arla/bin/dd/ref.ibm#1 branch .. //depot/projects/arla/bin/dd/ref.lcase#1 branch .. //depot/projects/arla/bin/dd/ref.oldascii#1 branch .. //depot/projects/arla/bin/dd/ref.oldebcdic#1 branch .. //depot/projects/arla/bin/dd/ref.oldibm#1 branch .. //depot/projects/arla/bin/dd/ref.pareven#1 branch .. //depot/projects/arla/bin/dd/ref.parnone#1 branch .. //depot/projects/arla/bin/dd/ref.parodd#1 branch .. //depot/projects/arla/bin/dd/ref.parset#1 branch .. //depot/projects/arla/bin/dd/ref.swab#1 branch .. //depot/projects/arla/bin/dd/ref.ucase#1 branch .. //depot/projects/arla/bin/df/Makefile#1 branch .. //depot/projects/arla/bin/df/df.1#1 branch .. //depot/projects/arla/bin/df/df.c#1 branch .. //depot/projects/arla/bin/domainname/Makefile#1 branch .. //depot/projects/arla/bin/domainname/domainname.1#1 branch .. //depot/projects/arla/bin/domainname/domainname.c#1 branch .. //depot/projects/arla/bin/echo/Makefile#1 branch .. //depot/projects/arla/bin/echo/echo.1#1 branch .. //depot/projects/arla/bin/echo/echo.c#1 branch .. //depot/projects/arla/bin/ed/Makefile#1 branch .. //depot/projects/arla/bin/ed/POSIX#1 branch .. //depot/projects/arla/bin/ed/README#1 branch .. //depot/projects/arla/bin/ed/buf.c#1 branch .. //depot/projects/arla/bin/ed/cbc.c#1 branch .. //depot/projects/arla/bin/ed/ed.1#1 branch .. //depot/projects/arla/bin/ed/ed.h#1 branch .. //depot/projects/arla/bin/ed/glbl.c#1 branch .. //depot/projects/arla/bin/ed/io.c#1 branch .. //depot/projects/arla/bin/ed/main.c#1 branch .. //depot/projects/arla/bin/ed/re.c#1 branch .. //depot/projects/arla/bin/ed/sub.c#1 branch .. //depot/projects/arla/bin/ed/test/=.err#1 branch .. //depot/projects/arla/bin/ed/test/Makefile#1 branch .. //depot/projects/arla/bin/ed/test/README#1 branch .. //depot/projects/arla/bin/ed/test/TODO#1 branch .. //depot/projects/arla/bin/ed/test/a.d#1 branch .. //depot/projects/arla/bin/ed/test/a.r#1 branch .. //depot/projects/arla/bin/ed/test/a.t#1 branch .. //depot/projects/arla/bin/ed/test/a1.err#1 branch .. //depot/projects/arla/bin/ed/test/a2.err#1 branch .. //depot/projects/arla/bin/ed/test/addr.d#1 branch .. //depot/projects/arla/bin/ed/test/addr.r#1 branch .. //depot/projects/arla/bin/ed/test/addr.t#1 branch .. //depot/projects/arla/bin/ed/test/addr1.err#1 branch .. //depot/projects/arla/bin/ed/test/addr2.err#1 branch .. //depot/projects/arla/bin/ed/test/ascii.d.uu#1 branch .. //depot/projects/arla/bin/ed/test/ascii.r.uu#1 branch .. //depot/projects/arla/bin/ed/test/ascii.t#1 branch .. //depot/projects/arla/bin/ed/test/bang1.d#1 branch .. //depot/projects/arla/bin/ed/test/bang1.err#1 branch .. //depot/projects/arla/bin/ed/test/bang1.r#1 branch .. //depot/projects/arla/bin/ed/test/bang1.t#1 branch .. //depot/projects/arla/bin/ed/test/bang2.err#1 branch .. //depot/projects/arla/bin/ed/test/c.d#1 branch .. //depot/projects/arla/bin/ed/test/c.r#1 branch .. //depot/projects/arla/bin/ed/test/c.t#1 branch .. //depot/projects/arla/bin/ed/test/c1.err#1 branch .. //depot/projects/arla/bin/ed/test/c2.err#1 branch .. //depot/projects/arla/bin/ed/test/ckscripts.sh#1 branch .. //depot/projects/arla/bin/ed/test/d.d#1 branch .. //depot/projects/arla/bin/ed/test/d.err#1 branch .. //depot/projects/arla/bin/ed/test/d.r#1 branch .. //depot/projects/arla/bin/ed/test/d.t#1 branch .. //depot/projects/arla/bin/ed/test/e1.d#1 branch .. //depot/projects/arla/bin/ed/test/e1.err#1 branch .. //depot/projects/arla/bin/ed/test/e1.r#1 branch .. //depot/projects/arla/bin/ed/test/e1.t#1 branch .. //depot/projects/arla/bin/ed/test/e2.d#1 branch .. //depot/projects/arla/bin/ed/test/e2.err#1 branch .. //depot/projects/arla/bin/ed/test/e2.r#1 branch .. //depot/projects/arla/bin/ed/test/e2.t#1 branch .. //depot/projects/arla/bin/ed/test/e3.d#1 branch .. //depot/projects/arla/bin/ed/test/e3.err#1 branch .. //depot/projects/arla/bin/ed/test/e3.r#1 branch .. //depot/projects/arla/bin/ed/test/e3.t#1 branch .. //depot/projects/arla/bin/ed/test/e4.d#1 branch .. //depot/projects/arla/bin/ed/test/e4.r#1 branch .. //depot/projects/arla/bin/ed/test/e4.t#1 branch .. //depot/projects/arla/bin/ed/test/f1.err#1 branch .. //depot/projects/arla/bin/ed/test/f2.err#1 branch .. //depot/projects/arla/bin/ed/test/g1.d#1 branch .. //depot/projects/arla/bin/ed/test/g1.err#1 branch .. //depot/projects/arla/bin/ed/test/g1.r#1 branch .. //depot/projects/arla/bin/ed/test/g1.t#1 branch .. //depot/projects/arla/bin/ed/test/g2.d#1 branch .. //depot/projects/arla/bin/ed/test/g2.err#1 branch .. //depot/projects/arla/bin/ed/test/g2.r#1 branch .. //depot/projects/arla/bin/ed/test/g2.t#1 branch .. //depot/projects/arla/bin/ed/test/g3.d#1 branch .. //depot/projects/arla/bin/ed/test/g3.err#1 branch .. //depot/projects/arla/bin/ed/test/g3.r#1 branch .. //depot/projects/arla/bin/ed/test/g3.t#1 branch .. //depot/projects/arla/bin/ed/test/g4.d#1 branch .. //depot/projects/arla/bin/ed/test/g4.r#1 branch .. //depot/projects/arla/bin/ed/test/g4.t#1 branch .. //depot/projects/arla/bin/ed/test/g5.d#1 branch .. //depot/projects/arla/bin/ed/test/g5.r#1 branch .. //depot/projects/arla/bin/ed/test/g5.t#1 branch .. //depot/projects/arla/bin/ed/test/h.err#1 branch .. //depot/projects/arla/bin/ed/test/i.d#1 branch .. //depot/projects/arla/bin/ed/test/i.r#1 branch .. //depot/projects/arla/bin/ed/test/i.t#1 branch .. //depot/projects/arla/bin/ed/test/i1.err#1 branch .. //depot/projects/arla/bin/ed/test/i2.err#1 branch .. //depot/projects/arla/bin/ed/test/i3.err#1 branch .. //depot/projects/arla/bin/ed/test/j.d#1 branch .. //depot/projects/arla/bin/ed/test/j.r#1 branch .. //depot/projects/arla/bin/ed/test/j.t#1 branch .. //depot/projects/arla/bin/ed/test/k.d#1 branch .. //depot/projects/arla/bin/ed/test/k.r#1 branch .. //depot/projects/arla/bin/ed/test/k.t#1 branch .. //depot/projects/arla/bin/ed/test/k1.err#1 branch .. //depot/projects/arla/bin/ed/test/k2.err#1 branch .. //depot/projects/arla/bin/ed/test/k3.err#1 branch .. //depot/projects/arla/bin/ed/test/k4.err#1 branch .. //depot/projects/arla/bin/ed/test/l.d#1 branch .. //depot/projects/arla/bin/ed/test/l.r#1 branch .. //depot/projects/arla/bin/ed/test/l.t#1 branch .. //depot/projects/arla/bin/ed/test/m.d#1 branch .. //depot/projects/arla/bin/ed/test/m.err#1 branch .. //depot/projects/arla/bin/ed/test/m.r#1 branch .. //depot/projects/arla/bin/ed/test/m.t#1 branch .. //depot/projects/arla/bin/ed/test/mkscripts.sh#1 branch .. //depot/projects/arla/bin/ed/test/n.d#1 branch .. //depot/projects/arla/bin/ed/test/n.r#1 branch .. //depot/projects/arla/bin/ed/test/n.t#1 branch .. //depot/projects/arla/bin/ed/test/nl.err#1 branch .. //depot/projects/arla/bin/ed/test/nl1.d#1 branch .. //depot/projects/arla/bin/ed/test/nl1.r#1 branch .. //depot/projects/arla/bin/ed/test/nl1.t#1 branch .. //depot/projects/arla/bin/ed/test/nl2.d#1 branch .. //depot/projects/arla/bin/ed/test/nl2.r#1 branch .. //depot/projects/arla/bin/ed/test/nl2.t#1 branch .. //depot/projects/arla/bin/ed/test/p.d#1 branch .. //depot/projects/arla/bin/ed/test/p.r#1 branch .. //depot/projects/arla/bin/ed/test/p.t#1 branch .. //depot/projects/arla/bin/ed/test/q.d#1 branch .. //depot/projects/arla/bin/ed/test/q.r#1 branch .. //depot/projects/arla/bin/ed/test/q.t#1 branch .. //depot/projects/arla/bin/ed/test/q1.err#1 branch .. //depot/projects/arla/bin/ed/test/r1.d#1 branch .. //depot/projects/arla/bin/ed/test/r1.err#1 branch .. //depot/projects/arla/bin/ed/test/r1.r#1 branch .. //depot/projects/arla/bin/ed/test/r1.t#1 branch .. //depot/projects/arla/bin/ed/test/r2.d#1 branch .. //depot/projects/arla/bin/ed/test/r2.err#1 branch .. //depot/projects/arla/bin/ed/test/r2.r#1 branch .. //depot/projects/arla/bin/ed/test/r2.t#1 branch .. //depot/projects/arla/bin/ed/test/r3.d#1 branch .. //depot/projects/arla/bin/ed/test/r3.r#1 branch .. //depot/projects/arla/bin/ed/test/r3.t#1 branch .. //depot/projects/arla/bin/ed/test/s1.d#1 branch .. //depot/projects/arla/bin/ed/test/s1.err#1 branch .. //depot/projects/arla/bin/ed/test/s1.r#1 branch .. //depot/projects/arla/bin/ed/test/s1.t#1 branch .. //depot/projects/arla/bin/ed/test/s10.err#1 branch .. //depot/projects/arla/bin/ed/test/s2.d#1 branch .. //depot/projects/arla/bin/ed/test/s2.err#1 branch .. //depot/projects/arla/bin/ed/test/s2.r#1 branch .. //depot/projects/arla/bin/ed/test/s2.t#1 branch .. //depot/projects/arla/bin/ed/test/s3.d#1 branch .. //depot/projects/arla/bin/ed/test/s3.err#1 branch .. //depot/projects/arla/bin/ed/test/s3.r#1 branch .. //depot/projects/arla/bin/ed/test/s3.t#1 branch .. //depot/projects/arla/bin/ed/test/s4.err#1 branch .. //depot/projects/arla/bin/ed/test/s5.err#1 branch .. //depot/projects/arla/bin/ed/test/s6.err#1 branch .. //depot/projects/arla/bin/ed/test/s7.err#1 branch .. //depot/projects/arla/bin/ed/test/s8.err#1 branch .. //depot/projects/arla/bin/ed/test/s9.err#1 branch .. //depot/projects/arla/bin/ed/test/t.d#1 branch .. //depot/projects/arla/bin/ed/test/t.r#1 branch .. //depot/projects/arla/bin/ed/test/t1.d#1 branch .. //depot/projects/arla/bin/ed/test/t1.err#1 branch .. //depot/projects/arla/bin/ed/test/t1.r#1 branch .. //depot/projects/arla/bin/ed/test/t1.t#1 branch .. //depot/projects/arla/bin/ed/test/t2.d#1 branch .. //depot/projects/arla/bin/ed/test/t2.err#1 branch .. //depot/projects/arla/bin/ed/test/t2.r#1 branch .. //depot/projects/arla/bin/ed/test/t2.t#1 branch .. //depot/projects/arla/bin/ed/test/u.d#1 branch .. //depot/projects/arla/bin/ed/test/u.err#1 branch .. //depot/projects/arla/bin/ed/test/u.r#1 branch .. //depot/projects/arla/bin/ed/test/u.t#1 branch .. //depot/projects/arla/bin/ed/test/v.d#1 branch .. //depot/projects/arla/bin/ed/test/v.r#1 branch .. //depot/projects/arla/bin/ed/test/v.t#1 branch .. //depot/projects/arla/bin/ed/test/w.d#1 branch .. //depot/projects/arla/bin/ed/test/w.r#1 branch .. //depot/projects/arla/bin/ed/test/w.t#1 branch .. //depot/projects/arla/bin/ed/test/w1.err#1 branch .. //depot/projects/arla/bin/ed/test/w2.err#1 branch .. //depot/projects/arla/bin/ed/test/w3.err#1 branch .. //depot/projects/arla/bin/ed/test/x.err#1 branch .. //depot/projects/arla/bin/ed/test/z.err#1 branch .. //depot/projects/arla/bin/ed/undo.c#1 branch .. //depot/projects/arla/bin/expr/Makefile#1 branch .. //depot/projects/arla/bin/expr/expr.1#1 branch .. //depot/projects/arla/bin/expr/expr.y#1 branch .. //depot/projects/arla/bin/getfacl/Makefile#1 branch .. //depot/projects/arla/bin/getfacl/getfacl.1#1 branch .. //depot/projects/arla/bin/getfacl/getfacl.c#1 branch .. //depot/projects/arla/bin/hostname/Makefile#1 branch .. //depot/projects/arla/bin/hostname/hostname.1#1 branch .. //depot/projects/arla/bin/hostname/hostname.c#1 branch .. //depot/projects/arla/bin/kenv/Makefile#1 branch .. //depot/projects/arla/bin/kenv/kenv.1#1 branch .. //depot/projects/arla/bin/kenv/kenv.c#1 branch .. //depot/projects/arla/bin/kill/Makefile#1 branch .. //depot/projects/arla/bin/kill/kill.1#1 branch .. //depot/projects/arla/bin/kill/kill.c#1 branch .. //depot/projects/arla/bin/ln/Makefile#1 branch .. //depot/projects/arla/bin/ln/ln.1#1 branch .. //depot/projects/arla/bin/ln/ln.c#1 branch .. //depot/projects/arla/bin/ln/symlink.7#1 branch .. //depot/projects/arla/bin/ls/Makefile#1 branch .. //depot/projects/arla/bin/ls/cmp.c#1 branch .. //depot/projects/arla/bin/ls/extern.h#1 branch .. //depot/projects/arla/bin/ls/ls.1#1 branch .. //depot/projects/arla/bin/ls/ls.c#1 branch .. //depot/projects/arla/bin/ls/ls.h#1 branch .. //depot/projects/arla/bin/ls/print.c#1 branch .. //depot/projects/arla/bin/ls/util.c#1 branch .. //depot/projects/arla/bin/mkdir/Makefile#1 branch .. //depot/projects/arla/bin/mkdir/mkdir.1#1 branch .. //depot/projects/arla/bin/mkdir/mkdir.c#1 branch .. //depot/projects/arla/bin/mv/Makefile#1 branch .. //depot/projects/arla/bin/mv/mv.1#1 branch .. //depot/projects/arla/bin/mv/mv.c#1 branch .. //depot/projects/arla/bin/pax/Makefile#1 branch .. //depot/projects/arla/bin/pax/ar_io.c#1 branch .. //depot/projects/arla/bin/pax/ar_subs.c#1 branch .. //depot/projects/arla/bin/pax/buf_subs.c#1 branch .. //depot/projects/arla/bin/pax/cache.c#1 branch .. //depot/projects/arla/bin/pax/cache.h#1 branch .. //depot/projects/arla/bin/pax/cpio.1#1 branch .. //depot/projects/arla/bin/pax/cpio.c#1 branch .. //depot/projects/arla/bin/pax/cpio.h#1 branch .. //depot/projects/arla/bin/pax/extern.h#1 branch .. //depot/projects/arla/bin/pax/file_subs.c#1 branch .. //depot/projects/arla/bin/pax/ftree.c#1 branch .. //depot/projects/arla/bin/pax/ftree.h#1 branch .. //depot/projects/arla/bin/pax/gen_subs.c#1 branch .. //depot/projects/arla/bin/pax/getoldopt.c#1 branch .. //depot/projects/arla/bin/pax/options.c#1 branch .. //depot/projects/arla/bin/pax/options.h#1 branch .. //depot/projects/arla/bin/pax/pat_rep.c#1 branch .. //depot/projects/arla/bin/pax/pat_rep.h#1 branch .. //depot/projects/arla/bin/pax/pax.1#1 branch .. //depot/projects/arla/bin/pax/pax.c#1 branch .. //depot/projects/arla/bin/pax/pax.h#1 branch .. //depot/projects/arla/bin/pax/sel_subs.c#1 branch .. //depot/projects/arla/bin/pax/sel_subs.h#1 branch .. //depot/projects/arla/bin/pax/tables.c#1 branch .. //depot/projects/arla/bin/pax/tables.h#1 branch .. //depot/projects/arla/bin/pax/tar.1#1 branch .. //depot/projects/arla/bin/pax/tar.c#1 branch .. //depot/projects/arla/bin/pax/tar.h#1 branch .. //depot/projects/arla/bin/pax/tty_subs.c#1 branch .. //depot/projects/arla/bin/ps/Makefile#1 branch .. //depot/projects/arla/bin/ps/extern.h#1 branch .. //depot/projects/arla/bin/ps/fmt.c#1 branch .. //depot/projects/arla/bin/ps/keyword.c#1 branch .. //depot/projects/arla/bin/ps/nlist.c#1 branch .. //depot/projects/arla/bin/ps/print.c#1 branch .. //depot/projects/arla/bin/ps/ps.1#1 branch .. //depot/projects/arla/bin/ps/ps.c#1 branch .. //depot/projects/arla/bin/ps/ps.h#1 branch .. //depot/projects/arla/bin/pwd/Makefile#1 branch .. //depot/projects/arla/bin/pwd/pwd.1#1 branch .. //depot/projects/arla/bin/pwd/pwd.c#1 branch .. //depot/projects/arla/bin/rcp/Makefile#1 branch .. //depot/projects/arla/bin/rcp/extern.h#1 branch .. //depot/projects/arla/bin/rcp/rcp.1#1 branch .. //depot/projects/arla/bin/rcp/rcp.c#1 branch .. //depot/projects/arla/bin/rcp/util.c#1 branch .. //depot/projects/arla/bin/realpath/Makefile#1 branch .. //depot/projects/arla/bin/realpath/realpath.1#1 branch .. //depot/projects/arla/bin/realpath/realpath.c#1 branch .. //depot/projects/arla/bin/rm/Makefile#1 branch .. //depot/projects/arla/bin/rm/rm.1#1 branch .. //depot/projects/arla/bin/rm/rm.c#1 branch .. //depot/projects/arla/bin/rmail/Makefile#1 branch .. //depot/projects/arla/bin/rmdir/Makefile#1 branch .. //depot/projects/arla/bin/rmdir/rmdir.1#1 branch .. //depot/projects/arla/bin/rmdir/rmdir.c#1 branch .. //depot/projects/arla/bin/setfacl/Makefile#1 branch .. //depot/projects/arla/bin/setfacl/file.c#1 branch .. //depot/projects/arla/bin/setfacl/mask.c#1 branch .. //depot/projects/arla/bin/setfacl/merge.c#1 branch .. //depot/projects/arla/bin/setfacl/remove.c#1 branch .. //depot/projects/arla/bin/setfacl/setfacl.1#1 branch .. //depot/projects/arla/bin/setfacl/setfacl.c#1 branch .. //depot/projects/arla/bin/setfacl/setfacl.h#1 branch .. //depot/projects/arla/bin/setfacl/util.c#1 branch .. //depot/projects/arla/bin/sh/Makefile#1 branch .. //depot/projects/arla/bin/sh/TOUR#1 branch .. //depot/projects/arla/bin/sh/alias.c#1 branch .. //depot/projects/arla/bin/sh/alias.h#1 branch .. //depot/projects/arla/bin/sh/arith.h#1 branch .. //depot/projects/arla/bin/sh/arith.y#1 branch .. //depot/projects/arla/bin/sh/arith_lex.l#1 branch .. //depot/projects/arla/bin/sh/bltin/bltin.h#1 branch .. //depot/projects/arla/bin/sh/bltin/echo.1#1 branch .. //depot/projects/arla/bin/sh/bltin/echo.c#1 branch .. //depot/projects/arla/bin/sh/builtins.def#1 branch .. //depot/projects/arla/bin/sh/cd.c#1 branch .. //depot/projects/arla/bin/sh/cd.h#1 branch .. //depot/projects/arla/bin/sh/error.c#1 branch .. //depot/projects/arla/bin/sh/error.h#1 branch .. //depot/projects/arla/bin/sh/eval.c#1 branch .. //depot/projects/arla/bin/sh/eval.h#1 branch .. //depot/projects/arla/bin/sh/exec.c#1 branch .. //depot/projects/arla/bin/sh/exec.h#1 branch .. //depot/projects/arla/bin/sh/expand.c#1 branch .. //depot/projects/arla/bin/sh/expand.h#1 branch .. //depot/projects/arla/bin/sh/funcs/cmv#1 branch .. //depot/projects/arla/bin/sh/funcs/dirs#1 branch .. //depot/projects/arla/bin/sh/funcs/kill#1 branch .. //depot/projects/arla/bin/sh/funcs/login#1 branch .. //depot/projects/arla/bin/sh/funcs/newgrp#1 branch .. //depot/projects/arla/bin/sh/funcs/popd#1 branch .. //depot/projects/arla/bin/sh/funcs/pushd#1 branch .. //depot/projects/arla/bin/sh/funcs/suspend#1 branch .. //depot/projects/arla/bin/sh/histedit.c#1 branch .. //depot/projects/arla/bin/sh/init.h#1 branch .. //depot/projects/arla/bin/sh/input.c#1 branch .. //depot/projects/arla/bin/sh/input.h#1 branch .. //depot/projects/arla/bin/sh/jobs.c#1 branch .. //depot/projects/arla/bin/sh/jobs.h#1 branch .. //depot/projects/arla/bin/sh/mail.c#1 branch .. //depot/projects/arla/bin/sh/mail.h#1 branch .. //depot/projects/arla/bin/sh/main.c#1 branch .. //depot/projects/arla/bin/sh/main.h#1 branch .. //depot/projects/arla/bin/sh/memalloc.c#1 branch .. //depot/projects/arla/bin/sh/memalloc.h#1 branch .. //depot/projects/arla/bin/sh/miscbltin.c#1 branch .. //depot/projects/arla/bin/sh/mkbuiltins#1 branch .. //depot/projects/arla/bin/sh/mkinit.c#1 branch .. //depot/projects/arla/bin/sh/mknodes.c#1 branch .. //depot/projects/arla/bin/sh/mksyntax.c#1 branch .. //depot/projects/arla/bin/sh/mktokens#1 branch .. //depot/projects/arla/bin/sh/myhistedit.h#1 branch .. //depot/projects/arla/bin/sh/mystring.c#1 branch .. //depot/projects/arla/bin/sh/mystring.h#1 branch .. //depot/projects/arla/bin/sh/nodes.c.pat#1 branch .. //depot/projects/arla/bin/sh/nodetypes#1 branch .. //depot/projects/arla/bin/sh/options.c#1 branch .. //depot/projects/arla/bin/sh/options.h#1 branch .. //depot/projects/arla/bin/sh/output.c#1 branch .. //depot/projects/arla/bin/sh/output.h#1 branch .. //depot/projects/arla/bin/sh/parser.c#1 branch .. //depot/projects/arla/bin/sh/parser.h#1 branch .. //depot/projects/arla/bin/sh/redir.c#1 branch .. //depot/projects/arla/bin/sh/redir.h#1 branch .. //depot/projects/arla/bin/sh/sh.1#1 branch .. //depot/projects/arla/bin/sh/shell.h#1 branch .. //depot/projects/arla/bin/sh/show.c#1 branch .. //depot/projects/arla/bin/sh/show.h#1 branch .. //depot/projects/arla/bin/sh/trap.c#1 branch .. //depot/projects/arla/bin/sh/trap.h#1 branch .. //depot/projects/arla/bin/sh/var.c#1 branch .. //depot/projects/arla/bin/sh/var.h#1 branch .. //depot/projects/arla/bin/sleep/Makefile#1 branch .. //depot/projects/arla/bin/sleep/sleep.1#1 branch .. //depot/projects/arla/bin/sleep/sleep.c#1 branch .. //depot/projects/arla/bin/stty/Makefile#1 branch .. //depot/projects/arla/bin/stty/cchar.c#1 branch .. //depot/projects/arla/bin/stty/extern.h#1 branch .. //depot/projects/arla/bin/stty/gfmt.c#1 branch .. //depot/projects/arla/bin/stty/key.c#1 branch .. //depot/projects/arla/bin/stty/modes.c#1 branch .. //depot/projects/arla/bin/stty/print.c#1 branch .. //depot/projects/arla/bin/stty/stty.1#1 branch .. //depot/projects/arla/bin/stty/stty.c#1 branch .. //depot/projects/arla/bin/stty/stty.h#1 branch .. //depot/projects/arla/bin/stty/util.c#1 branch .. //depot/projects/arla/bin/sync/Makefile#1 branch .. //depot/projects/arla/bin/sync/sync.8#1 branch .. //depot/projects/arla/bin/sync/sync.c#1 branch .. //depot/projects/arla/bin/test/Makefile#1 branch .. //depot/projects/arla/bin/test/TEST.README#1 branch .. //depot/projects/arla/bin/test/TEST.csh#1 branch .. //depot/projects/arla/bin/test/TEST.sh#1 branch .. //depot/projects/arla/bin/test/test.1#1 branch .. //depot/projects/arla/bin/test/test.c#1 branch .. //depot/projects/arla/contrib/amd/AUTHORS#1 branch .. //depot/projects/arla/contrib/amd/BUGS#1 branch .. //depot/projects/arla/contrib/amd/COPYING#1 branch .. //depot/projects/arla/contrib/amd/ChangeLog#1 branch .. //depot/projects/arla/contrib/amd/FREEBSD-Xlist#1 branch .. //depot/projects/arla/contrib/amd/FREEBSD-upgrade#1 branch .. //depot/projects/arla/contrib/amd/INSTALL#1 branch .. //depot/projects/arla/contrib/amd/MIRRORS.html#1 branch .. //depot/projects/arla/contrib/amd/MIRRORS.txt#1 branch .. //depot/projects/arla/contrib/amd/NEWS#1 branch .. //depot/projects/arla/contrib/amd/README#1 branch .. //depot/projects/arla/contrib/amd/README.ldap#1 branch .. //depot/projects/arla/contrib/amd/README.y2k#1 branch .. //depot/projects/arla/contrib/amd/amd/am_ops.c#1 branch .. //depot/projects/arla/contrib/amd/amd/amd.8#1 branch .. //depot/projects/arla/contrib/amd/amd/amd.c#1 branch .. //depot/projects/arla/contrib/amd/amd/amd.h#1 branch .. //depot/projects/arla/contrib/amd/amd/amfs_auto.c#1 branch .. //depot/projects/arla/contrib/amd/amd/amfs_direct.c#1 branch .. //depot/projects/arla/contrib/amd/amd/amfs_error.c#1 branch .. //depot/projects/arla/contrib/amd/amd/amfs_host.c#1 branch .. //depot/projects/arla/contrib/amd/amd/amfs_inherit.c#1 branch .. //depot/projects/arla/contrib/amd/amd/amfs_link.c#1 branch .. //depot/projects/arla/contrib/amd/amd/amfs_linkx.c#1 branch .. //depot/projects/arla/contrib/amd/amd/amfs_nfsl.c#1 branch .. //depot/projects/arla/contrib/amd/amd/amfs_nfsx.c#1 branch .. //depot/projects/arla/contrib/amd/amd/amfs_program.c#1 branch .. //depot/projects/arla/contrib/amd/amd/amfs_root.c#1 branch .. //depot/projects/arla/contrib/amd/amd/amfs_toplvl.c#1 branch .. //depot/projects/arla/contrib/amd/amd/amfs_union.c#1 branch .. //depot/projects/arla/contrib/amd/amd/amq_subr.c#1 branch .. //depot/projects/arla/contrib/amd/amd/amq_svc.c#1 branch .. //depot/projects/arla/contrib/amd/amd/autil.c#1 branch .. //depot/projects/arla/contrib/amd/amd/clock.c#1 branch .. //depot/projects/arla/contrib/amd/amd/conf.c#1 branch .. //depot/projects/arla/contrib/amd/amd/conf_parse.y#1 branch .. //depot/projects/arla/contrib/amd/amd/conf_tok.l#1 branch .. //depot/projects/arla/contrib/amd/amd/get_args.c#1 branch .. //depot/projects/arla/contrib/amd/amd/info_file.c#1 branch .. //depot/projects/arla/contrib/amd/amd/info_hesiod.c#1 branch .. //depot/projects/arla/contrib/amd/amd/info_ldap.c#1 branch .. //depot/projects/arla/contrib/amd/amd/info_ndbm.c#1 branch .. //depot/projects/arla/contrib/amd/amd/info_nis.c#1 branch .. //depot/projects/arla/contrib/amd/amd/info_nisplus.c#1 branch .. //depot/projects/arla/contrib/amd/amd/info_passwd.c#1 branch .. //depot/projects/arla/contrib/amd/amd/info_union.c#1 branch .. //depot/projects/arla/contrib/amd/amd/map.c#1 branch .. //depot/projects/arla/contrib/amd/amd/mapc.c#1 branch .. //depot/projects/arla/contrib/amd/amd/mntfs.c#1 branch .. //depot/projects/arla/contrib/amd/amd/nfs_prot_svc.c#1 branch .. //depot/projects/arla/contrib/amd/amd/nfs_start.c#1 branch .. //depot/projects/arla/contrib/amd/amd/nfs_subr.c#1 branch .. //depot/projects/arla/contrib/amd/amd/ops_TEMPLATE.c#1 branch .. //depot/projects/arla/contrib/amd/amd/ops_cachefs.c#1 branch .. //depot/projects/arla/contrib/amd/amd/ops_cdfs.c#1 branch .. //depot/projects/arla/contrib/amd/amd/ops_efs.c#1 branch .. //depot/projects/arla/contrib/amd/amd/ops_lofs.c#1 branch .. //depot/projects/arla/contrib/amd/amd/ops_mfs.c#1 branch .. //depot/projects/arla/contrib/amd/amd/ops_nfs.c#1 branch .. //depot/projects/arla/contrib/amd/amd/ops_nfs3.c#1 branch .. //depot/projects/arla/contrib/amd/amd/ops_nullfs.c#1 branch .. //depot/projects/arla/contrib/amd/amd/ops_pcfs.c#1 branch .. //depot/projects/arla/contrib/amd/amd/ops_tfs.c#1 branch .. //depot/projects/arla/contrib/amd/amd/ops_tmpfs.c#1 branch .. //depot/projects/arla/contrib/amd/amd/ops_ufs.c#1 branch .. //depot/projects/arla/contrib/amd/amd/ops_umapfs.c#1 branch .. //depot/projects/arla/contrib/amd/amd/ops_unionfs.c#1 branch .. //depot/projects/arla/contrib/amd/amd/ops_xfs.c#1 branch .. //depot/projects/arla/contrib/amd/amd/opts.c#1 branch .. //depot/projects/arla/contrib/amd/amd/restart.c#1 branch .. //depot/projects/arla/contrib/amd/amd/rpc_fwd.c#1 branch .. //depot/projects/arla/contrib/amd/amd/sched.c#1 branch .. //depot/projects/arla/contrib/amd/amd/srvr_amfs_auto.c#1 branch .. //depot/projects/arla/contrib/amd/amd/srvr_nfs.c#1 branch .. //depot/projects/arla/contrib/amd/amq/amq.8#1 branch .. //depot/projects/arla/contrib/amd/amq/amq.c#1 branch .. //depot/projects/arla/contrib/amd/amq/amq.h#1 branch .. //depot/projects/arla/contrib/amd/amq/amq_clnt.c#1 branch .. //depot/projects/arla/contrib/amd/amq/amq_xdr.c#1 branch .. //depot/projects/arla/contrib/amd/amq/pawd.1#1 branch .. //depot/projects/arla/contrib/amd/amq/pawd.c#1 branch .. //depot/projects/arla/contrib/amd/aux_conf.h.in#1 branch .. //depot/projects/arla/contrib/amd/bootstrap#1 branch .. //depot/projects/arla/contrib/amd/conf/checkmount/checkmount_bsd44.c#1 branch .. //depot/projects/arla/contrib/amd/conf/fh_dref/fh_dref_freebsd22.h#1 branch .. //depot/projects/arla/contrib/amd/conf/mtab/mtab_bsd.c#1 branch .. //depot/projects/arla/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#1 branch .. //depot/projects/arla/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#1 branch .. //depot/projects/arla/contrib/amd/conf/sa_dref/sa_dref_bsd44.h#1 branch .. //depot/projects/arla/contrib/amd/conf/transp/transp_sockets.c#1 branch .. //depot/projects/arla/contrib/amd/conf/trap/trap_default.h#1 branch .. //depot/projects/arla/contrib/amd/conf/umount/umount_bsd44.c#1 branch .. //depot/projects/arla/contrib/amd/doc/am-utils.texi#1 branch .. //depot/projects/arla/contrib/amd/doc/texinfo.tex#1 branch .. //depot/projects/arla/contrib/amd/doc/version.texi#1 branch .. //depot/projects/arla/contrib/amd/fixmount/fixmount.8#1 branch .. //depot/projects/arla/contrib/amd/fixmount/fixmount.c#1 branch .. //depot/projects/arla/contrib/amd/fsinfo/fsi_analyze.c#1 branch .. //depot/projects/arla/contrib/amd/fsinfo/fsi_data.h#1 branch .. //depot/projects/arla/contrib/amd/fsinfo/fsi_dict.c#1 branch .. //depot/projects/arla/contrib/amd/fsinfo/fsi_gram.y#1 branch .. //depot/projects/arla/contrib/amd/fsinfo/fsi_lex.l#1 branch .. //depot/projects/arla/contrib/amd/fsinfo/fsi_util.c#1 branch .. //depot/projects/arla/contrib/amd/fsinfo/fsinfo.8#1 branch .. //depot/projects/arla/contrib/amd/fsinfo/fsinfo.c#1 branch .. //depot/projects/arla/contrib/amd/fsinfo/fsinfo.h#1 branch .. //depot/projects/arla/contrib/amd/fsinfo/wr_atab.c#1 branch .. //depot/projects/arla/contrib/amd/fsinfo/wr_bparam.c#1 branch .. //depot/projects/arla/contrib/amd/fsinfo/wr_dumpset.c#1 branch .. //depot/projects/arla/contrib/amd/fsinfo/wr_exportfs.c#1 branch .. //depot/projects/arla/contrib/amd/fsinfo/wr_fstab.c#1 branch .. //depot/projects/arla/contrib/amd/hlfsd/hlfsd.8#1 branch .. //depot/projects/arla/contrib/amd/hlfsd/hlfsd.c#1 branch .. //depot/projects/arla/contrib/amd/hlfsd/hlfsd.h#1 branch .. //depot/projects/arla/contrib/amd/hlfsd/homedir.c#1 branch .. //depot/projects/arla/contrib/amd/hlfsd/nfs_prot_svc.c#1 branch .. //depot/projects/arla/contrib/amd/hlfsd/stubs.c#1 branch .. //depot/projects/arla/contrib/amd/include/am_compat.h#1 branch .. //depot/projects/arla/contrib/amd/include/am_defs.h#1 branch .. //depot/projects/arla/contrib/amd/include/am_utils.h#1 branch .. //depot/projects/arla/contrib/amd/include/am_xdr_func.h#1 branch .. //depot/projects/arla/contrib/amd/include/amq_defs.h#1 branch .. //depot/projects/arla/contrib/amd/include/mount_headers1.h#1 branch .. //depot/projects/arla/contrib/amd/include/mount_headers2.h#1 branch .. //depot/projects/arla/contrib/amd/ldap-id.ms#1 branch .. //depot/projects/arla/contrib/amd/ldap-id.txt#1 branch .. //depot/projects/arla/contrib/amd/libamu/alloca.c#1 branch .. //depot/projects/arla/contrib/amd/libamu/amu.h#1 branch .. //depot/projects/arla/contrib/amd/libamu/hasmntopt.c#1 branch .. //depot/projects/arla/contrib/amd/libamu/misc_rpc.c#1 branch .. //depot/projects/arla/contrib/amd/libamu/mount_fs.c#1 branch .. //depot/projects/arla/contrib/amd/libamu/mtab.c#1 branch .. //depot/projects/arla/contrib/amd/libamu/nfs_prot_xdr.c#1 branch .. //depot/projects/arla/contrib/amd/libamu/strerror.c#1 branch .. //depot/projects/arla/contrib/amd/libamu/util.c#1 branch .. //depot/projects/arla/contrib/amd/libamu/wire.c#1 branch .. //depot/projects/arla/contrib/amd/libamu/xdr_func.c#1 branch .. //depot/projects/arla/contrib/amd/libamu/xutil.c#1 branch .. //depot/projects/arla/contrib/amd/m4/GNUmakefile#1 branch .. //depot/projects/arla/contrib/amd/m4/amdgrep#1 branch .. //depot/projects/arla/contrib/amd/m4/amindent#1 branch .. //depot/projects/arla/contrib/amd/m4/autopat#1 branch .. //depot/projects/arla/contrib/amd/m4/chop-aclocal.pl#1 branch .. //depot/projects/arla/contrib/amd/m4/copy-if-newbig#1 branch .. //depot/projects/arla/contrib/amd/m4/macros/HEADER#1 branch .. //depot/projects/arla/contrib/amd/m4/macros/TRAILER#1 branch .. //depot/projects/arla/contrib/amd/m4/mk-aclocal#1 branch .. //depot/projects/arla/contrib/amd/m4/mkconf#1 branch .. //depot/projects/arla/contrib/amd/m4/rmtspc#1 branch .. //depot/projects/arla/contrib/amd/m4/update_build_version#1 branch .. //depot/projects/arla/contrib/amd/mk-amd-map/mk-amd-map.8#1 branch .. //depot/projects/arla/contrib/amd/mk-amd-map/mk-amd-map.c#1 branch .. //depot/projects/arla/contrib/amd/scripts/Makefile.am#1 branch .. //depot/projects/arla/contrib/amd/scripts/Makefile.in#1 branch .. //depot/projects/arla/contrib/amd/scripts/am-eject.in#1 branch .. //depot/projects/arla/contrib/amd/scripts/amd.conf-sample#1 branch .. //depot/projects/arla/contrib/amd/scripts/amd.conf.5#1 branch .. //depot/projects/arla/contrib/amd/scripts/amd2ldif.in#1 branch .. //depot/projects/arla/contrib/amd/scripts/amd2sun.in#1 branch .. //depot/projects/arla/contrib/amd/scripts/automount2amd.8#1 branch .. //depot/projects/arla/contrib/amd/scripts/automount2amd.in#1 branch .. //depot/projects/arla/contrib/amd/scripts/ctl-amd.in#1 branch .. //depot/projects/arla/contrib/amd/scripts/ctl-hlfsd.in#1 branch .. //depot/projects/arla/contrib/amd/scripts/expn.1#1 branch .. //depot/projects/arla/contrib/amd/scripts/expn.in#1 branch .. //depot/projects/arla/contrib/amd/scripts/fix-amd-map.in#1 branch .. //depot/projects/arla/contrib/amd/scripts/fixrmtab.in#1 branch .. //depot/projects/arla/contrib/amd/scripts/redhat-ctl-amd.in#1 branch .. //depot/projects/arla/contrib/amd/scripts/wait4amd.in#1 branch .. //depot/projects/arla/contrib/amd/scripts/wait4amd2die.in#1 branch .. //depot/projects/arla/contrib/amd/tasks#1 branch .. //depot/projects/arla/contrib/amd/wire-test/wire-test.8#1 branch .. //depot/projects/arla/contrib/amd/wire-test/wire-test.c#1 branch .. //depot/projects/arla/contrib/bc/AUTHORS#1 branch .. //depot/projects/arla/contrib/bc/ChangeLog#1 branch .. //depot/projects/arla/contrib/bc/Examples/ckbook.b#1 branch .. //depot/projects/arla/contrib/bc/Examples/pi.b#1 branch .. //depot/projects/arla/contrib/bc/Examples/primes.b#1 branch .. //depot/projects/arla/contrib/bc/Examples/twins.b#1 branch .. //depot/projects/arla/contrib/bc/FAQ#1 branch .. //depot/projects/arla/contrib/bc/FREEBSD-upgrade#1 branch .. //depot/projects/arla/contrib/bc/INSTALL#1 branch .. //depot/projects/arla/contrib/bc/Makefile.am#1 branch .. //depot/projects/arla/contrib/bc/Makefile.in#1 branch .. //depot/projects/arla/contrib/bc/NEWS#1 branch .. //depot/projects/arla/contrib/bc/README#1 branch .. //depot/projects/arla/contrib/bc/Test/BUG.bc#1 branch .. //depot/projects/arla/contrib/bc/Test/array.b#1 branch .. //depot/projects/arla/contrib/bc/Test/arrayp.b#1 branch .. //depot/projects/arla/contrib/bc/Test/aryprm.b#1 branch .. //depot/projects/arla/contrib/bc/Test/atan.b#1 branch .. //depot/projects/arla/contrib/bc/Test/checklib.b#1 branch .. //depot/projects/arla/contrib/bc/Test/div.b#1 branch .. //depot/projects/arla/contrib/bc/Test/exp.b#1 branch .. //depot/projects/arla/contrib/bc/Test/fact.b#1 branch .. //depot/projects/arla/contrib/bc/Test/jn.b#1 branch .. //depot/projects/arla/contrib/bc/Test/ln.b#1 branch .. //depot/projects/arla/contrib/bc/Test/mul.b#1 branch .. //depot/projects/arla/contrib/bc/Test/raise.b#1 branch .. //depot/projects/arla/contrib/bc/Test/signum#1 branch .. //depot/projects/arla/contrib/bc/Test/sine.b#1 branch .. //depot/projects/arla/contrib/bc/Test/sqrt.b#1 branch .. //depot/projects/arla/contrib/bc/Test/sqrt1.b#1 branch .. //depot/projects/arla/contrib/bc/Test/sqrt2.b#1 branch .. //depot/projects/arla/contrib/bc/Test/testfn.b#1 branch .. //depot/projects/arla/contrib/bc/Test/timetest#1 branch .. //depot/projects/arla/contrib/bc/acconfig.h#1 branch .. //depot/projects/arla/contrib/bc/aclocal.m4#1 branch .. //depot/projects/arla/contrib/bc/bc/Makefile.am#1 branch .. //depot/projects/arla/contrib/bc/bc/Makefile.in#1 branch .. //depot/projects/arla/contrib/bc/bc/bc.y#1 branch .. //depot/projects/arla/contrib/bc/bc/bcdefs.h#1 branch .. //depot/projects/arla/contrib/bc/bc/const.h#1 branch .. //depot/projects/arla/contrib/bc/bc/execute.c#1 branch .. //depot/projects/arla/contrib/bc/bc/fix-libmath_h#1 branch .. //depot/projects/arla/contrib/bc/bc/global.c#1 branch .. //depot/projects/arla/contrib/bc/bc/global.h#1 branch .. //depot/projects/arla/contrib/bc/bc/libmath.b#1 branch .. //depot/projects/arla/contrib/bc/bc/libmath.h#1 branch .. //depot/projects/arla/contrib/bc/bc/load.c#1 branch .. //depot/projects/arla/contrib/bc/bc/main.c#1 branch .. //depot/projects/arla/contrib/bc/bc/proto.h#1 branch .. //depot/projects/arla/contrib/bc/bc/sbc.y#1 branch .. //depot/projects/arla/contrib/bc/bc/scan.l#1 branch .. //depot/projects/arla/contrib/bc/bc/storage.c#1 branch .. //depot/projects/arla/contrib/bc/bc/util.c#1 branch .. //depot/projects/arla/contrib/bc/config.h.in#1 branch .. //depot/projects/arla/contrib/bc/configure#1 branch .. //depot/projects/arla/contrib/bc/configure.in#1 branch .. //depot/projects/arla/contrib/bc/dc/Makefile.am#1 branch .. //depot/projects/arla/contrib/bc/dc/Makefile.in#1 branch .. //depot/projects/arla/contrib/bc/dc/array.c#1 branch .. //depot/projects/arla/contrib/bc/dc/dc-proto.h#1 branch .. //depot/projects/arla/contrib/bc/dc/dc-regdef.h#1 branch .. //depot/projects/arla/contrib/bc/dc/dc.c#1 branch .. //depot/projects/arla/contrib/bc/dc/dc.h#1 branch .. //depot/projects/arla/contrib/bc/dc/eval.c#1 branch .. //depot/projects/arla/contrib/bc/dc/misc.c#1 branch .. //depot/projects/arla/contrib/bc/dc/numeric.c#1 branch .. //depot/projects/arla/contrib/bc/dc/stack.c#1 branch .. //depot/projects/arla/contrib/bc/dc/string.c#1 branch .. //depot/projects/arla/contrib/bc/doc/Makefile.am#1 branch .. //depot/projects/arla/contrib/bc/doc/Makefile.in#1 branch .. //depot/projects/arla/contrib/bc/doc/bc.1#1 branch .. //depot/projects/arla/contrib/bc/doc/bc.texi#1 branch .. //depot/projects/arla/contrib/bc/doc/dc.1#1 branch .. //depot/projects/arla/contrib/bc/doc/dc.texi#1 branch .. //depot/projects/arla/contrib/bc/h/number.h#1 branch .. //depot/projects/arla/contrib/bc/install-sh#1 branch .. //depot/projects/arla/contrib/bc/lib/Makefile.am#1 branch .. //depot/projects/arla/contrib/bc/lib/Makefile.in#1 branch .. //depot/projects/arla/contrib/bc/lib/number.c#1 branch .. //depot/projects/arla/contrib/bc/lib/testmul.c#1 branch .. //depot/projects/arla/contrib/bc/lib/vfprintf.c#1 branch .. //depot/projects/arla/contrib/bc/missing#1 branch .. //depot/projects/arla/contrib/bc/mkinstalldirs#1 branch .. //depot/projects/arla/contrib/bc/stamp-h.in#1 branch .. //depot/projects/arla/contrib/bind9/CHANGES#1 branch .. //depot/projects/arla/contrib/bind9/COPYRIGHT#1 branch .. //depot/projects/arla/contrib/bind9/FAQ#1 branch .. //depot/projects/arla/contrib/bind9/FAQ.xml#1 branch .. //depot/projects/arla/contrib/bind9/FREEBSD-Upgrade#1 branch .. //depot/projects/arla/contrib/bind9/FREEBSD-Xlist#1 branch .. //depot/projects/arla/contrib/bind9/Makefile.in#1 branch .. //depot/projects/arla/contrib/bind9/README#1 branch .. //depot/projects/arla/contrib/bind9/acconfig.h#1 branch .. //depot/projects/arla/contrib/bind9/bin/Makefile.in#1 branch .. //depot/projects/arla/contrib/bind9/bin/check/Makefile.in#1 branch .. //depot/projects/arla/contrib/bind9/bin/check/check-tool.c#1 branch .. //depot/projects/arla/contrib/bind9/bin/check/check-tool.h#1 branch .. //depot/projects/arla/contrib/bind9/bin/check/named-checkconf.8#1 branch .. //depot/projects/arla/contrib/bind9/bin/check/named-checkconf.c#1 branch .. //depot/projects/arla/contrib/bind9/bin/check/named-checkconf.docbook#1 branch .. //depot/projects/arla/contrib/bind9/bin/check/named-checkconf.html#1 branch .. //depot/projects/arla/contrib/bind9/bin/check/named-checkzone.8#1 branch .. //depot/projects/arla/contrib/bind9/bin/check/named-checkzone.c#1 branch .. //depot/projects/arla/contrib/bind9/bin/check/named-checkzone.docbook#1 branch .. //depot/projects/arla/contrib/bind9/bin/check/named-checkzone.html#1 branch .. //depot/projects/arla/contrib/bind9/bin/dig/Makefile.in#1 branch .. //depot/projects/arla/contrib/bind9/bin/dig/dig.1#1 branch .. //depot/projects/arla/contrib/bind9/bin/dig/dig.c#1 branch .. //depot/projects/arla/contrib/bind9/bin/dig/dig.docbook#1 branch .. //depot/projects/arla/contrib/bind9/bin/dig/dig.html#1 branch .. //depot/projects/arla/contrib/bind9/bin/dig/dighost.c#1 branch .. //depot/projects/arla/contrib/bind9/bin/dig/host.1#1 branch .. //depot/projects/arla/contrib/bind9/bin/dig/host.c#1 branch .. //depot/projects/arla/contrib/bind9/bin/dig/host.docbook#1 branch .. //depot/projects/arla/contrib/bind9/bin/dig/host.html#1 branch .. //depot/projects/arla/contrib/bind9/bin/dig/include/dig/dig.h#1 branch .. //depot/projects/arla/contrib/bind9/bin/dig/nslookup.1#1 branch .. //depot/projects/arla/contrib/bind9/bin/dig/nslookup.c#1 branch .. //depot/projects/arla/contrib/bind9/bin/dig/nslookup.docbook#1 branch .. //depot/projects/arla/contrib/bind9/bin/dig/nslookup.html#1 branch .. //depot/projects/arla/contrib/bind9/bin/dnssec/Makefile.in#1 branch .. //depot/projects/arla/contrib/bind9/bin/dnssec/dnssec-keygen.8#1 branch .. //depot/projects/arla/contrib/bind9/bin/dnssec/dnssec-keygen.c#1 branch .. //depot/projects/arla/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#1 branch .. //depot/projects/arla/contrib/bind9/bin/dnssec/dnssec-keygen.html#1 branch .. //depot/projects/arla/contrib/bind9/bin/dnssec/dnssec-signzone.8#1 branch .. //depot/projects/arla/contrib/bind9/bin/dnssec/dnssec-signzone.c#1 branch .. //depot/projects/arla/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#1 branch .. //depot/projects/arla/contrib/bind9/bin/dnssec/dnssec-signzone.html#1 branch .. //depot/projects/arla/contrib/bind9/bin/dnssec/dnssectool.c#1 branch .. //depot/projects/arla/contrib/bind9/bin/dnssec/dnssectool.h#1 branch .. //depot/projects/arla/contrib/bind9/bin/named/Makefile.in#1 branch .. //depot/projects/arla/contrib/bind9/bin/named/aclconf.c#1 branch .. //depot/projects/arla/contrib/bind9/bin/named/builtin.c#1 branch .. //depot/projects/arla/contrib/bind9/bin/named/client.c#1 branch .. //depot/projects/arla/contrib/bind9/bin/named/config.c#1 branch .. //depot/projects/arla/contrib/bind9/bin/named/control.c#1 branch .. //depot/projects/arla/contrib/bind9/bin/named/controlconf.c#1 branch .. //depot/projects/arla/contrib/bind9/bin/named/include/named/aclconf.h#1 branch .. //depot/projects/arla/contrib/bind9/bin/named/include/named/builtin.h#1 branch .. //depot/projects/arla/contrib/bind9/bin/named/include/named/client.h#1 branch .. //depot/projects/arla/contrib/bind9/bin/named/include/named/config.h#1 branch .. //depot/projects/arla/contrib/bind9/bin/named/include/named/control.h#1 branch .. //depot/projects/arla/contrib/bind9/bin/named/include/named/globals.h#1 branch .. //depot/projects/arla/contrib/bind9/bin/named/include/named/interfacemgr.h#1 branch .. //depot/projects/arla/contrib/bind9/bin/named/include/named/listenlist.h#1 branch .. //depot/projects/arla/contrib/bind9/bin/named/include/named/log.h#1 branch .. //depot/projects/arla/contrib/bind9/bin/named/include/named/logconf.h#1 branch .. //depot/projects/arla/contrib/bind9/bin/named/include/named/lwaddr.h#1 branch .. //depot/projects/arla/contrib/bind9/bin/named/include/named/lwdclient.h#1 branch .. //depot/projects/arla/contrib/bind9/bin/named/include/named/lwresd.h#1 branch .. //depot/projects/arla/contrib/bind9/bin/named/include/named/lwsearch.h#1 branch .. //depot/projects/arla/contrib/bind9/bin/named/include/named/main.h#1 branch .. //depot/projects/arla/contrib/bind9/bin/named/include/named/notify.h#1 branch .. //depot/projects/arla/contrib/bind9/bin/named/include/named/ns_smf_globals.h#1 branch .. //depot/projects/arla/contrib/bind9/bin/named/include/named/query.h#1 branch .. //depot/projects/arla/contrib/bind9/bin/named/include/named/server.h#1 branch .. //depot/projects/arla/contrib/bind9/bin/named/include/named/sortlist.h#1 branch .. //depot/projects/arla/contrib/bind9/bin/named/include/named/tkeyconf.h#1 branch .. //depot/projects/arla/contrib/bind9/bin/named/include/named/tsigconf.h#1 branch .. //depot/projects/arla/contrib/bind9/bin/named/include/named/types.h#1 branch .. //depot/projects/arla/contrib/bind9/bin/named/include/named/update.h#1 branch .. //depot/projects/arla/contrib/bind9/bin/named/include/named/xfrout.h#1 branch .. //depot/projects/arla/contrib/bind9/bin/named/include/named/zoneconf.h#1 branch .. //depot/projects/arla/contrib/bind9/bin/named/interfacemgr.c#1 branch .. //depot/projects/arla/contrib/bind9/bin/named/listenlist.c#1 branch .. //depot/projects/arla/contrib/bind9/bin/named/log.c#1 branch .. //depot/projects/arla/contrib/bind9/bin/named/logconf.c#1 branch .. //depot/projects/arla/contrib/bind9/bin/named/lwaddr.c#1 branch .. //depot/projects/arla/contrib/bind9/bin/named/lwdclient.c#1 branch .. //depot/projects/arla/contrib/bind9/bin/named/lwderror.c#1 branch .. //depot/projects/arla/contrib/bind9/bin/named/lwdgabn.c#1 branch .. //depot/projects/arla/contrib/bind9/bin/named/lwdgnba.c#1 branch .. //depot/projects/arla/contrib/bind9/bin/named/lwdgrbn.c#1 branch .. //depot/projects/arla/contrib/bind9/bin/named/lwdnoop.c#1 branch .. //depot/projects/arla/contrib/bind9/bin/named/lwresd.8#1 branch .. //depot/projects/arla/contrib/bind9/bin/named/lwresd.c#1 branch .. //depot/projects/arla/contrib/bind9/bin/named/lwresd.docbook#1 branch .. //depot/projects/arla/contrib/bind9/bin/named/lwresd.html#1 branch .. //depot/projects/arla/contrib/bind9/bin/named/lwsearch.c#1 branch .. //depot/projects/arla/contrib/bind9/bin/named/main.c#1 branch .. //depot/projects/arla/contrib/bind9/bin/named/named.8#1 branch .. //depot/projects/arla/contrib/bind9/bin/named/named.conf.5#1 branch .. //depot/projects/arla/contrib/bind9/bin/named/named.conf.docbook#1 branch .. //depot/projects/arla/contrib/bind9/bin/named/named.conf.html#1 branch .. //depot/projects/arla/contrib/bind9/bin/named/named.docbook#1 branch .. //depot/projects/arla/contrib/bind9/bin/named/named.html#1 branch .. //depot/projects/arla/contrib/bind9/bin/named/notify.c#1 branch .. //depot/projects/arla/contrib/bind9/bin/named/query.c#1 branch .. //depot/projects/arla/contrib/bind9/bin/named/server.c#1 branch .. //depot/projects/arla/contrib/bind9/bin/named/sortlist.c#1 branch .. //depot/projects/arla/contrib/bind9/bin/named/tkeyconf.c#1 branch .. //depot/projects/arla/contrib/bind9/bin/named/tsigconf.c#1 branch .. //depot/projects/arla/contrib/bind9/bin/named/unix/Makefile.in#1 branch .. //depot/projects/arla/contrib/bind9/bin/named/unix/include/named/os.h#1 branch .. //depot/projects/arla/contrib/bind9/bin/named/unix/os.c#1 branch .. //depot/projects/arla/contrib/bind9/bin/named/update.c#1 branch .. //depot/projects/arla/contrib/bind9/bin/named/xfrout.c#1 branch .. //depot/projects/arla/contrib/bind9/bin/named/zoneconf.c#1 branch .. //depot/projects/arla/contrib/bind9/bin/nsupdate/Makefile.in#1 branch .. //depot/projects/arla/contrib/bind9/bin/nsupdate/nsupdate.8#1 branch .. //depot/projects/arla/contrib/bind9/bin/nsupdate/nsupdate.c#1 branch .. //depot/projects/arla/contrib/bind9/bin/nsupdate/nsupdate.docbook#1 branch .. //depot/projects/arla/contrib/bind9/bin/nsupdate/nsupdate.html#1 branch .. //depot/projects/arla/contrib/bind9/bin/rndc/Makefile.in#1 branch .. //depot/projects/arla/contrib/bind9/bin/rndc/include/rndc/os.h#1 branch .. //depot/projects/arla/contrib/bind9/bin/rndc/rndc-confgen.8#1 branch .. //depot/projects/arla/contrib/bind9/bin/rndc/rndc-confgen.c#1 branch .. //depot/projects/arla/contrib/bind9/bin/rndc/rndc-confgen.docbook#1 branch .. //depot/projects/arla/contrib/bind9/bin/rndc/rndc-confgen.html#1 branch .. //depot/projects/arla/contrib/bind9/bin/rndc/rndc.8#1 branch .. //depot/projects/arla/contrib/bind9/bin/rndc/rndc.c#1 branch .. //depot/projects/arla/contrib/bind9/bin/rndc/rndc.conf#1 branch .. //depot/projects/arla/contrib/bind9/bin/rndc/rndc.conf.5#1 branch .. //depot/projects/arla/contrib/bind9/bin/rndc/rndc.conf.docbook#1 branch .. //depot/projects/arla/contrib/bind9/bin/rndc/rndc.conf.html#1 branch .. //depot/projects/arla/contrib/bind9/bin/rndc/rndc.docbook#1 branch .. //depot/projects/arla/contrib/bind9/bin/rndc/rndc.html#1 branch .. //depot/projects/arla/contrib/bind9/bin/rndc/unix/Makefile.in#1 branch .. //depot/projects/arla/contrib/bind9/bin/rndc/unix/os.c#1 branch .. //depot/projects/arla/contrib/bind9/bin/rndc/util.c#1 branch .. //depot/projects/arla/contrib/bind9/bin/rndc/util.h#1 branch .. //depot/projects/arla/contrib/bind9/config.guess#1 branch .. //depot/projects/arla/contrib/bind9/config.sub#1 branch .. //depot/projects/arla/contrib/bind9/config.threads.in#1 branch .. //depot/projects/arla/contrib/bind9/configure.in#1 branch .. //depot/projects/arla/contrib/bind9/doc/Makefile.in#1 branch .. //depot/projects/arla/contrib/bind9/doc/arm/Bv9ARM-book.xml#1 branch .. //depot/projects/arla/contrib/bind9/doc/arm/Bv9ARM.ch01.html#1 branch .. //depot/projects/arla/contrib/bind9/doc/arm/Bv9ARM.ch02.html#1 branch .. //depot/projects/arla/contrib/bind9/doc/arm/Bv9ARM.ch03.html#1 branch .. //depot/projects/arla/contrib/bind9/doc/arm/Bv9ARM.ch04.html#1 branch .. //depot/projects/arla/contrib/bind9/doc/arm/Bv9ARM.ch05.html#1 branch .. //depot/projects/arla/contrib/bind9/doc/arm/Bv9ARM.ch06.html#1 branch .. //depot/projects/arla/contrib/bind9/doc/arm/Bv9ARM.ch07.html#1 branch .. //depot/projects/arla/contrib/bind9/doc/arm/Bv9ARM.ch08.html#1 branch .. //depot/projects/arla/contrib/bind9/doc/arm/Bv9ARM.ch09.html#1 branch .. //depot/projects/arla/contrib/bind9/doc/arm/Bv9ARM.html#1 branch .. //depot/projects/arla/contrib/bind9/doc/arm/Bv9ARM.pdf#1 branch .. //depot/projects/arla/contrib/bind9/doc/arm/Makefile.in#1 branch .. //depot/projects/arla/contrib/bind9/doc/arm/README-SGML#1 branch .. //depot/projects/arla/contrib/bind9/doc/draft/draft-baba-dnsext-acl-reqts-01.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/draft/draft-daigle-napstr-04.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/draft/draft-danisch-dns-rr-smtp-03.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/draft/draft-dnsext-opcode-discover-02.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/draft/draft-durand-dnsop-dynreverse-00.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/draft/draft-ietf-dnsext-2929bis-01.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/draft/draft-ietf-dnsext-axfr-clarify-05.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-09.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/draft/draft-ietf-dnsext-dns-name-p-s-00.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-2535typecode-change-06.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-bis-updates-01.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-experiments-01.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-00.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-opt-in-07.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-trans-02.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/draft/draft-ietf-dnsext-ecc-key-07.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-06.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-02.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/draft/draft-ietf-dnsext-keyrr-key-signing-flag-12.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-43.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-02.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2536bis-dsa-06.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2538bis-04.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2539bis-dhk-06.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/draft/draft-ietf-dnsext-signed-nonexistence-requirements-01.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-05.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-01.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-04.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-08.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-04.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-04.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/draft/draft-ietf-dnsop-inaddr-required-07.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-06.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-11.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-transport-guidelines-01.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-02.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-02.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-04.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/draft/draft-ietf-enum-e164-gstn-np-05.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/draft/draft-ietf-ipv6-node-requirements-08.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/draft/draft-ietf-secsh-dns-05.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/draft/draft-ihren-dnsext-threshold-validation-00.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/draft/draft-kato-dnsop-local-zones-00.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/draft/draft-park-ipv6-extensions-dns-pnp-00.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/draft/update#1 branch .. //depot/projects/arla/contrib/bind9/doc/misc/Makefile.in#1 branch .. //depot/projects/arla/contrib/bind9/doc/misc/dnssec#1 branch .. //depot/projects/arla/contrib/bind9/doc/misc/format-options.pl#1 branch .. //depot/projects/arla/contrib/bind9/doc/misc/ipv6#1 branch .. //depot/projects/arla/contrib/bind9/doc/misc/migration#1 branch .. //depot/projects/arla/contrib/bind9/doc/misc/migration-4to9#1 branch .. //depot/projects/arla/contrib/bind9/doc/misc/options#1 branch .. //depot/projects/arla/contrib/bind9/doc/misc/rfc-compliance#1 branch .. //depot/projects/arla/contrib/bind9/doc/misc/roadmap#1 branch .. //depot/projects/arla/contrib/bind9/doc/misc/sdb#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/index#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc1032.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc1033.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc1034.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc1035.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc1101.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc1122.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc1123.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc1183.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc1348.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc1535.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc1536.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc1537.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc1591.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc1611.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc1612.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc1706.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc1712.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc1750.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc1876.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc1886.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc1982.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc1995.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc1996.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc2052.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc2104.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc2119.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc2133.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc2136.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc2137.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc2163.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc2168.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc2181.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc2230.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc2308.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc2317.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc2373.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc2374.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc2375.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc2418.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc2535.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc2536.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc2537.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc2538.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc2539.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc2540.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc2541.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc2553.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc2671.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc2672.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc2673.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc2782.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc2825.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc2826.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc2845.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc2874.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc2915.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc2929.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc2930.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc2931.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc3007.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc3008.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc3071.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc3090.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc3110.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc3123.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc3152.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc3197.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc3225.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc3226.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc3258.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc3363.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc3364.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc3425.txt#1 branch .. //depot/projects/arla/contrib/bind9/doc/rfc/rfc3445.txt#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jun 6 04:29:08 2006 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 1E3EB16A921; Tue, 6 Jun 2006 03:53:46 +0000 (UTC) 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 19F9B16A7AA for ; Tue, 6 Jun 2006 03:10:57 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C062743D5F for ; Tue, 6 Jun 2006 03:10:55 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k56399fD088528 for ; Tue, 6 Jun 2006 03:09:09 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k563997P088525 for perforce@freebsd.org; Tue, 6 Jun 2006 03:09:09 GMT (envelope-from jb@freebsd.org) Date: Tue, 6 Jun 2006 03:09:09 GMT Message-Id: <200606060309.k563997P088525@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 98625 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, 06 Jun 2006 04:29:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=98625 Change 98625 by jb@jb_freebsd2 on 2006/06/06 03:08:18 Add a function to get DTrace high resolution time independent of any other functions that can have DTrace probes enabled on them. DTrace high resolution time is equivalent to FreeBSD's nanouptime. Affected files ... .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/dtrace.h#18 edit .. //depot/projects/dtrace/src/sys/kern/kern_tc.c#2 edit .. //depot/projects/dtrace/src/sys/sys/time.h#4 edit Differences ... ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/dtrace.h#18 (text) ==== @@ -2231,7 +2231,9 @@ extern void (*dtrace_debugger_fini)(void); extern dtrace_cacheid_t dtrace_predcache_id; +#if defined(sun) extern hrtime_t dtrace_gethrtime(void); +#endif extern void dtrace_sync(void); extern void dtrace_toxic_ranges(void (*)(uintptr_t, uintptr_t)); extern void dtrace_xcall(processorid_t, dtrace_xcall_t, void *); ==== //depot/projects/dtrace/src/sys/kern/kern_tc.c#2 (text+ko) ==== @@ -10,6 +10,7 @@ #include __FBSDID("$FreeBSD: src/sys/kern/kern_tc.c,v 1.175 2006/03/15 20:22:32 phk Exp $"); +#include "opt_kdtrace.h" #include "opt_ntp.h" #include @@ -303,6 +304,34 @@ } /* + * DTrace needs a high resolution time function which can + * be called from a probe context and guaranteed not to have + * instrumented with probes itself. It avoids instrumenting + * functions with the 'dtrace_' prefix. + * + * The 'high resolution' time is actually nanoseconds uptime. + */ +#ifdef KDTRACE +uint64_t +dtrace_gethrtime() +{ + struct timehands *th; + u_int gen; + uint64_t hrt; + + do { + th = timehands; + gen = th->th_generation; + + hrt = th->th_offset.sec * (uint64_t)1000000000 + + (((uint64_t)1000000000 * (uint32_t)(th->th_offset.frac >> 32)) >> 32); + } while (gen == 0 || gen != th->th_generation); + + return (hrt); +} +#endif + +/* * Initialize a new timecounter and possibly use it. */ void ==== //depot/projects/dtrace/src/sys/sys/time.h#4 (text+ko) ==== @@ -304,6 +304,7 @@ void timevaladd(struct timeval *t1, const struct timeval *t2); void timevalsub(struct timeval *t1, const struct timeval *t2); int tvtohz(struct timeval *tv); +uint64_t dtrace_gethrtime(void); #else /* !_KERNEL */ #include From owner-p4-projects@FreeBSD.ORG Tue Jun 6 04:34:23 2006 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 5D74616AE2D; Tue, 6 Jun 2006 03:57:59 +0000 (UTC) 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 8C54B16A99A for ; Tue, 6 Jun 2006 03:14:00 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4990B43D46 for ; Tue, 6 Jun 2006 03:14:00 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k563CDJj088722 for ; Tue, 6 Jun 2006 03:12:13 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k563CDBn088719 for perforce@freebsd.org; Tue, 6 Jun 2006 03:12:13 GMT (envelope-from jb@freebsd.org) Date: Tue, 6 Jun 2006 03:12:13 GMT Message-Id: <200606060312.k563CDBn088719@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 98626 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, 06 Jun 2006 04:34:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=98626 Change 98626 by jb@jb_freebsd2 on 2006/06/06 03:11:29 Enable most of the remaining safety tests. Some of these fail for certain FBT probes which are not safe to be called from a DTrace probe context. That's a FBT problem not a problem with the DTrace infrastructure or the tests. The tests are just reporting it the way it is. I need to narrow down the functions which appear unsafe when called from a DTrace probe context. Needles and hay-stacks. Sigh. Affected files ... .. //depot/projects/dtrace/src/cddl/test/dtrace/Makefile#16 edit Differences ... ==== //depot/projects/dtrace/src/cddl/test/dtrace/Makefile#16 (text+ko) ==== @@ -317,8 +317,7 @@ ${.CURDIR}/tst/common/dtraceUtil/tst.ZeroFunctionProbes.d.ksh \ ${.CURDIR}/tst/common/dtraceUtil/tst.ZeroNameProbes.d.ksh \ ${.CURDIR}/tst/common/dtraceUtil/tst.ZeroProbeIdentfier.d.ksh \ - ${.CURDIR}/tst/common/dtraceUtil/tst.ZeroProbesWithoutZ.d.ksh \ - ${.CURDIR}/tst/common/dtraceUtil/tst.ZeroProviderProbes.d.ksh + ${.CURDIR}/tst/common/dtraceUtil/tst.ZeroProbesWithoutZ.d.ksh TESTEND= \ ${.CURDIR}/tst/common/end/err.D_IDENT_UNDEF.timespent.d \ @@ -646,8 +645,26 @@ ${.CURDIR}/tst/common/providers/tst.twoprof.d TESTSAFETY= \ + ${.CURDIR}/tst/common/safety/tst.cleanpath.d \ ${.CURDIR}/tst/common/safety/tst.copyin.d \ - ${.CURDIR}/tst/common/safety/tst.shortstr.d + ${.CURDIR}/tst/common/safety/tst.ddi_pathname.d \ + ${.CURDIR}/tst/common/safety/tst.dirname.d \ + ${.CURDIR}/tst/common/safety/tst.index.d \ + ${.CURDIR}/tst/common/safety/tst.null.d \ + ${.CURDIR}/tst/common/safety/tst.progenyof.d \ + ${.CURDIR}/tst/common/safety/tst.random.d \ + ${.CURDIR}/tst/common/safety/tst.shortstr.d \ + ${.CURDIR}/tst/common/safety/tst.stack.d \ + ${.CURDIR}/tst/common/safety/tst.stackdepth.d \ + ${.CURDIR}/tst/common/safety/tst.strchr.d \ + ${.CURDIR}/tst/common/safety/tst.strjoin.d \ + ${.CURDIR}/tst/common/safety/tst.strstr.d \ + ${.CURDIR}/tst/common/safety/tst.strtok.d \ + ${.CURDIR}/tst/common/safety/tst.substr.d \ + ${.CURDIR}/tst/common/safety/tst.unalign.d \ + ${.CURDIR}/tst/common/safety/tst.uregs.d \ + ${.CURDIR}/tst/common/safety/tst.ustack.d \ + ${.CURDIR}/tst/common/safety/tst.ustackdepth.d \ TESTSCALARS= \ ${.CURDIR}/tst/common/scalars/err.D_ARR_LOCAL.thisarray.d \ @@ -797,6 +814,7 @@ TESTTRACE= \ ${.CURDIR}/tst/common/trace/err.D_TRACE_VOID.bad.d \ ${.CURDIR}/tst/common/trace/err.D_PROTO_LEN.bad.d \ + ${.CURDIR}/tst/common/trace/tst.misc.d \ ${.CURDIR}/tst/common/trace/tst.qstring.d \ ${.CURDIR}/tst/common/trace/tst.string.d @@ -1268,6 +1286,9 @@ ${.CURDIR}/tst/common/profile-n/tst.ufunc.ksh \ ${.CURDIR}/tst/common/profile-n/tst.umod.ksh \ ${.CURDIR}/tst/common/profile-n/tst.usym.ksh \ + ${.CURDIR}/tst/common/safety/tst.rw.d \ + ${.CURDIR}/tst/common/safety/tst.vahole.d \ + ${.CURDIR}/tst/common/safety/tst.violentdeath.ksh \ ${.CURDIR}/tst/common/scalars/tst.selfarray2.d \ ${.CURDIR}/tst/common/scripting/err.D_MACRO_UNDEF.invalidargs.d \ ${.CURDIR}/tst/common/scripting/err.D_OP_LVAL.rdonly.d \ @@ -1288,39 +1309,11 @@ ${.CURDIR}/tst/common/speculation/err.D_ACT_SPEC.SpeculateWithPanic.d \ ${.CURDIR}/tst/common/speculation/err.D_ACT_SPEC.SpeculateWithRaise.d \ ${.CURDIR}/tst/common/speculation/err.D_ACT_SPEC.SpeculateWithStop.d \ - ${.CURDIR}/tst/common/trace/tst.misc.d \ - ${.CURDIR}/tst/common/tracemem/err.D_TRACEMEM_ADDR.badaddr.d + ${.CURDIR}/tst/common/tracemem/err.D_TRACEMEM_ADDR.badaddr.d \ notwork : ${.CURDIR}/bin/dtest ${NOTWORK} @${.CURDIR}/bin/dtest ${NOTWORK} -REQUIRES_FBT= \ - ${.CURDIR}/tst/common/misc/tst.roch.d \ - ${.CURDIR}/tst/common/predicates/tst.argsnotcached.d \ - ${.CURDIR}/tst/common/safety/tst.cleanpath.d \ - ${.CURDIR}/tst/common/safety/tst.ddi_pathname.d \ - ${.CURDIR}/tst/common/safety/tst.dirname.d \ - ${.CURDIR}/tst/common/safety/tst.index.d \ - ${.CURDIR}/tst/common/safety/tst.msgdsize.d \ - ${.CURDIR}/tst/common/safety/tst.msgsize.d \ - ${.CURDIR}/tst/common/safety/tst.null.d \ - ${.CURDIR}/tst/common/safety/tst.progenyof.d \ - ${.CURDIR}/tst/common/safety/tst.random.d \ - ${.CURDIR}/tst/common/safety/tst.rw.d \ - ${.CURDIR}/tst/common/safety/tst.stack.d \ - ${.CURDIR}/tst/common/safety/tst.stackdepth.d \ - ${.CURDIR}/tst/common/safety/tst.strchr.d \ - ${.CURDIR}/tst/common/safety/tst.strjoin.d \ - ${.CURDIR}/tst/common/safety/tst.strstr.d \ - ${.CURDIR}/tst/common/safety/tst.strtok.d \ - ${.CURDIR}/tst/common/safety/tst.substr.d \ - ${.CURDIR}/tst/common/safety/tst.unalign.d \ - ${.CURDIR}/tst/common/safety/tst.uregs.d \ - ${.CURDIR}/tst/common/safety/tst.ustack.d \ - ${.CURDIR}/tst/common/safety/tst.ustackdepth.d \ - ${.CURDIR}/tst/common/safety/tst.vahole.d \ - ${.CURDIR}/tst/common/safety/tst.violentdeath.ksh - REQUIRES_LIBPROC= \ ${.CURDIR}/tst/common/vars/tst.ucaller.ksh \ ${.CURDIR}/tst/common/misc/tst.schrock.ksh @@ -1358,10 +1351,14 @@ ${.CURDIR}/tst/common/funcs/tst.mutex_owner.d \ ${.CURDIR}/tst/common/funcs/tst.mutex_type_adaptive.d \ ${.CURDIR}/tst/common/misc/tst.include.ksh \ + ${.CURDIR}/tst/common/misc/tst.roch.d \ + ${.CURDIR}/tst/common/predicates/tst.argsnotcached.d \ ${.CURDIR}/tst/common/predicates/tst.predcache.ksh \ ${.CURDIR}/tst/common/preprocessor/err.D_PRAGCTL_INVAL.tabdefine.d \ ${.CURDIR}/tst/common/printf/tst.sym.d \ ${.CURDIR}/tst/common/probes/tst.probestar.d \ + ${.CURDIR}/tst/common/safety/tst.msgdsize.d \ + ${.CURDIR}/tst/common/safety/tst.msgsize.d \ ${.CURDIR}/tst/common/tracemem/tst.rootvp.d \ ${.CURDIR}/tst/common/types/tst.complex.d \ ${.CURDIR}/tst/common/types/tst.struct.d \ @@ -1377,6 +1374,7 @@ ${.CURDIR}/tst/common/dtraceUtil/tst.DestructWithName.d.ksh \ ${.CURDIR}/tst/common/dtraceUtil/tst.DestructWithProvider.d.ksh \ ${.CURDIR}/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh \ + ${.CURDIR}/tst/common/dtraceUtil/tst.ZeroProviderProbes.d.ksh \ ${.CURDIR}/tst/common/funcs/tst.chill.ksh \ ${.CURDIR}/tst/common/inline/tst.InlineKinds.d \ ${.CURDIR}/tst/common/printa/tst.stack.d \ From owner-p4-projects@FreeBSD.ORG Tue Jun 6 04:36:36 2006 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 8DA4516CD33; Tue, 6 Jun 2006 04:00:11 +0000 (UTC) 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 790DC16A65F for ; Tue, 6 Jun 2006 03:18:06 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4B2C143D45 for ; Tue, 6 Jun 2006 03:18:06 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k563GJ4D088903 for ; Tue, 6 Jun 2006 03:16:19 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k563GJiD088900 for perforce@freebsd.org; Tue, 6 Jun 2006 03:16:19 GMT (envelope-from jb@freebsd.org) Date: Tue, 6 Jun 2006 03:16:19 GMT Message-Id: <200606060316.k563GJiD088900@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 98627 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, 06 Jun 2006 04:36:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=98627 Change 98627 by jb@jb_freebsd2 on 2006/06/06 03:16:09 Use the new built-in dtrace_gethrtime(). Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_freebsd.c#2 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_freebsd.c#2 (text+ko) ==== @@ -31,15 +31,6 @@ hrtime_t dtrace_gethrestime(void) { - struct timespec ts; - getnanouptime(&ts); - return (((u_int64_t) ts.tv_sec) * 1000000000 + ts.tv_nsec); -} - -hrtime_t -dtrace_gethrtime(void) -{ - struct timespec ts; - getnanouptime(&ts); - return (((u_int64_t) ts.tv_sec) * 1000000000 + ts.tv_nsec); + /* XXX This should get the walltimestamp */ + return (dtrace_gethrtime()); } From owner-p4-projects@FreeBSD.ORG Tue Jun 6 05:18:57 2006 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 85B4516A9DE; Tue, 6 Jun 2006 04:49:11 +0000 (UTC) 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 339E116A754 for ; Tue, 6 Jun 2006 04:13:02 +0000 (UTC) (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 CC5BB43D48 for ; Tue, 6 Jun 2006 04:13:01 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k564BFBF094942 for ; Tue, 6 Jun 2006 04:11:15 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k564AQFg094922 for perforce@freebsd.org; Tue, 6 Jun 2006 04:10:26 GMT (envelope-from scottl@freebsd.org) Date: Tue, 6 Jun 2006 04:10:26 GMT Message-Id: <200606060410.k564AQFg094922@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 98628 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, 06 Jun 2006 05:18:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=98628 Change 98628 by scottl@scottl-x64 on 2006/06/06 04:10:05 IFC Affected files ... .. //depot/projects/scottl-camlock/src/sys/Makefile#7 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/busdma_machdep.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/pmap.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/busdma_machdep.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/elf_trampoline.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/pmap.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/vm_machdep.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/cpuconf.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/cpufunc.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/pmap.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/arm/sa11x0/assabet_machdep.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/arm/sa11x0/sa11x0_var.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/biosdisk.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/bsm/audit.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/bsm/audit_record.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_ccb.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#34 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_all.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linprocfs/linprocfs.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/conf/Makefile.arm#6 integrate .. //depot/projects/scottl-camlock/src/sys/conf/NOTES#10 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files#10 integrate .. //depot/projects/scottl-camlock/src/sys/conf/kern.mk#5 integrate .. //depot/projects/scottl-camlock/src/sys/conf/options.arm#7 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/COPYRIGHT#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/README#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/ah.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/ah_desc.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/ah_devid.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/ah_soc.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/freebsd/ah_if.m#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/freebsd/ah_osdep.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/freebsd/ah_osdep.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/ap30.hal.o.uu#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/ap30.inc#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/ap30.opt_ah.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/ap43.hal.o.uu#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/ap43.inc#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/ap43.opt_ah.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/ap51.hal.o.uu#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/ap51.inc#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/ap51.opt_ah.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/ap61.hal.o.uu#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/ap61.inc#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/ap61.opt_ah.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/armv4-be-elf.inc#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/armv4-le-elf.inc#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/i386-elf.inc#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/mips-be-elf.inc#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/mips-le-elf.inc#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/mips1-be-elf.inc#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/mips1-le-elf.inc#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.inc#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.inc#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/powerpc-be-eabi.inc#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/powerpc-be-elf.inc#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/powerpc-le-eabi.inc#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/sh4-le-elf.inc#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/sparc-be-elf.hal.o.uu#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/sparc-be-elf.inc#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/sparc-be-elf.opt_ah.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/sparc64-be-elf.inc#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/x86_64-elf.inc#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/xscale-be-elf.inc#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/xscale-le-elf.inc#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/version.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/crypto/via/padlock.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpi_support/acpi_panasonic.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_hpet.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ahb/ahb.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/if_ath.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/if_ath_pci.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/if_athvar.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/awi/awi.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bfe/if_bfe.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bfe/if_bfereg.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ciss/ciss.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/dc/dcphy.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/dc/if_dc.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/dc/if_dcreg.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/gem/if_gem.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hifn/hifn7751.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ipw/if_ipw.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_freebsd.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_freebsd.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iwi/if_iwi.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/le/if_le_pci.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/lmc/if_lmc.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_cam.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_cam.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_debug.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_pci.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_raid.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_raid.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_reg.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/my/if_my.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ofw/ofw_console.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pccbb/pccbb.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pccbb/pccbb_isa.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pccbb/pccbb_pci.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pccbb/pccbbvar.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pci/pcireg.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ral/rt2560.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ral/rt2661.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/safe/safe.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/midi/midi.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/midi/sequencer.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ubsec/ubsec.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ehci.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ehci_pci.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/if_axe.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/if_axereg.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/if_ural.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ohci.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ohci_pci.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ohcireg.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ohcivar.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/sl811hs.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/sl811hsvar.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ugen.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/uhci.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/uhci_pci.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/uhcivar.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_mem.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdi.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdivar.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/wi/if_wi.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/doc/subsys/Doxyfile-cam#2 integrate .. //depot/projects/scottl-camlock/src/sys/doc/subsys/Doxyfile-crypto#2 integrate .. //depot/projects/scottl-camlock/src/sys/doc/subsys/Doxyfile-dev_pci#2 integrate .. //depot/projects/scottl-camlock/src/sys/doc/subsys/Doxyfile-dev_sound#2 integrate .. //depot/projects/scottl-camlock/src/sys/doc/subsys/Doxyfile-dev_usb#2 integrate .. //depot/projects/scottl-camlock/src/sys/doc/subsys/Doxyfile-geom#2 integrate .. //depot/projects/scottl-camlock/src/sys/doc/subsys/Doxyfile-i4b#2 integrate .. //depot/projects/scottl-camlock/src/sys/doc/subsys/Doxyfile-kern#2 integrate .. //depot/projects/scottl-camlock/src/sys/doc/subsys/Doxyfile-libkern#2 integrate .. //depot/projects/scottl-camlock/src/sys/doc/subsys/Doxyfile-linux#2 integrate .. //depot/projects/scottl-camlock/src/sys/doc/subsys/Doxyfile-net80211#2 integrate .. //depot/projects/scottl-camlock/src/sys/doc/subsys/Doxyfile-netgraph#2 integrate .. //depot/projects/scottl-camlock/src/sys/doc/subsys/Doxyfile-netinet#2 integrate .. //depot/projects/scottl-camlock/src/sys/doc/subsys/Doxyfile-netinet6#2 integrate .. //depot/projects/scottl-camlock/src/sys/doc/subsys/Doxyfile-netipsec#2 integrate .. //depot/projects/scottl-camlock/src/sys/doc/subsys/Doxyfile-opencrypto#2 integrate .. //depot/projects/scottl-camlock/src/sys/doc/subsys/Doxyfile-vm#2 integrate .. //depot/projects/scottl-camlock/src/sys/doc/subsys/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sys/doc/subsys/notreviewed.dox#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/msdosfs/msdosfs_vfsops.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nullfs/null_vfsops.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/fs/procfs/procfs.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/fs/smbfs/smbfs_vnops.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/geom/eli/g_eli.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/geom/eli/g_eli.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/geom/eli/g_eli_ctl.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/geom/eli/g_eli_integrity.c#1 branch .. //depot/projects/scottl-camlock/src/sys/geom/eli/g_eli_key.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/geom/eli/g_eli_privacy.c#1 branch .. //depot/projects/scottl-camlock/src/sys/geom/geom.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/geom/geom_gpt.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/geom/geom_io.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/FreeBSD/xfs_frw.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/FreeBSD/xfs_fs_subr.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/FreeBSD/xfs_iget.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/FreeBSD/xfs_ioctl.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_attr.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_bit.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_dfrag.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_dir2_trace.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_inode.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_iomap.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_trans.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_vfsops.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_vnodeops.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/busdma_machdep.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/initcpu.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/machdep.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/minidump_machdep.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/pmap.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/ptrace_machdep.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/vm_machdep.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/md_var.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/npx.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/i386/isa/npx.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/conf/NOTES#6 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/busdma_machdep.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/pmap.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/ssc.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_acct.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_event.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_exec.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_exit.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_mutex.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_switch.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_synch.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_disk.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_stack.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_aio.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_mount.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_syscalls.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vnode_if.src#6 integrate .. //depot/projects/scottl-camlock/src/sys/modules/acpi/acpi/Makefile#6 integrate .. //depot/projects/scottl-camlock/src/sys/modules/acpi/acpi_asus/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/sys/modules/acpi/acpi_panasonic/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sys/modules/acpi/acpi_toshiba/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/sys/modules/acpi/acpi_video/Makefile#5 integrate .. //depot/projects/scottl-camlock/src/sys/modules/cpufreq/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/sys/modules/fdc/Makefile#6 integrate .. //depot/projects/scottl-camlock/src/sys/modules/geom/geom_eli/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/sys/modules/mfi/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/sys/net/bpf.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/net/bpf.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/net/bpf_filter.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/net/bpfdesc.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/net/if.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_disc.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_faith.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_fwsubr.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_gif.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_gre.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_loop.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_media.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_sl.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_stf.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_tap.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_tun.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/net/raw_cb.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/net/raw_usrreq.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/net/route.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_input.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_node.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/atm/uni/ng_uni_cust.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_base.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_iface.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/in_pcb.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_carp.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_gre.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_timer.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_usrreq.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/udp_usrreq.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/netipsec/ipsec.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/netipsec/ipsec_input.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_vfsops.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/nfsserver/nfs_serv.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/nfsserver/nfs_srvsubs.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/opencrypto/criov.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/opencrypto/crypto.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/opencrypto/cryptodev.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/opencrypto/cryptosoft.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/opencrypto/xform.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/pc98/pc98/machdep.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/pci/agp_amd64.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/pci/agp_sis.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/mmu_if.m#3 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/mmu_oea.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/pmap_dispatch.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/security/audit/audit.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/security/audit/audit_arg.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/security/audit/audit_bsm.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/security/audit/audit_bsm_klib.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/security/audit/audit_bsm_token.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/security/audit/audit_ioctl.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/security/audit/audit_pipe.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/security/audit/audit_private.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/security/audit/audit_syscalls.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/security/audit/audit_worker.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/include/pmap.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/isa/isa.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/pmap.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/sys/elf_common.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/sys/mutex.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/tools/vnode_if.awk#7 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ffs/ffs_vfsops.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ufs/ufs_vnops.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/vm/pmap.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_extern.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_glue.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_map.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_map.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_meter.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_page.c#8 integrate Differences ... ==== //depot/projects/scottl-camlock/src/sys/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/Makefile,v 1.35 2006/03/17 18:54:34 ru Exp $ +# $FreeBSD: src/sys/Makefile,v 1.36 2006/05/29 19:29:41 maxim Exp $ .include @@ -11,10 +11,10 @@ # Directories to include in cscope name file and TAGS. CSCOPEDIRS= coda compat conf contrib crypto ddb dev fs gnu i4b isa \ - isofs kern libkern modules net netatalk netatm netgraph \ - netinet netinet6 netipx netkey netnatm netncp netsmb nfs \ - nfsclient nfs4client rpc pccard pci posix4 sys ufs vm \ - ${ARCHDIR} + isofs kern libkern modules net net80211 netatalk netatm \ + netgraph netinet netinet6 netipx netkey netnatm netncp \ + netsmb nfs nfsclient nfs4client rpc pccard pci posix4 sys \ + ufs vm ${ARCHDIR} ARCHDIR ?= ${MACHINE} ==== //depot/projects/scottl-camlock/src/sys/amd64/amd64/busdma_machdep.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.74 2006/05/03 04:14:17 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.77 2006/06/01 04:49:29 silby Exp $"); #include #include @@ -492,7 +492,16 @@ } } + /* + * XXX: + * (dmat->alignment < dmat->maxsize) is just a quick hack; the exact + * alignment guarantees of malloc need to be nailed down, and the + * code below should be rewritten to take that into account. + * + * In the meantime, we'll warn the user if malloc gets it wrong. + */ if ((dmat->maxsize <= PAGE_SIZE) && + (dmat->alignment < dmat->maxsize) && dmat->lowaddr >= ptoa((vm_paddr_t)Maxmem)) { *vaddr = malloc(dmat->maxsize, M_DEVBUF, mflags); } else { @@ -510,6 +519,8 @@ CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d", __func__, dmat, dmat->flags, ENOMEM); return (ENOMEM); + } else if ((uintptr_t)*vaddr & (dmat->alignment - 1)) { + printf("bus_dmamem_alloc failed to align memory properly."); } CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d", __func__, dmat, dmat->flags, ENOMEM); @@ -529,8 +540,9 @@ */ if (map != NULL) panic("bus_dmamem_free: Invalid map freed\n"); - if ((dmat->maxsize <= PAGE_SIZE) - && dmat->lowaddr >= ptoa((vm_paddr_t)Maxmem)) + if ((dmat->maxsize <= PAGE_SIZE) && + (dmat->alignment < dmat->maxsize) && + dmat->lowaddr >= ptoa((vm_paddr_t)Maxmem)) free(vaddr, M_DEVBUF); else { contigfree(vaddr, dmat->maxsize, M_DEVBUF); ==== //depot/projects/scottl-camlock/src/sys/amd64/amd64/pmap.c#9 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.554 2006/05/01 22:06:59 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.555 2006/06/05 20:35:25 alc Exp $"); /* * Manages physical address maps. @@ -209,6 +209,8 @@ static pv_entry_t get_pv_entry(pmap_t locked_pmap, int try); static void pmap_clear_ptes(vm_page_t m, long bit); +static vm_page_t pmap_enter_quick_locked(pmap_t pmap, vm_offset_t va, + vm_page_t m, vm_prot_t prot, vm_page_t mpte); static int pmap_remove_pte(pmap_t pmap, pt_entry_t *ptq, vm_offset_t sva, pd_entry_t ptepde); static void pmap_remove_page(pmap_t pmap, vm_offset_t va, pd_entry_t *pde); @@ -2310,6 +2312,37 @@ } /* + * Maps a sequence of resident pages belonging to the same object. + * The sequence begins with the given page m_start. This page is + * mapped at the given virtual address start. Each subsequent page is + * mapped at a virtual address that is offset from start by the same + * amount as the page is offset from m_start within the object. The + * last page in the sequence is the page with the largest offset from + * m_start that can be mapped at a virtual address less than the given + * virtual address end. Not every virtual page between start and end + * is mapped; only those for which a resident page exists with the + * corresponding offset from m_start are mapped. + */ +void +pmap_enter_object(pmap_t pmap, vm_offset_t start, vm_offset_t end, + vm_page_t m_start, vm_prot_t prot) +{ + vm_page_t m, mpte; + vm_pindex_t diff, psize; + + psize = atop(end - start); + mpte = NULL; + m = m_start; + PMAP_LOCK(pmap); + while (m != NULL && (diff = m->pindex - m_start->pindex) < psize) { + mpte = pmap_enter_quick_locked(pmap, start + ptoa(diff), m, + prot, mpte); + m = TAILQ_NEXT(m, listq); + } + PMAP_UNLOCK(pmap); +} + +/* * this code makes some *MAJOR* assumptions: * 1. Current pmap & pmap exists. * 2. Not wired. @@ -2322,15 +2355,26 @@ pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, vm_page_t mpte) { + + PMAP_LOCK(pmap); + mpte = pmap_enter_quick_locked(pmap, va, m, prot, mpte); + PMAP_UNLOCK(pmap); + return (mpte); +} + +static vm_page_t +pmap_enter_quick_locked(pmap_t pmap, vm_offset_t va, vm_page_t m, + vm_prot_t prot, vm_page_t mpte) +{ pt_entry_t *pte; vm_paddr_t pa; KASSERT(va < kmi.clean_sva || va >= kmi.clean_eva || (m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) != 0, - ("pmap_enter_quick: managed mapping within the clean submap")); + ("pmap_enter_quick_locked: managed mapping within the clean submap")); mtx_assert(&vm_page_queue_mtx, MA_OWNED); VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED); - PMAP_LOCK(pmap); + PMAP_LOCK_ASSERT(pmap, MA_OWNED); /* * In the case that a page table page is not @@ -2395,7 +2439,7 @@ pmap_unwire_pte_hold(pmap, va, mpte); mpte = NULL; } - goto out; + return (mpte); } /* @@ -2422,8 +2466,6 @@ pte_store(pte, pa | PG_V | PG_U); else pte_store(pte, pa | PG_V | PG_U | PG_MANAGED); -out: - PMAP_UNLOCK(pmap); return mpte; } ==== //depot/projects/scottl-camlock/src/sys/arm/arm/busdma_machdep.c#6 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.25 2006/03/01 23:04:25 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.26 2006/05/31 15:50:33 cognet Exp $"); /* * MacPPC bus dma support routines @@ -806,13 +806,16 @@ if (op & BUS_DMASYNC_PREWRITE) cpu_dcache_wb_range((vm_offset_t)buf, len); - if (op & BUS_DMASYNC_POSTREAD) { - if ((((vm_offset_t)buf | len) & arm_dcache_align_mask) == 0) - cpu_dcache_inv_range((vm_offset_t)buf, len); - else - cpu_dcache_wbinv_range((vm_offset_t)buf, len); - + if (op & BUS_DMASYNC_PREREAD) { + if ((vm_offset_t)buf & arm_dcache_align_mask) + cpu_dcache_wbinv_range((vm_offset_t)buf & + ~arm_dcache_align_mask, arm_dcache_align); + if (((vm_offset_t)buf + len) & arm_dcache_align_mask) + cpu_dcache_wbinv_range(((vm_offset_t)buf + len) & + ~arm_dcache_align_mask, arm_dcache_align); } + if (op & BUS_DMASYNC_POSTREAD) + cpu_dcache_inv_range((vm_offset_t)buf, len); } void @@ -823,7 +826,7 @@ int resid; struct iovec *iov; - if (!(op & (BUS_DMASYNC_PREWRITE | BUS_DMASYNC_POSTREAD))) + if (op == BUS_DMASYNC_POSTWRITE) return; if (map->flags & DMAMAP_COHERENT) return; ==== //depot/projects/scottl-camlock/src/sys/arm/arm/elf_trampoline.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.5 2006/01/20 00:46:44 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.6 2006/05/30 21:13:47 cognet Exp $"); #include #include #include @@ -31,6 +31,7 @@ #include #include #include +#include #include @@ -44,6 +45,24 @@ #define GZ_HEAD 0xa +#ifdef CPU_ARM7TDMI +#define cpu_idcache_wbinv_all arm7tdmi_cache_flushID +#elif defined(CPU_ARM8) +#define cpu_idcache_wbinv_all arm8_cache_purgeID +#elif defined(CPU_ARM9) +#define cpu_idcache_wbinv_all arm9_dcache_wbinv_all +#elif defined(CPU_ARM10) +#define cpu_idcache_wbinv_all arm10_idcache_wbinv_all +#elif defined(CPU_SA110) || defined(CPU_SA1110) || defined(CPU_SA1100) || \ + defined(CPU_IXP12X0) +#define cpu_idcache_wbinv_all sa1_cache_purgeID +#elif defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ + defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) +#define cpu_idcache_wbinv_all xscale_cache_purgeID +#endif +int arm_pdcache_line_size = 32; +int block_userspace_access = 0; + static __inline void * memcpy(void *dst, const void *src, int len) { @@ -160,7 +179,7 @@ static int input(void *dummy) { - if ((size_t)(i_input - orig_input) >= KERNSIZE) { + if ((size_t)(i_input - orig_input) >= KERNCOMPSIZE) { return (GZ_EOF); } return *i_input++; @@ -383,7 +402,7 @@ __start(void) { void *curaddr; - void *dst; + void *dst, *altdst; char *kernel = (char *)&kernel_start; __asm __volatile("mov %0, pc" : @@ -393,11 +412,22 @@ if (*kernel == 0x1f && kernel[1] == 0x8b) { int pt_addr = (((int)&_end + KERNSIZE + 0x100) & ~(L1_TABLE_SIZE - 1)) + L1_TABLE_SIZE; + setup_pagetables(pt_addr, (vm_paddr_t)curaddr, (vm_paddr_t)curaddr + 0x10000000); /* Gzipped kernel */ dst = inflate_kernel(kernel, &_end); kernel = (char *)&_end; + altdst = 4 + load_kernel((unsigned int)kernel, + (unsigned int)curaddr, + (unsigned int)&func_end , 0); + if (altdst > dst) + dst = altdst; + cpu_idcache_wbinv_all(); + __asm __volatile("mrc p15, 0, %0, c1, c0, 0\n" + "bic %0, %0, #1\n" /* MMU_ENABLE */ + "mcr p15, 0, %0, c1, c0, 0\n" + : "=r" (pt_addr)); } else #endif dst = 4 + load_kernel((unsigned int)&kernel_start, ==== //depot/projects/scottl-camlock/src/sys/arm/arm/pmap.c#8 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.47 2006/04/22 22:51:32 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.54 2006/06/06 01:14:12 cognet Exp $"); #include #include #include @@ -198,6 +198,8 @@ static void pmap_free_pv_entry (pv_entry_t); static pv_entry_t pmap_get_pv_entry(void); +static void pmap_enter_locked(pmap_t, vm_offset_t, vm_page_t, + vm_prot_t, boolean_t); static void pmap_vac_me_harder(struct vm_page *, pmap_t, vm_offset_t); static void pmap_vac_me_kpmap(struct vm_page *, pmap_t, @@ -230,6 +232,8 @@ static pt_entry_t *csrc_pte, *cdst_pte; static vm_offset_t csrcp, cdstp; +static struct mtx cmtx; + static void pmap_init_l1(struct l1_ttable *, pd_entry_t *); /* * These routines are called when the CPU type is identified to set up @@ -913,20 +917,38 @@ l1idx = L1_IDX(va); + mtx_assert(&vm_page_queue_mtx, MA_OWNED); if ((l2 = pm->pm_l2[L2_IDX(l1idx)]) == NULL) { /* * No mapping at this address, as there is * no entry in the L1 table. * Need to allocate a new l2_dtable. */ +again_l2table: + vm_page_unlock_queues(); if ((l2 = pmap_alloc_l2_dtable()) == NULL) { + vm_page_lock_queues(); return (NULL); } - bzero(l2, sizeof(*l2)); - /* - * Link it into the parent pmap - */ - pm->pm_l2[L2_IDX(l1idx)] = l2; + vm_page_lock_queues(); + if (pm->pm_l2[L2_IDX(l1idx)] != NULL) { + vm_page_unlock_queues(); + uma_zfree(l2table_zone, l2); + vm_page_lock_queues(); + l2 = pm->pm_l2[L2_IDX(l1idx)]; + if (l2 == NULL) + goto again_l2table; + /* + * Someone already allocated the l2_dtable while + * we were doing the same. + */ + } else { + bzero(l2, sizeof(*l2)); + /* + * Link it into the parent pmap + */ + pm->pm_l2[L2_IDX(l1idx)] = l2; + } } l2b = &l2->l2_bucket[L2_BUCKET(l1idx)]; @@ -941,7 +963,19 @@ * No L2 page table has been allocated. Chances are, this * is because we just allocated the l2_dtable, above. */ +again_ptep: + vm_page_unlock_queues(); ptep = (void*)uma_zalloc(l2zone, M_NOWAIT); + vm_page_lock_queues(); + if (l2b->l2b_kva != 0) { + /* We lost the race. */ + vm_page_unlock_queues(); + uma_zfree(l2zone, ptep); + vm_page_lock_queues(); + if (l2b->l2b_kva == 0) + goto again_ptep; + return (l2b); + } l2b->l2b_phys = vtophys(ptep); if (ptep == NULL) { /* @@ -2541,6 +2575,7 @@ virtual_end = lastaddr; kernel_vm_end = pmap_curmaxkvaddr; arm_nocache_startaddr = lastaddr; + mtx_init(&cmtx, "TMP mappings mtx", NULL, MTX_DEF); #ifdef ARM_USE_SMALL_ALLOC mtx_init(&smallalloc_mtx, "Small alloc page list", NULL, MTX_DEF); @@ -3067,6 +3102,7 @@ if (!pmap_get_pde_pte(pmap, addr, &pde, &pte)) return (FALSE); + KASSERT(pte != NULL, ("Valid mapping but no pte ?")); if (*pte == 0) return (TRUE); return (FALSE); @@ -3303,6 +3339,19 @@ pmap_enter(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, boolean_t wired) { + + vm_page_lock_queues(); + pmap_enter_locked(pmap, va, m, prot, wired); + vm_page_unlock_queues(); +} + +/* + * The page queues and pmap must be locked. + */ +static void +pmap_enter_locked(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, + boolean_t wired) +{ struct l2_bucket *l2b = NULL; struct vm_page *opg; struct pv_entry *pve = NULL; @@ -3311,7 +3360,7 @@ u_int oflags; vm_paddr_t pa; - vm_page_lock_queues(); + mtx_assert(&vm_page_queue_mtx, MA_OWNED); if (va == vector_page) { pa = systempage.pv_pa; m = NULL; @@ -3428,9 +3477,11 @@ simple_lock(&opg->mdpage.pvh_slock); #endif pve = pmap_remove_pv(opg, pmap, va); - if (m && (m->flags & (PG_UNMANAGED | PG_FICTITIOUS)) && pve) + if (m && (m->flags & (PG_UNMANAGED | PG_FICTITIOUS)) && + pve) pmap_free_pv_entry(pve); - else if (!pve) + else if (!pve && + !(m->flags & (PG_UNMANAGED | PG_FICTITIOUS))) pve = pmap_get_pv_entry(); KASSERT(pve != NULL, ("No pv")); #if 0 @@ -3525,7 +3576,34 @@ if (m) pmap_vac_me_harder(m, pmap, va); } - vm_page_unlock_queues(); +} + +/* + * Maps a sequence of resident pages belonging to the same object. + * The sequence begins with the given page m_start. This page is + * mapped at the given virtual address start. Each subsequent page is + * mapped at a virtual address that is offset from start by the same + * amount as the page is offset from m_start within the object. The + * last page in the sequence is the page with the largest offset from + * m_start that can be mapped at a virtual address less than the given + * virtual address end. Not every virtual page between start and end + * is mapped; only those for which a resident page exists with the + * corresponding offset from m_start are mapped. + */ +void +pmap_enter_object(pmap_t pmap, vm_offset_t start, vm_offset_t end, + vm_page_t m_start, vm_prot_t prot) +{ + vm_page_t m; + vm_pindex_t diff, psize; + + psize = atop(end - start); + m = m_start; + while (m != NULL && (diff = m->pindex - m_start->pindex) < psize) { + pmap_enter_locked(pmap, start + ptoa(diff), m, prot & + (VM_PROT_READ | VM_PROT_EXECUTE), FALSE); + m = TAILQ_NEXT(m, listq); + } } /* @@ -3542,15 +3620,8 @@ vm_page_t mpte) { - vm_page_busy(m); - vm_page_unlock_queues(); - VM_OBJECT_UNLOCK(m->object); - mtx_lock(&Giant); - pmap_enter(pmap, va, m, prot & (VM_PROT_READ | VM_PROT_EXECUTE), FALSE); - mtx_unlock(&Giant); - VM_OBJECT_LOCK(m->object); - vm_page_lock_queues(); - vm_page_wakeup(m); + pmap_enter_locked(pmap, va, m, prot & (VM_PROT_READ | VM_PROT_EXECUTE), + FALSE); return (NULL); } @@ -4002,6 +4073,7 @@ return; + mtx_lock(&cmtx); /* * Hook in the page, zero it, and purge the cache for that * zeroed page. Invalidate the TLB as needed. @@ -4015,6 +4087,7 @@ bzero((void *)(cdstp + off), size); else bzero_page(cdstp); + mtx_unlock(&cmtx); cpu_dcache_wbinv_range(cdstp, PAGE_SIZE); } #endif /* (ARM_MMU_GENERIC + ARM_MMU_SA1) != 0 */ @@ -4027,6 +4100,7 @@ if (_arm_bzero && _arm_bzero((void *)(phys + off), size, IS_PHYSICAL) == 0) return; + mtx_lock(&cmtx); /* * Hook in the page, zero it, and purge the cache for that * zeroed page. Invalidate the TLB as needed. @@ -4041,6 +4115,7 @@ bzero((void *)(cdstp + off), size); else bzero_page(cdstp); + mtx_unlock(&cmtx); xscale_cache_clean_minidata(); } @@ -4263,6 +4338,7 @@ * the cache for the appropriate page. Invalidate the TLB * as required. */ + mtx_lock(&cmtx); *csrc_pte = L2_S_PROTO | src | L2_S_PROT(PTE_KERNEL, VM_PROT_READ) | pte_l2_s_cache_mode; PTE_SYNC(csrc_pte); @@ -4273,6 +4349,7 @@ cpu_tlb_flushD_SE(cdstp); cpu_cpwait(); bcopy_page(csrcp, cdstp); + mtx_unlock(&cmtx); cpu_dcache_inv_range(csrcp, PAGE_SIZE); #if 0 mtx_lock(&src_pg->md.pvh_mtx); @@ -4314,6 +4391,7 @@ * the cache for the appropriate page. Invalidate the TLB * as required. */ + mtx_lock(&cmtx); *csrc_pte = L2_S_PROTO | src | L2_S_PROT(PTE_KERNEL, VM_PROT_READ) | L2_C | L2_XSCALE_T_TEX(TEX_XSCALE_X); /* mini-data */ @@ -4326,6 +4404,7 @@ cpu_tlb_flushD_SE(cdstp); cpu_cpwait(); bcopy_page(csrcp, cdstp); + mtx_unlock(&cmtx); xscale_cache_clean_minidata(); } #endif /* ARM_MMU_XSCALE == 1 */ @@ -4474,7 +4553,7 @@ pa += PAGE_SIZE; } - return ((void *)(va)); + return ((void *)(va + offset)); } #define BOOTSTRAP_DEBUG @@ -4624,7 +4703,7 @@ panic("pmap_map_chunk: no L1 table provided"); #ifdef VERBOSE_INIT_ARM - printf("pmap_map_chunk: pa=0x%lx va=0x%lx size=0x%lx resid=0x%lx " + printf("pmap_map_chunk: pa=0x%x va=0x%x size=0x%x resid=0x%x " "prot=0x%x cache=%d\n", pa, va, size, resid, prot, cache); #endif @@ -4763,7 +4842,7 @@ for (i = 0; pmap_devmap_table[i].pd_size != 0; i++) { #ifdef VERBOSE_INIT_ARM - printf("devmap: %08lx -> %08lx @ %08lx\n", + printf("devmap: %08x -> %08x @ %08x\n", pmap_devmap_table[i].pd_pa, pmap_devmap_table[i].pd_pa + pmap_devmap_table[i].pd_size - 1, ==== //depot/projects/scottl-camlock/src/sys/arm/arm/vm_machdep.c#7 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.23 2006/03/02 00:37:40 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.24 2006/06/05 23:42:47 cognet Exp $"); #include #include @@ -471,14 +471,13 @@ } static void * -arm_uma_do_alloc(struct arm_small_page **pglist, int bytes, int pagetable, - int flags) +arm_uma_do_alloc(struct arm_small_page **pglist, int bytes, int pagetable) { void *ret; vm_page_t page_array = NULL; *pglist = (void *)kmem_malloc(kmem_map, (0x100000 / PAGE_SIZE) * - sizeof(struct arm_small_page), flags); + sizeof(struct arm_small_page), M_WAITOK); if (*pglist && alloc_curaddr < 0xf0000000) {/* XXX */ mtx_lock(&Giant); page_array = vm_page_alloc_contig(0x100000 / PAGE_SIZE, @@ -533,22 +532,24 @@ if (!sp) { /* No more free pages, need to alloc more. */ - if (in_alloc && (wait & M_WAITOK)) { + if (!(wait & M_WAITOK)) { + mtx_unlock(&smallalloc_mtx); + *flags = UMA_SLAB_KMEM; + return ((void *)kmem_malloc(kmem_map, bytes, M_NOWAIT)); + } + if (in_alloc) { /* Somebody else is already doing the allocation. */ in_sleep++; msleep(&in_alloc, &smallalloc_mtx, PWAIT, "smallalloc", 0); in_sleep--; goto retry; - } else if (in_alloc) { - mtx_unlock(&smallalloc_mtx); - return (NULL); } in_alloc = 1; mtx_unlock(&smallalloc_mtx); /* Try to alloc 1MB of contiguous memory. */ ret = arm_uma_do_alloc(&sp, bytes, zone == l2zone ? - SECTION_PT : SECTION_CACHE, wait); + SECTION_PT : SECTION_CACHE); mtx_lock(&smallalloc_mtx); in_alloc = 0; if (in_sleep) ==== //depot/projects/scottl-camlock/src/sys/arm/include/cpuconf.h#4 (text+ko) ==== @@ -34,7 +34,7 @@ * 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/cpuconf.h,v 1.5 2005/05/26 16:05:22 cognet Exp $ + * $FreeBSD: src/sys/arm/include/cpuconf.h,v 1.7 2006/06/02 09:39:06 cognet Exp $ * >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jun 6 09:26:28 2006 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 0F75816BB7F; Tue, 6 Jun 2006 09:25:56 +0000 (UTC) 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 028B316A4C5 for ; Tue, 6 Jun 2006 09:22:43 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BFCB443D45 for ; Tue, 6 Jun 2006 09:22:42 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k569KtZF040640 for ; Tue, 6 Jun 2006 09:20:55 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k569KtcP040637 for perforce@freebsd.org; Tue, 6 Jun 2006 09:20:55 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 6 Jun 2006 09:20:55 GMT Message-Id: <200606060920.k569KtcP040637@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 98642 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, 06 Jun 2006 09:26:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=98642 Change 98642 by hselasky@hselasky_mini_itx on 2006/06/06 09:20:08 Bugfix: Make sure that "USB cdev" waits for data to get flushed. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_cdev.c#3 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_cdev.c#3 (text+ko) ==== @@ -1294,6 +1294,12 @@ USBD_IF_PREPEND(&(sc->sc_wrq_used), m); } } else { + + if (tr_data) { + /* wait for data to be written out */ + break; + } + if (sc->sc_flags & USB_CDEV_FLAG_FLUSHING_WRITE) { sc->sc_flags &= ~USB_CDEV_FLAG_FLUSHING_WRITE; wakeup(&(sc->sc_wakeup_flush)); From owner-p4-projects@FreeBSD.ORG Tue Jun 6 15:54:09 2006 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 B809216A8AB; Tue, 6 Jun 2006 15:54:08 +0000 (UTC) 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 677FD16A5FE for ; Tue, 6 Jun 2006 15:54:05 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DD31A43D48 for ; Tue, 6 Jun 2006 15:54:04 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k56FqG83081731 for ; Tue, 6 Jun 2006 15:52:16 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k56FqFCG081728 for perforce@freebsd.org; Tue, 6 Jun 2006 15:52:15 GMT (envelope-from rdivacky@FreeBSD.org) Date: Tue, 6 Jun 2006 15:52:15 GMT Message-Id: <200606061552.k56FqFCG081728@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 98672 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, 06 Jun 2006 15:54:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=98672 Change 98672 by rdivacky@rdivacky_witten on 2006/06/06 15:51:41 Update of syscall.master: o Adding of several new syscalls (268-310) o Synchronization of amd64 syscall.master with i386 one o Auditing added to amd64 syscall.master Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/syscalls.master#2 edit .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/syscalls.master#2 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/syscalls.master#2 (text+ko) ==== @@ -4,7 +4,7 @@ ; System call name/number master file (or rather, slave, from LINUX). ; Processed to create linux_sysent.c, linux_proto.h and linux_syscall.h. -; Columns: number type nargs name alt{name,tag,rtyp}/comments +; Columns: number audit type nargs name alt{name,tag,rtyp}/comments ; number system call number, must be in order ; audit the audit event associated with the system call ; A value of AUE_NULL means no auditing, but it also means that @@ -14,15 +14,20 @@ ; type one of STD, OBSOL, UNIMPL ; name psuedo-prototype of syscall routine ; If one of the following alts is different, then all appear: +; audit the audit event associated with the system call +; A value of AUE_NULL means no auditing, but it also means that +; there is no audit event for the call at this time. For the +; case where the event exists, but we don't want auditing, the +; event should be #defined to AUE_NULL in audit_kevents.h. ; altname name of system call if different ; alttag name of args struct tag if different from [o]`name'"_args" ; altrtyp return type if not int (bogus - syscalls always return int) ; for UNIMPL/OBSOL, name continues with comments ; types: -; STD always included +; AUE_NULL STD always included ; OBSOL obsolete, not included in system, only specifies name -; UNIMPL not implemented, placeholder only +; AUE_NULL UNIMPL not implemented, placeholder only #include "opt_compat.h" #include @@ -38,247 +43,244 @@ ; #ifdef's, etc. may be included, and are copied to the output files. 0 AUE_NULL UNIMPL setup -1 AUE_NULL MNOPROTO { void sys_exit(int rval); } exit \ +1 AUE_EXIT MNOPROTO { void sys_exit(int rval); } exit \ sys_exit_args void -2 AUE_NULL MSTD { int linux_fork(void); } +2 AUE_FORK MSTD { int linux_fork(void); } 3 AUE_NULL MNOPROTO { int read(int fd, char *buf, \ u_int nbyte); } 4 AUE_NULL MNOPROTO { int write(int fd, char *buf, \ u_int nbyte); } -5 AUE_NULL MSTD { int linux_open(char *path, l_int flags, \ +5 AUE_OPEN_RWTC MSTD { int linux_open(char *path, l_int flags, \ l_int mode); } -6 AUE_NULL MNOPROTO { int close(int fd); } -7 AUE_NULL MSTD { int linux_waitpid(l_pid_t pid, \ +6 AUE_CLOSE MNOPROTO { int close(int fd); } +7 AUE_WAIT4 MSTD { int linux_waitpid(l_pid_t pid, \ l_int *status, l_int options); } -8 AUE_NULL MSTD { int linux_creat(char *path, l_int mode); } -9 AUE_NULL MSTD { int linux_link(char *path, char *to); } -10 AUE_NULL MSTD { int linux_unlink(char *path); } -11 AUE_NULL MSTD { int linux_execve(char *path, char **argp, \ +8 AUE_O_CREAT MSTD { int linux_creat(char *path, \ + l_int mode); } +9 AUE_LINK MSTD { int linux_link(char *path, char *to); } +10 AUE_UNLINK MSTD { int linux_unlink(char *path); } +11 AUE_EXECVE MSTD { int linux_execve(char *path, char **argp, \ char **envp); } -12 AUE_NULL MSTD { int linux_chdir(char *path); } +12 AUE_CHDIR MSTD { int linux_chdir(char *path); } 13 AUE_NULL MSTD { int linux_time(l_time_t *tm); } -14 AUE_NULL MSTD { int linux_mknod(char *path, l_int mode, \ +14 AUE_MKNOD MSTD { int linux_mknod(char *path, l_int mode, \ l_dev_t dev); } -15 AUE_NULL MSTD { int linux_chmod(char *path, \ +15 AUE_CHMOD MSTD { int linux_chmod(char *path, \ l_mode_t mode); } -16 AUE_NULL MSTD { int linux_lchown16(char *path, \ +16 AUE_LCHOWN MSTD { int linux_lchown16(char *path, \ l_uid16_t uid, l_gid16_t gid); } 17 AUE_NULL UNIMPL break -18 AUE_NULL MSTD { int linux_stat(char *path, \ - struct linux_stat *up); } -19 AUE_NULL MSTD { int linux_lseek(l_uint fdes, l_off_t off, \ +18 AUE_STAT MSTD { int linux_stat(char *path, \ + struct linux_stat *up); } +19 AUE_LSEEK MSTD { int linux_lseek(l_uint fdes, l_off_t off, \ l_int whence); } -20 AUE_NULL MSTD { int linux_getpid(void); } -21 AUE_NULL STD { int linux_mount(char *specialfile, \ +20 AUE_GETPID MSTD { int linux_getpid(void); } +21 AUE_MOUNT STD { int linux_mount(char *specialfile, \ char *dir, char *filesystemtype, \ l_ulong rwflag, void *data); } -22 AUE_NULL STD { int linux_oldumount(char *path); } -23 AUE_NULL MSTD { int linux_setuid16(l_uid16_t uid); } -24 AUE_NULL MSTD { int linux_getuid16(void); } -25 AUE_NULL MSTD { int linux_stime(void); } -26 AUE_NULL MSTD { int linux_ptrace(l_long req, l_long pid, \ +22 AUE_UMOUNT STD { int linux_oldumount(char *path); } +23 AUE_SETUID MSTD { int linux_setuid16(l_uid16_t uid); } +24 AUE_GETUID MSTD { int linux_getuid16(void); } +25 AUE_SETTIMEOFDAY MSTD { int linux_stime(void); } +26 AUE_PTRACE MSTD { int linux_ptrace(l_long req, l_long pid, \ l_long addr, l_long data); } 27 AUE_NULL MSTD { int linux_alarm(l_uint secs); } 28 AUE_NULL UNIMPL fstat 29 AUE_NULL MSTD { int linux_pause(void); } -30 AUE_NULL MSTD { int linux_utime(char *fname, \ +30 AUE_UTIME MSTD { int linux_utime(char *fname, \ struct l_utimbuf *times); } 31 AUE_NULL UNIMPL stty 32 AUE_NULL UNIMPL gtty -33 AUE_NULL MSTD { int linux_access(char *path, l_int flags); } -34 AUE_NULL MSTD { int linux_nice(l_int inc); } +33 AUE_ACCESS MSTD { int linux_access(char *path, l_int flags); } +34 AUE_NICE MSTD { int linux_nice(l_int inc); } 35 AUE_NULL UNIMPL ftime -36 AUE_NULL MNOPROTO { int sync(void); } -37 AUE_NULL MSTD { int linux_kill(l_int pid, l_int signum); } -38 AUE_NULL MSTD { int linux_rename(char *from, char *to); } -39 AUE_NULL MSTD { int linux_mkdir(char *path, l_int mode); } -40 AUE_NULL MSTD { int linux_rmdir(char *path); } -41 AUE_NULL MNOPROTO { int dup(u_int fd); } -42 AUE_NULL MSTD { int linux_pipe(l_ulong *pipefds); } +36 AUE_SYNC MNOPROTO { int sync(void); } +37 AUE_KILL MSTD { int linux_kill(l_int pid, l_int signum); } +38 AUE_RENAME MSTD { int linux_rename(char *from, char *to); } +39 AUE_MKDIR MSTD { int linux_mkdir(char *path, l_int mode); } +40 AUE_RMDIR MSTD { int linux_rmdir(char *path); } +41 AUE_DUP MNOPROTO { int dup(u_int fd); } +42 AUE_PIPE MSTD { int linux_pipe(l_ulong *pipefds); } 43 AUE_NULL MSTD { int linux_times(struct l_times_argv *buf); } 44 AUE_NULL UNIMPL prof 45 AUE_NULL STD { int linux_brk(l_ulong dsend); } -46 AUE_NULL MSTD { int linux_setgid16(l_gid16_t gid); } -47 AUE_NULL MSTD { int linux_getgid16(void); } +46 AUE_SETGID MSTD { int linux_setgid16(l_gid16_t gid); } +47 AUE_GETGID MSTD { int linux_getgid16(void); } 48 AUE_NULL MSTD { int linux_signal(l_int sig, \ l_handler_t handler); } -49 AUE_NULL MSTD { int linux_geteuid16(void); } -50 AUE_NULL MSTD { int linux_getegid16(void); } -51 AUE_NULL MNOPROTO { int acct(char *path); } -52 AUE_NULL STD { int linux_umount(char *path, l_int flags); } +49 AUE_GETEUID MSTD { int linux_geteuid16(void); } +50 AUE_GETEGID MSTD { int linux_getegid16(void); } +51 AUE_ACCT MNOPROTO { int acct(char *path); } +52 AUE_UMOUNT STD { int linux_umount(char *path, l_int flags); } 53 AUE_NULL UNIMPL lock -54 AUE_NULL STD { int linux_ioctl(l_uint fd, l_uint cmd, \ +54 AUE_IOCTL STD { int linux_ioctl(l_uint fd, l_uint cmd, \ uintptr_t arg); } -55 AUE_NULL MSTD { int linux_fcntl(l_uint fd, l_uint cmd, \ +55 AUE_FCNTL MSTD { int linux_fcntl(l_uint fd, l_uint cmd, \ uintptr_t arg); } 56 AUE_NULL UNIMPL mpx -57 AUE_NULL MNOPROTO { int setpgid(int pid, int pgid); } +57 AUE_SETPGRP MNOPROTO { int setpgid(int pid, int pgid); } 58 AUE_NULL UNIMPL ulimit 59 AUE_NULL MSTD { int linux_olduname(void); } -60 AUE_NULL MNOPROTO { int umask(int newmask); } -61 AUE_NULL MNOPROTO { int chroot(char *path); } +60 AUE_UMASK MNOPROTO { int umask(int newmask); } +61 AUE_CHROOT MNOPROTO { int chroot(char *path); } 62 AUE_NULL MSTD { int linux_ustat(l_dev_t dev, \ struct l_ustat *ubuf); } -63 AUE_NULL MNOPROTO { int dup2(u_int from, u_int to); } -64 AUE_NULL MNOPROTO { int getppid(void); } -65 AUE_NULL MNOPROTO { int getpgrp(void); } -66 AUE_NULL MNOPROTO { int setsid(void); } +63 AUE_DUP2 MNOPROTO { int dup2(u_int from, u_int to); } +64 AUE_GETPPID MNOPROTO { int getppid(void); } +65 AUE_GETPGRP MNOPROTO { int getpgrp(void); } +66 AUE_SETSID MNOPROTO { int setsid(void); } 67 AUE_NULL MSTD { int linux_sigaction(l_int sig, \ l_osigaction_t *nsa, \ l_osigaction_t *osa); } 68 AUE_NULL MSTD { int linux_sgetmask(void); } 69 AUE_NULL MSTD { int linux_ssetmask(l_osigset_t mask); } -70 AUE_NULL MSTD { int linux_setreuid16(l_uid16_t ruid, \ +70 AUE_SETREUID MSTD { int linux_setreuid16(l_uid16_t ruid, \ l_uid16_t euid); } -71 AUE_NULL MSTD { int linux_setregid16(l_gid16_t rgid, \ +71 AUE_SETREGID MSTD { int linux_setregid16(l_gid16_t rgid, \ l_gid16_t egid); } 72 AUE_NULL MSTD { int linux_sigsuspend(l_int hist0, \ l_int hist1, l_osigset_t mask); } 73 AUE_NULL MSTD { int linux_sigpending(l_osigset_t *mask); } -74 AUE_NULL MSTD { int linux_sethostname(char *hostname, \ +74 AUE_SYSCTL MSTD { int linux_sethostname(char *hostname, \ u_int len); } -75 AUE_NULL MSTD { int linux_setrlimit(l_uint resource, \ +75 AUE_SETRLIMIT MSTD { int linux_setrlimit(l_uint resource, \ struct l_rlimit *rlim); } -76 AUE_NULL MSTD { int linux_old_getrlimit(l_uint resource, \ +76 AUE_GETRLIMIT MSTD { int linux_old_getrlimit(l_uint resource, \ struct l_rlimit *rlim); } -77 AUE_NULL MSTD { int linux_getrusage(int who, \ +77 AUE_GETRUSAGE MSTD { int linux_getrusage(int who, \ struct l_rusage *rusage); } 78 AUE_NULL MSTD { int linux_gettimeofday( \ struct l_timeval *tp, \ struct timezone *tzp); } -79 AUE_NULL MSTD { int linux_settimeofday( \ +79 AUE_SETTIMEOFDAY MSTD { int linux_settimeofday( \ struct l_timeval *tp, \ struct timezone *tzp); } -80 AUE_NULL MSTD { int linux_getgroups16(l_uint gidsetsize, \ +80 AUE_GETGROUPS MSTD { int linux_getgroups16(l_uint gidsetsize, \ l_gid16_t *gidset); } -81 AUE_NULL MSTD { int linux_setgroups16(l_uint gidsetsize, \ +81 AUE_SETGROUPS MSTD { int linux_setgroups16(l_uint gidsetsize, \ l_gid16_t *gidset); } -82 AUE_NULL MSTD { int linux_old_select( \ +82 AUE_SELECT MSTD { int linux_old_select( \ struct l_old_select_argv *ptr); } -83 AUE_NULL MSTD { int linux_symlink(char *path, \ - char *to); } -84 AUE_NULL MSTD { int linux_lstat(char *path, struct linux_lstat *up); } -85 AUE_NULL MSTD { int linux_readlink(char *name, \ - char *buf, l_int count); } +83 AUE_SYMLINK MSTD { int linux_symlink(char *path, char *to); } +84 AUE_STAT MSTD { int linux_lstat(char *path, struct linux_lstat *up); } +85 AUE_READLINK MSTD { int linux_readlink(char *name, char *buf, \ + l_int count); } 86 AUE_NULL UNIMPL linux_uselib -87 AUE_NULL MNOPROTO { int swapon(char *name); } -88 AUE_NULL MSTD { int linux_reboot(l_int magic1, \ - l_int magic2, l_uint cmd, \ - void *arg); } -89 AUE_NULL STD { int linux_readdir(l_uint fd, \ +87 AUE_SWAPON MNOPROTO { int swapon(char *name); } +88 AUE_REBOOT MSTD { int linux_reboot(l_int magic1, \ + l_int magic2, l_uint cmd, void *arg); } +89 AUE_O_GETDENTS STD { int linux_readdir(l_uint fd, \ struct l_dirent *dent, l_uint count); } -90 AUE_NULL MSTD { int linux_mmap(struct l_mmap_argv *ptr); } -91 AUE_NULL MNOPROTO { int munmap(caddr_t addr, int len); } -92 AUE_NULL MSTD { int linux_truncate(char *path, \ +90 AUE_MMAP MSTD { int linux_mmap(struct l_mmap_argv *ptr); } +91 AUE_MUNMAP MNOPROTO { int munmap(caddr_t addr, int len); } +92 AUE_TRUNCATE MSTD { int linux_truncate(char *path, \ l_ulong length); } -93 AUE_NULL MSTD { int linux_ftruncate(int fd, long length); } -94 AUE_NULL MNOPROTO { int fchmod(int fd, int mode); } -95 AUE_NULL MNOPROTO { int fchown(int fd, int uid, int gid); } -96 AUE_NULL MSTD { int linux_getpriority(int which, int who); } -97 AUE_NULL MNOPROTO { int setpriority(int which, int who, \ +93 AUE_FTRUNCATE MSTD { int linux_ftruncate(int fd, long length); } +94 AUE_FCHMOD MNOPROTO { int fchmod(int fd, int mode); } +95 AUE_FCHOWN MNOPROTO { int fchown(int fd, int uid, int gid); } +96 AUE_GETPRIORITY MSTD { int linux_getpriority(int which, int who); } +97 AUE_SETPRIORITY MNOPROTO { int setpriority(int which, int who, \ int prio); } -98 AUE_NULL UNIMPL profil -99 AUE_NULL MSTD { int linux_statfs(char *path, \ +98 AUE_AUE_PROFILE UNIMPL profil +99 AUE_STATFS MSTD { int linux_statfs(char *path, \ struct l_statfs_buf *buf); } -100 AUE_NULL MSTD { int linux_fstatfs(l_uint fd, \ +100 AUE_FSTATFS MSTD { int linux_fstatfs(l_uint fd, \ struct l_statfs_buf *buf); } 101 AUE_NULL UNIMPL ioperm 102 AUE_NULL MSTD { int linux_socketcall(l_int what, \ l_ulong args); } 103 AUE_NULL MSTD { int linux_syslog(l_int type, char *buf, \ l_int len); } -104 AUE_NULL MSTD { int linux_setitimer(l_int which, \ +104 AUE_SETITIMER MSTD { int linux_setitimer(l_int which, \ struct l_itimerval *itv, \ struct l_itimerval *oitv); } -105 AUE_NULL MSTD { int linux_getitimer(l_int which, \ +105 AUE_GETITIMER MSTD { int linux_getitimer(l_int which, \ struct l_itimerval *itv); } -106 AUE_NULL MSTD { int linux_newstat(char *path, \ +106 AUE_STAT MSTD { int linux_newstat(char *path, \ struct l_newstat *buf); } -107 AUE_NULL MSTD { int linux_newlstat(char *path, \ +107 AUE_LSTAT MSTD { int linux_newlstat(char *path, \ struct l_newstat *buf); } -108 AUE_NULL MSTD { int linux_newfstat(l_uint fd, \ +108 AUE_FSTAT MSTD { int linux_newfstat(l_uint fd, \ struct l_newstat *buf); } 109 AUE_NULL MSTD { int linux_uname(void); } 110 AUE_NULL UNIMPL iopl 111 AUE_NULL MSTD { int linux_vhangup(void); } 112 AUE_NULL UNIMPL idle 113 AUE_NULL UNIMPL vm86old -114 AUE_NULL MSTD { int linux_wait4(l_pid_t pid, \ +114 AUE_WAIT4 MSTD { int linux_wait4(l_pid_t pid, \ l_uint *status, l_int options, \ struct l_rusage *rusage); } -115 AUE_NULL MSTD { int linux_swapoff(void); } +115 AUE_SWAPOFF MSTD { int linux_swapoff(void); } 116 AUE_NULL MSTD { int linux_sysinfo(struct l_sysinfo *info); } 117 AUE_NULL STD { int linux_ipc(l_uint what, l_int arg1, \ l_int arg2, l_int arg3, void *ptr, \ l_long arg5); } -118 AUE_NULL MNOPROTO { int fsync(int fd); } -119 AUE_NULL MSTD { int linux_sigreturn( \ +118 AUE_FSYNC MNOPROTO { int fsync(int fd); } +119 AUE_SIGRETURN MSTD { int linux_sigreturn( \ struct l_sigframe *sfp); } -120 AUE_NULL MSTD { int linux_clone(l_int flags, \ - void *stack); } -121 AUE_NULL MNOPROTO { int setdomainname(char *name, int len); } +120 AUE_RFORK MSTD { int linux_clone(l_int flags, void *stack); } +121 AUE_SYSCTL MNOPROTO { int setdomainname(char *name, \ + int len); } 122 AUE_NULL MSTD { int linux_newuname( \ struct l_new_utsname *buf); } 123 AUE_NULL UNIMPL modify_ldt -124 AUE_NULL MSTD { int linux_adjtimex(void); } -125 AUE_NULL MSTD { int linux_mprotect(caddr_t addr, int len, \ +124 AUE_ADJTIME MSTD { int linux_adjtimex(void); } +125 AUE_MPROTECT MSTD { int linux_mprotect(caddr_t addr, int len, \ int prot); } -126 AUE_NULL MSTD { int linux_sigprocmask(l_int how, \ +126 AUE_SIGPROCMASK MSTD { int linux_sigprocmask(l_int how, \ l_osigset_t *mask, l_osigset_t *omask); } 127 AUE_NULL MSTD { int linux_create_module(void); } 128 AUE_NULL MSTD { int linux_init_module(void); } 129 AUE_NULL MSTD { int linux_delete_module(void); } 130 AUE_NULL MSTD { int linux_get_kernel_syms(void); } -131 AUE_NULL MSTD { int linux_quotactl(void); } -132 AUE_NULL MNOPROTO { int getpgid(int pid); } -133 AUE_NULL MNOPROTO { int fchdir(int fd); } -134 AUE_NULL MSTD { int linux_bdflush(void); } +131 AUE_QUOTACTL MSTD { int linux_quotactl(void); } +132 AUE_GETPGID MNOPROTO { int getpgid(int pid); } +133 AUE_FCHDIR MNOPROTO { int fchdir(int fd); } +134 AUE_BDFLUSH MSTD { int linux_bdflush(void); } 135 AUE_NULL MSTD { int linux_sysfs(l_int option, \ l_ulong arg1, l_ulong arg2); } -136 AUE_NULL MSTD { int linux_personality(l_ulong per); } +136 AUE_PERSONALITY MSTD { int linux_personality(l_ulong per); } 137 AUE_NULL UNIMPL afs_syscall -138 AUE_NULL MSTD { int linux_setfsuid16(l_uid16_t uid); } -139 AUE_NULL MSTD { int linux_setfsgid16(l_gid16_t gid); } -140 AUE_NULL MSTD { int linux_llseek(l_int fd, l_ulong ohigh, \ +138 AUE_SETFSUID MSTD { int linux_setfsuid16(l_uid16_t uid); } +139 AUE_SETFSGID MSTD { int linux_setfsgid16(l_gid16_t gid); } +140 AUE_LSEEK MSTD { int linux_llseek(l_int fd, l_ulong ohigh, \ l_ulong olow, l_loff_t *res, \ l_uint whence); } -141 AUE_NULL STD { int linux_getdents(l_uint fd, void *dent, \ +141 AUE_O_GETDENTS STD { int linux_getdents(l_uint fd, void *dent, \ l_uint count); } -142 AUE_NULL MSTD { int linux_select(l_int nfds, \ +142 AUE_SELECT MSTD { int linux_select(l_int nfds, \ l_fd_set *readfds, l_fd_set *writefds, \ l_fd_set *exceptfds, \ struct l_timeval *timeout); } -143 AUE_NULL MNOPROTO { int flock(int fd, int how); } -144 AUE_NULL MSTD { int linux_msync(l_ulong addr, \ +143 AUE_FLOCK MNOPROTO { int flock(int fd, int how); } +144 AUE_MSYNC MSTD { int linux_msync(l_ulong addr, \ l_size_t len, l_int fl); } -145 AUE_NULL MSTD { int linux_readv(int fd, \ - struct iovec32 *iovp, u_int iovcnt); } -146 AUE_NULL MSTD { int linux_writev(int fd, \ - struct iovec32 *iovp, u_int iovcnt); } -147 AUE_NULL MSTD { int linux_getsid(l_pid_t pid); } +145 AUE_READV MSTD { int linux_readv(int fd, struct iovec32 *iovp, \ + u_int iovcnt); } +146 AUE_WRITEV MSTD { int linux_writev(int fd, struct iovec32 *iovp, \ + u_int iovcnt); } +147 AUE_GETSID MSTD { int linux_getsid(l_pid_t pid); } 148 AUE_NULL MSTD { int linux_fdatasync(l_uint fd); } -149 AUE_NULL MSTD { int linux_sysctl( \ +149 AUE_SYSCTL MSTD { int linux_sysctl( \ struct l___sysctl_args *args); } -150 AUE_NULL MNOPROTO { int mlock(const void *addr, size_t len); } -151 AUE_NULL MNOPROTO { int munlock(const void *addr, \ - size_t len); } -152 AUE_NULL MNOPROTO { int mlockall(int how); } -153 AUE_NULL MNOPROTO { int munlockall(void); } -154 AUE_NULL MNOPROTO { int sched_setparam(pid_t pid, \ +150 AUE_MLOCK MNOPROTO { int mlock(const void *addr, size_t len); } +151 AUE_MUNLOCK MNOPROTO { int munlock(const void *addr, size_t len); } +152 AUE_MLOCKALL MNOPROTO { int mlockall(int how); } +153 AUE_MUNLOCKALL MNOPROTO { int munlockall(void); } +154 AUE_SCHED_SETPARAM MNOPROTO { int sched_setparam(pid_t pid, \ const struct sched_param *param); } -155 AUE_NULL MNOPROTO { int sched_getparam(pid_t pid, \ +155 AUE_SCHED_GETPARAM MNOPROTO { int sched_getparam(pid_t pid, \ struct sched_param *param); } -156 AUE_NULL MSTD { int linux_sched_setscheduler(l_pid_t pid, \ +156 AUE_SCHED_SETSCHEDULER MSTD { int linux_sched_setscheduler(l_pid_t pid, \ l_int policy, \ struct l_sched_param *param); } -157 AUE_NULL MSTD { int linux_sched_getscheduler(l_pid_t pid); } +157 AUE_SCHED_GETSCHEDULER MSTD { int linux_sched_getscheduler(l_pid_t pid); } 158 AUE_NULL MNOPROTO { int sched_yield(void); } -159 AUE_NULL MSTD { int linux_sched_get_priority_max( \ +159 AUE_SCHED_GET_PRIORITY_MAX MSTD { int linux_sched_get_priority_max( \ l_int policy); } -160 AUE_NULL MSTD { int linux_sched_get_priority_min( \ +160 AUE_SCHED_GET_PRIORITY_MIN MSTD { int linux_sched_get_priority_min( \ l_int policy); } -161 AUE_NULL MSTD { int linux_sched_rr_get_interval( \ - l_pid_t pid, \ +161 AUE_SCHED_RR_GET_INTERVAL MSTD { int linux_sched_rr_get_interval(l_pid_t pid, \ struct l_timespec *interval); } 162 AUE_NULL MSTD { int linux_nanosleep( \ const struct l_timespec *rqtp, \ @@ -286,20 +288,20 @@ 163 AUE_NULL MSTD { int linux_mremap(l_ulong addr, \ l_ulong old_len, l_ulong new_len, \ l_ulong flags, l_ulong new_addr); } -164 AUE_NULL MSTD { int linux_setresuid16(l_uid16_t ruid, \ +164 AUE_SETRESUID MSTD { int linux_setresuid16(l_uid16_t ruid, \ l_uid16_t euid, l_uid16_t suid); } -165 AUE_NULL MSTD { int linux_getresuid16(l_uid16_t *ruid, \ +165 AUE_GETRESUID MSTD { int linux_getresuid16(l_uid16_t *ruid, \ l_uid16_t *euid, l_uid16_t *suid); } 166 AUE_NULL UNIMPL vm86 167 AUE_NULL MSTD { int linux_query_module(void); } -168 AUE_NULL MNOPROTO { int poll(struct pollfd*, \ +168 AUE_POLL MNOPROTO { int poll(struct pollfd*, \ unsigned int nfds, int timeout); } 169 AUE_NULL MSTD { int linux_nfsservctl(void); } -170 AUE_NULL MSTD { int linux_setresgid16(l_gid16_t rgid, \ +170 AUE_SETRESGID MSTD { int linux_setresgid16(l_gid16_t rgid, \ l_gid16_t egid, l_gid16_t sgid); } -171 AUE_NULL MSTD { int linux_getresgid16(l_gid16_t *rgid, \ +171 AUE_GETRESGID MSTD { int linux_getresgid16(l_gid16_t *rgid, \ l_gid16_t *egid, l_gid16_t *sgid); } -172 AUE_NULL MSTD { int linux_prctl(void); } +172 AUE_PRCTL MSTD { int linux_prctl(void); } 173 AUE_NULL MSTD { int linux_rt_sigreturn( \ struct l_ucontext *ucp); } 174 AUE_NULL MSTD { int linux_rt_sigaction(l_int sig, \ @@ -315,78 +317,78 @@ 179 AUE_NULL MSTD { int linux_rt_sigsuspend( \ l_sigset_t *newset, \ l_size_t sigsetsize); } -180 AUE_NULL MSTD { int linux_pread(l_uint fd, char *buf, \ +180 AUE_PREAD MSTD { int linux_pread(l_uint fd, char *buf, \ l_size_t nbyte, l_loff_t offset); } -181 AUE_NULL MSTD { int linux_pwrite(l_uint fd, char *buf, \ +181 AUE_PWRITE MSTD { int linux_pwrite(l_uint fd, char *buf, \ l_size_t nbyte, l_loff_t offset); } -182 AUE_NULL MSTD { int linux_chown16(char *path, \ +182 AUE_CHOWN MSTD { int linux_chown16(char *path, \ l_uid16_t uid, l_gid16_t gid); } -183 AUE_NULL MSTD { int linux_getcwd(char *buf, \ +183 AUE_GETCWD MSTD { int linux_getcwd(char *buf, \ l_ulong bufsize); } -184 AUE_NULL MSTD { int linux_capget(void); } -185 AUE_NULL MSTD { int linux_capset(void); } +184 AUE_CAPGET MSTD { int linux_capget(void); } +185 AUE_CAPSET MSTD { int linux_capset(void); } 186 AUE_NULL MSTD { int linux_sigaltstack(l_stack_t *uss, \ l_stack_t *uoss); } -187 AUE_NULL MSTD { int linux_sendfile(void); } -188 AUE_NULL UNIMPL getpmsg -189 AUE_NULL UNIMPL putpmsg -190 AUE_NULL MSTD { int linux_vfork(void); } -191 AUE_NULL MSTD { int linux_getrlimit(l_uint resource, \ +187 AUE_SENDFILE MSTD { int linux_sendfile(void); } +188 AUE_GETPMSG UNIMPL getpmsg +189 AUE_PUTPMSG UNIMPL putpmsg +190 AUE_VFORK MSTD { int linux_vfork(void); } +191 AUE_GETRLIMIT MSTD { int linux_getrlimit(l_uint resource, \ struct l_rlimit *rlim); } -192 AUE_NULL MSTD { int linux_mmap2(l_ulong addr, l_ulong len, \ +192 AUE_MMAP MSTD { int linux_mmap2(l_ulong addr, l_ulong len, \ l_ulong prot, l_ulong flags, l_ulong fd, \ l_ulong pgoff); } -193 AUE_NULL MSTD { int linux_truncate64(char *path, \ +193 AUE_TRUNCATE MSTD { int linux_truncate64(char *path, \ l_loff_t length); } -194 AUE_NULL MSTD { int linux_ftruncate64(l_uint fd, \ +194 AUE_FTRUNCATE MSTD { int linux_ftruncate64(l_uint fd, \ l_loff_t length); } -195 AUE_NULL MSTD { int linux_stat64(char *filename, \ +195 AUE_STAT MSTD { int linux_stat64(char *filename, \ struct l_stat64 *statbuf, l_long flags); } -196 AUE_NULL MSTD { int linux_lstat64(char *filename, \ +196 AUE_LSTAT MSTD { int linux_lstat64(char *filename, \ struct l_stat64 *statbuf, l_long flags); } -197 AUE_NULL MSTD { int linux_fstat64(l_ulong fd, \ +197 AUE_FSTAT MSTD { int linux_fstat64(l_ulong fd, \ struct l_stat64 *statbuf, l_long flags); } -198 AUE_NULL MSTD { int linux_lchown(char *path, l_uid_t uid, \ +198 AUE_LCHOWN MSTD { int linux_lchown(char *path, l_uid_t uid, \ l_gid_t gid); } -199 AUE_NULL MSTD { int linux_getuid(void); } -200 AUE_NULL MSTD { int linux_getgid(void); } -201 AUE_NULL MNOPROTO { int geteuid(void); } -202 AUE_NULL MNOPROTO { int getegid(void); } -203 AUE_NULL MNOPROTO { int setreuid(uid_t ruid, uid_t euid); } -204 AUE_NULL MNOPROTO { int setregid(gid_t rgid, gid_t egid); } -205 AUE_NULL MSTD { int linux_getgroups(l_int gidsetsize, \ +199 AUE_GETUID MSTD { int linux_getuid(void); } +200 AUE_GETGID MSTD { int linux_getgid(void); } +201 AUE_GETEUID MNOPROTO { int geteuid(void); } +202 AUE_GETEGID MNOPROTO { int getegid(void); } +203 AUE_SETREUID MNOPROTO { int setreuid(uid_t ruid, uid_t euid); } +204 AUE_SETREGID MNOPROTO { int setregid(gid_t rgid, gid_t egid); } +205 AUE_GETGROUPS MSTD { int linux_getgroups(l_int gidsetsize, \ l_gid_t *grouplist); } -206 AUE_NULL MSTD { int linux_setgroups(l_int gidsetsize, \ +206 AUE_SETGROUPS MSTD { int linux_setgroups(l_int gidsetsize, \ l_gid_t *grouplist); } -207 AUE_NULL NODEF fchown fchown fchown_args int -208 AUE_NULL MNOPROTO { int setresuid(uid_t ruid, uid_t euid, \ +207 AUE_FCHOWN NODEF fchown fchown fchown_args int +208 AUE_SETRESUID MNOPROTO { int setresuid(uid_t ruid, uid_t euid, \ uid_t suid); } -209 AUE_NULL MNOPROTO { int getresuid(uid_t *ruid, uid_t *euid, \ +209 AUE_GETRESUID MNOPROTO { int getresuid(uid_t *ruid, uid_t *euid, \ uid_t *suid); } -210 AUE_NULL MNOPROTO { int setresgid(gid_t rgid, gid_t egid, \ +210 AUE_SETRESGID MNOPROTO { int setresgid(gid_t rgid, gid_t egid, \ gid_t sgid); } -211 AUE_NULL MNOPROTO { int getresgid(gid_t *rgid, gid_t *egid, \ +211 AUE_GETRESGID MNOPROTO { int getresgid(gid_t *rgid, gid_t *egid, \ gid_t *sgid); } -212 AUE_NULL MSTD { int linux_chown(char *path, l_uid_t uid, \ +212 AUE_CHOWN MSTD { int linux_chown(char *path, l_uid_t uid, \ l_gid_t gid); } -213 AUE_NULL MNOPROTO { int setuid(uid_t uid); } -214 AUE_NULL MNOPROTO { int setgid(gid_t gid); } -215 AUE_NULL MSTD { int linux_setfsuid(l_uid_t uid); } -216 AUE_NULL MSTD { int linux_setfsgid(l_gid_t gid); } -217 AUE_NULL MSTD { int linux_pivot_root(char *new_root, \ +213 AUE_SETUID MNOPROTO { int setuid(uid_t uid); } +214 AUE_SETGID MNOPROTO { int setgid(gid_t gid); } +215 AUE_SETFSUID MSTD { int linux_setfsuid(l_uid_t uid); } +216 AUE_SETFSGID MSTD { int linux_setfsgid(l_gid_t gid); } +217 AUE_PIVOT_ROOT MSTD { int linux_pivot_root(char *new_root, \ char *put_old); } -218 AUE_NULL MSTD { int linux_mincore(l_ulong start, \ +218 AUE_MINCORE MSTD { int linux_mincore(l_ulong start, \ l_size_t len, u_char *vec); } -219 AUE_NULL MNOPROTO { int madvise(void *addr, size_t len, \ +219 AUE_MADVISE MNOPROTO { int madvise(void *addr, size_t len, \ int behav); } -220 AUE_NULL STD { int linux_getdents64(l_uint fd, \ +220 AUE_O_GETDENTS STD { int linux_getdents64(l_uint fd, \ void *dirent, l_uint count); } -221 AUE_NULL MSTD { int linux_fcntl64(l_uint fd, l_uint cmd, \ +221 AUE_FCNTL MSTD { int linux_fcntl64(l_uint fd, l_uint cmd, \ uintptr_t arg); } 222 AUE_NULL UNIMPL 223 AUE_NULL UNIMPL -224 AUE_NULL MNOPROTO { int linux_getpid(void); } gettid \ - linux_getpid_args void +224 AUE_NULL MNOPROTO { long linux_getpid(void); } gettid \ + linux_getpid_args void 225 AUE_NULL UNIMPL linux_readahead 226 AUE_NULL MSTD { int linux_setxattr(void); } 227 AUE_NULL MSTD { int linux_lsetxattr(void); } @@ -401,7 +403,7 @@ 236 AUE_NULL MSTD { int linux_lremovexattr(void); } 237 AUE_NULL MSTD { int linux_fremovexattr(void); } 238 AUE_NULL UNIMPL linux_tkill -239 AUE_NULL UNIMPL linux_sendfile64 +239 AUE_SENDFILE UNIMPL linux_sendfile64 240 AUE_NULL UNIMPL linux_futex 241 AUE_NULL UNIMPL linux_sched_setaffinity 242 AUE_NULL UNIMPL linux_sched_getaffinity @@ -414,7 +416,7 @@ 249 AUE_NULL UNIMPL linux_io_cancel 250 AUE_NULL MSTD { int linux_fadvise64(void); } 251 AUE_NULL UNIMPL -252 AUE_NULL MNOPROTO { void sys_exit(int rval); } exit_group \ +252 AUE_EXIT MNOPROTO { void sys_exit(int rval); } exit_group \ sys_exit_args void 253 AUE_NULL UNIMPL linux_lookup_dcookie 254 AUE_NULL UNIMPL linux_epoll_create @@ -427,7 +429,50 @@ 261 AUE_NULL UNIMPL linux_timer_gettime 262 AUE_NULL UNIMPL linux_timer_getoverrun 263 AUE_NULL UNIMPL linux_timer_delete -264 AUE_NULL UNIMPL linux_clock_settime +264 AUE_CLOCK_SETTIME UNIMPL linux_clock_settime 265 AUE_NULL UNIMPL linux_clock_gettime 266 AUE_NULL UNIMPL linux_clock_getres 267 AUE_NULL UNIMPL linux_clock_nanosleep +268 AUE_NULL UNIMPL linux_statfs64 +269 AUE_NULL UNIMPL linux_fstatfs64 +270 AUE_NULL UNIMPL linux_tgkill /* 270 */ +271 AUE_NULL UNIMPL linux_utimes +272 AUE_NULL UNIMPL linux_fadvise64_64 +273 AUE_NULL UNIMPL linux_ni_syscall /* linux_vserver */ +274 AUE_NULL UNIMPL linux_mbind +275 AUE_NULL UNIMPL linux_get_mempolicy +276 AUE_NULL UNIMPL linux_set_mempolicy +277 AUE_NULL UNIMPL linux_mq_open +278 AUE_NULL UNIMPL linux_mq_unlink +279 AUE_NULL UNIMPL linux_mq_timedsend +280 AUE_NULL UNIMPL linux_mq_timedreceive /* 280 */ +281 AUE_NULL UNIMPL linux_mq_notify +282 AUE_NULL UNIMPL linux_mq_getsetattr +283 AUE_NULL UNIMPL linux_kexec_load +284 AUE_NULL UNIMPL linux_waitid +285 AUE_NULL UNIMPL linux_ni_syscall /* 285 */ /* available */ +286 AUE_NULL UNIMPL linux_add_key +287 AUE_NULL UNIMPL linux_request_key +288 AUE_NULL UNIMPL linux_keyctl +289 AUE_NULL UNIMPL linux_ioprio_set +290 AUE_NULL UNIMPL linux_ioprio_get /* 290 */ +291 AUE_NULL UNIMPL linux_inotify_init +292 AUE_NULL UNIMPL linux_inotify_add_watch +293 AUE_NULL UNIMPL linux_inotify_rm_watch +294 AUE_NULL UNIMPL linux_migrate_pages +295 AUE_NULL UNIMPL linux_openat /* 295 */ +296 AUE_NULL UNIMPL linux_mkdirat +297 AUE_NULL UNIMPL linux_mknodat +298 AUE_NULL UNIMPL linux_fchownat +299 AUE_NULL UNIMPL linux_futimesat +300 AUE_NULL UNIMPL linux_fstatat64 /* 300 */ +301 AUE_NULL UNIMPL linux_unlinkat +302 AUE_NULL UNIMPL linux_renameat +303 AUE_NULL UNIMPL linux_linkat +304 AUE_NULL UNIMPL linux_symlinkat +305 AUE_NULL UNIMPL linux_readlinkat /* 305 */ +306 AUE_NULL UNIMPL linux_fchmodat +307 AUE_NULL UNIMPL linux_faccessat +308 AUE_NULL UNIMPL linux_pselect6 +309 AUE_NULL UNIMPL linux_ppoll +310 AUE_NULL UNIMPL linux_unshare /* 310 */ ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/syscalls.master#2 (text+ko) ==== @@ -434,3 +434,46 @@ 265 AUE_NULL UNIMPL linux_clock_gettime 266 AUE_NULL UNIMPL linux_clock_getres 267 AUE_NULL UNIMPL linux_clock_nanosleep +268 AUE_NULL UNIMPL linux_statfs64 +269 AUE_NULL UNIMPL linux_fstatfs64 +270 AUE_NULL UNIMPL linux_tgkill /* 270 */ +271 AUE_NULL UNIMPL linux_utimes +272 AUE_NULL UNIMPL linux_fadvise64_64 +273 AUE_NULL UNIMPL linux_ni_syscall /* linux_vserver */ +274 AUE_NULL UNIMPL linux_mbind +275 AUE_NULL UNIMPL linux_get_mempolicy +276 AUE_NULL UNIMPL linux_set_mempolicy +277 AUE_NULL UNIMPL linux_mq_open +278 AUE_NULL UNIMPL linux_mq_unlink +279 AUE_NULL UNIMPL linux_mq_timedsend +280 AUE_NULL UNIMPL linux_mq_timedreceive /* 280 */ +281 AUE_NULL UNIMPL linux_mq_notify +282 AUE_NULL UNIMPL linux_mq_getsetattr +283 AUE_NULL UNIMPL linux_kexec_load +284 AUE_NULL UNIMPL linux_waitid +285 AUE_NULL UNIMPL linux_ni_syscall /* 285 */ /* available */ +286 AUE_NULL UNIMPL linux_add_key +287 AUE_NULL UNIMPL linux_request_key +288 AUE_NULL UNIMPL linux_keyctl +289 AUE_NULL UNIMPL linux_ioprio_set +290 AUE_NULL UNIMPL linux_ioprio_get /* 290 */ +291 AUE_NULL UNIMPL linux_inotify_init +292 AUE_NULL UNIMPL linux_inotify_add_watch +293 AUE_NULL UNIMPL linux_inotify_rm_watch +294 AUE_NULL UNIMPL linux_migrate_pages +295 AUE_NULL UNIMPL linux_openat /* 295 */ +296 AUE_NULL UNIMPL linux_mkdirat +297 AUE_NULL UNIMPL linux_mknodat +298 AUE_NULL UNIMPL linux_fchownat +299 AUE_NULL UNIMPL linux_futimesat +300 AUE_NULL UNIMPL linux_fstatat64 /* 300 */ +301 AUE_NULL UNIMPL linux_unlinkat +302 AUE_NULL UNIMPL linux_renameat +303 AUE_NULL UNIMPL linux_linkat +304 AUE_NULL UNIMPL linux_symlinkat +305 AUE_NULL UNIMPL linux_readlinkat /* 305 */ +306 AUE_NULL UNIMPL linux_fchmodat +307 AUE_NULL UNIMPL linux_faccessat +308 AUE_NULL UNIMPL linux_pselect6 +309 AUE_NULL UNIMPL linux_ppoll +310 AUE_NULL UNIMPL linux_unshare /* 310 */ From owner-p4-projects@FreeBSD.ORG Tue Jun 6 15:56:11 2006 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 9B26416A73A; Tue, 6 Jun 2006 15:56:11 +0000 (UTC) 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 0A73816A5AE for ; Tue, 6 Jun 2006 15:56:09 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A123943D45 for ; Tue, 6 Jun 2006 15:56:08 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k56FsJF8081790 for ; Tue, 6 Jun 2006 15:54:19 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k56FsJFh081787 for perforce@freebsd.org; Tue, 6 Jun 2006 15:54:19 GMT (envelope-from rdivacky@FreeBSD.org) Date: Tue, 6 Jun 2006 15:54:19 GMT Message-Id: <200606061554.k56FsJFh081787@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 98673 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, 06 Jun 2006 15:56:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=98673 Change 98673 by rdivacky@rdivacky_witten on 2006/06/06 15:53:24 Regenerate after syscall.master update Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_proto.h#2 edit .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_syscall.h#2 edit .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_sysent.c#2 edit .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_proto.h#2 edit .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_syscall.h#2 edit .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_sysent.c#2 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_proto.h#2 (text+ko) ==== @@ -2,7 +2,7 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.11 2006/05/10 18:19:51 netchild Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.9 2006/05/10 18:17:28 netchild Exp */ ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_syscall.h#2 (text+ko) ==== @@ -2,7 +2,7 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.11 2006/05/10 18:19:51 netchild Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.9 2006/05/10 18:17:28 netchild Exp */ @@ -221,4 +221,4 @@ #define LINUX_SYS_linux_fremovexattr 237 #define LINUX_SYS_linux_fadvise64 250 #define LINUX_SYS_exit_group 252 -#define LINUX_SYS_MAXSYSCALL 268 +#define LINUX_SYS_MAXSYSCALL 311 ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_sysent.c#2 (text+ko) ==== @@ -2,7 +2,7 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.11 2006/05/10 18:19:51 netchild Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.9 2006/05/10 18:17:28 netchild Exp */ @@ -21,178 +21,178 @@ struct sysent linux_sysent[] = { #define nosys linux_nosys { 0, (sy_call_t *)nosys, AUE_NULL }, /* 0 = setup */ - { SYF_MPSAFE | AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_NULL }, /* 1 = exit */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_fork, AUE_NULL }, /* 2 = linux_fork */ + { SYF_MPSAFE | AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT }, /* 1 = exit */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_fork, AUE_FORK }, /* 2 = linux_fork */ { SYF_MPSAFE | AS(read_args), (sy_call_t *)read, AUE_NULL }, /* 3 = read */ { SYF_MPSAFE | AS(write_args), (sy_call_t *)write, AUE_NULL }, /* 4 = write */ - { SYF_MPSAFE | AS(linux_open_args), (sy_call_t *)linux_open, AUE_NULL }, /* 5 = linux_open */ - { SYF_MPSAFE | AS(close_args), (sy_call_t *)close, AUE_NULL }, /* 6 = close */ - { SYF_MPSAFE | AS(linux_waitpid_args), (sy_call_t *)linux_waitpid, AUE_NULL }, /* 7 = linux_waitpid */ - { SYF_MPSAFE | AS(linux_creat_args), (sy_call_t *)linux_creat, AUE_NULL }, /* 8 = linux_creat */ - { SYF_MPSAFE | AS(linux_link_args), (sy_call_t *)linux_link, AUE_NULL }, /* 9 = linux_link */ - { SYF_MPSAFE | AS(linux_unlink_args), (sy_call_t *)linux_unlink, AUE_NULL }, /* 10 = linux_unlink */ - { SYF_MPSAFE | AS(linux_execve_args), (sy_call_t *)linux_execve, AUE_NULL }, /* 11 = linux_execve */ - { SYF_MPSAFE | AS(linux_chdir_args), (sy_call_t *)linux_chdir, AUE_NULL }, /* 12 = linux_chdir */ + { SYF_MPSAFE | AS(linux_open_args), (sy_call_t *)linux_open, AUE_OPEN_RWTC }, /* 5 = linux_open */ + { SYF_MPSAFE | AS(close_args), (sy_call_t *)close, AUE_CLOSE }, /* 6 = close */ + { SYF_MPSAFE | AS(linux_waitpid_args), (sy_call_t *)linux_waitpid, AUE_WAIT4 }, /* 7 = linux_waitpid */ + { SYF_MPSAFE | AS(linux_creat_args), (sy_call_t *)linux_creat, AUE_O_CREAT }, /* 8 = linux_creat */ + { SYF_MPSAFE | AS(linux_link_args), (sy_call_t *)linux_link, AUE_LINK }, /* 9 = linux_link */ + { SYF_MPSAFE | AS(linux_unlink_args), (sy_call_t *)linux_unlink, AUE_UNLINK }, /* 10 = linux_unlink */ + { SYF_MPSAFE | AS(linux_execve_args), (sy_call_t *)linux_execve, AUE_EXECVE }, /* 11 = linux_execve */ + { SYF_MPSAFE | AS(linux_chdir_args), (sy_call_t *)linux_chdir, AUE_CHDIR }, /* 12 = linux_chdir */ { SYF_MPSAFE | AS(linux_time_args), (sy_call_t *)linux_time, AUE_NULL }, /* 13 = linux_time */ - { SYF_MPSAFE | AS(linux_mknod_args), (sy_call_t *)linux_mknod, AUE_NULL }, /* 14 = linux_mknod */ - { SYF_MPSAFE | AS(linux_chmod_args), (sy_call_t *)linux_chmod, AUE_NULL }, /* 15 = linux_chmod */ - { SYF_MPSAFE | AS(linux_lchown16_args), (sy_call_t *)linux_lchown16, AUE_NULL }, /* 16 = linux_lchown16 */ + { SYF_MPSAFE | AS(linux_mknod_args), (sy_call_t *)linux_mknod, AUE_MKNOD }, /* 14 = linux_mknod */ + { SYF_MPSAFE | AS(linux_chmod_args), (sy_call_t *)linux_chmod, AUE_CHMOD }, /* 15 = linux_chmod */ + { SYF_MPSAFE | AS(linux_lchown16_args), (sy_call_t *)linux_lchown16, AUE_LCHOWN }, /* 16 = linux_lchown16 */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 17 = break */ - { SYF_MPSAFE | AS(linux_stat_args), (sy_call_t *)linux_stat, AUE_NULL }, /* 18 = linux_stat */ - { SYF_MPSAFE | AS(linux_lseek_args), (sy_call_t *)linux_lseek, AUE_NULL }, /* 19 = linux_lseek */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_getpid, AUE_NULL }, /* 20 = linux_getpid */ - { AS(linux_mount_args), (sy_call_t *)linux_mount, AUE_NULL }, /* 21 = linux_mount */ - { AS(linux_oldumount_args), (sy_call_t *)linux_oldumount, AUE_NULL }, /* 22 = linux_oldumount */ - { SYF_MPSAFE | AS(linux_setuid16_args), (sy_call_t *)linux_setuid16, AUE_NULL }, /* 23 = linux_setuid16 */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_getuid16, AUE_NULL }, /* 24 = linux_getuid16 */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_stime, AUE_NULL }, /* 25 = linux_stime */ - { SYF_MPSAFE | AS(linux_ptrace_args), (sy_call_t *)linux_ptrace, AUE_NULL }, /* 26 = linux_ptrace */ + { SYF_MPSAFE | AS(linux_stat_args), (sy_call_t *)linux_stat, AUE_STAT }, /* 18 = linux_stat */ + { SYF_MPSAFE | AS(linux_lseek_args), (sy_call_t *)linux_lseek, AUE_LSEEK }, /* 19 = linux_lseek */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_getpid, AUE_GETPID }, /* 20 = linux_getpid */ + { AS(linux_mount_args), (sy_call_t *)linux_mount, AUE_MOUNT }, /* 21 = linux_mount */ + { AS(linux_oldumount_args), (sy_call_t *)linux_oldumount, AUE_UMOUNT }, /* 22 = linux_oldumount */ + { SYF_MPSAFE | AS(linux_setuid16_args), (sy_call_t *)linux_setuid16, AUE_SETUID }, /* 23 = linux_setuid16 */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_getuid16, AUE_GETUID }, /* 24 = linux_getuid16 */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_stime, AUE_SETTIMEOFDAY }, /* 25 = linux_stime */ + { SYF_MPSAFE | AS(linux_ptrace_args), (sy_call_t *)linux_ptrace, AUE_PTRACE }, /* 26 = linux_ptrace */ { SYF_MPSAFE | AS(linux_alarm_args), (sy_call_t *)linux_alarm, AUE_NULL }, /* 27 = linux_alarm */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 28 = fstat */ { SYF_MPSAFE | 0, (sy_call_t *)linux_pause, AUE_NULL }, /* 29 = linux_pause */ - { SYF_MPSAFE | AS(linux_utime_args), (sy_call_t *)linux_utime, AUE_NULL }, /* 30 = linux_utime */ + { SYF_MPSAFE | AS(linux_utime_args), (sy_call_t *)linux_utime, AUE_UTIME }, /* 30 = linux_utime */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 31 = stty */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 32 = gtty */ - { SYF_MPSAFE | AS(linux_access_args), (sy_call_t *)linux_access, AUE_NULL }, /* 33 = linux_access */ - { SYF_MPSAFE | AS(linux_nice_args), (sy_call_t *)linux_nice, AUE_NULL }, /* 34 = linux_nice */ + { SYF_MPSAFE | AS(linux_access_args), (sy_call_t *)linux_access, AUE_ACCESS }, /* 33 = linux_access */ + { SYF_MPSAFE | AS(linux_nice_args), (sy_call_t *)linux_nice, AUE_NICE }, /* 34 = linux_nice */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 35 = ftime */ - { SYF_MPSAFE | 0, (sy_call_t *)sync, AUE_NULL }, /* 36 = sync */ - { SYF_MPSAFE | AS(linux_kill_args), (sy_call_t *)linux_kill, AUE_NULL }, /* 37 = linux_kill */ - { SYF_MPSAFE | AS(linux_rename_args), (sy_call_t *)linux_rename, AUE_NULL }, /* 38 = linux_rename */ - { SYF_MPSAFE | AS(linux_mkdir_args), (sy_call_t *)linux_mkdir, AUE_NULL }, /* 39 = linux_mkdir */ - { SYF_MPSAFE | AS(linux_rmdir_args), (sy_call_t *)linux_rmdir, AUE_NULL }, /* 40 = linux_rmdir */ - { SYF_MPSAFE | AS(dup_args), (sy_call_t *)dup, AUE_NULL }, /* 41 = dup */ - { SYF_MPSAFE | AS(linux_pipe_args), (sy_call_t *)linux_pipe, AUE_NULL }, /* 42 = linux_pipe */ + { SYF_MPSAFE | 0, (sy_call_t *)sync, AUE_SYNC }, /* 36 = sync */ + { SYF_MPSAFE | AS(linux_kill_args), (sy_call_t *)linux_kill, AUE_KILL }, /* 37 = linux_kill */ + { SYF_MPSAFE | AS(linux_rename_args), (sy_call_t *)linux_rename, AUE_RENAME }, /* 38 = linux_rename */ + { SYF_MPSAFE | AS(linux_mkdir_args), (sy_call_t *)linux_mkdir, AUE_MKDIR }, /* 39 = linux_mkdir */ + { SYF_MPSAFE | AS(linux_rmdir_args), (sy_call_t *)linux_rmdir, AUE_RMDIR }, /* 40 = linux_rmdir */ + { SYF_MPSAFE | AS(dup_args), (sy_call_t *)dup, AUE_DUP }, /* 41 = dup */ + { SYF_MPSAFE | AS(linux_pipe_args), (sy_call_t *)linux_pipe, AUE_PIPE }, /* 42 = linux_pipe */ { SYF_MPSAFE | AS(linux_times_args), (sy_call_t *)linux_times, AUE_NULL }, /* 43 = linux_times */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 44 = prof */ { AS(linux_brk_args), (sy_call_t *)linux_brk, AUE_NULL }, /* 45 = linux_brk */ - { SYF_MPSAFE | AS(linux_setgid16_args), (sy_call_t *)linux_setgid16, AUE_NULL }, /* 46 = linux_setgid16 */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_getgid16, AUE_NULL }, /* 47 = linux_getgid16 */ + { SYF_MPSAFE | AS(linux_setgid16_args), (sy_call_t *)linux_setgid16, AUE_SETGID }, /* 46 = linux_setgid16 */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_getgid16, AUE_GETGID }, /* 47 = linux_getgid16 */ { SYF_MPSAFE | AS(linux_signal_args), (sy_call_t *)linux_signal, AUE_NULL }, /* 48 = linux_signal */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_geteuid16, AUE_NULL }, /* 49 = linux_geteuid16 */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_getegid16, AUE_NULL }, /* 50 = linux_getegid16 */ - { SYF_MPSAFE | AS(acct_args), (sy_call_t *)acct, AUE_NULL }, /* 51 = acct */ - { AS(linux_umount_args), (sy_call_t *)linux_umount, AUE_NULL }, /* 52 = linux_umount */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_geteuid16, AUE_GETEUID }, /* 49 = linux_geteuid16 */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_getegid16, AUE_GETEGID }, /* 50 = linux_getegid16 */ + { SYF_MPSAFE | AS(acct_args), (sy_call_t *)acct, AUE_ACCT }, /* 51 = acct */ + { AS(linux_umount_args), (sy_call_t *)linux_umount, AUE_UMOUNT }, /* 52 = linux_umount */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 53 = lock */ - { AS(linux_ioctl_args), (sy_call_t *)linux_ioctl, AUE_NULL }, /* 54 = linux_ioctl */ - { SYF_MPSAFE | AS(linux_fcntl_args), (sy_call_t *)linux_fcntl, AUE_NULL }, /* 55 = linux_fcntl */ + { AS(linux_ioctl_args), (sy_call_t *)linux_ioctl, AUE_IOCTL }, /* 54 = linux_ioctl */ + { SYF_MPSAFE | AS(linux_fcntl_args), (sy_call_t *)linux_fcntl, AUE_FCNTL }, /* 55 = linux_fcntl */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 56 = mpx */ - { SYF_MPSAFE | AS(setpgid_args), (sy_call_t *)setpgid, AUE_NULL }, /* 57 = setpgid */ + { SYF_MPSAFE | AS(setpgid_args), (sy_call_t *)setpgid, AUE_SETPGRP }, /* 57 = setpgid */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 58 = ulimit */ { SYF_MPSAFE | 0, (sy_call_t *)linux_olduname, AUE_NULL }, /* 59 = linux_olduname */ - { SYF_MPSAFE | AS(umask_args), (sy_call_t *)umask, AUE_NULL }, /* 60 = umask */ - { SYF_MPSAFE | AS(chroot_args), (sy_call_t *)chroot, AUE_NULL }, /* 61 = chroot */ + { SYF_MPSAFE | AS(umask_args), (sy_call_t *)umask, AUE_UMASK }, /* 60 = umask */ + { SYF_MPSAFE | AS(chroot_args), (sy_call_t *)chroot, AUE_CHROOT }, /* 61 = chroot */ { SYF_MPSAFE | AS(linux_ustat_args), (sy_call_t *)linux_ustat, AUE_NULL }, /* 62 = linux_ustat */ - { SYF_MPSAFE | AS(dup2_args), (sy_call_t *)dup2, AUE_NULL }, /* 63 = dup2 */ - { SYF_MPSAFE | 0, (sy_call_t *)getppid, AUE_NULL }, /* 64 = getppid */ - { SYF_MPSAFE | 0, (sy_call_t *)getpgrp, AUE_NULL }, /* 65 = getpgrp */ - { SYF_MPSAFE | 0, (sy_call_t *)setsid, AUE_NULL }, /* 66 = setsid */ + { SYF_MPSAFE | AS(dup2_args), (sy_call_t *)dup2, AUE_DUP2 }, /* 63 = dup2 */ + { SYF_MPSAFE | 0, (sy_call_t *)getppid, AUE_GETPPID }, /* 64 = getppid */ + { SYF_MPSAFE | 0, (sy_call_t *)getpgrp, AUE_GETPGRP }, /* 65 = getpgrp */ + { SYF_MPSAFE | 0, (sy_call_t *)setsid, AUE_SETSID }, /* 66 = setsid */ { SYF_MPSAFE | AS(linux_sigaction_args), (sy_call_t *)linux_sigaction, AUE_NULL }, /* 67 = linux_sigaction */ { SYF_MPSAFE | 0, (sy_call_t *)linux_sgetmask, AUE_NULL }, /* 68 = linux_sgetmask */ { SYF_MPSAFE | AS(linux_ssetmask_args), (sy_call_t *)linux_ssetmask, AUE_NULL }, /* 69 = linux_ssetmask */ - { SYF_MPSAFE | AS(linux_setreuid16_args), (sy_call_t *)linux_setreuid16, AUE_NULL }, /* 70 = linux_setreuid16 */ - { SYF_MPSAFE | AS(linux_setregid16_args), (sy_call_t *)linux_setregid16, AUE_NULL }, /* 71 = linux_setregid16 */ + { SYF_MPSAFE | AS(linux_setreuid16_args), (sy_call_t *)linux_setreuid16, AUE_SETREUID }, /* 70 = linux_setreuid16 */ + { SYF_MPSAFE | AS(linux_setregid16_args), (sy_call_t *)linux_setregid16, AUE_SETREGID }, /* 71 = linux_setregid16 */ { SYF_MPSAFE | AS(linux_sigsuspend_args), (sy_call_t *)linux_sigsuspend, AUE_NULL }, /* 72 = linux_sigsuspend */ { SYF_MPSAFE | AS(linux_sigpending_args), (sy_call_t *)linux_sigpending, AUE_NULL }, /* 73 = linux_sigpending */ - { SYF_MPSAFE | AS(linux_sethostname_args), (sy_call_t *)linux_sethostname, AUE_NULL }, /* 74 = linux_sethostname */ - { SYF_MPSAFE | AS(linux_setrlimit_args), (sy_call_t *)linux_setrlimit, AUE_NULL }, /* 75 = linux_setrlimit */ - { SYF_MPSAFE | AS(linux_old_getrlimit_args), (sy_call_t *)linux_old_getrlimit, AUE_NULL }, /* 76 = linux_old_getrlimit */ - { SYF_MPSAFE | AS(linux_getrusage_args), (sy_call_t *)linux_getrusage, AUE_NULL }, /* 77 = linux_getrusage */ + { SYF_MPSAFE | AS(linux_sethostname_args), (sy_call_t *)linux_sethostname, AUE_SYSCTL }, /* 74 = linux_sethostname */ + { SYF_MPSAFE | AS(linux_setrlimit_args), (sy_call_t *)linux_setrlimit, AUE_SETRLIMIT }, /* 75 = linux_setrlimit */ + { SYF_MPSAFE | AS(linux_old_getrlimit_args), (sy_call_t *)linux_old_getrlimit, AUE_GETRLIMIT }, /* 76 = linux_old_getrlimit */ + { SYF_MPSAFE | AS(linux_getrusage_args), (sy_call_t *)linux_getrusage, AUE_GETRUSAGE }, /* 77 = linux_getrusage */ { SYF_MPSAFE | AS(linux_gettimeofday_args), (sy_call_t *)linux_gettimeofday, AUE_NULL }, /* 78 = linux_gettimeofday */ - { SYF_MPSAFE | AS(linux_settimeofday_args), (sy_call_t *)linux_settimeofday, AUE_NULL }, /* 79 = linux_settimeofday */ - { SYF_MPSAFE | AS(linux_getgroups16_args), (sy_call_t *)linux_getgroups16, AUE_NULL }, /* 80 = linux_getgroups16 */ - { SYF_MPSAFE | AS(linux_setgroups16_args), (sy_call_t *)linux_setgroups16, AUE_NULL }, /* 81 = linux_setgroups16 */ - { SYF_MPSAFE | AS(linux_old_select_args), (sy_call_t *)linux_old_select, AUE_NULL }, /* 82 = linux_old_select */ - { SYF_MPSAFE | AS(linux_symlink_args), (sy_call_t *)linux_symlink, AUE_NULL }, /* 83 = linux_symlink */ - { SYF_MPSAFE | AS(linux_lstat_args), (sy_call_t *)linux_lstat, AUE_NULL }, /* 84 = linux_lstat */ - { SYF_MPSAFE | AS(linux_readlink_args), (sy_call_t *)linux_readlink, AUE_NULL }, /* 85 = linux_readlink */ + { SYF_MPSAFE | AS(linux_settimeofday_args), (sy_call_t *)linux_settimeofday, AUE_SETTIMEOFDAY }, /* 79 = linux_settimeofday */ + { SYF_MPSAFE | AS(linux_getgroups16_args), (sy_call_t *)linux_getgroups16, AUE_GETGROUPS }, /* 80 = linux_getgroups16 */ + { SYF_MPSAFE | AS(linux_setgroups16_args), (sy_call_t *)linux_setgroups16, AUE_SETGROUPS }, /* 81 = linux_setgroups16 */ + { SYF_MPSAFE | AS(linux_old_select_args), (sy_call_t *)linux_old_select, AUE_SELECT }, /* 82 = linux_old_select */ + { SYF_MPSAFE | AS(linux_symlink_args), (sy_call_t *)linux_symlink, AUE_SYMLINK }, /* 83 = linux_symlink */ + { SYF_MPSAFE | AS(linux_lstat_args), (sy_call_t *)linux_lstat, AUE_STAT }, /* 84 = linux_lstat */ + { SYF_MPSAFE | AS(linux_readlink_args), (sy_call_t *)linux_readlink, AUE_READLINK }, /* 85 = linux_readlink */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 86 = linux_uselib */ - { SYF_MPSAFE | AS(swapon_args), (sy_call_t *)swapon, AUE_NULL }, /* 87 = swapon */ - { SYF_MPSAFE | AS(linux_reboot_args), (sy_call_t *)linux_reboot, AUE_NULL }, /* 88 = linux_reboot */ - { AS(linux_readdir_args), (sy_call_t *)linux_readdir, AUE_NULL }, /* 89 = linux_readdir */ - { SYF_MPSAFE | AS(linux_mmap_args), (sy_call_t *)linux_mmap, AUE_NULL }, /* 90 = linux_mmap */ - { SYF_MPSAFE | AS(munmap_args), (sy_call_t *)munmap, AUE_NULL }, /* 91 = munmap */ - { SYF_MPSAFE | AS(linux_truncate_args), (sy_call_t *)linux_truncate, AUE_NULL }, /* 92 = linux_truncate */ - { SYF_MPSAFE | AS(linux_ftruncate_args), (sy_call_t *)linux_ftruncate, AUE_NULL }, /* 93 = linux_ftruncate */ - { SYF_MPSAFE | AS(fchmod_args), (sy_call_t *)fchmod, AUE_NULL }, /* 94 = fchmod */ - { SYF_MPSAFE | AS(fchown_args), (sy_call_t *)fchown, AUE_NULL }, /* 95 = fchown */ - { SYF_MPSAFE | AS(linux_getpriority_args), (sy_call_t *)linux_getpriority, AUE_NULL }, /* 96 = linux_getpriority */ - { SYF_MPSAFE | AS(setpriority_args), (sy_call_t *)setpriority, AUE_NULL }, /* 97 = setpriority */ + { SYF_MPSAFE | AS(swapon_args), (sy_call_t *)swapon, AUE_SWAPON }, /* 87 = swapon */ + { SYF_MPSAFE | AS(linux_reboot_args), (sy_call_t *)linux_reboot, AUE_REBOOT }, /* 88 = linux_reboot */ + { AS(linux_readdir_args), (sy_call_t *)linux_readdir, AUE_O_GETDENTS }, /* 89 = linux_readdir */ + { SYF_MPSAFE | AS(linux_mmap_args), (sy_call_t *)linux_mmap, AUE_MMAP }, /* 90 = linux_mmap */ + { SYF_MPSAFE | AS(munmap_args), (sy_call_t *)munmap, AUE_MUNMAP }, /* 91 = munmap */ + { SYF_MPSAFE | AS(linux_truncate_args), (sy_call_t *)linux_truncate, AUE_TRUNCATE }, /* 92 = linux_truncate */ + { SYF_MPSAFE | AS(linux_ftruncate_args), (sy_call_t *)linux_ftruncate, AUE_FTRUNCATE }, /* 93 = linux_ftruncate */ + { SYF_MPSAFE | AS(fchmod_args), (sy_call_t *)fchmod, AUE_FCHMOD }, /* 94 = fchmod */ + { SYF_MPSAFE | AS(fchown_args), (sy_call_t *)fchown, AUE_FCHOWN }, /* 95 = fchown */ + { SYF_MPSAFE | AS(linux_getpriority_args), (sy_call_t *)linux_getpriority, AUE_GETPRIORITY }, /* 96 = linux_getpriority */ + { SYF_MPSAFE | AS(setpriority_args), (sy_call_t *)setpriority, AUE_SETPRIORITY }, /* 97 = setpriority */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 98 = profil */ - { SYF_MPSAFE | AS(linux_statfs_args), (sy_call_t *)linux_statfs, AUE_NULL }, /* 99 = linux_statfs */ - { SYF_MPSAFE | AS(linux_fstatfs_args), (sy_call_t *)linux_fstatfs, AUE_NULL }, /* 100 = linux_fstatfs */ + { SYF_MPSAFE | AS(linux_statfs_args), (sy_call_t *)linux_statfs, AUE_STATFS }, /* 99 = linux_statfs */ + { SYF_MPSAFE | AS(linux_fstatfs_args), (sy_call_t *)linux_fstatfs, AUE_FSTATFS }, /* 100 = linux_fstatfs */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 101 = ioperm */ { SYF_MPSAFE | AS(linux_socketcall_args), (sy_call_t *)linux_socketcall, AUE_NULL }, /* 102 = linux_socketcall */ { SYF_MPSAFE | AS(linux_syslog_args), (sy_call_t *)linux_syslog, AUE_NULL }, /* 103 = linux_syslog */ - { SYF_MPSAFE | AS(linux_setitimer_args), (sy_call_t *)linux_setitimer, AUE_NULL }, /* 104 = linux_setitimer */ - { SYF_MPSAFE | AS(linux_getitimer_args), (sy_call_t *)linux_getitimer, AUE_NULL }, /* 105 = linux_getitimer */ - { SYF_MPSAFE | AS(linux_newstat_args), (sy_call_t *)linux_newstat, AUE_NULL }, /* 106 = linux_newstat */ - { SYF_MPSAFE | AS(linux_newlstat_args), (sy_call_t *)linux_newlstat, AUE_NULL }, /* 107 = linux_newlstat */ - { SYF_MPSAFE | AS(linux_newfstat_args), (sy_call_t *)linux_newfstat, AUE_NULL }, /* 108 = linux_newfstat */ + { SYF_MPSAFE | AS(linux_setitimer_args), (sy_call_t *)linux_setitimer, AUE_SETITIMER }, /* 104 = linux_setitimer */ + { SYF_MPSAFE | AS(linux_getitimer_args), (sy_call_t *)linux_getitimer, AUE_GETITIMER }, /* 105 = linux_getitimer */ + { SYF_MPSAFE | AS(linux_newstat_args), (sy_call_t *)linux_newstat, AUE_STAT }, /* 106 = linux_newstat */ + { SYF_MPSAFE | AS(linux_newlstat_args), (sy_call_t *)linux_newlstat, AUE_LSTAT }, /* 107 = linux_newlstat */ + { SYF_MPSAFE | AS(linux_newfstat_args), (sy_call_t *)linux_newfstat, AUE_FSTAT }, /* 108 = linux_newfstat */ { SYF_MPSAFE | 0, (sy_call_t *)linux_uname, AUE_NULL }, /* 109 = linux_uname */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 110 = iopl */ { SYF_MPSAFE | 0, (sy_call_t *)linux_vhangup, AUE_NULL }, /* 111 = linux_vhangup */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 112 = idle */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 113 = vm86old */ - { SYF_MPSAFE | AS(linux_wait4_args), (sy_call_t *)linux_wait4, AUE_NULL }, /* 114 = linux_wait4 */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_swapoff, AUE_NULL }, /* 115 = linux_swapoff */ + { SYF_MPSAFE | AS(linux_wait4_args), (sy_call_t *)linux_wait4, AUE_WAIT4 }, /* 114 = linux_wait4 */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_swapoff, AUE_SWAPOFF }, /* 115 = linux_swapoff */ { SYF_MPSAFE | AS(linux_sysinfo_args), (sy_call_t *)linux_sysinfo, AUE_NULL }, /* 116 = linux_sysinfo */ { AS(linux_ipc_args), (sy_call_t *)linux_ipc, AUE_NULL }, /* 117 = linux_ipc */ - { SYF_MPSAFE | AS(fsync_args), (sy_call_t *)fsync, AUE_NULL }, /* 118 = fsync */ - { SYF_MPSAFE | AS(linux_sigreturn_args), (sy_call_t *)linux_sigreturn, AUE_NULL }, /* 119 = linux_sigreturn */ - { SYF_MPSAFE | AS(linux_clone_args), (sy_call_t *)linux_clone, AUE_NULL }, /* 120 = linux_clone */ - { SYF_MPSAFE | AS(setdomainname_args), (sy_call_t *)setdomainname, AUE_NULL }, /* 121 = setdomainname */ + { SYF_MPSAFE | AS(fsync_args), (sy_call_t *)fsync, AUE_FSYNC }, /* 118 = fsync */ + { SYF_MPSAFE | AS(linux_sigreturn_args), (sy_call_t *)linux_sigreturn, AUE_SIGRETURN }, /* 119 = linux_sigreturn */ + { SYF_MPSAFE | AS(linux_clone_args), (sy_call_t *)linux_clone, AUE_RFORK }, /* 120 = linux_clone */ + { SYF_MPSAFE | AS(setdomainname_args), (sy_call_t *)setdomainname, AUE_SYSCTL }, /* 121 = setdomainname */ { SYF_MPSAFE | AS(linux_newuname_args), (sy_call_t *)linux_newuname, AUE_NULL }, /* 122 = linux_newuname */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 123 = modify_ldt */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_adjtimex, AUE_NULL }, /* 124 = linux_adjtimex */ - { SYF_MPSAFE | AS(linux_mprotect_args), (sy_call_t *)linux_mprotect, AUE_NULL }, /* 125 = linux_mprotect */ - { SYF_MPSAFE | AS(linux_sigprocmask_args), (sy_call_t *)linux_sigprocmask, AUE_NULL }, /* 126 = linux_sigprocmask */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_adjtimex, AUE_ADJTIME }, /* 124 = linux_adjtimex */ + { SYF_MPSAFE | AS(linux_mprotect_args), (sy_call_t *)linux_mprotect, AUE_MPROTECT }, /* 125 = linux_mprotect */ + { SYF_MPSAFE | AS(linux_sigprocmask_args), (sy_call_t *)linux_sigprocmask, AUE_SIGPROCMASK }, /* 126 = linux_sigprocmask */ { SYF_MPSAFE | 0, (sy_call_t *)linux_create_module, AUE_NULL }, /* 127 = linux_create_module */ { SYF_MPSAFE | 0, (sy_call_t *)linux_init_module, AUE_NULL }, /* 128 = linux_init_module */ { SYF_MPSAFE | 0, (sy_call_t *)linux_delete_module, AUE_NULL }, /* 129 = linux_delete_module */ { SYF_MPSAFE | 0, (sy_call_t *)linux_get_kernel_syms, AUE_NULL }, /* 130 = linux_get_kernel_syms */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_quotactl, AUE_NULL }, /* 131 = linux_quotactl */ - { SYF_MPSAFE | AS(getpgid_args), (sy_call_t *)getpgid, AUE_NULL }, /* 132 = getpgid */ - { SYF_MPSAFE | AS(fchdir_args), (sy_call_t *)fchdir, AUE_NULL }, /* 133 = fchdir */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_bdflush, AUE_NULL }, /* 134 = linux_bdflush */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_quotactl, AUE_QUOTACTL }, /* 131 = linux_quotactl */ + { SYF_MPSAFE | AS(getpgid_args), (sy_call_t *)getpgid, AUE_GETPGID }, /* 132 = getpgid */ + { SYF_MPSAFE | AS(fchdir_args), (sy_call_t *)fchdir, AUE_FCHDIR }, /* 133 = fchdir */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_bdflush, AUE_BDFLUSH }, /* 134 = linux_bdflush */ { SYF_MPSAFE | AS(linux_sysfs_args), (sy_call_t *)linux_sysfs, AUE_NULL }, /* 135 = linux_sysfs */ - { SYF_MPSAFE | AS(linux_personality_args), (sy_call_t *)linux_personality, AUE_NULL }, /* 136 = linux_personality */ + { SYF_MPSAFE | AS(linux_personality_args), (sy_call_t *)linux_personality, AUE_PERSONALITY }, /* 136 = linux_personality */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 137 = afs_syscall */ - { SYF_MPSAFE | AS(linux_setfsuid16_args), (sy_call_t *)linux_setfsuid16, AUE_NULL }, /* 138 = linux_setfsuid16 */ - { SYF_MPSAFE | AS(linux_setfsgid16_args), (sy_call_t *)linux_setfsgid16, AUE_NULL }, /* 139 = linux_setfsgid16 */ - { SYF_MPSAFE | AS(linux_llseek_args), (sy_call_t *)linux_llseek, AUE_NULL }, /* 140 = linux_llseek */ - { AS(linux_getdents_args), (sy_call_t *)linux_getdents, AUE_NULL }, /* 141 = linux_getdents */ - { SYF_MPSAFE | AS(linux_select_args), (sy_call_t *)linux_select, AUE_NULL }, /* 142 = linux_select */ - { SYF_MPSAFE | AS(flock_args), (sy_call_t *)flock, AUE_NULL }, /* 143 = flock */ - { SYF_MPSAFE | AS(linux_msync_args), (sy_call_t *)linux_msync, AUE_NULL }, /* 144 = linux_msync */ - { SYF_MPSAFE | AS(linux_readv_args), (sy_call_t *)linux_readv, AUE_NULL }, /* 145 = linux_readv */ - { SYF_MPSAFE | AS(linux_writev_args), (sy_call_t *)linux_writev, AUE_NULL }, /* 146 = linux_writev */ - { SYF_MPSAFE | AS(linux_getsid_args), (sy_call_t *)linux_getsid, AUE_NULL }, /* 147 = linux_getsid */ + { SYF_MPSAFE | AS(linux_setfsuid16_args), (sy_call_t *)linux_setfsuid16, AUE_SETFSUID }, /* 138 = linux_setfsuid16 */ + { SYF_MPSAFE | AS(linux_setfsgid16_args), (sy_call_t *)linux_setfsgid16, AUE_SETFSGID }, /* 139 = linux_setfsgid16 */ + { SYF_MPSAFE | AS(linux_llseek_args), (sy_call_t *)linux_llseek, AUE_LSEEK }, /* 140 = linux_llseek */ + { AS(linux_getdents_args), (sy_call_t *)linux_getdents, AUE_O_GETDENTS }, /* 141 = linux_getdents */ + { SYF_MPSAFE | AS(linux_select_args), (sy_call_t *)linux_select, AUE_SELECT }, /* 142 = linux_select */ + { SYF_MPSAFE | AS(flock_args), (sy_call_t *)flock, AUE_FLOCK }, /* 143 = flock */ + { SYF_MPSAFE | AS(linux_msync_args), (sy_call_t *)linux_msync, AUE_MSYNC }, /* 144 = linux_msync */ + { SYF_MPSAFE | AS(linux_readv_args), (sy_call_t *)linux_readv, AUE_READV }, /* 145 = linux_readv */ + { SYF_MPSAFE | AS(linux_writev_args), (sy_call_t *)linux_writev, AUE_WRITEV }, /* 146 = linux_writev */ + { SYF_MPSAFE | AS(linux_getsid_args), (sy_call_t *)linux_getsid, AUE_GETSID }, /* 147 = linux_getsid */ { SYF_MPSAFE | AS(linux_fdatasync_args), (sy_call_t *)linux_fdatasync, AUE_NULL }, /* 148 = linux_fdatasync */ - { SYF_MPSAFE | AS(linux_sysctl_args), (sy_call_t *)linux_sysctl, AUE_NULL }, /* 149 = linux_sysctl */ - { SYF_MPSAFE | AS(mlock_args), (sy_call_t *)mlock, AUE_NULL }, /* 150 = mlock */ - { SYF_MPSAFE | AS(munlock_args), (sy_call_t *)munlock, AUE_NULL }, /* 151 = munlock */ - { SYF_MPSAFE | AS(mlockall_args), (sy_call_t *)mlockall, AUE_NULL }, /* 152 = mlockall */ - { SYF_MPSAFE | 0, (sy_call_t *)munlockall, AUE_NULL }, /* 153 = munlockall */ - { SYF_MPSAFE | AS(sched_setparam_args), (sy_call_t *)sched_setparam, AUE_NULL }, /* 154 = sched_setparam */ - { SYF_MPSAFE | AS(sched_getparam_args), (sy_call_t *)sched_getparam, AUE_NULL }, /* 155 = sched_getparam */ - { SYF_MPSAFE | AS(linux_sched_setscheduler_args), (sy_call_t *)linux_sched_setscheduler, AUE_NULL }, /* 156 = linux_sched_setscheduler */ - { SYF_MPSAFE | AS(linux_sched_getscheduler_args), (sy_call_t *)linux_sched_getscheduler, AUE_NULL }, /* 157 = linux_sched_getscheduler */ + { SYF_MPSAFE | AS(linux_sysctl_args), (sy_call_t *)linux_sysctl, AUE_SYSCTL }, /* 149 = linux_sysctl */ + { SYF_MPSAFE | AS(mlock_args), (sy_call_t *)mlock, AUE_MLOCK }, /* 150 = mlock */ + { SYF_MPSAFE | AS(munlock_args), (sy_call_t *)munlock, AUE_MUNLOCK }, /* 151 = munlock */ + { SYF_MPSAFE | AS(mlockall_args), (sy_call_t *)mlockall, AUE_MLOCKALL }, /* 152 = mlockall */ + { SYF_MPSAFE | 0, (sy_call_t *)munlockall, AUE_MUNLOCKALL }, /* 153 = munlockall */ + { SYF_MPSAFE | AS(sched_setparam_args), (sy_call_t *)sched_setparam, AUE_SCHED_SETPARAM }, /* 154 = sched_setparam */ + { SYF_MPSAFE | AS(sched_getparam_args), (sy_call_t *)sched_getparam, AUE_SCHED_GETPARAM }, /* 155 = sched_getparam */ + { SYF_MPSAFE | AS(linux_sched_setscheduler_args), (sy_call_t *)linux_sched_setscheduler, AUE_SCHED_SETSCHEDULER }, /* 156 = linux_sched_setscheduler */ + { SYF_MPSAFE | AS(linux_sched_getscheduler_args), (sy_call_t *)linux_sched_getscheduler, AUE_SCHED_GETSCHEDULER }, /* 157 = linux_sched_getscheduler */ { SYF_MPSAFE | 0, (sy_call_t *)sched_yield, AUE_NULL }, /* 158 = sched_yield */ - { SYF_MPSAFE | AS(linux_sched_get_priority_max_args), (sy_call_t *)linux_sched_get_priority_max, AUE_NULL }, /* 159 = linux_sched_get_priority_max */ - { SYF_MPSAFE | AS(linux_sched_get_priority_min_args), (sy_call_t *)linux_sched_get_priority_min, AUE_NULL }, /* 160 = linux_sched_get_priority_min */ - { SYF_MPSAFE | AS(linux_sched_rr_get_interval_args), (sy_call_t *)linux_sched_rr_get_interval, AUE_NULL }, /* 161 = linux_sched_rr_get_interval */ + { SYF_MPSAFE | AS(linux_sched_get_priority_max_args), (sy_call_t *)linux_sched_get_priority_max, AUE_SCHED_GET_PRIORITY_MAX }, /* 159 = linux_sched_get_priority_max */ + { SYF_MPSAFE | AS(linux_sched_get_priority_min_args), (sy_call_t *)linux_sched_get_priority_min, AUE_SCHED_GET_PRIORITY_MIN }, /* 160 = linux_sched_get_priority_min */ + { SYF_MPSAFE | AS(linux_sched_rr_get_interval_args), (sy_call_t *)linux_sched_rr_get_interval, AUE_SCHED_RR_GET_INTERVAL }, /* 161 = linux_sched_rr_get_interval */ { SYF_MPSAFE | AS(linux_nanosleep_args), (sy_call_t *)linux_nanosleep, AUE_NULL }, /* 162 = linux_nanosleep */ { SYF_MPSAFE | AS(linux_mremap_args), (sy_call_t *)linux_mremap, AUE_NULL }, /* 163 = linux_mremap */ - { SYF_MPSAFE | AS(linux_setresuid16_args), (sy_call_t *)linux_setresuid16, AUE_NULL }, /* 164 = linux_setresuid16 */ - { SYF_MPSAFE | AS(linux_getresuid16_args), (sy_call_t *)linux_getresuid16, AUE_NULL }, /* 165 = linux_getresuid16 */ + { SYF_MPSAFE | AS(linux_setresuid16_args), (sy_call_t *)linux_setresuid16, AUE_SETRESUID }, /* 164 = linux_setresuid16 */ + { SYF_MPSAFE | AS(linux_getresuid16_args), (sy_call_t *)linux_getresuid16, AUE_GETRESUID }, /* 165 = linux_getresuid16 */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 166 = vm86 */ { SYF_MPSAFE | 0, (sy_call_t *)linux_query_module, AUE_NULL }, /* 167 = linux_query_module */ - { SYF_MPSAFE | AS(poll_args), (sy_call_t *)poll, AUE_NULL }, /* 168 = poll */ + { SYF_MPSAFE | AS(poll_args), (sy_call_t *)poll, AUE_POLL }, /* 168 = poll */ { SYF_MPSAFE | 0, (sy_call_t *)linux_nfsservctl, AUE_NULL }, /* 169 = linux_nfsservctl */ - { SYF_MPSAFE | AS(linux_setresgid16_args), (sy_call_t *)linux_setresgid16, AUE_NULL }, /* 170 = linux_setresgid16 */ - { SYF_MPSAFE | AS(linux_getresgid16_args), (sy_call_t *)linux_getresgid16, AUE_NULL }, /* 171 = linux_getresgid16 */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_prctl, AUE_NULL }, /* 172 = linux_prctl */ + { SYF_MPSAFE | AS(linux_setresgid16_args), (sy_call_t *)linux_setresgid16, AUE_SETRESGID }, /* 170 = linux_setresgid16 */ + { SYF_MPSAFE | AS(linux_getresgid16_args), (sy_call_t *)linux_getresgid16, AUE_GETRESGID }, /* 171 = linux_getresgid16 */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_prctl, AUE_PRCTL }, /* 172 = linux_prctl */ { SYF_MPSAFE | AS(linux_rt_sigreturn_args), (sy_call_t *)linux_rt_sigreturn, AUE_NULL }, /* 173 = linux_rt_sigreturn */ { SYF_MPSAFE | AS(linux_rt_sigaction_args), (sy_call_t *)linux_rt_sigaction, AUE_NULL }, /* 174 = linux_rt_sigaction */ { SYF_MPSAFE | AS(linux_rt_sigprocmask_args), (sy_call_t *)linux_rt_sigprocmask, AUE_NULL }, /* 175 = linux_rt_sigprocmask */ @@ -200,48 +200,48 @@ { SYF_MPSAFE | 0, (sy_call_t *)linux_rt_sigtimedwait, AUE_NULL }, /* 177 = linux_rt_sigtimedwait */ { SYF_MPSAFE | 0, (sy_call_t *)linux_rt_sigqueueinfo, AUE_NULL }, /* 178 = linux_rt_sigqueueinfo */ { SYF_MPSAFE | AS(linux_rt_sigsuspend_args), (sy_call_t *)linux_rt_sigsuspend, AUE_NULL }, /* 179 = linux_rt_sigsuspend */ - { SYF_MPSAFE | AS(linux_pread_args), (sy_call_t *)linux_pread, AUE_NULL }, /* 180 = linux_pread */ - { SYF_MPSAFE | AS(linux_pwrite_args), (sy_call_t *)linux_pwrite, AUE_NULL }, /* 181 = linux_pwrite */ - { SYF_MPSAFE | AS(linux_chown16_args), (sy_call_t *)linux_chown16, AUE_NULL }, /* 182 = linux_chown16 */ - { SYF_MPSAFE | AS(linux_getcwd_args), (sy_call_t *)linux_getcwd, AUE_NULL }, /* 183 = linux_getcwd */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_capget, AUE_NULL }, /* 184 = linux_capget */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_capset, AUE_NULL }, /* 185 = linux_capset */ + { SYF_MPSAFE | AS(linux_pread_args), (sy_call_t *)linux_pread, AUE_PREAD }, /* 180 = linux_pread */ + { SYF_MPSAFE | AS(linux_pwrite_args), (sy_call_t *)linux_pwrite, AUE_PWRITE }, /* 181 = linux_pwrite */ + { SYF_MPSAFE | AS(linux_chown16_args), (sy_call_t *)linux_chown16, AUE_CHOWN }, /* 182 = linux_chown16 */ + { SYF_MPSAFE | AS(linux_getcwd_args), (sy_call_t *)linux_getcwd, AUE_GETCWD }, /* 183 = linux_getcwd */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_capget, AUE_CAPGET }, /* 184 = linux_capget */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_capset, AUE_CAPSET }, /* 185 = linux_capset */ { SYF_MPSAFE | AS(linux_sigaltstack_args), (sy_call_t *)linux_sigaltstack, AUE_NULL }, /* 186 = linux_sigaltstack */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_sendfile, AUE_NULL }, /* 187 = linux_sendfile */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_sendfile, AUE_SENDFILE }, /* 187 = linux_sendfile */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 188 = getpmsg */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 189 = putpmsg */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_vfork, AUE_NULL }, /* 190 = linux_vfork */ - { SYF_MPSAFE | AS(linux_getrlimit_args), (sy_call_t *)linux_getrlimit, AUE_NULL }, /* 191 = linux_getrlimit */ - { SYF_MPSAFE | AS(linux_mmap2_args), (sy_call_t *)linux_mmap2, AUE_NULL }, /* 192 = linux_mmap2 */ - { SYF_MPSAFE | AS(linux_truncate64_args), (sy_call_t *)linux_truncate64, AUE_NULL }, /* 193 = linux_truncate64 */ - { SYF_MPSAFE | AS(linux_ftruncate64_args), (sy_call_t *)linux_ftruncate64, AUE_NULL }, /* 194 = linux_ftruncate64 */ - { SYF_MPSAFE | AS(linux_stat64_args), (sy_call_t *)linux_stat64, AUE_NULL }, /* 195 = linux_stat64 */ - { SYF_MPSAFE | AS(linux_lstat64_args), (sy_call_t *)linux_lstat64, AUE_NULL }, /* 196 = linux_lstat64 */ - { SYF_MPSAFE | AS(linux_fstat64_args), (sy_call_t *)linux_fstat64, AUE_NULL }, /* 197 = linux_fstat64 */ - { SYF_MPSAFE | AS(linux_lchown_args), (sy_call_t *)linux_lchown, AUE_NULL }, /* 198 = linux_lchown */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_getuid, AUE_NULL }, /* 199 = linux_getuid */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_getgid, AUE_NULL }, /* 200 = linux_getgid */ - { SYF_MPSAFE | 0, (sy_call_t *)geteuid, AUE_NULL }, /* 201 = geteuid */ - { SYF_MPSAFE | 0, (sy_call_t *)getegid, AUE_NULL }, /* 202 = getegid */ - { SYF_MPSAFE | AS(setreuid_args), (sy_call_t *)setreuid, AUE_NULL }, /* 203 = setreuid */ - { SYF_MPSAFE | AS(setregid_args), (sy_call_t *)setregid, AUE_NULL }, /* 204 = setregid */ - { SYF_MPSAFE | AS(linux_getgroups_args), (sy_call_t *)linux_getgroups, AUE_NULL }, /* 205 = linux_getgroups */ - { SYF_MPSAFE | AS(linux_setgroups_args), (sy_call_t *)linux_setgroups, AUE_NULL }, /* 206 = linux_setgroups */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_vfork, AUE_VFORK }, /* 190 = linux_vfork */ + { SYF_MPSAFE | AS(linux_getrlimit_args), (sy_call_t *)linux_getrlimit, AUE_GETRLIMIT }, /* 191 = linux_getrlimit */ + { SYF_MPSAFE | AS(linux_mmap2_args), (sy_call_t *)linux_mmap2, AUE_MMAP }, /* 192 = linux_mmap2 */ + { SYF_MPSAFE | AS(linux_truncate64_args), (sy_call_t *)linux_truncate64, AUE_TRUNCATE }, /* 193 = linux_truncate64 */ + { SYF_MPSAFE | AS(linux_ftruncate64_args), (sy_call_t *)linux_ftruncate64, AUE_FTRUNCATE }, /* 194 = linux_ftruncate64 */ + { SYF_MPSAFE | AS(linux_stat64_args), (sy_call_t *)linux_stat64, AUE_STAT }, /* 195 = linux_stat64 */ + { SYF_MPSAFE | AS(linux_lstat64_args), (sy_call_t *)linux_lstat64, AUE_LSTAT }, /* 196 = linux_lstat64 */ + { SYF_MPSAFE | AS(linux_fstat64_args), (sy_call_t *)linux_fstat64, AUE_FSTAT }, /* 197 = linux_fstat64 */ + { SYF_MPSAFE | AS(linux_lchown_args), (sy_call_t *)linux_lchown, AUE_LCHOWN }, /* 198 = linux_lchown */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_getuid, AUE_GETUID }, /* 199 = linux_getuid */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_getgid, AUE_GETGID }, /* 200 = linux_getgid */ + { SYF_MPSAFE | 0, (sy_call_t *)geteuid, AUE_GETEUID }, /* 201 = geteuid */ + { SYF_MPSAFE | 0, (sy_call_t *)getegid, AUE_GETEGID }, /* 202 = getegid */ + { SYF_MPSAFE | AS(setreuid_args), (sy_call_t *)setreuid, AUE_SETREUID }, /* 203 = setreuid */ + { SYF_MPSAFE | AS(setregid_args), (sy_call_t *)setregid, AUE_SETREGID }, /* 204 = setregid */ + { SYF_MPSAFE | AS(linux_getgroups_args), (sy_call_t *)linux_getgroups, AUE_GETGROUPS }, /* 205 = linux_getgroups */ + { SYF_MPSAFE | AS(linux_setgroups_args), (sy_call_t *)linux_setgroups, AUE_SETGROUPS }, /* 206 = linux_setgroups */ { AS(fchown_args), (sy_call_t *)fchown, AUE_NULL }, /* 207 = fchown */ - { SYF_MPSAFE | AS(setresuid_args), (sy_call_t *)setresuid, AUE_NULL }, /* 208 = setresuid */ - { SYF_MPSAFE | AS(getresuid_args), (sy_call_t *)getresuid, AUE_NULL }, /* 209 = getresuid */ - { SYF_MPSAFE | AS(setresgid_args), (sy_call_t *)setresgid, AUE_NULL }, /* 210 = setresgid */ - { SYF_MPSAFE | AS(getresgid_args), (sy_call_t *)getresgid, AUE_NULL }, /* 211 = getresgid */ - { SYF_MPSAFE | AS(linux_chown_args), (sy_call_t *)linux_chown, AUE_NULL }, /* 212 = linux_chown */ - { SYF_MPSAFE | AS(setuid_args), (sy_call_t *)setuid, AUE_NULL }, /* 213 = setuid */ - { SYF_MPSAFE | AS(setgid_args), (sy_call_t *)setgid, AUE_NULL }, /* 214 = setgid */ - { SYF_MPSAFE | AS(linux_setfsuid_args), (sy_call_t *)linux_setfsuid, AUE_NULL }, /* 215 = linux_setfsuid */ - { SYF_MPSAFE | AS(linux_setfsgid_args), (sy_call_t *)linux_setfsgid, AUE_NULL }, /* 216 = linux_setfsgid */ - { SYF_MPSAFE | AS(linux_pivot_root_args), (sy_call_t *)linux_pivot_root, AUE_NULL }, /* 217 = linux_pivot_root */ - { SYF_MPSAFE | AS(linux_mincore_args), (sy_call_t *)linux_mincore, AUE_NULL }, /* 218 = linux_mincore */ - { SYF_MPSAFE | AS(madvise_args), (sy_call_t *)madvise, AUE_NULL }, /* 219 = madvise */ - { AS(linux_getdents64_args), (sy_call_t *)linux_getdents64, AUE_NULL }, /* 220 = linux_getdents64 */ - { SYF_MPSAFE | AS(linux_fcntl64_args), (sy_call_t *)linux_fcntl64, AUE_NULL }, /* 221 = linux_fcntl64 */ + { SYF_MPSAFE | AS(setresuid_args), (sy_call_t *)setresuid, AUE_SETRESUID }, /* 208 = setresuid */ + { SYF_MPSAFE | AS(getresuid_args), (sy_call_t *)getresuid, AUE_GETRESUID }, /* 209 = getresuid */ + { SYF_MPSAFE | AS(setresgid_args), (sy_call_t *)setresgid, AUE_SETRESGID }, /* 210 = setresgid */ + { SYF_MPSAFE | AS(getresgid_args), (sy_call_t *)getresgid, AUE_GETRESGID }, /* 211 = getresgid */ + { SYF_MPSAFE | AS(linux_chown_args), (sy_call_t *)linux_chown, AUE_CHOWN }, /* 212 = linux_chown */ + { SYF_MPSAFE | AS(setuid_args), (sy_call_t *)setuid, AUE_SETUID }, /* 213 = setuid */ + { SYF_MPSAFE | AS(setgid_args), (sy_call_t *)setgid, AUE_SETGID }, /* 214 = setgid */ + { SYF_MPSAFE | AS(linux_setfsuid_args), (sy_call_t *)linux_setfsuid, AUE_SETFSUID }, /* 215 = linux_setfsuid */ + { SYF_MPSAFE | AS(linux_setfsgid_args), (sy_call_t *)linux_setfsgid, AUE_SETFSGID }, /* 216 = linux_setfsgid */ + { SYF_MPSAFE | AS(linux_pivot_root_args), (sy_call_t *)linux_pivot_root, AUE_PIVOT_ROOT }, /* 217 = linux_pivot_root */ + { SYF_MPSAFE | AS(linux_mincore_args), (sy_call_t *)linux_mincore, AUE_MINCORE }, /* 218 = linux_mincore */ + { SYF_MPSAFE | AS(madvise_args), (sy_call_t *)madvise, AUE_MADVISE }, /* 219 = madvise */ + { AS(linux_getdents64_args), (sy_call_t *)linux_getdents64, AUE_O_GETDENTS }, /* 220 = linux_getdents64 */ + { SYF_MPSAFE | AS(linux_fcntl64_args), (sy_call_t *)linux_fcntl64, AUE_FCNTL }, /* 221 = linux_fcntl64 */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 222 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 223 = */ { SYF_MPSAFE | 0, (sy_call_t *)linux_getpid, AUE_NULL }, /* 224 = gettid */ @@ -272,7 +272,7 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 249 = linux_io_cancel */ { SYF_MPSAFE | 0, (sy_call_t *)linux_fadvise64, AUE_NULL }, /* 250 = linux_fadvise64 */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 251 = */ - { SYF_MPSAFE | AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_NULL }, /* 252 = exit_group */ + { SYF_MPSAFE | AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT }, /* 252 = exit_group */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 253 = linux_lookup_dcookie */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 254 = linux_epoll_create */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 255 = linux_epoll_ctl */ @@ -288,4 +288,47 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 265 = linux_clock_gettime */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 266 = linux_clock_getres */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 267 = linux_clock_nanosleep */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 268 = linux_statfs64 */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 269 = linux_fstatfs64 */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 270 = linux_tgkill */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 271 = linux_utimes */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 272 = linux_fadvise64_64 */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 273 = linux_ni_syscall */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 274 = linux_mbind */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 275 = linux_get_mempolicy */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 276 = linux_set_mempolicy */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 277 = linux_mq_open */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 278 = linux_mq_unlink */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 279 = linux_mq_timedsend */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 280 = linux_mq_timedreceive */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 281 = linux_mq_notify */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 282 = linux_mq_getsetattr */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 283 = linux_kexec_load */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 284 = linux_waitid */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 285 = linux_ni_syscall */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 286 = linux_add_key */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 287 = linux_request_key */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 288 = linux_keyctl */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 289 = linux_ioprio_set */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 290 = linux_ioprio_get */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 291 = linux_inotify_init */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 292 = linux_inotify_add_watch */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 293 = linux_inotify_rm_watch */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 294 = linux_migrate_pages */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 295 = linux_openat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 296 = linux_mkdirat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 297 = linux_mknodat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 298 = linux_fchownat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 299 = linux_futimesat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 300 = linux_fstatat64 */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 301 = linux_unlinkat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 302 = linux_renameat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 303 = linux_linkat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 304 = linux_symlinkat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 305 = linux_readlinkat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 306 = linux_fchmodat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 307 = linux_faccessat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 308 = linux_pselect6 */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 309 = linux_ppoll */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 310 = linux_unshare */ }; ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_proto.h#2 (text+ko) ==== @@ -2,7 +2,7 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/i386/linux/linux_proto.h,v 1.69 2006/05/10 18:19:51 netchild Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.66 2006/05/10 18:17:29 netchild Exp */ ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_syscall.h#2 (text+ko) ==== @@ -2,7 +2,7 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/i386/linux/linux_syscall.h,v 1.63 2006/05/10 18:19:51 netchild Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.66 2006/05/10 18:17:29 netchild Exp */ @@ -230,4 +230,4 @@ #define LINUX_SYS_linux_set_thread_area 243 #define LINUX_SYS_linux_fadvise64 250 #define LINUX_SYS_exit_group 252 -#define LINUX_SYS_MAXSYSCALL 268 +#define LINUX_SYS_MAXSYSCALL 311 ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_sysent.c#2 (text+ko) ==== @@ -2,7 +2,7 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/i386/linux/linux_sysent.c,v 1.70 2006/05/10 18:19:51 netchild Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.66 2006/05/10 18:17:29 netchild Exp */ @@ -287,4 +287,47 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 265 = linux_clock_gettime */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 266 = linux_clock_getres */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 267 = linux_clock_nanosleep */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 268 = linux_statfs64 */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 269 = linux_fstatfs64 */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 270 = linux_tgkill */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 271 = linux_utimes */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 272 = linux_fadvise64_64 */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 273 = linux_ni_syscall */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 274 = linux_mbind */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 275 = linux_get_mempolicy */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 276 = linux_set_mempolicy */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 277 = linux_mq_open */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 278 = linux_mq_unlink */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 279 = linux_mq_timedsend */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 280 = linux_mq_timedreceive */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 281 = linux_mq_notify */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 282 = linux_mq_getsetattr */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 283 = linux_kexec_load */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 284 = linux_waitid */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 285 = linux_ni_syscall */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 286 = linux_add_key */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 287 = linux_request_key */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 288 = linux_keyctl */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 289 = linux_ioprio_set */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 290 = linux_ioprio_get */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 291 = linux_inotify_init */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 292 = linux_inotify_add_watch */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 293 = linux_inotify_rm_watch */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 294 = linux_migrate_pages */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 295 = linux_openat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 296 = linux_mkdirat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 297 = linux_mknodat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 298 = linux_fchownat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 299 = linux_futimesat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 300 = linux_fstatat64 */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 301 = linux_unlinkat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 302 = linux_renameat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 303 = linux_linkat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 304 = linux_symlinkat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 305 = linux_readlinkat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 306 = linux_fchmodat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 307 = linux_faccessat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 308 = linux_pselect6 */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 309 = linux_ppoll */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 310 = linux_unshare */ }; From owner-p4-projects@FreeBSD.ORG Tue Jun 6 15:57:14 2006 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 288BD16A8B4; Tue, 6 Jun 2006 15:57:14 +0000 (UTC) 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 A9FC516A7D5 for ; Tue, 6 Jun 2006 15:57:10 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 68E0C43D45 for ; Tue, 6 Jun 2006 15:57:10 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k56FtLmH081904 for ; Tue, 6 Jun 2006 15:55:21 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k56FtLSU081901 for perforce@freebsd.org; Tue, 6 Jun 2006 15:55:21 GMT (envelope-from rdivacky@FreeBSD.org) Date: Tue, 6 Jun 2006 15:55:21 GMT Message-Id: <200606061555.k56FtLSU081901@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 98674 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, 06 Jun 2006 15:57:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=98674 Change 98674 by rdivacky@rdivacky_witten on 2006/06/06 15:54:54 Change auditing type for lstat syscall. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/syscalls.master#3 edit .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/syscalls.master#3 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/syscalls.master#3 (text+ko) ==== @@ -162,7 +162,7 @@ 82 AUE_SELECT MSTD { int linux_old_select( \ struct l_old_select_argv *ptr); } 83 AUE_SYMLINK MSTD { int linux_symlink(char *path, char *to); } -84 AUE_STAT MSTD { int linux_lstat(char *path, struct linux_lstat *up); } +84 AUE_LSTAT MSTD { int linux_lstat(char *path, struct linux_lstat *up); } 85 AUE_READLINK MSTD { int linux_readlink(char *name, char *buf, \ l_int count); } 86 AUE_NULL UNIMPL linux_uselib ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/syscalls.master#3 (text+ko) ==== @@ -162,7 +162,7 @@ 82 AUE_SELECT MSTD { int linux_old_select( \ struct l_old_select_argv *ptr); } 83 AUE_SYMLINK MSTD { int linux_symlink(char *path, char *to); } -84 AUE_STAT MSTD { int linux_lstat(char *path, struct ostat *up); } +84 AUE_LSTAT MSTD { int linux_lstat(char *path, struct ostat *up); } 85 AUE_READLINK MSTD { int linux_readlink(char *name, char *buf, \ l_int count); } 86 AUE_USELIB STD { int linux_uselib(char *library); } From owner-p4-projects@FreeBSD.ORG Tue Jun 6 15:58:13 2006 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 7741316A6E5; Tue, 6 Jun 2006 15:58:13 +0000 (UTC) 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 B37B516A66D for ; Tue, 6 Jun 2006 15:58:12 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 55C9143D45 for ; Tue, 6 Jun 2006 15:58:12 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k56FuNg9081951 for ; Tue, 6 Jun 2006 15:56:23 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k56FuNB8081948 for perforce@freebsd.org; Tue, 6 Jun 2006 15:56:23 GMT (envelope-from rdivacky@FreeBSD.org) Date: Tue, 6 Jun 2006 15:56:23 GMT Message-Id: <200606061556.k56FuNB8081948@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 98675 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, 06 Jun 2006 15:58:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=98675 Change 98675 by rdivacky@rdivacky_witten on 2006/06/06 15:55:57 Regen after syscall.master update. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_proto.h#3 edit .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_syscall.h#3 edit .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_sysent.c#3 edit .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_proto.h#3 edit .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_syscall.h#3 edit .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_sysent.c#3 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_proto.h#3 (text+ko) ==== ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_syscall.h#3 (text+ko) ==== ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_sysent.c#3 (text+ko) ==== @@ -104,7 +104,7 @@ { SYF_MPSAFE | AS(linux_setgroups16_args), (sy_call_t *)linux_setgroups16, AUE_SETGROUPS }, /* 81 = linux_setgroups16 */ { SYF_MPSAFE | AS(linux_old_select_args), (sy_call_t *)linux_old_select, AUE_SELECT }, /* 82 = linux_old_select */ { SYF_MPSAFE | AS(linux_symlink_args), (sy_call_t *)linux_symlink, AUE_SYMLINK }, /* 83 = linux_symlink */ - { SYF_MPSAFE | AS(linux_lstat_args), (sy_call_t *)linux_lstat, AUE_STAT }, /* 84 = linux_lstat */ + { SYF_MPSAFE | AS(linux_lstat_args), (sy_call_t *)linux_lstat, AUE_LSTAT }, /* 84 = linux_lstat */ { SYF_MPSAFE | AS(linux_readlink_args), (sy_call_t *)linux_readlink, AUE_READLINK }, /* 85 = linux_readlink */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 86 = linux_uselib */ { SYF_MPSAFE | AS(swapon_args), (sy_call_t *)swapon, AUE_SWAPON }, /* 87 = swapon */ ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_proto.h#3 (text+ko) ==== ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_syscall.h#3 (text+ko) ==== ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_sysent.c#3 (text+ko) ==== @@ -103,7 +103,7 @@ { SYF_MPSAFE | AS(linux_setgroups16_args), (sy_call_t *)linux_setgroups16, AUE_SETGROUPS }, /* 81 = linux_setgroups16 */ { SYF_MPSAFE | AS(linux_old_select_args), (sy_call_t *)linux_old_select, AUE_SELECT }, /* 82 = linux_old_select */ { SYF_MPSAFE | AS(linux_symlink_args), (sy_call_t *)linux_symlink, AUE_SYMLINK }, /* 83 = linux_symlink */ - { SYF_MPSAFE | AS(linux_lstat_args), (sy_call_t *)linux_lstat, AUE_STAT }, /* 84 = linux_lstat */ + { SYF_MPSAFE | AS(linux_lstat_args), (sy_call_t *)linux_lstat, AUE_LSTAT }, /* 84 = linux_lstat */ { SYF_MPSAFE | AS(linux_readlink_args), (sy_call_t *)linux_readlink, AUE_READLINK }, /* 85 = linux_readlink */ { AS(linux_uselib_args), (sy_call_t *)linux_uselib, AUE_USELIB }, /* 86 = linux_uselib */ { SYF_MPSAFE | AS(swapon_args), (sy_call_t *)swapon, AUE_SWAPON }, /* 87 = swapon */ From owner-p4-projects@FreeBSD.ORG Tue Jun 6 21:49:28 2006 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 CD52616D0CF; Tue, 6 Jun 2006 21:39:42 +0000 (UTC) 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 19EB116D103 for ; Tue, 6 Jun 2006 21:33:02 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1D1DF43D5A for ; Tue, 6 Jun 2006 21:33:01 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k56LVBNV033317 for ; Tue, 6 Jun 2006 21:31:11 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k56LVBxg033314 for perforce@freebsd.org; Tue, 6 Jun 2006 21:31:11 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 6 Jun 2006 21:31:11 GMT Message-Id: <200606062131.k56LVBxg033314@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 98697 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, 06 Jun 2006 21:49:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=98697 Change 98697 by kmacy@kmacy_storage:sun4v_work_test on 2006/06/06 21:30:18 fix KTR compile error Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/trap.c#14 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/trap.c#14 (text+ko) ==== @@ -432,7 +432,7 @@ #endif CTR4(KTR_TRAP, "trap_pfault: td=%p pm_ctx=%#lx va=%#lx ctx=%#lx", - td, p->p_vmspace->vm_pmap.pm_context[PCPU_GET(cpuid)], va, ctx); + td, p->p_vmspace->vm_pmap.pm_context, va, ctx); if (type == T_DATA_PROTECTION) { prot = VM_PROT_WRITE; From owner-p4-projects@FreeBSD.ORG Tue Jun 6 21:59:45 2006 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 DDE6C16B618; Tue, 6 Jun 2006 21:48:18 +0000 (UTC) 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 12DB816D23C for ; Tue, 6 Jun 2006 21:37:07 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B1EA643D53 for ; Tue, 6 Jun 2006 21:37:06 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k56LZGga033482 for ; Tue, 6 Jun 2006 21:35:17 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k56LZGPI033479 for perforce@freebsd.org; Tue, 6 Jun 2006 21:35:16 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 6 Jun 2006 21:35:16 GMT Message-Id: <200606062135.k56LZGPI033479@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 98698 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, 06 Jun 2006 21:59:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=98698 Change 98698 by kmacy@kmacy_storage:sun4v_work_test on 2006/06/06 21:34:38 reduce idle thread contention by moving choosethread (largely) out from under sched_lock Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_idle.c#5 edit .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_switch.c#5 edit .. //depot/projects/kmacy_sun4v/src/sys/kern/sched_4bsd.c#5 edit .. //depot/projects/kmacy_sun4v/src/sys/kern/subr_witness.c#5 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/runq.h#2 edit .. //depot/projects/kmacy_sun4v/src/sys/sys/runq.h#3 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/kern/kern_idle.c#5 (text+ko) ==== @@ -104,9 +104,7 @@ p = td->td_proc; #ifdef SMP mycpu = PCPU_GET(cpumask); - mtx_lock_spin(&sched_lock); - idle_cpus_mask |= mycpu; - mtx_unlock_spin(&sched_lock); + atomic_set_int(&idle_cpus_mask, mycpu); #endif for (;;) { mtx_assert(&Giant, MA_NOTOWNED); @@ -114,15 +112,21 @@ while (sched_runnable() == 0) cpu_idle(); - mtx_lock_spin(&sched_lock); + #ifdef SMP - idle_cpus_mask &= ~mycpu; + atomic_clear_int(&idle_cpus_mask, mycpu); #endif - if ((td = choosethread()) != curthread) - sched_switch(curthread, td, SW_VOL); + spinlock_enter(); /* avoid preemption after choosethread */ + if ((td = choosethread()) != curthread) { + mtx_lock_spin(&sched_lock); + spinlock_exit(); + sched_switch(curthread, td, SW_VOL); + mtx_unlock_spin(&sched_lock); + } else + spinlock_exit(); #ifdef SMP - idle_cpus_mask |= mycpu; + atomic_set_int(&idle_cpus_mask, mycpu); #endif - mtx_unlock_spin(&sched_lock); + } } ==== //depot/projects/kmacy_sun4v/src/sys/kern/kern_switch.c#5 (text+ko) ==== @@ -47,6 +47,11 @@ #if defined(SMP) && defined(SCHED_4BSD) #include #endif +#ifndef SMP +#error "use SMP!" +#define runq_lock(a, b) +#define runq_unlock(a, b) +#endif /* Uncomment this to enable logging of critical_enter/exit. */ #if 0 @@ -330,9 +335,17 @@ rqb->rqb_bits[RQB_WORD(pri)], rqb->rqb_bits[RQB_WORD(pri)] & ~RQB_BIT(pri), RQB_BIT(pri), RQB_WORD(pri)); - rqb->rqb_bits[RQB_WORD(pri)] &= ~RQB_BIT(pri); + atomic_clear_long(&rqb->rqb_bits[RQB_WORD(pri)], RQB_BIT(pri)); } +static __inline int +runq_isset(struct runq *rq, int pri) +{ + struct rqbits *rqb; + + rqb = &rq->rq_status; + return ((rqb->rqb_bits[RQB_WORD(pri)] & RQB_BIT(pri)) ? 1 : 0); +} /* * Find the index of the first non-empty run queue. This is done by * scanning the status bits, a set bit indicates a non-empty queue. @@ -343,11 +356,30 @@ struct rqbits *rqb; int pri; int i; - +#ifdef SMP + u_long lockbits; +#endif rqb = &rq->rq_status; for (i = 0; i < RQB_LEN; i++) if (rqb->rqb_bits[i]) { pri = RQB_FFS(rqb->rqb_bits[i]) + (i << RQB_L2BPW); +#ifdef SMP + lockbits = rq->rq_lockbits[i]; + if (!atomic_cmpset_acq_long(&rq->rq_lockbits[i], + (lockbits & ~RQB_BIT(pri)), + (lockbits | RQB_BIT(pri)))) + { + i = 0; + continue; + } + if (!runq_isset(rq, pri)) { + atomic_clear_rel_long(&rq->rq_lockbits[RQB_WORD(pri)], + RQB_BIT(pri)); + i = 0; + continue; + } + runq_clrbit(rq, pri); +#endif CTR3(KTR_RUNQ, "runq_findbit: bits=%#x i=%d pri=%d", rqb->rqb_bits[i], i, pri); return (pri); @@ -370,7 +402,8 @@ rqb->rqb_bits[RQB_WORD(pri)], rqb->rqb_bits[RQB_WORD(pri)] | RQB_BIT(pri), RQB_BIT(pri), RQB_WORD(pri)); - rqb->rqb_bits[RQB_WORD(pri)] |= RQB_BIT(pri); + /* XXX only works on 64-bit - 32 bit will need a mutex */ + atomic_set_long(&rqb->rqb_bits[RQB_WORD(pri)], RQB_BIT(pri)); } /* @@ -385,14 +418,18 @@ pri = ke->ke_thread->td_priority / RQ_PPQ; ke->ke_rqindex = pri; - runq_setbit(rq, pri); rqh = &rq->rq_queues[pri]; CTR5(KTR_RUNQ, "runq_add: td=%p ke=%p pri=%d %d rqh=%p", ke->ke_thread, ke, ke->ke_thread->td_priority, pri, rqh); + runq_lock(ke->ke_runq, ke); if (flags & SRQ_PREEMPTED) TAILQ_INSERT_HEAD(rqh, ke, ke_procq); else TAILQ_INSERT_TAIL(rqh, ke, ke_procq); + runq_unlock(ke->ke_runq, ke); +#ifndef SMP + runq_setbit(rq, pri); +#endif } /* @@ -423,6 +460,30 @@ SYSCTL_INT(_kern_sched, OID_AUTO, runq_fuzz, CTLFLAG_RW, &runq_fuzz, 0, ""); #endif +static struct kse * +runq_check_lastcpu(struct rqhead *rqh, int count) +{ + /* + * In the first couple of entries, check if + * there is one for our CPU as a preference. + */ + int cpu = PCPU_GET(cpuid); + struct kse *ke, *ke2; + ke2 = ke = TAILQ_FIRST(rqh); + + while (count-- && ke2) { + if (ke->ke_thread->td_lastcpu == cpu) { + ke = ke2; + break; + } + ke2 = TAILQ_NEXT(ke2, ke_procq); + } + KASSERT(ke != NULL, ("runq_choose: no proc on busy queue")); + CTR2(KTR_RUNQ, + "runq_choose: kse=%p rqh=%p", ke, rqh); + return (ke); +} + /* * Find the highest priority process on the run queue. */ @@ -433,31 +494,21 @@ struct kse *ke; int pri; - mtx_assert(&sched_lock, MA_OWNED); while ((pri = runq_findbit(rq)) != -1) { rqh = &rq->rq_queues[pri]; #if defined(SMP) && defined(SCHED_4BSD) /* fuzz == 1 is normal.. 0 or less are ignored */ - if (runq_fuzz > 1) { - /* - * In the first couple of entries, check if - * there is one for our CPU as a preference. - */ - int count = runq_fuzz; - int cpu = PCPU_GET(cpuid); - struct kse *ke2; - ke2 = ke = TAILQ_FIRST(rqh); - - while (count-- && ke2) { - if (ke->ke_thread->td_lastcpu == cpu) { - ke = ke2; - break; - } - ke2 = TAILQ_NEXT(ke2, ke_procq); - } - } else + if (runq_fuzz > 1) + ke = runq_check_lastcpu(rqh, runq_fuzz); + else #endif ke = TAILQ_FIRST(rqh); + if (ke) { + runq_remove_unlocked(rq, ke); + runq_unlock(rq, ke); + } else + panic("bit set but runq empty for bit %d - lockbits=0x%lx availbits=0x%lx", + pri, rq->rq_lockbits[0], rq->rq_status.rqb_bits[0]); KASSERT(ke != NULL, ("runq_choose: no proc on busy queue")); CTR3(KTR_RUNQ, "runq_choose: pri=%d kse=%p rqh=%p", pri, ke, rqh); @@ -465,7 +516,7 @@ } CTR1(KTR_RUNQ, "runq_choose: idleproc pri=%d", pri); - return (NULL); + return (NULL); } /* @@ -473,8 +524,8 @@ * corresponding status bit if the queue becomes empty. * Caller must set ke->ke_state afterwards. */ -void -runq_remove(struct runq *rq, struct kse *ke) +static __inline void +_runq_remove(struct runq *rq, struct kse *ke) { struct rqhead *rqh; int pri; @@ -487,12 +538,56 @@ ke->ke_thread, ke, ke->ke_thread->td_priority, pri, rqh); KASSERT(ke != NULL, ("runq_remove: no proc on busy queue")); TAILQ_REMOVE(rqh, ke, ke_procq); +#ifndef SMP if (TAILQ_EMPTY(rqh)) { CTR0(KTR_RUNQ, "runq_remove: empty"); runq_clrbit(rq, pri); } +#endif } +void +runq_remove(struct runq *rq, struct kse *ke) +{ + runq_lock(rq, ke); + _runq_remove(rq, ke); + runq_unlock(rq, ke); +} + +void +runq_remove_unlocked(struct runq *rq, struct kse *ke) +{ + _runq_remove(rq, ke); +} + +#ifdef SMP +void +runq_lock(struct runq *rq, struct kse *ke) +{ + int pri; + u_long lockbits; + + pri = ke->ke_rqindex; + do { + lockbits = (rq->rq_lockbits[RQB_WORD(pri)] & ~RQB_BIT(pri)); + } while (!atomic_cmpset_acq_long(&rq->rq_lockbits[RQB_WORD(pri)], lockbits, + (lockbits | RQB_BIT(pri)))); + runq_clrbit(rq, pri); +} + +void +runq_unlock(struct runq *rq, struct kse *ke) +{ + struct rqhead *rqh; + int pri; + + pri = ke->ke_rqindex; + rqh = &rq->rq_queues[pri]; + if (!TAILQ_EMPTY(rqh)) + runq_setbit(rq, pri); + atomic_clear_rel_long(&rq->rq_lockbits[RQB_WORD(pri)], RQB_BIT(pri)); +} +#endif /****** functions that are temporarily here ***********/ #include extern struct mtx kse_zombie_lock; ==== //depot/projects/kmacy_sun4v/src/sys/kern/sched_4bsd.c#5 (text+ko) ==== @@ -824,7 +824,16 @@ if ((newtd->td_proc->p_flag & P_NOLOAD) == 0) sched_load_add(); } else { +#if 0 + spinlock_enter(); + mtx_unlock_spin(&sched_lock); +#endif newtd = choosethread(); +#if 0 + mtx_lock_spin(&sched_lock); + spinlock_exit(); +#endif + } if (td != newtd) { @@ -1110,14 +1119,15 @@ struct thread * sched_choose(void) { - struct kse *ke; + struct kse *ke, *kesel; struct runq *rq; + struct thread *td = NULL; #ifdef SMP struct kse *kecpu; rq = &runq; - ke = runq_choose(&runq); + kesel = ke = runq_choose(&runq); kecpu = runq_choose(&runq_pcpu[PCPU_GET(cpuid)]); if (ke == NULL || @@ -1125,26 +1135,27 @@ kecpu->ke_thread->td_priority < ke->ke_thread->td_priority)) { CTR2(KTR_RUNQ, "choosing kse %p from pcpu runq %d", kecpu, PCPU_GET(cpuid)); - ke = kecpu; + kesel = kecpu; rq = &runq_pcpu[PCPU_GET(cpuid)]; + if (ke) + runq_add(rq, ke, SRQ_PREEMPTED); } else { + if (kecpu) + runq_add(rq, kecpu, SRQ_PREEMPTED); CTR1(KTR_RUNQ, "choosing kse %p from main runq", ke); } - #else rq = &runq; - ke = runq_choose(&runq); + kesel = ke = runq_choose(&runq); #endif + if (kesel) { + kesel->ke_state = KES_THREAD; - if (ke) { - runq_remove(rq, ke); - ke->ke_state = KES_THREAD; - KASSERT(ke->ke_thread->td_proc->p_sflag & PS_INMEM, ("sched_choose: process swapped out")); - return (ke->ke_thread); + td = kesel->ke_thread; } - return (NULL); + return (td); } void ==== //depot/projects/kmacy_sun4v/src/sys/kern/subr_witness.c#5 (text+ko) ==== @@ -400,6 +400,7 @@ { "vm page queue free mutex", &lock_class_mtx_spin }, { "icu", &lock_class_mtx_spin }, #ifdef SMP + { "runq lock", &lock_class_mtx_spin }, { "smp rendezvous", &lock_class_mtx_spin }, #if defined(__i386__) || defined(__amd64__) { "tlb", &lock_class_mtx_spin }, ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/runq.h#2 (text+ko) ==== @@ -42,17 +42,19 @@ * Type of run queue status word. */ typedef u_int64_t rqb_word_t; +static int ffslut64[] = { + 64, 1, 48, 2, 57, 49, 28, 3, + 61, 58, 50, 42, 38, 29, 17, 4, + 62, 55, 59, 36, 53, 51, 43, 22, + 45, 39, 33, 30, 24, 18, 12, 5, + 63, 47, 56, 27, 60, 41, 37, 16, + 54, 35, 52, 21, 44, 32, 23, 11, + 46, 26, 40, 15, 34, 20, 31, 10, + 25, 14, 19, 9, 13, 8, 7, 6 +}; -static __inline u_long -ffs64(u_long mask) +static inline u_long ffs64(uint64_t mask) { - u_long bit; - - if (mask == 0) - return (0); - for (bit = 1; (mask & 1UL) == 0; bit++) - mask >>= 1UL; - return (bit); + return mask ? ffslut64[((mask & (-mask)) * 0x07EF3AE369961512) >> 58] : 0; } - #endif ==== //depot/projects/kmacy_sun4v/src/sys/sys/runq.h#3 (text+ko) ==== @@ -59,6 +59,7 @@ */ struct runq { struct rqbits rq_status; + rqb_word_t rq_lockbits[RQB_LEN]; struct rqhead rq_queues[RQ_NQS]; }; @@ -67,5 +68,8 @@ struct kse *runq_choose(struct runq *); void runq_init(struct runq *); void runq_remove(struct runq *, struct kse *); +void runq_remove_unlocked(struct runq *, struct kse *); +void runq_lock(struct runq *, struct kse *); +void runq_unlock(struct runq *, struct kse *); #endif From owner-p4-projects@FreeBSD.ORG Tue Jun 6 22:23:53 2006 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 6529D16BABA; Tue, 6 Jun 2006 22:08:39 +0000 (UTC) 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 5B86116CF9F for ; Tue, 6 Jun 2006 21:51:26 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C914943D49 for ; Tue, 6 Jun 2006 21:51:25 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k56LnaCd036312 for ; Tue, 6 Jun 2006 21:49:36 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k56LnZgI036309 for perforce@freebsd.org; Tue, 6 Jun 2006 21:49:35 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 6 Jun 2006 21:49:35 GMT Message-Id: <200606062149.k56LnZgI036309@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 98700 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, 06 Jun 2006 22:23:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=98700 Change 98700 by kmacy@kmacy_storage:sun4v_work on 2006/06/06 21:49:30 Kris Kennaway's spinlock profiling changes Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/conf/options#9 edit .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_mutex.c#8 edit .. //depot/projects/kmacy_sun4v/src/sys/sys/_mutex.h#3 edit .. //depot/projects/kmacy_sun4v/src/sys/sys/file.h#4 edit .. //depot/projects/kmacy_sun4v/src/sys/sys/mutex.h#6 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/conf/options#9 (text+ko) ==== ==== //depot/projects/kmacy_sun4v/src/sys/kern/kern_mutex.c#8 (text+ko) ==== @@ -35,7 +35,6 @@ #include __FBSDID("$FreeBSD: src/sys/kern/kern_mutex.c,v 1.173 2006/06/03 21:11:32 jhb Exp $"); - #include "opt_adaptive_mutexes.h" #include "opt_ddb.h" #include "opt_mprof.h" @@ -56,12 +55,14 @@ #include #include #include +#include #include #include #include #include #include +#include #include #include @@ -84,7 +85,7 @@ * Internal utility macros. */ #define mtx_unowned(m) ((m)->mtx_lock == MTX_UNOWNED) - +/* XXX */ #define mtx_owner(m) ((struct thread *)((m)->mtx_lock & ~MTX_FLAGMASK)) #ifdef DDB @@ -114,6 +115,7 @@ */ struct mtx sched_lock; struct mtx Giant; +struct mtx timer_lock; #ifdef SPIN_PROFILING SYSCTL_NODE(_debug, OID_AUTO, spinlock, CTLFLAG_RD, NULL, "spinlock debugging"); @@ -121,12 +123,15 @@ int spin_prof_enable = 0; SYSCTL_INT(_debug_spinlock_prof, OID_AUTO, enable, CTLFLAG_RW, &spin_prof_enable, 0, "Enable tracing of spinlock holdtime"); -int spin_total = 0; -int spin_count = 0; -SYSCTL_INT(_debug_spinlock_prof, OID_AUTO, total, CTLFLAG_RD, +u_int spin_total = 0; +uint64_t spin_count = 0; +u_int spin_scale = 100; +SYSCTL_UINT(_debug_spinlock_prof, OID_AUTO, total, CTLFLAG_RD, &spin_total, 0, "Number of spinlock spins recorded"); -SYSCTL_INT(_debug_spinlock_prof, OID_AUTO, count, CTLFLAG_RD, +SYSCTL_UINT(_debug_spinlock_prof, OID_AUTO, count, CTLFLAG_RD, &spin_count, 0, "Number of spinlock acquisitions recorded"); +SYSCTL_UINT(_debug_spinlock_prof, OID_AUTO, scale, CTLFLAG_RW, + &spin_scale, 0, "How often to KTR spinlock acquisition"); static int reset_spin_prof_stats(SYSCTL_HANDLER_ARGS) @@ -155,50 +160,55 @@ SYSCTL_NODE(_debug_mutex, OID_AUTO, prof, CTLFLAG_RD, NULL, "mutex profiling"); static int mutex_prof_enable = 0; SYSCTL_INT(_debug_mutex_prof, OID_AUTO, enable, CTLFLAG_RW, - &mutex_prof_enable, 0, "Enable tracing of mutex holdtime"); + &mutex_prof_enable, 0, "Enable tracing of mutex holdtime/contention"); +static int mutex_prof_global = 1; +SYSCTL_INT(_debug_mutex_prof, OID_AUTO, global, CTLFLAG_RW, + &mutex_prof_global, 0, "Enable tracing of all mutexes"); struct mutex_prof { const char *name; + u_int namehash; const char *file; int line; +#if 0 uintmax_t cnt_max; uintmax_t cnt_tot; +#endif uintmax_t cnt_cur; uintmax_t cnt_contest_holding; uintmax_t cnt_contest_locking; - struct mutex_prof *next; }; /* * mprof_buf is a static pool of profiling records to avoid possible * reentrance of the memory allocation functions. - * - * Note: NUM_MPROF_BUFFERS must be smaller than MPROF_HASH_SIZE. */ -#ifdef MPROF_BUFFERS -#define NUM_MPROF_BUFFERS MPROF_BUFFERS -#else -#define NUM_MPROF_BUFFERS 1000 -#endif -static struct mutex_prof mprof_buf[NUM_MPROF_BUFFERS]; -static int first_free_mprof_buf; #ifndef MPROF_HASH_SIZE -#define MPROF_HASH_SIZE 1009 +#define MPROF_HASH_SIZE 4096 +#define MPROF_HASH_MASK (MPROF_HASH_SIZE - 1) #endif -#if NUM_MPROF_BUFFERS >= MPROF_HASH_SIZE -#error MPROF_BUFFERS must be larger than MPROF_HASH_SIZE -#endif -static struct mutex_prof *mprof_hash[MPROF_HASH_SIZE]; +static struct mutex_prof mprof_buf[MPROF_HASH_SIZE]; +static int allocated_mprof_buf; /* SWAG: sbuf size = avg stat. line size * number of locks */ #define MPROF_SBUF_SIZE 256 * 400 +/* We keep a smaller pool of spin mutexes for protecting the mprof hash entries */ +#define MPROF_LOCK_SIZE 16 +#define MPROF_LOCK_MASK (MPROF_LOCK_SIZE - 1) +#define MPROF_LHASH(hash) ((hash) & MPROF_LOCK_MASK) + +#define MPROF_LOCK(hash) mtx_lock_spin(&mprof_locks[MPROF_LHASH(hash)]) +#define MPROF_UNLOCK(hash) mtx_unlock_spin(&mprof_locks[MPROF_LHASH(hash)]) + +struct mtx mprof_locks[MPROF_LOCK_SIZE]; + static int mutex_prof_acquisitions; SYSCTL_INT(_debug_mutex_prof, OID_AUTO, acquisitions, CTLFLAG_RD, &mutex_prof_acquisitions, 0, "Number of mutex acquistions recorded"); static int mutex_prof_records; SYSCTL_INT(_debug_mutex_prof, OID_AUTO, records, CTLFLAG_RD, &mutex_prof_records, 0, "Number of profiling records"); -static int mutex_prof_maxrecords = NUM_MPROF_BUFFERS; +static int mutex_prof_maxrecords = MPROF_HASH_SIZE; SYSCTL_INT(_debug_mutex_prof, OID_AUTO, maxrecords, CTLFLAG_RD, &mutex_prof_maxrecords, 0, "Maximum number of profiling records"); static int mutex_prof_rejected; @@ -210,13 +220,13 @@ static int mutex_prof_collisions = 0; SYSCTL_INT(_debug_mutex_prof, OID_AUTO, collisions, CTLFLAG_RD, &mutex_prof_collisions, 0, "Number of hash collisions"); +#ifdef KTR +static int stack_scale = 1; +SYSCTL_INT(_debug_mutex_prof, OID_AUTO, scale, CTLTYPE_INT | CTLFLAG_RW, + &stack_scale, 0, "How often to sample stack traces"); +#endif -/* - * mprof_mtx protects the profiling buffers and the hash. - */ -static struct mtx mprof_mtx; -MTX_SYSINIT(mprof, &mprof_mtx, "mutex profiling lock", MTX_SPIN | MTX_QUIET); - +#if 0 static u_int64_t nanoseconds(void) { @@ -225,6 +235,7 @@ nanotime(&tv); return (tv.tv_sec * (u_int64_t)1000000000 + tv.tv_nsec); } +#endif static int dump_mutex_prof_stats(SYSCTL_HANDLER_ARGS) @@ -232,8 +243,9 @@ struct sbuf *sb; int error, i; static int multiplier = 1; + const char *p; - if (first_free_mprof_buf == 0) + if (allocated_mprof_buf == 0) return (SYSCTL_OUT(req, "No locking recorded", sizeof("No locking recorded"))); @@ -241,31 +253,35 @@ sb = sbuf_new(NULL, NULL, MPROF_SBUF_SIZE * multiplier, SBUF_FIXEDLEN); sbuf_printf(sb, "\n%6s %12s %11s %5s %12s %12s %s\n", "max", "total", "count", "avg", "cnt_hold", "cnt_lock", "name"); - /* - * XXX this spinlock seems to be by far the largest perpetrator - * of spinlock latency (1.6 msec on an Athlon1600 was recorded - * even before I pessimized it further by moving the average - * computation here). - */ - mtx_lock_spin(&mprof_mtx); - for (i = 0; i < first_free_mprof_buf; ++i) { + for (i = 0; i < MPROF_HASH_SIZE; ++i) { + if (mprof_buf[i].name == NULL) + continue; + for (p = mprof_buf[i].file; + p != NULL && strncmp(p, "../", 3) == 0; p += 3) + /* nothing */ ; sbuf_printf(sb, "%6ju %12ju %11ju %5ju %12ju %12ju %s:%d (%s)\n", +#if 0 mprof_buf[i].cnt_max / 1000, mprof_buf[i].cnt_tot / 1000, +#endif + (uintmax_t)0, + (uintmax_t)0, mprof_buf[i].cnt_cur, + (uintmax_t)0, +#if 0 mprof_buf[i].cnt_cur == 0 ? (uintmax_t)0 : mprof_buf[i].cnt_tot / (mprof_buf[i].cnt_cur * 1000), +#endif mprof_buf[i].cnt_contest_holding, mprof_buf[i].cnt_contest_locking, - mprof_buf[i].file, mprof_buf[i].line, mprof_buf[i].name); + p, mprof_buf[i].line, mprof_buf[i].name); if (sbuf_overflowed(sb)) { - mtx_unlock_spin(&mprof_mtx); sbuf_delete(sb); multiplier++; goto retry_sbufops; } } - mtx_unlock_spin(&mprof_mtx); + sbuf_finish(sb); error = SYSCTL_OUT(req, sbuf_data(sb), sbuf_len(sb) + 1); sbuf_delete(sb); @@ -279,7 +295,7 @@ { int error, v; - if (first_free_mprof_buf == 0) + if (allocated_mprof_buf == 0) return (0); v = 0; @@ -291,11 +307,8 @@ if (v == 0) return (0); - mtx_lock_spin(&mprof_mtx); - bzero(mprof_buf, sizeof(*mprof_buf) * first_free_mprof_buf); - bzero(mprof_hash, sizeof(struct mtx *) * MPROF_HASH_SIZE); - first_free_mprof_buf = 0; - mtx_unlock_spin(&mprof_mtx); + bzero(mprof_buf, MPROF_HASH_SIZE); + allocated_mprof_buf = 0; return (0); } SYSCTL_PROC(_debug_mutex_prof, OID_AUTO, reset, CTLTYPE_INT | CTLFLAG_RW, @@ -322,11 +335,13 @@ WITNESS_LOCK(&m->mtx_object, opts | LOP_EXCLUSIVE, file, line); #ifdef MUTEX_PROFILING /* don't reset the timer when/if recursing */ - if (m->mtx_acqtime == 0) { + if (mutex_prof_enable == 1 && mutex_prof_global && m->mtx_acqtime == 0) { m->mtx_filename = file; m->mtx_lineno = line; - m->mtx_acqtime = mutex_prof_enable ? nanoseconds() : 0; + m->mtx_acqtime = 1; +#if 0 ++mutex_prof_acquisitions; +#endif } #endif } @@ -344,53 +359,63 @@ line); mtx_assert(m, MA_OWNED); #ifdef MUTEX_PROFILING - if (m->mtx_acqtime != 0) { - static const char *unknown = "(unknown)"; + if (mutex_prof_global && m->mtx_acqtime != 0) { + const char *unknown = "(unknown)"; struct mutex_prof *mpp; u_int64_t acqtime, now; - const char *p, *q; - volatile u_int hash; + u_int hash; + const char *p = m->mtx_filename; + int collision = 0; - now = nanoseconds(); + now = 2; acqtime = m->mtx_acqtime; m->mtx_acqtime = 0; if (now <= acqtime) goto out; - for (p = m->mtx_filename; - p != NULL && strncmp(p, "../", 3) == 0; p += 3) - /* nothing */ ; if (p == NULL || *p == '\0') p = unknown; - for (hash = m->mtx_lineno, q = p; *q != '\0'; ++q) - hash = (hash * 2 + *q) % MPROF_HASH_SIZE; - mtx_lock_spin(&mprof_mtx); - for (mpp = mprof_hash[hash]; mpp != NULL; mpp = mpp->next) + hash = (m->mtx_namehash * 31 * 31 + (uintptr_t)p * 31 + m->mtx_lineno) & MPROF_HASH_MASK; + CTR5(KTR_SPARE1, "Hashing %s(%x) %s:%d to %d", mtx_name(m), m->mtx_namehash, p, m->mtx_lineno, hash); + mpp = &mprof_buf[hash]; + while (mpp->name != NULL) { if (mpp->line == m->mtx_lineno && - strcmp(mpp->file, p) == 0) + mpp->file == p && + mpp->namehash == m->mtx_namehash) break; - if (mpp == NULL) { + /* If the mprof_hash entry is allocated to someone else, try the next one */ + collision = 1; + CTR4(KTR_SPARE1, "Hash collision, %s:%d %s(%x)", mpp->file, mpp->line, mpp->name, mpp->namehash); + hash = (hash + 1) & MPROF_HASH_MASK; + mpp = &mprof_buf[hash]; + } + if (mpp->name == NULL) { + int buf; + + buf = atomic_fetchadd_int(&allocated_mprof_buf, 1); /* Just exit if we cannot get a trace buffer */ - if (first_free_mprof_buf >= NUM_MPROF_BUFFERS) { + if (buf >= MPROF_HASH_SIZE) { ++mutex_prof_rejected; - goto unlock; + goto out; } - mpp = &mprof_buf[first_free_mprof_buf++]; - mpp->name = mtx_name(m); mpp->file = p; mpp->line = m->mtx_lineno; - mpp->next = mprof_hash[hash]; - if (mprof_hash[hash] != NULL) + mpp->name = mtx_name(m); + mpp->namehash = m->mtx_namehash; + if (collision) ++mutex_prof_collisions; - mprof_hash[hash] = mpp; + /* We might have raced someone else but who cares, they'll try again next time */ ++mutex_prof_records; } + MPROF_LOCK(hash); /* * Record if the mutex has been held longer now than ever * before. */ +#if 0 if (now - acqtime > mpp->cnt_max) mpp->cnt_max = now - acqtime; mpp->cnt_tot += now - acqtime; +#endif mpp->cnt_cur++; /* * There's a small race, really we should cmpxchg @@ -402,8 +427,7 @@ m->mtx_contest_holding = 0; mpp->cnt_contest_locking += m->mtx_contest_locking; m->mtx_contest_locking = 0; -unlock: - mtx_unlock_spin(&mprof_mtx); + MPROF_UNLOCK(hash); } out: #endif @@ -486,10 +510,12 @@ #endif uintptr_t v; #ifdef KTR +#if 0 int cont_logged = 0; #endif +#endif #ifdef MUTEX_PROFILING - int contested; + int contested, oldhold, fine_profiling = 0; #endif if (mtx_owned(m)) { @@ -510,11 +536,32 @@ #ifdef MUTEX_PROFILING contested = 0; + if (m->mtx_object.lo_flags & LO_PROFILE) + fine_profiling = 1; #endif while (!_obtain_lock(m, tid)) { #ifdef MUTEX_PROFILING - contested = 1; - atomic_add_int(&m->mtx_contest_holding, 1); + if (mutex_prof_global) { + contested = 1; + atomic_add_int(&m->mtx_contest_holding, 1); + } else if (fine_profiling && !contested) { + contested = 1; + oldhold = atomic_fetchadd_int(&m->mtx_contest_holding, 1); +#if 0 + if (!((oldhold + 1) % stack_scale)) { + mtx_lock_spin(&mprof_mtx); + stack_save(&mtx_stack); + CTR2(KTR_CONTENTION, "cont_hold (%d) of %s", oldhold, m->mtx_object.lo_name); + CTRSTACK(KTR_CONTENTION, &mtx_stack, 4, 0); + mtx_unlock_spin(&mprof_mtx); + } + CTR3(KTR_CONTENTION, + "%s held by %s:%d", + m->mtx_object.lo_name, + m->mtx_filename, + m->mtx_lineno); +#endif + } #endif turnstile_lock(&m->mtx_object); v = m->mtx_lock; @@ -581,17 +628,6 @@ */ mtx_assert(m, MA_NOTOWNED); -#ifdef KTR - if (!cont_logged) { - CTR6(KTR_CONTENTION, - "contention: %p at %s:%d wants %s, taken by %s:%d", - (void *)tid, file, line, m->mtx_object.lo_name, - WITNESS_FILE(&m->mtx_object), - WITNESS_LINE(&m->mtx_object)); - cont_logged = 1; - } -#endif - /* * Block on the turnstile. */ @@ -600,16 +636,19 @@ } #ifdef KTR - if (cont_logged) { +#if 0 + if (fine_profiling && contested) { CTR4(KTR_CONTENTION, "contention end: %s acquired by %p at %s:%d", - m->mtx_object.lo_name, (void *)tid, file, line); + m->mtx_object.lo_name, (void *)tid, m->mtx_filename, m->mtx_lineno); } #endif +#endif #ifdef MUTEX_PROFILING - if (contested) - m->mtx_contest_locking++; - m->mtx_contest_holding = 0; + if (fine_profiling || mutex_prof_global) { + m->mtx_contest_locking = contested; + atomic_store_rel_int(&m->mtx_contest_holding,0); + } #endif return; } @@ -628,8 +667,9 @@ int i = 0; #ifdef SPIN_PROFILING int profiling = 0; + volatile struct thread *td = NULL; - if (m->mtx_object.lo_flags & LO_PROFILE && spin_prof_enable) + if (spin_prof_enable) profiling = 1; #endif @@ -640,6 +680,9 @@ /* Give interrupts a chance while we spin. */ spinlock_exit(); +#ifdef SPIN_PROFILING + td = mtx_owner(m); +#endif while (m->mtx_lock != MTX_UNOWNED) { if (i++ < 10000000) { cpu_spinwait(); @@ -664,7 +707,13 @@ /* We have the lock, record how many spins it took to get it */ if (profiling) { spin_total += i; - spin_count++; + if (!(++spin_count % spin_scale)) { + if (td != NULL) + CTR6(KTR_SPARE1, "%p %s:%d spun %d (pid %d, \"%s\")", m, file, line, i, + td->td_proc->p_pid, td->td_proc->p_comm); + else + CTR4(KTR_SPARE1, "%p %s:%d spun %d", m, file, line, i); + } } #endif @@ -871,6 +920,10 @@ { struct lock_class *class; int flags; +#ifdef MUTEX_PROFILING + const char *p; + u_int hash = 0; +#endif MPASS((opts & ~(MTX_SPIN | MTX_QUIET | MTX_RECURSE | MTX_NOWITNESS | MTX_DUPOK)) == 0); @@ -906,7 +959,16 @@ m->mtx_lineno = 0; m->mtx_contest_holding = 0; m->mtx_contest_locking = 0; + + /* Hash the mutex name to an int so we don't have to strcmp() it repeatedly */ + for (p = name; *p != '\0'; p++) + hash = 31 * hash + *p; + m->mtx_namehash = hash; +#if 0 + if (opts & MTX_PROFILE) + m->mtx_stack = stack_create(); #endif +#endif lock_init(&m->mtx_object, class, name, type, flags); } @@ -935,6 +997,13 @@ __LINE__); } +#ifdef MUTEX_PROFILING +#if 0 + if (m->mtx_object.lo_flags & LO_PROFILE) + stack_destroy(m->mtx_stack); +#endif +#endif + lock_destroy(&m->mtx_object); } @@ -946,15 +1015,27 @@ void mutex_init(void) { +#ifdef MUTEX_PROFILING + int i; +#endif /* Setup turnstiles so that sleep mutexes work. */ init_turnstiles(); +#ifdef MUTEX_PROFILING + /* Initialize the mutex profiling locks */ + for (i = 0; i < MPROF_LOCK_SIZE; i++) { + mtx_init(&mprof_locks[i], "mprof lock", + NULL, MTX_SPIN|MTX_QUIET); + } +#endif + /* * Initialize mutexes. */ mtx_init(&Giant, "Giant", NULL, MTX_DEF | MTX_RECURSE); - mtx_init(&sched_lock, "sched lock", NULL, MTX_SPIN | MTX_RECURSE | MTX_PROFILE); + mtx_init(&sched_lock, "sched lock", NULL, MTX_SPIN | MTX_RECURSE); + mtx_init(&timer_lock, "timer lock", NULL, MTX_SPIN); mtx_init(&proc0.p_mtx, "process lock", NULL, MTX_DEF | MTX_DUPOK); mtx_init(&devmtx, "cdev", NULL, MTX_DEF); mtx_lock(&Giant); ==== //depot/projects/kmacy_sun4v/src/sys/sys/_mutex.h#3 (text+ko) ==== @@ -45,6 +45,7 @@ * MUTEX_PROFILING is in opt_global.h */ u_int64_t mtx_acqtime; + u_int mtx_namehash; const char *mtx_filename; int mtx_lineno; /* @@ -56,6 +57,7 @@ */ u_int mtx_contest_holding; u_int mtx_contest_locking; + struct stack *mtx_stack; #endif }; ==== //depot/projects/kmacy_sun4v/src/sys/sys/file.h#4 (text+ko) ==== @@ -92,6 +92,7 @@ #define DFLAG_PASSABLE 0x01 /* may be passed via unix sockets. */ #define DFLAG_SEEKABLE 0x02 /* seekable / nonsequential */ +#define DFLAG_MPSAFE 0x04 /* These fileops are MPSAFE */ /* * Kernel descriptor table. ==== //depot/projects/kmacy_sun4v/src/sys/sys/mutex.h#6 (text+ko) ==== @@ -56,7 +56,7 @@ #define MTX_SPIN 0x00000001 /* Spin lock (disables interrupts) */ #define MTX_RECURSE 0x00000004 /* Option: lock allowed to recurse */ #define MTX_NOWITNESS 0x00000008 /* Don't do any witness checking. */ -#define MTX_PROFILE 0x00000010 /* Enable spinlock profiling for this spin lock */ +#define MTX_PROFILE 0x00000020 /* Enable spinlock profiling for this spin lock */ /* * Option flags passed to certain lock/unlock routines, through the use @@ -74,6 +74,7 @@ #define MTX_UNOWNED 0x00000004 /* Cookie for free mutex */ #define MTX_FLAGMASK (MTX_RECURSED | MTX_CONTESTED | MTX_UNOWNED) + #endif /* _KERNEL */ #ifndef LOCORE @@ -165,9 +166,22 @@ */ #ifndef _get_spin_lock #ifdef SMP +#define _mtx_spin_trylock(mp, tid, file, line) ({ \ + uintptr_t _tid = (uintptr_t)(tid); \ + int v; \ + \ + spinlock_enter(); \ + v = _obtain_lock((mp), _tid); \ + if (!v) \ + spinlock_exit(); \ + v; \ +}) + + #ifdef SPIN_PROFILING extern int spin_prof_enable; -extern int spin_count; +extern uint64_t spin_count; +extern u_int spin_scale; #define _get_spin_lock(mp, tid, opts, file, line) do { \ uintptr_t _tid = (uintptr_t)(tid); \ \ @@ -178,8 +192,8 @@ else \ _mtx_lock_spin((mp), _tid, (opts), (file), (line)); \ } \ - else if ((mp)->mtx_object.lo_flags & LO_PROFILE && spin_prof_enable) \ - spin_count++; \ + else if (spin_prof_enable && !(++spin_count % spin_scale)) \ + CTR3(KTR_SPARE1, "%p %s:%d", mp, file, line); \ } while (0) #else /* SPIN_PROFILING */ #define _get_spin_lock(mp, tid, opts, file, line) do { \ @@ -325,6 +339,8 @@ _mtx_lock_spin_flags((m), (opts), LOCK_FILE, LOCK_LINE) #define mtx_unlock_spin_flags(m, opts) \ _mtx_unlock_spin_flags((m), (opts), LOCK_FILE, LOCK_LINE) +#define mtx_trylock_spin(m) \ + _mtx_spin_trylock((m), curthread, LOCK_FILE, LOCK_LINE) #else /* LOCK_DEBUG == 0 && !MUTEX_NOINLINE */ #define mtx_lock_flags(m, opts) \ _get_sleep_lock((m), curthread, (opts), LOCK_FILE, LOCK_LINE) @@ -334,10 +350,13 @@ _get_spin_lock((m), curthread, (opts), LOCK_FILE, LOCK_LINE) #define mtx_unlock_spin_flags(m, opts) \ _rel_spin_lock((m)) +#define mtx_trylock_spin(m) \ + _mtx_spin_trylock((m), curthread, LOCK_FILE, LOCK_LINE) #endif /* LOCK_DEBUG > 0 || MUTEX_NOINLINE */ -#define mtx_trylock_flags(m, opts) \ - _mtx_trylock((m), (opts), LOCK_FILE, LOCK_LINE) +#define mtx_trylock_flags(m, opts) \ + _mtx_trylock((m), (opts), LOCK_FILE, LOCK_LINE) + #define mtx_initialized(m) lock_initalized(&(m)->mtx_object) @@ -351,6 +370,7 @@ * Global locks. */ extern struct mtx sched_lock; +extern struct mtx timer_lock; extern struct mtx Giant; /* From owner-p4-projects@FreeBSD.ORG Wed Jun 7 00:22:59 2006 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 2DB2916B22D; Wed, 7 Jun 2006 00:08:04 +0000 (UTC) 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 61B7F16B185 for ; Tue, 6 Jun 2006 23:25:25 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DAE8243D45 for ; Tue, 6 Jun 2006 23:25:24 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k56NNYqp042347 for ; Tue, 6 Jun 2006 23:23:34 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k56NNYJs042344 for perforce@freebsd.org; Tue, 6 Jun 2006 23:23:34 GMT (envelope-from jb@freebsd.org) Date: Tue, 6 Jun 2006 23:23:34 GMT Message-Id: <200606062323.k56NNYJs042344@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 98705 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Jun 2006 00:23:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=98705 Change 98705 by jb@jb_freebsd2 on 2006/06/06 23:23:22 Add the fields that DTrace uses in it's chill action. Affected files ... .. //depot/projects/dtrace/src/sys/sys/pcpu.h#7 edit Differences ... ==== //depot/projects/dtrace/src/sys/sys/pcpu.h#7 (text+ko) ==== @@ -79,6 +79,8 @@ struct cyc_cpu *pc_cyclic; /* Cyclic subsystem data */ u_int pc_intr_actv; /* Used by DTrace. */ uintptr_t pc_dtrace_caller; /* Used by DTrace. */ + uint64_t cpu_dtrace_chillmark; /* DTrace chill mark time */ + uint64_t cpu_dtrace_chilled; /* DTrace total chill time */ }; SLIST_HEAD(cpuhead, pcpu); From owner-p4-projects@FreeBSD.ORG Wed Jun 7 00:25:00 2006 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 A0F4216B9BA; Wed, 7 Jun 2006 00:06:23 +0000 (UTC) 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 4435616D335 for ; Tue, 6 Jun 2006 23:32:37 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1109343D6D for ; Tue, 6 Jun 2006 23:32:34 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k56NUi28042729 for ; Tue, 6 Jun 2006 23:30:44 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k56NUiSJ042723 for perforce@freebsd.org; Tue, 6 Jun 2006 23:30:44 GMT (envelope-from jb@freebsd.org) Date: Tue, 6 Jun 2006 23:30:44 GMT Message-Id: <200606062330.k56NUiSJ042723@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 98707 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Jun 2006 00:25:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=98707 Change 98707 by jb@jb_freebsd2 on 2006/06/06 23:29:58 Add a function for DTrace to get the uptime in it's high resolution format (nanoseconds) without calling any other functions (which would violate the probe context call rules). Note that this only works on Pentium processors and above where the TSC is being used. It doesn't address any issues with TSC differences between processors. So there is more work required here. rdtsc() is an inline function so it doesn't violate the probe context rules. Affected files ... .. //depot/projects/dtrace/src/sys/i386/i386/tsc.c#2 edit Differences ... ==== //depot/projects/dtrace/src/sys/i386/i386/tsc.c#2 (text+ko) ==== @@ -28,6 +28,7 @@ __FBSDID("$FreeBSD: src/sys/i386/i386/tsc.c,v 1.205 2006/02/11 09:33:06 phk Exp $"); #include "opt_clock.h" +#include "opt_kdtrace.h" #include #include @@ -153,3 +154,18 @@ { return (rdtsc()); } + +/* + * DTrace needs a high resolution time function which can + * be called from a probe context and guaranteed not to have + * instrumented with probes itself. + * + * Returns nanoseconds since boot. + */ +#ifdef KDTRACE +uint64_t +dtrace_gethrtime() +{ + return (rdtsc() * (uint64_t) 1000000000 / tsc_freq); +} +#endif From owner-p4-projects@FreeBSD.ORG Wed Jun 7 00:25:53 2006 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 AC2DB16A9E3; Wed, 7 Jun 2006 00:08:02 +0000 (UTC) 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 D6D8816B22D for ; Tue, 6 Jun 2006 23:25:24 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 87E4843D45 for ; Tue, 6 Jun 2006 23:25:24 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k56NNY7h042341 for ; Tue, 6 Jun 2006 23:23:34 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k56NNYR2042338 for perforce@freebsd.org; Tue, 6 Jun 2006 23:23:34 GMT (envelope-from jb@freebsd.org) Date: Tue, 6 Jun 2006 23:23:34 GMT Message-Id: <200606062323.k56NNYR2042338@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 98704 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Jun 2006 00:25:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=98704 Change 98704 by jb@jb_freebsd2 on 2006/06/06 23:22:36 Add the prototype for DTrace's high resolution wallclock time function. Affected files ... .. //depot/projects/dtrace/src/sys/sys/time.h#5 edit Differences ... ==== //depot/projects/dtrace/src/sys/sys/time.h#5 (text+ko) ==== @@ -305,6 +305,7 @@ void timevalsub(struct timeval *t1, const struct timeval *t2); int tvtohz(struct timeval *tv); uint64_t dtrace_gethrtime(void); +uint64_t dtrace_gethrestime(void); #else /* !_KERNEL */ #include From owner-p4-projects@FreeBSD.ORG Wed Jun 7 00:26:01 2006 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 DA0ED16C872; Wed, 7 Jun 2006 00:08:17 +0000 (UTC) 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 DA14016D4FC for ; Tue, 6 Jun 2006 23:33:36 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A10A843D46 for ; Tue, 6 Jun 2006 23:33:36 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k56NVkHA042847 for ; Tue, 6 Jun 2006 23:31:46 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k56NVkke042844 for perforce@freebsd.org; Tue, 6 Jun 2006 23:31:46 GMT (envelope-from jb@freebsd.org) Date: Tue, 6 Jun 2006 23:31:46 GMT Message-Id: <200606062331.k56NVkke042844@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 98708 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Jun 2006 00:26:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=98708 Change 98708 by jb@jb_freebsd2 on 2006/06/06 23:31:33 On FreeBSD, use the prototype for dtrace_gethrestime() from sys/time.h, not the DTrace one here. The reason is that I chose not to polute the FreeBSD headers with hrtime_t which is really just a uint64_t. Affected files ... .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/dtrace_impl.h#8 edit Differences ... ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/dtrace_impl.h#8 (text) ==== @@ -1261,7 +1261,9 @@ int, uintptr_t); extern int dtrace_assfail(const char *, const char *, int); extern int dtrace_attached(void); +#if defined(sun) extern hrtime_t dtrace_gethrestime(void); +#endif #ifdef __sparc extern void dtrace_flush_windows(void); From owner-p4-projects@FreeBSD.ORG Wed Jun 7 00:27:22 2006 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 9294316CF96; Wed, 7 Jun 2006 00:08:55 +0000 (UTC) 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 A5E1A16BDD7 for ; Tue, 6 Jun 2006 23:36:41 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6922143D48 for ; Tue, 6 Jun 2006 23:36:41 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k56NYp3A043151 for ; Tue, 6 Jun 2006 23:34:51 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k56NYp5w043148 for perforce@freebsd.org; Tue, 6 Jun 2006 23:34:51 GMT (envelope-from jb@freebsd.org) Date: Tue, 6 Jun 2006 23:34:51 GMT Message-Id: <200606062334.k56NYp5w043148@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 98710 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Jun 2006 00:27:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=98710 Change 98710 by jb@jb_freebsd2 on 2006/06/06 23:34:09 Enable the chill action. Affected files ... .. //depot/projects/dtrace/src/cddl/test/dtrace/Makefile#17 edit .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_action.c#4 edit Differences ... ==== //depot/projects/dtrace/src/cddl/test/dtrace/Makefile#17 (text+ko) ==== @@ -388,6 +388,7 @@ ${.CURDIR}/tst/common/funcs/tst.badfreopen.ksh \ ${.CURDIR}/tst/common/funcs/tst.basename.d \ ${.CURDIR}/tst/common/funcs/tst.bcopy.d \ + ${.CURDIR}/tst/common/funcs/tst.chill.ksh \ ${.CURDIR}/tst/common/funcs/tst.cleanpath.d \ ${.CURDIR}/tst/common/funcs/tst.default.d \ ${.CURDIR}/tst/common/funcs/tst.ftruncate.ksh \ @@ -1375,7 +1376,6 @@ ${.CURDIR}/tst/common/dtraceUtil/tst.DestructWithProvider.d.ksh \ ${.CURDIR}/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh \ ${.CURDIR}/tst/common/dtraceUtil/tst.ZeroProviderProbes.d.ksh \ - ${.CURDIR}/tst/common/funcs/tst.chill.ksh \ ${.CURDIR}/tst/common/inline/tst.InlineKinds.d \ ${.CURDIR}/tst/common/printa/tst.stack.d \ ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_action.c#4 (text+ko) ==== @@ -137,11 +137,13 @@ static void dtrace_action_chill(dtrace_mstate_t *mstate, hrtime_t val) { -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); -#ifdef DOODAD hrtime_t now; volatile uint16_t *flags; +#if defined(sun) cpu_t *cpu = CPU; +#else + cpu_t *cpu = pcpu_find(curcpu); +#endif if (dtrace_destructive_disallow) return; @@ -179,7 +181,6 @@ */ mstate->dtms_present &= ~DTRACE_MSTATE_TIMESTAMP; cpu->cpu_dtrace_chilled += val; -#endif } static void From owner-p4-projects@FreeBSD.ORG Wed Jun 7 00:27:25 2006 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 B878216CFA4; Wed, 7 Jun 2006 00:08:55 +0000 (UTC) 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 43F3616ABA6 for ; Tue, 6 Jun 2006 23:28:29 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 087D343D46 for ; Tue, 6 Jun 2006 23:28:29 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k56NQcft042484 for ; Tue, 6 Jun 2006 23:26:38 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k56NQc2l042481 for perforce@freebsd.org; Tue, 6 Jun 2006 23:26:38 GMT (envelope-from jb@freebsd.org) Date: Tue, 6 Jun 2006 23:26:38 GMT Message-Id: <200606062326.k56NQc2l042481@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 98706 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Jun 2006 00:27:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=98706 Change 98706 by jb@jb_freebsd2 on 2006/06/06 23:26:23 Add DTrace's wallclock high resolution time function and remove the uptime one which belongs in the machine dependent code. The diff for this change makes the change look more complicated than it really is. It's one function removed and one added. No others are changed. Affected files ... .. //depot/projects/dtrace/src/sys/kern/kern_tc.c#3 edit Differences ... ==== //depot/projects/dtrace/src/sys/kern/kern_tc.c#3 (text+ko) ==== @@ -289,47 +289,38 @@ } while (gen == 0 || gen != th->th_generation); } -void -getmicrotime(struct timeval *tvp) +#ifdef KDTRACE +uint64_t +dtrace_gethrestime() { struct timehands *th; u_int gen; + uint64_t hrt; - ngetmicrotime++; do { th = timehands; gen = th->th_generation; - *tvp = th->th_microtime; + hrt = ((uint64_t) th->th_nanotime.tv_sec * 1000000000) + + th->th_nanotime.tv_nsec; } while (gen == 0 || gen != th->th_generation); + + return (hrt); } +#endif -/* - * DTrace needs a high resolution time function which can - * be called from a probe context and guaranteed not to have - * instrumented with probes itself. It avoids instrumenting - * functions with the 'dtrace_' prefix. - * - * The 'high resolution' time is actually nanoseconds uptime. - */ -#ifdef KDTRACE -uint64_t -dtrace_gethrtime() +void +getmicrotime(struct timeval *tvp) { struct timehands *th; u_int gen; - uint64_t hrt; + ngetmicrotime++; do { th = timehands; gen = th->th_generation; - - hrt = th->th_offset.sec * (uint64_t)1000000000 + - (((uint64_t)1000000000 * (uint32_t)(th->th_offset.frac >> 32)) >> 32); + *tvp = th->th_microtime; } while (gen == 0 || gen != th->th_generation); - - return (hrt); } -#endif /* * Initialize a new timecounter and possibly use it. From owner-p4-projects@FreeBSD.ORG Wed Jun 7 00:31:40 2006 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 5E84F16D6DF; Wed, 7 Jun 2006 00:14:39 +0000 (UTC) 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 400A716CE9A for ; Tue, 6 Jun 2006 23:35:40 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B846943D46 for ; Tue, 6 Jun 2006 23:35:39 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k56NXnJj043091 for ; Tue, 6 Jun 2006 23:33:49 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k56NXnIC043088 for perforce@freebsd.org; Tue, 6 Jun 2006 23:33:49 GMT (envelope-from jb@freebsd.org) Date: Tue, 6 Jun 2006 23:33:49 GMT Message-Id: <200606062333.k56NXnIC043088@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 98709 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Jun 2006 00:31:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=98709 Change 98709 by jb@jb_freebsd2 on 2006/06/06 23:33:18 Remove a function that is implemented elsewhere now. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_freebsd.c#3 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_freebsd.c#3 (text+ko) ==== @@ -28,9 +28,3 @@ * $FreeBSD$ */ -hrtime_t -dtrace_gethrestime(void) -{ - /* XXX This should get the walltimestamp */ - return (dtrace_gethrtime()); -} From owner-p4-projects@FreeBSD.ORG Wed Jun 7 04:34:33 2006 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 016EB16AB78; Wed, 7 Jun 2006 04:33:46 +0000 (UTC) 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 A656A16ABB0 for ; Wed, 7 Jun 2006 04:32:53 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 60BCC43D49 for ; Wed, 7 Jun 2006 04:32:53 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k574V24G071764 for ; Wed, 7 Jun 2006 04:31:02 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k574V2Hd071761 for perforce@freebsd.org; Wed, 7 Jun 2006 04:31:02 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 7 Jun 2006 04:31:02 GMT Message-Id: <200606070431.k574V2Hd071761@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 98715 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Jun 2006 04:34:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=98715 Change 98715 by kmacy@kmacy_storage:sun4v_work on 2006/06/07 04:30:30 make spinlock sampling interval prime Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_mutex.c#9 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/kern/kern_mutex.c#9 (text+ko) ==== @@ -125,7 +125,7 @@ &spin_prof_enable, 0, "Enable tracing of spinlock holdtime"); u_int spin_total = 0; uint64_t spin_count = 0; -u_int spin_scale = 100; +u_int spin_scale = 101; SYSCTL_UINT(_debug_spinlock_prof, OID_AUTO, total, CTLFLAG_RD, &spin_total, 0, "Number of spinlock spins recorded"); SYSCTL_UINT(_debug_spinlock_prof, OID_AUTO, count, CTLFLAG_RD, From owner-p4-projects@FreeBSD.ORG Wed Jun 7 05:13:12 2006 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 9205416AFC2; Wed, 7 Jun 2006 05:09:17 +0000 (UTC) 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 5A7F016BA0A for ; Wed, 7 Jun 2006 05:05:34 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0C6FD43D46 for ; Wed, 7 Jun 2006 05:05:34 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5753gO1081913 for ; Wed, 7 Jun 2006 05:03:42 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5753g6R081910 for perforce@freebsd.org; Wed, 7 Jun 2006 05:03:42 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 7 Jun 2006 05:03:42 GMT Message-Id: <200606070503.k5753g6R081910@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 98716 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Jun 2006 05:13:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=98716 Change 98716 by kmacy@kmacy_storage:sun4v_work on 2006/06/07 05:03:24 turn off spill fill optimization to handle general case for now Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#62 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#62 (text+ko) ==== @@ -430,8 +430,6 @@ #define SYNC #Sync #define LOOKASIDE #Lookaside -#define USE_FAST_SPILLFILL - #ifdef USE_FAST_SPILLFILL #define spill_64bit_asi(asival, asival_unaligned, target) \ wr %g0, asival, %asi ; \ From owner-p4-projects@FreeBSD.ORG Wed Jun 7 08:39:16 2006 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 3F2B016AAED; Wed, 7 Jun 2006 08:30:36 +0000 (UTC) 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 74B7B16AC21; Wed, 7 Jun 2006 08:27:26 +0000 (UTC) (envelope-from Alexander@Leidinger.net) Received: from www.ebusiness-leidinger.de (jojo.ms-net.de [84.16.236.246]) by mx1.FreeBSD.org (Postfix) with ESMTP id B6B8A43D49; Wed, 7 Jun 2006 08:27:25 +0000 (GMT) (envelope-from Alexander@Leidinger.net) Received: from Andro-Beta.Leidinger.net (p54A5D520.dip.t-dialin.net [84.165.213.32]) (authenticated bits=0) by www.ebusiness-leidinger.de (8.13.4/8.13.4) with ESMTP id k578P5T1030250; Wed, 7 Jun 2006 10:25:06 +0200 (CEST) (envelope-from Alexander@Leidinger.net) Received: from localhost (localhost [127.0.0.1]) by Andro-Beta.Leidinger.net (8.13.4/8.13.3) with ESMTP id k578ROJ8073701; Wed, 7 Jun 2006 10:27:24 +0200 (CEST) (envelope-from Alexander@Leidinger.net) Received: from pslux.cec.eu.int (pslux.cec.eu.int [158.169.9.14]) by webmail.leidinger.net (Horde MIME library) with HTTP; Wed, 07 Jun 2006 10:27:23 +0200 Message-ID: <20060607102723.q83gsal28gksook0@netchild.homeip.net> X-Priority: 3 (Normal) Date: Wed, 07 Jun 2006 10:27:23 +0200 From: Alexander Leidinger To: Roman Divacky References: <200606061552.k56FqFCG081728@repoman.freebsd.org> In-Reply-To: <200606061552.k56FqFCG081728@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8; DelSp="Yes"; format="flowed" Content-Disposition: inline Content-Transfer-Encoding: 7bit User-Agent: Internet Messaging Program (IMP) H3 (4.1) / FreeBSD-4.11 X-Virus-Scanned: by amavisd-new Cc: Perforce Change Reviews Subject: Re: PERFORCE change 98672 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Jun 2006 08:39:22 -0000 Quoting Roman Divacky (from Tue, 6 Jun 2006 15:52:15 GMT): > http://perforce.freebsd.org/chv.cgi?CH=98672 > > Change 98672 by rdivacky@rdivacky_witten on 2006/06/06 15:51:41 > > Update of syscall.master: > o Adding of several new syscalls (268-310) For the casual reader: these are stubs of all missing syscalls, not a full implementation. > o Synchronization of amd64 syscall.master with i386 one > o Auditing added to amd64 syscall.master Bye, Alexander. -- Selling GoodYear Eagle F1 235/40ZR18, 2x 4mm + 2x 5mm, ~150 EUR you have to pick it up between Germany/Saarland and Luxembourg/Capellen http://www.Leidinger.net Alexander @ Leidinger.net: PGP ID = B0063FE7 http://www.FreeBSD.org netchild @ FreeBSD.org : PGP ID = 72077137 From owner-p4-projects@FreeBSD.ORG Wed Jun 7 08:53:47 2006 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 4D13A16CA59; Wed, 7 Jun 2006 08:38:34 +0000 (UTC) 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 BC1AC16A8E3; Wed, 7 Jun 2006 08:29:50 +0000 (UTC) (envelope-from Alexander@Leidinger.net) Received: from www.ebusiness-leidinger.de (jojo.ms-net.de [84.16.236.246]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0B08743D46; Wed, 7 Jun 2006 08:29:49 +0000 (GMT) (envelope-from Alexander@Leidinger.net) Received: from Andro-Beta.Leidinger.net (p54A5D520.dip.t-dialin.net [84.165.213.32]) (authenticated bits=0) by www.ebusiness-leidinger.de (8.13.4/8.13.4) with ESMTP id k578RU5H030258; Wed, 7 Jun 2006 10:27:30 +0200 (CEST) (envelope-from Alexander@Leidinger.net) Received: from localhost (localhost [127.0.0.1]) by Andro-Beta.Leidinger.net (8.13.4/8.13.3) with ESMTP id k578Tl6M073994; Wed, 7 Jun 2006 10:29:48 +0200 (CEST) (envelope-from Alexander@Leidinger.net) Received: from pslux.cec.eu.int (pslux.cec.eu.int [158.169.9.14]) by webmail.leidinger.net (Horde MIME library) with HTTP; Wed, 07 Jun 2006 10:29:47 +0200 Message-ID: <20060607102947.zzquvik1wk0cs4ws@netchild.homeip.net> X-Priority: 3 (Normal) Date: Wed, 07 Jun 2006 10:29:47 +0200 From: Alexander Leidinger To: Roman Divacky References: <200606061555.k56FtLSU081901@repoman.freebsd.org> In-Reply-To: <200606061555.k56FtLSU081901@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8; DelSp="Yes"; format="flowed" Content-Disposition: inline Content-Transfer-Encoding: 7bit User-Agent: Internet Messaging Program (IMP) H3 (4.1) / FreeBSD-4.11 X-Virus-Scanned: by amavisd-new Cc: Perforce Change Reviews Subject: Re: PERFORCE change 98674 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Jun 2006 08:54:00 -0000 Quoting Roman Divacky (from Tue, 6 Jun 2006 15:55:21 GMT): > http://perforce.freebsd.org/chv.cgi?CH=98674 > > Change 98674 by rdivacky@rdivacky_witten on 2006/06/06 15:54:54 > > Change auditing type for lstat syscall. AFAIK this was "Found by: rwatson (review of AUDIT part for amd64)" (a bug in the existing code on i386, not in the syncronization). Bye, Alexander. -- Selling GoodYear Eagle F1 235/40ZR18, 2x 4mm + 2x 5mm, ~150 EUR you have to pick it up between Germany/Saarland and Luxembourg/Capellen http://www.Leidinger.net Alexander @ Leidinger.net: PGP ID = B0063FE7 http://www.FreeBSD.org netchild @ FreeBSD.org : PGP ID = 72077137 From owner-p4-projects@FreeBSD.ORG Wed Jun 7 19:14:50 2006 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 5A117170014; Wed, 7 Jun 2006 16:56:15 +0000 (UTC) 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 0C74016E2E2 for ; Wed, 7 Jun 2006 14:18:16 +0000 (UTC) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 959ED43D53 for ; Wed, 7 Jun 2006 14:18:15 +0000 (GMT) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k57EGMlt037106 for ; Wed, 7 Jun 2006 14:16:22 GMT (envelope-from deker@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k57EGMNu037103 for perforce@freebsd.org; Wed, 7 Jun 2006 14:16:22 GMT (envelope-from deker@FreeBSD.org) Date: Wed, 7 Jun 2006 14:16:22 GMT Message-Id: <200606071416.k57EGMNu037103@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to deker@FreeBSD.org using -f From: Rob Deker To: Perforce Change Reviews Cc: Subject: PERFORCE change 98738 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Jun 2006 19:14:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=98738 Change 98738 by deker@sebsd_build on 2006/06/07 14:15:54 Minor website changes. Affected files ... .. //depot/projects/trustedbsd/www/sebsd.page#4 edit Differences ... ==== //depot/projects/trustedbsd/www/sebsd.page#4 (text+ko) ==== @@ -37,7 +37,7 @@ - $P4: //depot/projects/trustedbsd/www/sebsd.page#3 $ + $P4: //depot/projects/trustedbsd/www/sebsd.page#4 $ @@ -63,11 +63,10 @@ policy; many but not all relevant userland applications have been updated to properly interact with FLASK security contexts, including the login program. - The FLASK implementation provides access to Type Enforcement - (TE), as well as RBAC and a second MLS policy implementation.

+

McAfee Research, now SPARTA - ISSO, provides an ISO snapshot and CVSUP source distribution of + ISSO, now provides a source tarball and CVSUP source distribution of SEBSD maintained on the FreeBSD Project Perforce Server.

The FLASK/TE implementation provided by NSA, SCC, and From owner-p4-projects@FreeBSD.ORG Wed Jun 7 23:01:42 2006 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 7B5A116FC9A; Wed, 7 Jun 2006 20:38:34 +0000 (UTC) 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 2FDAB1712D0 for ; Wed, 7 Jun 2006 18:53:13 +0000 (UTC) (envelope-from clem1@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C5D0D43D6D for ; Wed, 7 Jun 2006 18:53:02 +0000 (GMT) (envelope-from clem1@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k57Ip8O8063618 for ; Wed, 7 Jun 2006 18:51:08 GMT (envelope-from clem1@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k57Ip8rW063615 for perforce@freebsd.org; Wed, 7 Jun 2006 18:51:08 GMT (envelope-from clem1@FreeBSD.org) Date: Wed, 7 Jun 2006 18:51:08 GMT Message-Id: <200606071851.k57Ip8rW063615@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to clem1@FreeBSD.org using -f From: Clément Lecigne To: Perforce Change Reviews Cc: Subject: PERFORCE change 98749 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Jun 2006 23:01:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=98749 Change 98749 by clem1@clem1_ipv6vulns on 2006/06/07 18:50:44 Libnet source tree and ipv6 setsockopt() fuzzer. Submitted by: clem1 Affected files ... .. //depot/projects/soc2006/clem1_ipv6vulns/fuzzers/DESCRIPTION#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/fuzzers/local/DESCRIPTION#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/fuzzers/local/TODO#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/fuzzers/local/global/funcs.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/fuzzers/local/include/fuzzer.h#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/fuzzers/local/include/rand.h#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/fuzzers/local/include/setsockopt.h#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/fuzzers/local/rand/rand.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/fuzzers/local/setsockopt/Makefile#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/fuzzers/local/setsockopt/main.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/fuzzers/local/setsockopt/setsockopt.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/CVS/Entries#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/CVS/Repository#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/CVS/Root#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/Makefile.am#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/Makefile.am.common#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/Makefile.in#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/README#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/VERSION#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/acconfig.h#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/acinclude.m4#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/aclocal.m4#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/autom4te.cache/CVS/Entries#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/autom4te.cache/CVS/Repository#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/autom4te.cache/CVS/Root#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/autom4te.cache/output.0#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/autom4te.cache/requests#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/autom4te.cache/traces.0#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/config.guess#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/config.sub#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/configure#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/configure.in#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/doc/BUGS#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/doc/CHANGELOG#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/doc/CONTRIB#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/doc/COPYING#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/doc/CVS/Entries#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/doc/CVS/Repository#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/doc/CVS/Root#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/doc/DESIGN_NOTES#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/doc/MIGRATION#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/doc/PACKET_BUILDING#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/doc/PORTED#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/doc/RAWSOCKET_NON_SEQUITUR#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/doc/TODO#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/doc/html/acconfig_8h-source.html#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/doc/html/annotated.html#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/doc/html/bpf_8h-source.html#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/doc/html/config_8h-source.html#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/doc/html/doxygen.css#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/doc/html/doxygen.png#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/doc/html/files.html#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/doc/html/functions.html#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/doc/html/functions_vars.html#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/doc/html/getopt_8h-source.html#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/doc/html/globals.html#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/doc/html/globals_defs.html#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/doc/html/globals_func.html#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/doc/html/gnuc_8h-source.html#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/doc/html/graph_legend.dot#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/doc/html/graph_legend.html#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/doc/html/ifaddrlist_8h-source.html#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/doc/html/in__systm_8h-source.html#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/doc/html/index.html#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/doc/html/libnet-asn1_8h-source.html#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/doc/html/libnet-functions_8h-source.html#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/doc/html/libnet-functions_8h.html#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/doc/html/libnet-headers_8h-source.html#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/doc/html/libnet-headers_8h.html#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/doc/html/libnet-macros_8h-source.html#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/doc/html/libnet-macros_8h.html#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/doc/html/libnet-structures_8h-source.html#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/doc/html/libnet-types_8h-source.html#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/doc/html/libnet_8h-source.html#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/doc/html/libnet_8h.html#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/doc/html/structlibnet__802__1q__hdr.html#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/doc/html/structlibnet__802__1x__hdr.html#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/doc/libnet.doxygen.conf#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/doc/man/CVS/Entries#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/doc/man/CVS/Repository#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/doc/man/CVS/Root#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/doc/man/man3/libnet-functions.h.3#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/doc/man/man3/libnet-headers.h.3#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/doc/man/man3/libnet-macros.h.3#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/doc/man/man3/libnet.h.3#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/doc/man/man3/libnet_802_1q_hdr.3#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/doc/man/man3/libnet_802_1x_hdr.3#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/include/CVS/Entries#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/include/CVS/Repository#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/include/CVS/Root#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/include/Makefile.am#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/include/Makefile.in#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/include/bpf.h#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/include/config.h.in#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/include/gnuc.h#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/include/ifaddrlist.h#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/include/libnet.h.in#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/include/libnet/CVS/Entries#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/include/libnet/CVS/Repository#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/include/libnet/CVS/Root#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/include/libnet/Makefile.am#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/include/libnet/Makefile.in#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/include/libnet/libnet-asn1.h#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/include/libnet/libnet-functions.h#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/include/libnet/libnet-headers.h#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/include/libnet/libnet-macros.h#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/include/libnet/libnet-structures.h#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/include/libnet/libnet-types.h#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/include/stamp-h.in#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/include/win32/CVS/Entries#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/include/win32/CVS/Repository#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/include/win32/CVS/Root#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/include/win32/config.h#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/include/win32/getopt.h#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/include/win32/in_systm.h#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/include/win32/libnet.h#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/install-sh#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/libnet-config.in#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/libnet.doxygen.conf#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/man/CVS/Entries#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/man/CVS/Repository#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/man/CVS/Root#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/missing#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/mkinstalldirs#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/.icmp_redirect.c.swp#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/CVS/Entries#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/CVS/Repository#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/CVS/Root#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/Makefile.am#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/Makefile.in#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/arp-new.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/arp.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/bgp4_hdr.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/bgp4_notification.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/bgp4_open.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/bgp4_update.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/cdp.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/dhcp_discover.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/dns.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/dot1x.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/fddi_tcp1.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/fddi_tcp2.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/get_addr.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/gre.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/icmp6_echoreq.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/icmp_echo_cq.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/icmp_redirect.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/icmp_timeexceed.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/icmp_timestamp.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/icmp_unreach.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/ieee.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/ip_link.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/ip_raw.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/isl.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/libnet_test.h#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/mpls.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/ntp.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/ospf_hello.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/ospf_lsa.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/ping_of_death.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/rpc_tcp.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/rpc_udp.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/sebek.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/smurf.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/stp.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/synflood.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/synflood6.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/synflood6_frag.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/tcp1.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/tcp2.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/tftp.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/tring_tcp1.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/tring_tcp2.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/udp1.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/udp2.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/win32/CVS/Entries#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/win32/CVS/Repository#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/win32/CVS/Root#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/win32/arp/CVS/Entries#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/win32/arp/CVS/Repository#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/win32/arp/CVS/Root#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/win32/arp/arp.vcproj#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/win32/cdp/CVS/Entries#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/win32/cdp/CVS/Repository#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/win32/cdp/CVS/Root#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/win32/cdp/cdp.vcproj#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/win32/dhcp_discover/CVS/Entries#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/win32/dhcp_discover/CVS/Repository#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/win32/dhcp_discover/CVS/Root#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/win32/dhcp_discover/dhcp_discover.vcproj#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/win32/dns/CVS/Entries#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/win32/dns/CVS/Repository#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/win32/dns/CVS/Root#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/win32/dns/dns.vcproj#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/win32/get_addr/CVS/Entries#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/win32/get_addr/CVS/Repository#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/win32/get_addr/CVS/Root#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/win32/get_addr/get_addr.vcproj#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/win32/getopt.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/win32/icmp_echo_cq/CVS/Entries#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/win32/icmp_echo_cq/CVS/Repository#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/win32/icmp_echo_cq/CVS/Root#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/win32/icmp_echo_cq/icmp_echo_cq.vcproj#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/win32/tcp1/CVS/Entries#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/win32/tcp1/CVS/Repository#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/win32/tcp1/CVS/Root#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/win32/tcp1/tcp1.vcproj#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/win32/udp1/CVS/Entries#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/win32/udp1/CVS/Repository#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/win32/udp1/CVS/Root#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/win32/udp1/dns.vcproj#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/win32/udp1/udp1.vcproj#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/CVS/Entries#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/CVS/Repository#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/CVS/Root#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/Makefile.am#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/Makefile.in#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_advanced.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_asn1.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_build_802.1q.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_build_802.1x.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_build_802.2.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_build_802.3.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_build_arp.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_build_bgp.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_build_cdp.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_build_data.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_build_dhcp.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_build_dns.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_build_ethernet.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_build_fddi.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_build_gre.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_build_icmp.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_build_igmp.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_build_ip.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_build_ipsec.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_build_isl.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_build_link.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_build_mpls.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_build_ntp.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_build_ospf.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_build_rip.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_build_rpc.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_build_sebek.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_build_snmp.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_build_stp.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_build_tcp.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_build_token_ring.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_build_udp.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_build_vrrp.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_checksum.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_cq.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_crc.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_dll.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_error.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_if_addr.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_init.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_internal.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_link_bpf.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_link_dlpi.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_link_linux.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_link_nit.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_link_none.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_link_pf.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_link_snit.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_link_snoop.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_link_win32.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_pblock.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_port_list.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_prand.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_raw.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_resolve.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_version.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_write.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/version.h.in#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/win32/CVS/Entries#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/win32/CVS/Repository#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/win32/CVS/Root#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/win32/Libnet-1.1.1-2002.sln#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/win32/Libnet-1.1.1-2003.ncb#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/win32/Libnet-1.1.1-2003.sln#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/win32/Libnet-1.1.1-2003.suo#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/win32/Libnet-1.1.1.vcproj#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/win32/Libnet-latest.ncb#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/win32/Libnet-latest.opt#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/win32/Libnet-latest.sln#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/win32/Libnet-latest.suo#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/win32/Libnet-latest.vcproj#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/win32/Libnet.dsp#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/win32/Libnet.dsw#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/win32/README.txt#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/win32/libnet_dll.def#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Jun 8 01:45:06 2006 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 8142316EE80; Wed, 7 Jun 2006 23:35:39 +0000 (UTC) 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 527DD16D8B6 for ; Wed, 7 Jun 2006 21:08:12 +0000 (UTC) (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 2AD9A43D48 for ; Wed, 7 Jun 2006 21:08:11 +0000 (GMT) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k57L6HBT082794 for ; Wed, 7 Jun 2006 21:06:17 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k57L5bZL082701 for perforce@freebsd.org; Wed, 7 Jun 2006 21:05:37 GMT (envelope-from bz@freebsd.org) Date: Wed, 7 Jun 2006 21:05:37 GMT Message-Id: <200606072105.k57L5bZL082701@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 98757 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, 08 Jun 2006 01:45:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=98757 Change 98757 by bz@bz_dopt_ah on 2006/06/07 21:04:51 IFC @98752 Affected files ... .. //depot/projects/fast_ipsec/src/sys/amd64/amd64/busdma_machdep.c#7 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/amd64/pmap.c#11 integrate .. //depot/projects/fast_ipsec/src/sys/arm/arm/busdma_machdep.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/arm/arm/elf_trampoline.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/arm/arm/pmap.c#8 integrate .. //depot/projects/fast_ipsec/src/sys/arm/arm/vm_machdep.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/arm/at91/kb920x_machdep.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/arm/include/cpuconf.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/arm/include/cpufunc.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/arm/include/pmap.h#7 integrate .. //depot/projects/fast_ipsec/src/sys/arm/sa11x0/assabet_machdep.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/arm/sa11x0/uart_cpu_sa1110.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/arm/sa11x0/uart_dev_sa1110.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/arm/xscale/i80321/iq31244_machdep.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/boot/i386/libi386/biosdisk.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/bsm/audit.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/bsm/audit_record.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/cam/cam_ccb.h#4 integrate .. //depot/projects/fast_ipsec/src/sys/cam/cam_xpt.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/cam/scsi/scsi_all.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/compat/linprocfs/linprocfs.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/conf/Makefile.arm#8 integrate .. //depot/projects/fast_ipsec/src/sys/conf/NOTES#9 integrate .. //depot/projects/fast_ipsec/src/sys/conf/files#14 integrate .. //depot/projects/fast_ipsec/src/sys/conf/files.arm#3 integrate .. //depot/projects/fast_ipsec/src/sys/conf/kern.mk#3 integrate .. //depot/projects/fast_ipsec/src/sys/conf/options#12 integrate .. //depot/projects/fast_ipsec/src/sys/conf/options.arm#5 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/COPYRIGHT#3 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/README#3 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/ah.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/ah_desc.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/ah_devid.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/ah_soc.h#1 branch .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/freebsd/ah_if.m#3 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/freebsd/ah_osdep.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/freebsd/ah_osdep.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/ap30.hal.o.uu#1 branch .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/ap30.inc#1 branch .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/ap30.opt_ah.h#1 branch .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/ap43.hal.o.uu#1 branch .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/ap43.inc#1 branch .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/ap43.opt_ah.h#1 branch .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/ap51.hal.o.uu#1 branch .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/ap51.inc#1 branch .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/ap51.opt_ah.h#1 branch .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/ap61.hal.o.uu#1 branch .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/ap61.inc#1 branch .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/ap61.opt_ah.h#1 branch .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#3 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#3 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#3 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/armv4-be-elf.inc#3 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#3 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/armv4-le-elf.inc#3 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#3 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/i386-elf.inc#3 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#3 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/mips-be-elf.inc#3 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#3 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/mips-le-elf.inc#3 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#3 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/mips1-be-elf.inc#3 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#3 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/mips1-le-elf.inc#3 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#3 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.inc#3 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#3 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.inc#3 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#3 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/powerpc-be-eabi.inc#3 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/powerpc-be-elf.inc#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#3 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/powerpc-le-eabi.inc#3 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#3 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/sh4-le-elf.inc#3 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/sparc-be-elf.hal.o.uu#1 branch .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/sparc-be-elf.inc#1 branch .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/sparc-be-elf.opt_ah.h#1 branch .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/sparc64-be-elf.inc#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#3 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/x86_64-elf.inc#3 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#3 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/xscale-be-elf.inc#3 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#3 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/xscale-le-elf.inc#3 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/version.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/crypto/via/padlock.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/acpi_support/acpi_panasonic.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/acpica/acpi_hpet.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ahb/ahb.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ath/if_ath.c#8 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ath/if_ath_pci.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ath/if_athvar.h#5 integrate .. //depot/projects/fast_ipsec/src/sys/dev/awi/awi.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ciss/ciss.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/dev/dc/dcphy.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/dc/if_dc.c#8 integrate .. //depot/projects/fast_ipsec/src/sys/dev/dc/if_dcreg.h#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/em/if_em.c#8 integrate .. //depot/projects/fast_ipsec/src/sys/dev/gem/if_gem.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/dev/hifn/hifn7751.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ipw/if_ipw.c#7 integrate .. //depot/projects/fast_ipsec/src/sys/dev/isp/isp_freebsd.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/dev/isp/isp_freebsd.h#7 integrate .. //depot/projects/fast_ipsec/src/sys/dev/iwi/if_iwi.c#8 integrate .. //depot/projects/fast_ipsec/src/sys/dev/le/if_le_pci.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/lmc/if_lmc.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mpt/mpt.c#10 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mpt/mpt.h#11 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mpt/mpt_cam.c#11 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mpt/mpt_pci.c#8 integrate .. //depot/projects/fast_ipsec/src/sys/dev/my/if_my.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ofw/ofw_console.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/pccbb/pccbb.c#10 integrate .. //depot/projects/fast_ipsec/src/sys/dev/pccbb/pccbb_isa.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/pccbb/pccbb_pci.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/dev/pccbb/pccbbvar.h#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/pci/pcireg.h#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ral/rt2560.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ral/rt2661.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/dev/safe/safe.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sk/if_sk.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ubsec/ubsec.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/if_axe.c#7 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/if_axereg.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/if_ural.c#7 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/ugen.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/wi/if_wi.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/fs/msdosfs/msdosfs_vfsops.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/fs/procfs/procfs.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/fs/smbfs/smbfs_vnops.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/geom/eli/g_eli.c#7 integrate .. //depot/projects/fast_ipsec/src/sys/geom/eli/g_eli.h#4 integrate .. //depot/projects/fast_ipsec/src/sys/geom/eli/g_eli_ctl.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/geom/eli/g_eli_integrity.c#1 branch .. //depot/projects/fast_ipsec/src/sys/geom/eli/g_eli_key.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/geom/eli/g_eli_privacy.c#1 branch .. //depot/projects/fast_ipsec/src/sys/geom/geom.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/geom/geom_gpt.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/geom/geom_io.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfs_frw.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfs_fs_subr.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfs_iget.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfs_ioctl.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_attr.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_bit.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_dfrag.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_dir2_trace.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_inode.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_iomap.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_trans.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_vfsops.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_vnodeops.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/i386/busdma_machdep.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/i386/i386/initcpu.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/i386/i386/machdep.c#10 integrate .. //depot/projects/fast_ipsec/src/sys/i386/i386/minidump_machdep.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/i386/pmap.c#11 integrate .. //depot/projects/fast_ipsec/src/sys/i386/i386/ptrace_machdep.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/i386/include/md_var.h#4 integrate .. //depot/projects/fast_ipsec/src/sys/i386/include/npx.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/i386/isa/npx.c#7 integrate .. //depot/projects/fast_ipsec/src/sys/ia64/conf/NOTES#3 integrate .. //depot/projects/fast_ipsec/src/sys/ia64/ia64/busdma_machdep.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/ia64/ia64/pmap.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_acct.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_event.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_mutex.c#7 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_switch.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_synch.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/kern/sched_4bsd.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/kern/sched_ule.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/kern/vfs_aio.c#7 integrate .. //depot/projects/fast_ipsec/src/sys/kern/vfs_mount.c#9 integrate .. //depot/projects/fast_ipsec/src/sys/kern/vfs_syscalls.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/kern/vnode_if.src#4 integrate .. //depot/projects/fast_ipsec/src/sys/modules/acpi/acpi/Makefile#4 integrate .. //depot/projects/fast_ipsec/src/sys/modules/acpi/acpi_asus/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/acpi/acpi_panasonic/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/acpi/acpi_toshiba/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/acpi/acpi_video/Makefile#3 integrate .. //depot/projects/fast_ipsec/src/sys/modules/cpufreq/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/fdc/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/geom/geom_eli/Makefile#3 integrate .. //depot/projects/fast_ipsec/src/sys/net/bpf.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/net/bpf.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/net/bpfdesc.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/net/if.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/net/if_disc.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/net/if_faith.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/net/if_fwsubr.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/net/if_gif.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/net/if_gre.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/net/if_loop.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/net/if_media.h#5 integrate .. //depot/projects/fast_ipsec/src/sys/net/if_sl.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/net/if_stf.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/net/if_tap.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/net/if_tun.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/net/raw_cb.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/net/raw_usrreq.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/net/route.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/net80211/ieee80211_input.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/net80211/ieee80211_node.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/netgraph/atm/uni/ng_uni_cust.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/netgraph/netgraph.h#5 integrate .. //depot/projects/fast_ipsec/src/sys/netgraph/ng_base.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/netgraph/ng_iface.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/in_pcb.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/ip_carp.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/ip_gre.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/tcp_timer.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/tcp_usrreq.c#7 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/udp_usrreq.c#9 integrate .. //depot/projects/fast_ipsec/src/sys/netipsec/ipsec.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/netipsec/ipsec_input.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/nfsclient/nfs_vfsops.c#7 integrate .. //depot/projects/fast_ipsec/src/sys/nfsserver/nfs_serv.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/nfsserver/nfs_srvsubs.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/opencrypto/criov.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/opencrypto/crypto.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/opencrypto/cryptodev.h#4 integrate .. //depot/projects/fast_ipsec/src/sys/opencrypto/cryptosoft.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/opencrypto/xform.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/pc98/pc98/machdep.c#11 integrate .. //depot/projects/fast_ipsec/src/sys/pci/agp_amd64.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/pci/agp_sis.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/powerpc/powerpc/mmu_if.m#3 integrate .. //depot/projects/fast_ipsec/src/sys/powerpc/powerpc/mmu_oea.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/powerpc/powerpc/pmap_dispatch.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/security/audit/audit.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/security/audit/audit_arg.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/security/audit/audit_bsm.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/security/audit/audit_bsm_klib.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/security/audit/audit_bsm_token.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/security/audit/audit_ioctl.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/security/audit/audit_pipe.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/security/audit/audit_private.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/security/audit/audit_syscalls.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/security/audit/audit_worker.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/conf/GENERIC#7 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/isa/isa.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/sparc64/pmap.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/sys/elf_common.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/sys/mutex.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/sys/protosw.h#4 integrate .. //depot/projects/fast_ipsec/src/sys/tools/vnode_if.awk#4 integrate .. //depot/projects/fast_ipsec/src/sys/ufs/ffs/ffs_vfsops.c#11 integrate .. //depot/projects/fast_ipsec/src/sys/ufs/ufs/ufs_vnops.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/vm/pmap.h#4 integrate .. //depot/projects/fast_ipsec/src/sys/vm/vm_map.c#7 integrate .. //depot/projects/fast_ipsec/src/sys/vm/vm_page.c#8 integrate Differences ... ==== //depot/projects/fast_ipsec/src/sys/amd64/amd64/busdma_machdep.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.75 2006/05/28 18:31:32 silby Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.77 2006/06/01 04:49:29 silby Exp $"); #include #include @@ -498,7 +498,7 @@ * alignment guarantees of malloc need to be nailed down, and the * code below should be rewritten to take that into account. * - * In the meantime, we'll panic if malloc gets it wrong. + * In the meantime, we'll warn the user if malloc gets it wrong. */ if ((dmat->maxsize <= PAGE_SIZE) && (dmat->alignment < dmat->maxsize) && @@ -520,7 +520,7 @@ __func__, dmat, dmat->flags, ENOMEM); return (ENOMEM); } else if ((uintptr_t)*vaddr & (dmat->alignment - 1)) { - panic("bus_dmamem_alloc failed to align memory properly."); + printf("bus_dmamem_alloc failed to align memory properly."); } CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d", __func__, dmat, dmat->flags, ENOMEM); ==== //depot/projects/fast_ipsec/src/sys/amd64/amd64/pmap.c#11 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.554 2006/05/01 22:06:59 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.555 2006/06/05 20:35:25 alc Exp $"); /* * Manages physical address maps. @@ -209,6 +209,8 @@ static pv_entry_t get_pv_entry(pmap_t locked_pmap, int try); static void pmap_clear_ptes(vm_page_t m, long bit); +static vm_page_t pmap_enter_quick_locked(pmap_t pmap, vm_offset_t va, + vm_page_t m, vm_prot_t prot, vm_page_t mpte); static int pmap_remove_pte(pmap_t pmap, pt_entry_t *ptq, vm_offset_t sva, pd_entry_t ptepde); static void pmap_remove_page(pmap_t pmap, vm_offset_t va, pd_entry_t *pde); @@ -2310,6 +2312,37 @@ } /* + * Maps a sequence of resident pages belonging to the same object. + * The sequence begins with the given page m_start. This page is + * mapped at the given virtual address start. Each subsequent page is + * mapped at a virtual address that is offset from start by the same + * amount as the page is offset from m_start within the object. The + * last page in the sequence is the page with the largest offset from + * m_start that can be mapped at a virtual address less than the given + * virtual address end. Not every virtual page between start and end + * is mapped; only those for which a resident page exists with the + * corresponding offset from m_start are mapped. + */ +void +pmap_enter_object(pmap_t pmap, vm_offset_t start, vm_offset_t end, + vm_page_t m_start, vm_prot_t prot) +{ + vm_page_t m, mpte; + vm_pindex_t diff, psize; + + psize = atop(end - start); + mpte = NULL; + m = m_start; + PMAP_LOCK(pmap); + while (m != NULL && (diff = m->pindex - m_start->pindex) < psize) { + mpte = pmap_enter_quick_locked(pmap, start + ptoa(diff), m, + prot, mpte); + m = TAILQ_NEXT(m, listq); + } + PMAP_UNLOCK(pmap); +} + +/* * this code makes some *MAJOR* assumptions: * 1. Current pmap & pmap exists. * 2. Not wired. @@ -2322,15 +2355,26 @@ pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, vm_page_t mpte) { + + PMAP_LOCK(pmap); + mpte = pmap_enter_quick_locked(pmap, va, m, prot, mpte); + PMAP_UNLOCK(pmap); + return (mpte); +} + +static vm_page_t +pmap_enter_quick_locked(pmap_t pmap, vm_offset_t va, vm_page_t m, + vm_prot_t prot, vm_page_t mpte) +{ pt_entry_t *pte; vm_paddr_t pa; KASSERT(va < kmi.clean_sva || va >= kmi.clean_eva || (m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) != 0, - ("pmap_enter_quick: managed mapping within the clean submap")); + ("pmap_enter_quick_locked: managed mapping within the clean submap")); mtx_assert(&vm_page_queue_mtx, MA_OWNED); VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED); - PMAP_LOCK(pmap); + PMAP_LOCK_ASSERT(pmap, MA_OWNED); /* * In the case that a page table page is not @@ -2395,7 +2439,7 @@ pmap_unwire_pte_hold(pmap, va, mpte); mpte = NULL; } - goto out; + return (mpte); } /* @@ -2422,8 +2466,6 @@ pte_store(pte, pa | PG_V | PG_U); else pte_store(pte, pa | PG_V | PG_U | PG_MANAGED); -out: - PMAP_UNLOCK(pmap); return mpte; } ==== //depot/projects/fast_ipsec/src/sys/arm/arm/busdma_machdep.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.25 2006/03/01 23:04:25 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.26 2006/05/31 15:50:33 cognet Exp $"); /* * MacPPC bus dma support routines @@ -806,13 +806,16 @@ if (op & BUS_DMASYNC_PREWRITE) cpu_dcache_wb_range((vm_offset_t)buf, len); - if (op & BUS_DMASYNC_POSTREAD) { - if ((((vm_offset_t)buf | len) & arm_dcache_align_mask) == 0) - cpu_dcache_inv_range((vm_offset_t)buf, len); - else - cpu_dcache_wbinv_range((vm_offset_t)buf, len); - + if (op & BUS_DMASYNC_PREREAD) { + if ((vm_offset_t)buf & arm_dcache_align_mask) + cpu_dcache_wbinv_range((vm_offset_t)buf & + ~arm_dcache_align_mask, arm_dcache_align); + if (((vm_offset_t)buf + len) & arm_dcache_align_mask) + cpu_dcache_wbinv_range(((vm_offset_t)buf + len) & + ~arm_dcache_align_mask, arm_dcache_align); } + if (op & BUS_DMASYNC_POSTREAD) + cpu_dcache_inv_range((vm_offset_t)buf, len); } void @@ -823,7 +826,7 @@ int resid; struct iovec *iov; - if (!(op & (BUS_DMASYNC_PREWRITE | BUS_DMASYNC_POSTREAD))) + if (op == BUS_DMASYNC_POSTWRITE) return; if (map->flags & DMAMAP_COHERENT) return; ==== //depot/projects/fast_ipsec/src/sys/arm/arm/elf_trampoline.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.5 2006/01/20 00:46:44 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.6 2006/05/30 21:13:47 cognet Exp $"); #include #include #include @@ -31,6 +31,7 @@ #include #include #include +#include #include @@ -44,6 +45,24 @@ #define GZ_HEAD 0xa +#ifdef CPU_ARM7TDMI +#define cpu_idcache_wbinv_all arm7tdmi_cache_flushID +#elif defined(CPU_ARM8) +#define cpu_idcache_wbinv_all arm8_cache_purgeID +#elif defined(CPU_ARM9) +#define cpu_idcache_wbinv_all arm9_dcache_wbinv_all +#elif defined(CPU_ARM10) +#define cpu_idcache_wbinv_all arm10_idcache_wbinv_all +#elif defined(CPU_SA110) || defined(CPU_SA1110) || defined(CPU_SA1100) || \ + defined(CPU_IXP12X0) +#define cpu_idcache_wbinv_all sa1_cache_purgeID +#elif defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ + defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) +#define cpu_idcache_wbinv_all xscale_cache_purgeID +#endif +int arm_pdcache_line_size = 32; +int block_userspace_access = 0; + static __inline void * memcpy(void *dst, const void *src, int len) { @@ -160,7 +179,7 @@ static int input(void *dummy) { - if ((size_t)(i_input - orig_input) >= KERNSIZE) { + if ((size_t)(i_input - orig_input) >= KERNCOMPSIZE) { return (GZ_EOF); } return *i_input++; @@ -383,7 +402,7 @@ __start(void) { void *curaddr; - void *dst; + void *dst, *altdst; char *kernel = (char *)&kernel_start; __asm __volatile("mov %0, pc" : @@ -393,11 +412,22 @@ if (*kernel == 0x1f && kernel[1] == 0x8b) { int pt_addr = (((int)&_end + KERNSIZE + 0x100) & ~(L1_TABLE_SIZE - 1)) + L1_TABLE_SIZE; + setup_pagetables(pt_addr, (vm_paddr_t)curaddr, (vm_paddr_t)curaddr + 0x10000000); /* Gzipped kernel */ dst = inflate_kernel(kernel, &_end); kernel = (char *)&_end; + altdst = 4 + load_kernel((unsigned int)kernel, + (unsigned int)curaddr, + (unsigned int)&func_end , 0); + if (altdst > dst) + dst = altdst; + cpu_idcache_wbinv_all(); + __asm __volatile("mrc p15, 0, %0, c1, c0, 0\n" + "bic %0, %0, #1\n" /* MMU_ENABLE */ + "mcr p15, 0, %0, c1, c0, 0\n" + : "=r" (pt_addr)); } else #endif dst = 4 + load_kernel((unsigned int)&kernel_start, ==== //depot/projects/fast_ipsec/src/sys/arm/arm/pmap.c#8 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.47 2006/04/22 22:51:32 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.58 2006/06/07 17:14:48 alc Exp $"); #include #include #include @@ -198,6 +198,8 @@ static void pmap_free_pv_entry (pv_entry_t); static pv_entry_t pmap_get_pv_entry(void); +static void pmap_enter_locked(pmap_t, vm_offset_t, vm_page_t, + vm_prot_t, boolean_t); static void pmap_vac_me_harder(struct vm_page *, pmap_t, vm_offset_t); static void pmap_vac_me_kpmap(struct vm_page *, pmap_t, @@ -230,6 +232,8 @@ static pt_entry_t *csrc_pte, *cdst_pte; static vm_offset_t csrcp, cdstp; +static struct mtx cmtx; + static void pmap_init_l1(struct l1_ttable *, pd_entry_t *); /* * These routines are called when the CPU type is identified to set up @@ -268,9 +272,6 @@ */ union pmap_cache_state *pmap_cache_state; -LIST_HEAD(pmaplist, pmap); -struct pmaplist allpmaps; - /* static pt_entry_t *msgbufmap;*/ struct msgbuf *msgbufp = 0; @@ -411,7 +412,6 @@ static vm_offset_t pmap_kernel_l2ptp_kva; static vm_paddr_t pmap_kernel_l2ptp_phys; static struct vm_object pvzone_obj; -static struct vm_object l2zone_obj; static int pv_entry_count=0, pv_entry_max=0, pv_entry_high_water=0; int pmap_pagedaemon_waken = 0; @@ -455,14 +455,8 @@ struct pv_addr *pv; SLIST_FOREACH(pv, &kernel_pt_list, pv_list) { -#ifndef ARM32_NEW_VM_LAYOUT - if (pv->pv_pa == (pa & ~PAGE_MASK)) { - return (pv->pv_va | (pa & PAGE_MASK)); - } -#else if (pv->pv_pa == pa) return (pv->pv_va); -#endif } return (0); } @@ -714,21 +708,12 @@ for (; size != 0; va += L2_S_SIZE, pa += L2_S_SIZE, size -= L2_S_SIZE) { -#ifndef ARM32_NEW_VM_LAYOUT - pte = (pt_entry_t *) - kernel_pt_lookup(pde[va >> L1_S_SHIFT] & L2_S_FRAME); -#else pte = (pt_entry_t *) kernel_pt_lookup( pde[L1_IDX(va)] & L1_C_ADDR_MASK); -#endif if (pte == NULL) panic("xscale_setup_minidata: can't find L2 table for " "VA 0x%08x", (u_int32_t) va); -#ifndef ARM32_NEW_VM_LAYOUT - pte[(va >> PAGE_SHIFT) & 0x3ff] = -#else pte[l2pte_index(va)] = -#endif L2_S_PROTO | pa | L2_S_PROT(PTE_KERNEL, VM_PROT_READ) | L2_C | L2_XSCALE_T_TEX(TEX_XSCALE_X); } @@ -913,20 +898,44 @@ l1idx = L1_IDX(va); + PMAP_ASSERT_LOCKED(pm); + mtx_assert(&vm_page_queue_mtx, MA_OWNED); if ((l2 = pm->pm_l2[L2_IDX(l1idx)]) == NULL) { /* * No mapping at this address, as there is * no entry in the L1 table. * Need to allocate a new l2_dtable. */ +again_l2table: + PMAP_UNLOCK(pm); + vm_page_unlock_queues(); if ((l2 = pmap_alloc_l2_dtable()) == NULL) { + vm_page_lock_queues(); + PMAP_LOCK(pm); return (NULL); } - bzero(l2, sizeof(*l2)); - /* - * Link it into the parent pmap - */ - pm->pm_l2[L2_IDX(l1idx)] = l2; + vm_page_lock_queues(); + PMAP_LOCK(pm); + if (pm->pm_l2[L2_IDX(l1idx)] != NULL) { + PMAP_UNLOCK(pm); + vm_page_unlock_queues(); + uma_zfree(l2table_zone, l2); + vm_page_lock_queues(); + PMAP_LOCK(pm); + l2 = pm->pm_l2[L2_IDX(l1idx)]; + if (l2 == NULL) + goto again_l2table; + /* + * Someone already allocated the l2_dtable while + * we were doing the same. + */ + } else { + bzero(l2, sizeof(*l2)); + /* + * Link it into the parent pmap + */ + pm->pm_l2[L2_IDX(l1idx)] = l2; + } } l2b = &l2->l2_bucket[L2_BUCKET(l1idx)]; @@ -941,7 +950,23 @@ * No L2 page table has been allocated. Chances are, this * is because we just allocated the l2_dtable, above. */ +again_ptep: + PMAP_UNLOCK(pm); + vm_page_unlock_queues(); ptep = (void*)uma_zalloc(l2zone, M_NOWAIT); + vm_page_lock_queues(); + PMAP_LOCK(pm); + if (l2b->l2b_kva != 0) { + /* We lost the race. */ + PMAP_UNLOCK(pm); + vm_page_unlock_queues(); + uma_zfree(l2zone, ptep); + vm_page_lock_queues(); + PMAP_LOCK(pm); + if (l2b->l2b_kva == 0) + goto again_ptep; + return (l2b); + } l2b->l2b_phys = vtophys(ptep); if (ptep == NULL) { /* @@ -1511,10 +1536,8 @@ vm_offset_t va; u_int oflags; int count = 0; -#if 0 - PMAP_HEAD_TO_MAP_LOCK(); - simple_lock(&pg->mdpage.pvh_slock); -#endif + + mtx_assert(&vm_page_queue_mtx, MA_OWNED); /* * Clear saved attributes (modify, reference) @@ -1522,10 +1545,6 @@ pg->md.pvh_attrs &= ~(maskbits & (PVF_MOD | PVF_REF)); if (TAILQ_EMPTY(&pg->md.pv_list)) { -#if 0 - simple_unlock(&pg->mdpage.pvh_slock); - PMAP_HEAD_TO_MAP_UNLOCK(); -#endif return (0); } @@ -1538,9 +1557,7 @@ oflags = pv->pv_flags; pv->pv_flags &= ~maskbits; -#if 0 - pmap_acquire_pmap_lock(pm); -#endif + PMAP_LOCK(pm); l2b = pmap_get_l2_bucket(pm, va); @@ -1658,16 +1675,10 @@ pmap_tlb_flushD_SE(pm, pv->pv_va); } -#if 0 - pmap_release_pmap_lock(pm); -#endif + PMAP_UNLOCK(pm); } -#if 0 - simple_unlock(&pg->mdpage.pvh_slock); - PMAP_HEAD_TO_MAP_UNLOCK(); -#endif if (maskbits & PVF_WRITE) vm_page_flag_clear(pg, PG_WRITEABLE); return (count); @@ -1696,14 +1707,12 @@ vm_offset_t va, u_int flags) { - + mtx_assert(&vm_page_queue_mtx, MA_OWNED); + PMAP_ASSERT_LOCKED(pm); pve->pv_pmap = pm; pve->pv_va = va; pve->pv_flags = flags; -#if 0 - mtx_lock(&pg->md.pvh_mtx); -#endif TAILQ_INSERT_HEAD(&pg->md.pv_list, pve, pv_list); TAILQ_INSERT_HEAD(&pm->pm_pvlist, pve, pv_plist); pg->md.pvh_attrs |= flags & (PVF_REF | PVF_MOD); @@ -1718,9 +1727,6 @@ else pg->md.uro_mappings++; pg->md.pv_list_count++; -#if 0 - mtx_unlock(&pg->md.pvh_mtx); -#endif if (pve->pv_flags & PVF_WIRED) ++pm->pm_stats.wired_count; vm_page_flag_set(pg, PG_REFERENCED); @@ -1737,6 +1743,7 @@ { struct pv_entry *pv; + mtx_assert(&vm_page_queue_mtx, MA_OWNED); TAILQ_FOREACH(pv, &pg->md.pv_list, pv_list) if (pm == pv->pv_pmap && va == pv->pv_va) break; @@ -1779,6 +1786,8 @@ pmap_nuke_pv(struct vm_page *pg, pmap_t pm, struct pv_entry *pve) { + mtx_assert(&vm_page_queue_mtx, MA_OWNED); + PMAP_ASSERT_LOCKED(pm); TAILQ_REMOVE(&pg->md.pv_list, pve, pv_list); TAILQ_REMOVE(&pm->pm_pvlist, pve, pv_plist); if (pve->pv_flags & PVF_WIRED) @@ -1845,6 +1854,8 @@ struct pv_entry *npv; u_int flags, oflags; + PMAP_ASSERT_LOCKED(pm); + mtx_assert(&vm_page_queue_mtx, MA_OWNED); if ((npv = pmap_find_pv(pg, pm, va)) == NULL) return (0); @@ -1910,6 +1921,8 @@ dprintf("pmap_pinit0: pmap = %08x, pm_pdir = %08x\n", (u_int32_t) pmap, (u_int32_t) pmap->pm_pdir); bcopy(kernel_pmap, pmap, sizeof(*pmap)); + bzero(&pmap->pm_mtx, sizeof(pmap->pm_mtx)); + PMAP_LOCK_INIT(pmap); } /* @@ -1956,7 +1969,6 @@ UMA_ZONE_VM | UMA_ZONE_NOFREE); uma_zone_set_obj(pvzone, &pvzone_obj, pv_entry_max); - uma_zone_set_obj(l2zone, &l2zone_obj, pv_entry_max); } @@ -2502,11 +2514,10 @@ cpu_tlb_flushID(); cpu_cpwait(); + PMAP_LOCK_INIT(kernel_pmap); kernel_pmap->pm_active = -1; kernel_pmap->pm_domain = PMAP_DOMAIN_KERNEL; - LIST_INIT(&allpmaps); TAILQ_INIT(&kernel_pmap->pm_pvlist); - LIST_INSERT_HEAD(&allpmaps, kernel_pmap, pm_list); /* * Reserve some special page table entries/VA space for temporary @@ -2541,6 +2552,7 @@ virtual_end = lastaddr; kernel_vm_end = pmap_curmaxkvaddr; arm_nocache_startaddr = lastaddr; + mtx_init(&cmtx, "TMP mappings mtx", NULL, MTX_DEF); #ifdef ARM_USE_SMALL_ALLOC mtx_init(&smallalloc_mtx, "Small alloc page list", NULL, MTX_DEF); @@ -2566,7 +2578,6 @@ pmap_idcache_wbinv_all(pmap); pmap_tlb_flushID(pmap); cpu_cpwait(); - LIST_REMOVE(pmap, pm_list); if (vector_page < KERNBASE) { struct pcb *curpcb = PCPU_GET(curpcb); pcb = thread0.td_pcb; @@ -2595,6 +2606,7 @@ } pmap_free_l1(pmap); + PMAP_LOCK_DESTROY(pmap); dprintf("pmap_release()\n"); } @@ -2804,6 +2816,7 @@ pt_entry_t *pt; vm_page_lock_queues(); + PMAP_LOCK(pmap); for (pv = TAILQ_FIRST(&pmap->pm_pvlist); pv; pv = npv) { if (pv->pv_flags & PVF_WIRED) { /* The page is wired, cannot remove it now. */ @@ -2827,6 +2840,7 @@ cpu_idcache_wbinv_all(); cpu_tlb_flushID(); cpu_cpwait(); + PMAP_UNLOCK(pmap); } @@ -3067,6 +3081,7 @@ if (!pmap_get_pde_pte(pmap, addr, &pde, &pte)) return (FALSE); + KASSERT(pte != NULL, ("Valid mapping but no pte ?")); if (*pte == 0) return (TRUE); return (FALSE); @@ -3160,6 +3175,7 @@ if (flush == FALSE && (pv->pv_pmap == curpm || pv->pv_pmap == pmap_kernel())) flush = TRUE; + PMAP_LOCK(pv->pv_pmap); l2b = pmap_get_l2_bucket(pv->pv_pmap, pv->pv_va); KASSERT(l2b != NULL, ("No l2 bucket")); ptep = &l2b->l2b_kva[l2pte_index(pv->pv_va)]; @@ -3172,6 +3188,7 @@ pv->pv_pmap->pm_stats.resident_count--; flags |= pv->pv_flags; pmap_nuke_pv(m, pv->pv_pmap, pv); + PMAP_UNLOCK(pv->pv_pmap); pmap_free_pv_entry(pv); } @@ -3199,9 +3216,7 @@ int flush; if ((prot & VM_PROT_READ) == 0) { - mtx_lock(&Giant); pmap_remove(pm, sva, eva); - mtx_unlock(&Giant); return; } @@ -3213,7 +3228,8 @@ return; } - mtx_lock(&Giant); + vm_page_lock_queues(); + PMAP_LOCK(pm); /* * OK, at this point, we know we're doing write-protect operation. @@ -3224,7 +3240,6 @@ flush = ((eva - sva) >= (PAGE_SIZE * 4)) ? 0 : -1; flags = 0; - vm_page_lock_queues(); while (sva < eva) { next_bucket = L2_NEXT_BUCKET(sva); if (next_bucket > eva) @@ -3282,7 +3297,7 @@ } vm_page_unlock_queues(); - mtx_unlock(&Giant); + PMAP_UNLOCK(pm); } @@ -3303,6 +3318,21 @@ pmap_enter(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, boolean_t wired) { + + vm_page_lock_queues(); + PMAP_LOCK(pmap); + pmap_enter_locked(pmap, va, m, prot, wired); + vm_page_unlock_queues(); + PMAP_UNLOCK(pmap); +} + +/* + * The page queues and pmap must be locked. + */ +static void +pmap_enter_locked(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, + boolean_t wired) +{ struct l2_bucket *l2b = NULL; struct vm_page *opg; struct pv_entry *pve = NULL; @@ -3311,7 +3341,8 @@ u_int oflags; vm_paddr_t pa; - vm_page_lock_queues(); + PMAP_ASSERT_LOCKED(pmap); + mtx_assert(&vm_page_queue_mtx, MA_OWNED); if (va == vector_page) { pa = systempage.pv_pa; m = NULL; @@ -3428,9 +3459,11 @@ simple_lock(&opg->mdpage.pvh_slock); #endif pve = pmap_remove_pv(opg, pmap, va); - if (m && (m->flags & (PG_UNMANAGED | PG_FICTITIOUS)) && pve) + if (m && (m->flags & (PG_UNMANAGED | PG_FICTITIOUS)) && + pve) pmap_free_pv_entry(pve); - else if (!pve) + else if (!pve && + !(m->flags & (PG_UNMANAGED | PG_FICTITIOUS))) pve = pmap_get_pv_entry(); KASSERT(pve != NULL, ("No pv")); #if 0 @@ -3525,7 +3558,36 @@ if (m) pmap_vac_me_harder(m, pmap, va); } - vm_page_unlock_queues(); +} + +/* + * Maps a sequence of resident pages belonging to the same object. + * The sequence begins with the given page m_start. This page is + * mapped at the given virtual address start. Each subsequent page is + * mapped at a virtual address that is offset from start by the same + * amount as the page is offset from m_start within the object. The + * last page in the sequence is the page with the largest offset from >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jun 8 02:45:17 2006 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 5B7DC16D1D2; Thu, 8 Jun 2006 00:29:00 +0000 (UTC) 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 7151516EE47 for ; Wed, 7 Jun 2006 22:02:01 +0000 (UTC) (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 7DB8D43D53 for ; Wed, 7 Jun 2006 22:01:57 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k57M03cW085572 for ; Wed, 7 Jun 2006 22:00:03 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k57M02kC085569 for perforce@freebsd.org; Wed, 7 Jun 2006 22:00:02 GMT (envelope-from wsalamon@computer.org) Date: Wed, 7 Jun 2006 22:00:02 GMT Message-Id: <200606072200.k57M02kC085569@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 98761 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, 08 Jun 2006 02:45:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=98761 Change 98761 by wsalamon@vh1 on 2006/06/07 21:59:50 Generate subject32_ex and process32_ex tokens to be of minimal length necessary to contain the IP address. This follows the Solaris BSM record format. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#48 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#48 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#47 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#48 $ */ #include @@ -691,7 +691,16 @@ token_t *t; u_char *dptr = NULL; - GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 13 * sizeof(u_int32_t)); + if (tid->at_type == AU_IPv4) + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + + 10 * sizeof(u_int32_t)); + else if (tid->at_type == AU_IPv6) + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + + 13 * sizeof(u_int32_t)); + else { + errno = EINVAL; + return (NULL); + } if (t == NULL) return (NULL); @@ -706,9 +715,11 @@ ADD_U_INT32(dptr, tid->at_port); ADD_U_INT32(dptr, tid->at_type); ADD_U_INT32(dptr, tid->at_addr[0]); - ADD_U_INT32(dptr, tid->at_addr[1]); - ADD_U_INT32(dptr, tid->at_addr[2]); - ADD_U_INT32(dptr, tid->at_addr[3]); + if (tid->at_type == AU_IPv6) { + ADD_U_INT32(dptr, tid->at_addr[1]); + ADD_U_INT32(dptr, tid->at_addr[2]); + ADD_U_INT32(dptr, tid->at_addr[3]); + } return (t); } @@ -969,7 +980,16 @@ token_t *t; u_char *dptr = NULL; - GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 13 * sizeof(u_int32_t)); + if (tid->at_type == AU_IPv4) + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 10 * + sizeof(u_int32_t)); + else if (tid->at_type == AU_IPv6) + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 13 * + sizeof(u_int32_t)); + else { + errno = EINVAL; + return (NULL); + } if (t == NULL) return (NULL); @@ -984,9 +1004,11 @@ ADD_U_INT32(dptr, tid->at_port); ADD_U_INT32(dptr, tid->at_type); ADD_U_INT32(dptr, tid->at_addr[0]); - ADD_U_INT32(dptr, tid->at_addr[1]); - ADD_U_INT32(dptr, tid->at_addr[2]); - ADD_U_INT32(dptr, tid->at_addr[3]); + if (tid->at_type == AU_IPv6) { + ADD_U_INT32(dptr, tid->at_addr[1]); + ADD_U_INT32(dptr, tid->at_addr[2]); + ADD_U_INT32(dptr, tid->at_addr[3]); + } return (t); } From owner-p4-projects@FreeBSD.ORG Thu Jun 8 02:49:52 2006 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 AF6F616BE11; Thu, 8 Jun 2006 00:32:44 +0000 (UTC) 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 A4CB416F976 for ; Wed, 7 Jun 2006 22:02:59 +0000 (UTC) (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 6C5C843D5A for ; Wed, 7 Jun 2006 22:02:59 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k57M15T5085660 for ; Wed, 7 Jun 2006 22:01:05 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k57M14l2085657 for perforce@freebsd.org; Wed, 7 Jun 2006 22:01:04 GMT (envelope-from wsalamon@computer.org) Date: Wed, 7 Jun 2006 22:01:04 GMT Message-Id: <200606072201.k57M14l2085657@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 98762 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, 08 Jun 2006 02:49:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=98762 Change 98762 by wsalamon@vh1 on 2006/06/07 22:01:00 Add subject32_ex and process32_ex token create functions to the BSM test program. Affected files ... .. //depot/projects/trustedbsd/openbsm/test/bsm/generate.c#4 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/test/bsm/generate.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/test/bsm/generate.c#3 $ + * $P4: //depot/projects/trustedbsd/openbsm/test/bsm/generate.c#4 $ */ /* @@ -31,6 +31,7 @@ */ #include +#include #include #include @@ -267,6 +268,7 @@ static pid_t subject32_pid = 0x13243546; static au_asid_t subject32_sid = 0x97867564; static au_tid_t subject32_tid = { 0x16593746 }; +static au_tid_addr_t subject32_tid_addr = { 0x16593746 }; static void generate_subject32_token(const char *directory, const char *token_filename) @@ -298,6 +300,32 @@ write_record(directory, record_filename, subject32_token, AUE_NULL); } +static void +generate_subject32ex_token(const char *directory, const char *token_filename, + u_int32_t type) +{ + token_t *subject32ex_token; + char *buf; + + buf = (char *)malloc(strlen(token_filename) + 6); + if (type == AU_IPv6) { + inet_pton(AF_INET6, "fe80::1", subject32_tid_addr.at_addr); + subject32_tid_addr.at_type = AU_IPv6; + sprintf(buf, "%s%s", token_filename, "-IPv6"); + } else { + subject32_tid_addr.at_addr[0] = inet_addr("127.0.0.1"); + subject32_tid_addr.at_type = AU_IPv4; + sprintf(buf, "%s%s", token_filename, "-IPv4"); + } + + subject32ex_token = au_to_subject32_ex(subject32_auid, subject32_euid, + subject32_egid, subject32_ruid, subject32_rgid, subject32_pid, + subject32_sid, &subject32_tid_addr); + if (subject32ex_token == NULL) + err(EX_UNAVAILABLE, "au_to_subject32_ex"); + write_token(directory, buf, subject32ex_token); +} + static au_id_t process32_auid = 0x12345678; static uid_t process32_euid = 0x01234567; static gid_t process32_egid = 0x23456789; @@ -306,6 +334,7 @@ static pid_t process32_pid = 0x13243546; static au_asid_t process32_sid = 0x97867564; static au_tid_t process32_tid = { 0x16593746 }; +static au_tid_addr_t process32_tid_addr = { 0x16593746 }; static void generate_process32_token(const char *directory, const char *token_filename) @@ -337,6 +366,22 @@ write_record(directory, record_filename, process32_token, AUE_NULL); } +static void +generate_process32ex_token(const char *directory, const char *token_filename) +{ + token_t *process32ex_token; + + process32_tid_addr.at_addr[0] = inet_addr("127.0.0.1"); + process32_tid_addr.at_type = AU_IPv4; + + process32ex_token = au_to_process32_ex(process32_auid, process32_euid, + process32_egid, process32_ruid, process32_rgid, process32_pid, + process32_sid, &process32_tid_addr); + if (process32ex_token == NULL) + err(EX_UNAVAILABLE, "au_to_process32_ex"); + write_token(directory, token_filename, process32ex_token); +} + static char return32_status = 0xd7; static uint32_t return32_ret = 0x12345678; @@ -713,7 +758,10 @@ generate_ipc_token(directory, "ipc_token"); generate_path_token(directory, "path_token"); generate_subject32_token(directory, "subject32_token"); + generate_subject32ex_token(directory, "subject32ex_token", AU_IPv4); + generate_subject32ex_token(directory, "subject32ex_token", AU_IPv6); generate_process32_token(directory, "process32_token"); + generate_process32ex_token(directory, "process32ex_token"); generate_return32_token(directory, "return32_token"); generate_text_token(directory, "text_token"); generate_opaque_token(directory, "opaque_token"); @@ -736,7 +784,10 @@ generate_ipc_token(directory, "ipc_record"); generate_path_token(directory, "path_record"); generate_subject32_token(directory, "subject32_record"); + generate_subject32ex_token(directory, "subject32ex_record", AU_IPv4); + generate_subject32ex_token(directory, "subject32ex_record", AU_IPv6); generate_process32_token(directory, "process32_record"); + generate_process32ex_token(directory, "process32ex_token"); generate_return32_token(directory, "return32_record"); generate_text_token(directory, "text_record"); generate_opaque_token(directory, "opaque_record"); From owner-p4-projects@FreeBSD.ORG Thu Jun 8 03:03:19 2006 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 C2E1E16B2F5; Thu, 8 Jun 2006 00:47:50 +0000 (UTC) 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 80FD0170967 for ; Wed, 7 Jun 2006 22:17:57 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3B61C43D48 for ; Wed, 7 Jun 2006 22:17:56 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k57MG1nO087480 for ; Wed, 7 Jun 2006 22:16:01 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k57MFBJU087473 for perforce@freebsd.org; Wed, 7 Jun 2006 22:15:11 GMT (envelope-from jb@freebsd.org) Date: Wed, 7 Jun 2006 22:15:11 GMT Message-Id: <200606072215.k57MFBJU087473@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 98764 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, 08 Jun 2006 03:03:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=98764 Change 98764 by jb@jb_freebsd2 on 2006/06/07 22:14:25 IFC Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/committers-guide/article.sgml#4 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#11 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#10 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.staff.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.who.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/faq/book.sgml#5 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#9 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/authors.ent#7 integrate .. //depot/projects/dtrace/doc/share/pgpkeys/ceri.key#3 integrate .. //depot/projects/dtrace/doc/share/pgpkeys/kib.key#1 branch .. //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys-developers.sgml#6 integrate .. //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys.ent#6 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/articles/Makefile#2 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/articles/contributing/article.sgml#2 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/articles/nanobsd/Makefile#1 branch .. //depot/projects/dtrace/doc/zh_CN.GB2312/articles/nanobsd/article.sgml#1 branch .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/arch-handbook/driverbasics/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/arch-handbook/pci/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/Makefile#4 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/advanced-networking/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/basics/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/bibliography/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/book.sgml#3 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/boot/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/chapters.ent#3 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/config/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/cutting-edge/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/disks/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/firewalls/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/geom/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/install/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/kernelconfig/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/l10n/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/linuxemu/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/mac/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/mail/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/mirrors/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/multimedia/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/nanobsd/Makefile#2 delete .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/nanobsd/chapter.sgml#2 delete .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/network-servers/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/ppp-and-slip/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/preface/preface.sgml#3 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/printing/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/security/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/serialcomms/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/users/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/vinum/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/x11/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/porters-handbook/book.sgml#4 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/share/sgml/authors.ent#3 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/share/sgml/l10n.ent#2 integrate .. //depot/projects/dtrace/src/MAINTAINERS#6 integrate .. //depot/projects/dtrace/src/Makefile#5 integrate .. //depot/projects/dtrace/src/Makefile.inc1#10 integrate .. //depot/projects/dtrace/src/README#2 integrate .. //depot/projects/dtrace/src/contrib/openbsm/HISTORY#2 integrate .. //depot/projects/dtrace/src/contrib/openbsm/Makefile.am#2 integrate .. //depot/projects/dtrace/src/contrib/openbsm/Makefile.in#2 integrate .. //depot/projects/dtrace/src/contrib/openbsm/README#2 integrate .. //depot/projects/dtrace/src/contrib/openbsm/TODO#2 integrate .. //depot/projects/dtrace/src/contrib/openbsm/VERSION#2 integrate .. //depot/projects/dtrace/src/contrib/openbsm/bin/Makefile.am#2 integrate .. //depot/projects/dtrace/src/contrib/openbsm/bin/Makefile.in#2 integrate .. //depot/projects/dtrace/src/contrib/openbsm/bin/auditd/auditd.c#2 integrate .. //depot/projects/dtrace/src/contrib/openbsm/bin/auditfilterd/Makefile.am#1 branch .. //depot/projects/dtrace/src/contrib/openbsm/bin/auditfilterd/Makefile.in#1 branch .. //depot/projects/dtrace/src/contrib/openbsm/bin/auditfilterd/auditfilterd.8#1 branch .. //depot/projects/dtrace/src/contrib/openbsm/bin/auditfilterd/auditfilterd.c#1 branch .. //depot/projects/dtrace/src/contrib/openbsm/bin/auditfilterd/auditfilterd.h#1 branch .. //depot/projects/dtrace/src/contrib/openbsm/bin/auditfilterd/auditfilterd_conf.c#1 branch .. //depot/projects/dtrace/src/contrib/openbsm/bin/auditreduce/auditreduce.c#2 integrate .. //depot/projects/dtrace/src/contrib/openbsm/bsm/Makefile.am#2 integrate .. //depot/projects/dtrace/src/contrib/openbsm/bsm/Makefile.in#2 integrate .. //depot/projects/dtrace/src/contrib/openbsm/bsm/audit.h#2 integrate .. //depot/projects/dtrace/src/contrib/openbsm/bsm/audit_filter.h#1 branch .. //depot/projects/dtrace/src/contrib/openbsm/bsm/audit_record.h#2 integrate .. //depot/projects/dtrace/src/contrib/openbsm/bsm/libbsm.h#2 integrate .. //depot/projects/dtrace/src/contrib/openbsm/config/config.h#2 integrate .. //depot/projects/dtrace/src/contrib/openbsm/config/config.h.in#2 integrate .. //depot/projects/dtrace/src/contrib/openbsm/configure#2 integrate .. //depot/projects/dtrace/src/contrib/openbsm/configure.ac#2 integrate .. //depot/projects/dtrace/src/contrib/openbsm/etc/audit_filter#1 branch .. //depot/projects/dtrace/src/contrib/openbsm/libbsm/Makefile.am#2 integrate .. //depot/projects/dtrace/src/contrib/openbsm/libbsm/Makefile.in#2 integrate .. //depot/projects/dtrace/src/contrib/openbsm/libbsm/au_open.3#1 branch .. //depot/projects/dtrace/src/contrib/openbsm/libbsm/au_token.3#2 integrate .. //depot/projects/dtrace/src/contrib/openbsm/libbsm/audit_submit.3#1 branch .. //depot/projects/dtrace/src/contrib/openbsm/libbsm/bsm_audit.c#2 integrate .. //depot/projects/dtrace/src/contrib/openbsm/libbsm/bsm_io.c#2 integrate .. //depot/projects/dtrace/src/contrib/openbsm/libbsm/bsm_token.c#2 integrate .. //depot/projects/dtrace/src/contrib/openbsm/libbsm/bsm_wrappers.c#2 integrate .. //depot/projects/dtrace/src/contrib/openbsm/libbsm/libbsm.3#2 integrate .. //depot/projects/dtrace/src/contrib/openbsm/man/auditctl.2#2 integrate .. //depot/projects/dtrace/src/contrib/openbsm/modules/Makefile.am#1 branch .. //depot/projects/dtrace/src/contrib/openbsm/modules/Makefile.in#1 branch .. //depot/projects/dtrace/src/contrib/openbsm/modules/auditfilter_noop/Makefile.am#1 branch .. //depot/projects/dtrace/src/contrib/openbsm/modules/auditfilter_noop/Makefile.in#1 branch .. //depot/projects/dtrace/src/contrib/openbsm/modules/auditfilter_noop/auditfilter_noop.c#1 branch .. //depot/projects/dtrace/src/contrib/openbsm/test/Makefile.am#1 branch .. //depot/projects/dtrace/src/contrib/openbsm/test/Makefile.in#1 branch .. //depot/projects/dtrace/src/contrib/openbsm/test/bsm/Makefile.am#1 branch .. //depot/projects/dtrace/src/contrib/openbsm/test/bsm/Makefile.in#1 branch .. //depot/projects/dtrace/src/contrib/openbsm/test/bsm/generate.c#1 branch .. //depot/projects/dtrace/src/contrib/pf/man/pfsync.4#2 integrate .. //depot/projects/dtrace/src/etc/defaults/rc.conf#11 integrate .. //depot/projects/dtrace/src/etc/rc.d/auditd#2 integrate .. //depot/projects/dtrace/src/etc/rc.d/cached#2 integrate .. //depot/projects/dtrace/src/etc/rc.d/pf#2 integrate .. //depot/projects/dtrace/src/gnu/lib/libgcc_r/Makefile#2 delete .. //depot/projects/dtrace/src/lib/libbsm/Makefile#2 integrate .. //depot/projects/dtrace/src/lib/libc/gen/glob.c#3 integrate .. //depot/projects/dtrace/src/lib/libc/i386/gen/_ctx_start.S#2 integrate .. //depot/projects/dtrace/src/lib/libkvm/kvm_minidump_amd64.c#2 integrate .. //depot/projects/dtrace/src/lib/libkvm/kvm_minidump_i386.c#2 integrate .. //depot/projects/dtrace/src/lib/libsdp/sdp.h#2 integrate .. //depot/projects/dtrace/src/lib/libsdp/util.c#2 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_private.h#4 integrate .. //depot/projects/dtrace/src/libexec/ftpd/Makefile#2 integrate .. //depot/projects/dtrace/src/libexec/ftpd/ftpcmd.y#2 integrate .. //depot/projects/dtrace/src/sbin/geom/class/eli/geli.8#2 integrate .. //depot/projects/dtrace/src/sbin/geom/class/eli/geom_eli.c#3 integrate .. //depot/projects/dtrace/src/sbin/ifconfig/ifpfsync.c#2 integrate .. //depot/projects/dtrace/src/share/man/man4/Makefile#8 integrate .. //depot/projects/dtrace/src/share/man/man4/altq.4#4 integrate .. //depot/projects/dtrace/src/share/man/man4/audit.4#2 integrate .. //depot/projects/dtrace/src/share/man/man4/auditpipe.4#1 branch .. //depot/projects/dtrace/src/share/man/man4/carp.4#2 integrate .. //depot/projects/dtrace/src/share/man/man4/ktr.4#2 integrate .. //depot/projects/dtrace/src/share/man/man4/man4.i386/padlock.4#2 integrate .. //depot/projects/dtrace/src/share/man/man4/mpt.4#3 integrate .. //depot/projects/dtrace/src/share/man/man5/mailer.conf.5#2 integrate .. //depot/projects/dtrace/src/share/man/man8/rc.subr.8#2 integrate .. //depot/projects/dtrace/src/share/man/man9/crypto.9#5 integrate .. //depot/projects/dtrace/src/share/man/man9/vgone.9#2 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/pmap.c#7 integrate .. //depot/projects/dtrace/src/sys/arm/arm/pmap.c#6 integrate .. //depot/projects/dtrace/src/sys/arm/arm/vm_machdep.c#2 integrate .. //depot/projects/dtrace/src/sys/arm/at91/kb920x_machdep.c#2 integrate .. //depot/projects/dtrace/src/sys/arm/include/pmap.h#5 integrate .. //depot/projects/dtrace/src/sys/arm/sa11x0/assabet_machdep.c#4 integrate .. //depot/projects/dtrace/src/sys/arm/sa11x0/uart_cpu_sa1110.c#3 integrate .. //depot/projects/dtrace/src/sys/arm/sa11x0/uart_dev_sa1110.c#4 integrate .. //depot/projects/dtrace/src/sys/arm/xscale/i80321/iq31244_machdep.c#3 integrate .. //depot/projects/dtrace/src/sys/bsm/audit.h#2 integrate .. //depot/projects/dtrace/src/sys/bsm/audit_record.h#2 integrate .. //depot/projects/dtrace/src/sys/cam/cam_ccb.h#3 integrate .. //depot/projects/dtrace/src/sys/cam/cam_xpt.c#3 integrate .. //depot/projects/dtrace/src/sys/conf/NOTES#8 integrate .. //depot/projects/dtrace/src/sys/conf/files#16 integrate .. //depot/projects/dtrace/src/sys/conf/files.arm#2 integrate .. //depot/projects/dtrace/src/sys/conf/options#10 integrate .. //depot/projects/dtrace/src/sys/conf/options.arm#3 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/COPYRIGHT#2 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/README#2 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/ah.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/ah_desc.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/ah_devid.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/ah_soc.h#1 branch .. //depot/projects/dtrace/src/sys/contrib/dev/ath/freebsd/ah_if.m#2 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/freebsd/ah_osdep.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/freebsd/ah_osdep.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#2 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/ap30.hal.o.uu#1 branch .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/ap30.inc#1 branch .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/ap30.opt_ah.h#1 branch .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/ap43.hal.o.uu#1 branch .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/ap43.inc#1 branch .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/ap43.opt_ah.h#1 branch .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/ap51.hal.o.uu#1 branch .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/ap51.inc#1 branch .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/ap51.opt_ah.h#1 branch .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/ap61.hal.o.uu#1 branch .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/ap61.inc#1 branch .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/ap61.opt_ah.h#1 branch .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#2 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#2 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#2 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/armv4-be-elf.inc#2 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#2 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/armv4-le-elf.inc#2 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#2 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/i386-elf.inc#2 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#2 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/mips-be-elf.inc#2 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#2 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/mips-le-elf.inc#2 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#2 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/mips1-be-elf.inc#2 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#2 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/mips1-le-elf.inc#2 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#2 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.inc#2 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#2 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.inc#2 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#2 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/powerpc-be-eabi.inc#2 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#2 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/powerpc-be-elf.inc#2 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#2 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/powerpc-le-eabi.inc#2 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#2 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/sh4-le-elf.inc#2 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/sparc-be-elf.hal.o.uu#1 branch .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/sparc-be-elf.inc#1 branch .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/sparc-be-elf.opt_ah.h#1 branch .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#2 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/sparc64-be-elf.inc#2 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#2 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/x86_64-elf.inc#2 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#2 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/xscale-be-elf.inc#2 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#2 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/xscale-le-elf.inc#2 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/version.h#2 integrate .. //depot/projects/dtrace/src/sys/crypto/via/padlock.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/acpi_support/acpi_panasonic.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/acpica/acpi_hpet.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/ath/if_ath.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/ath/if_ath_pci.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/ath/if_athvar.h#3 integrate .. //depot/projects/dtrace/src/sys/dev/awi/awi.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/bge/if_bge.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/dc/dcphy.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/dc/if_dc.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/dc/if_dcreg.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/em/if_em.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/gem/if_gem.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/hifn/hifn7751.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/ipw/if_ipw.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/isp/isp_freebsd.h#5 integrate .. //depot/projects/dtrace/src/sys/dev/iwi/if_iwi.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/le/if_le_pci.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/lmc/if_lmc.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/mpt/mpt.h#8 integrate .. //depot/projects/dtrace/src/sys/dev/mpt/mpt_cam.c#8 integrate .. //depot/projects/dtrace/src/sys/dev/my/if_my.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/pccbb/pccbb.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/pccbb/pccbb_isa.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/pccbb/pccbb_pci.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/pccbb/pccbbvar.h#3 integrate .. //depot/projects/dtrace/src/sys/dev/ral/rt2661.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/safe/safe.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/sk/if_sk.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/ubsec/ubsec.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/usb/if_axe.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/usb/if_axereg.h#3 integrate .. //depot/projects/dtrace/src/sys/dev/usb/if_ural.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/usb/ugen.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/wi/if_wi.c#4 integrate .. //depot/projects/dtrace/src/sys/fs/procfs/procfs.c#3 integrate .. //depot/projects/dtrace/src/sys/geom/eli/g_eli.c#4 integrate .. //depot/projects/dtrace/src/sys/geom/eli/g_eli.h#2 integrate .. //depot/projects/dtrace/src/sys/geom/eli/g_eli_ctl.c#2 integrate .. //depot/projects/dtrace/src/sys/geom/eli/g_eli_integrity.c#1 branch .. //depot/projects/dtrace/src/sys/geom/eli/g_eli_key.c#2 integrate .. //depot/projects/dtrace/src/sys/geom/eli/g_eli_privacy.c#1 branch .. //depot/projects/dtrace/src/sys/geom/geom.h#3 integrate .. //depot/projects/dtrace/src/sys/geom/geom_gpt.c#3 integrate .. //depot/projects/dtrace/src/sys/geom/geom_io.c#2 integrate .. //depot/projects/dtrace/src/sys/i386/i386/minidump_machdep.c#2 integrate .. //depot/projects/dtrace/src/sys/i386/i386/pmap.c#5 integrate .. //depot/projects/dtrace/src/sys/ia64/ia64/pmap.c#3 integrate .. //depot/projects/dtrace/src/sys/kern/kern_acct.c#2 integrate .. //depot/projects/dtrace/src/sys/kern/kern_mutex.c#5 integrate .. //depot/projects/dtrace/src/sys/kern/kern_synch.c#3 integrate .. //depot/projects/dtrace/src/sys/kern/sched_4bsd.c#4 integrate .. //depot/projects/dtrace/src/sys/kern/sched_ule.c#2 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_mount.c#5 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_syscalls.c#2 integrate .. //depot/projects/dtrace/src/sys/modules/geom/geom_eli/Makefile#3 integrate .. //depot/projects/dtrace/src/sys/net/bpf.h#3 integrate .. //depot/projects/dtrace/src/sys/net/if_faith.c#2 integrate .. //depot/projects/dtrace/src/sys/net/if_fwsubr.c#2 integrate .. //depot/projects/dtrace/src/sys/net/route.c#4 integrate .. //depot/projects/dtrace/src/sys/netgraph/netgraph.h#2 integrate .. //depot/projects/dtrace/src/sys/netgraph/ng_base.c#3 integrate .. //depot/projects/dtrace/src/sys/netgraph/ng_iface.c#2 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_timer.c#4 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_usrreq.c#3 integrate .. //depot/projects/dtrace/src/sys/netinet/udp_usrreq.c#6 integrate .. //depot/projects/dtrace/src/sys/netipsec/ipsec.c#3 integrate .. //depot/projects/dtrace/src/sys/netipsec/ipsec_input.c#2 integrate .. //depot/projects/dtrace/src/sys/nfsserver/nfs_serv.c#2 integrate .. //depot/projects/dtrace/src/sys/nfsserver/nfs_srvsubs.c#2 integrate .. //depot/projects/dtrace/src/sys/opencrypto/criov.c#3 integrate .. //depot/projects/dtrace/src/sys/opencrypto/crypto.c#5 integrate .. //depot/projects/dtrace/src/sys/opencrypto/cryptodev.h#4 integrate .. //depot/projects/dtrace/src/sys/opencrypto/cryptosoft.c#4 integrate .. //depot/projects/dtrace/src/sys/opencrypto/xform.c#3 integrate .. //depot/projects/dtrace/src/sys/pc98/pc98/machdep.c#4 integrate .. //depot/projects/dtrace/src/sys/powerpc/powerpc/mmu_if.m#2 integrate .. //depot/projects/dtrace/src/sys/powerpc/powerpc/mmu_oea.c#2 integrate .. //depot/projects/dtrace/src/sys/powerpc/powerpc/pmap_dispatch.c#2 integrate .. //depot/projects/dtrace/src/sys/security/audit/audit.c#2 integrate .. //depot/projects/dtrace/src/sys/security/audit/audit_arg.c#2 integrate .. //depot/projects/dtrace/src/sys/security/audit/audit_bsm.c#2 integrate .. //depot/projects/dtrace/src/sys/security/audit/audit_bsm_klib.c#3 integrate .. //depot/projects/dtrace/src/sys/security/audit/audit_bsm_token.c#2 integrate .. //depot/projects/dtrace/src/sys/security/audit/audit_ioctl.h#2 integrate .. //depot/projects/dtrace/src/sys/security/audit/audit_pipe.c#2 integrate .. //depot/projects/dtrace/src/sys/security/audit/audit_private.h#2 integrate .. //depot/projects/dtrace/src/sys/security/audit/audit_syscalls.c#2 integrate .. //depot/projects/dtrace/src/sys/security/audit/audit_worker.c#2 integrate .. //depot/projects/dtrace/src/sys/sparc64/conf/GENERIC#4 integrate .. //depot/projects/dtrace/src/sys/sparc64/isa/isa.c#2 integrate .. //depot/projects/dtrace/src/sys/sparc64/sparc64/pmap.c#3 integrate .. //depot/projects/dtrace/src/sys/sys/mutex.h#2 integrate .. //depot/projects/dtrace/src/sys/sys/protosw.h#2 integrate .. //depot/projects/dtrace/src/sys/ufs/ffs/ffs_vfsops.c#6 integrate .. //depot/projects/dtrace/src/sys/vm/pmap.h#2 integrate .. //depot/projects/dtrace/src/sys/vm/vm_map.c#3 integrate .. //depot/projects/dtrace/src/tools/regression/geom_eli/init-a.t#1 branch .. //depot/projects/dtrace/src/tools/regression/geom_eli/init.t#2 integrate .. //depot/projects/dtrace/src/tools/regression/geom_eli/integrity-copy.t#1 branch .. //depot/projects/dtrace/src/tools/regression/geom_eli/integrity-data.t#1 branch .. //depot/projects/dtrace/src/tools/regression/geom_eli/integrity-hmac.t#1 branch .. //depot/projects/dtrace/src/tools/regression/geom_eli/onetime-a.t#1 branch .. //depot/projects/dtrace/src/tools/regression/geom_eli/onetime.t#2 integrate .. //depot/projects/dtrace/src/tools/regression/ipsec/ipsec.t#1 branch .. //depot/projects/dtrace/src/usr.bin/kdump/mkioctls#2 integrate .. //depot/projects/dtrace/src/usr.bin/vmstat/vmstat.c#2 integrate .. //depot/projects/dtrace/src/usr.sbin/adduser/adduser.8#2 integrate .. //depot/projects/dtrace/src/usr.sbin/config/config.y#2 integrate .. //depot/projects/dtrace/src/usr.sbin/config/main.c#2 integrate .. //depot/projects/dtrace/src/usr.sbin/config/mkmakefile.c#3 integrate .. //depot/projects/dtrace/src/usr.sbin/config/mkoptions.c#2 integrate .. //depot/projects/dtrace/src/usr.sbin/mailwrapper/Makefile#2 integrate .. //depot/projects/dtrace/src/usr.sbin/mailwrapper/mailwrapper.c#2 integrate .. //depot/projects/dtrace/src/usr.sbin/mountd/mountd.c#4 integrate .. //depot/projects/dtrace/src/usr.sbin/ntp/doc/ntp.conf.5#3 integrate .. //depot/projects/dtrace/www/en/commercial/hardware.xml#3 integrate .. //depot/projects/dtrace/www/en/commercial/isp.xml#6 integrate .. //depot/projects/dtrace/www/en/developers.sgml#7 integrate .. //depot/projects/dtrace/www/en/docs/webresources.sgml#2 integrate .. //depot/projects/dtrace/www/en/donations/donors.sgml#8 integrate .. //depot/projects/dtrace/www/en/gnome/news.xml#4 integrate .. //depot/projects/dtrace/www/en/news/news.xml#11 integrate .. //depot/projects/dtrace/www/en/news/press.xml#5 integrate .. //depot/projects/dtrace/www/en/platforms/amd64/motherboards.sgml#5 integrate .. //depot/projects/dtrace/www/en/platforms/ia64/refs.sgml#2 integrate .. //depot/projects/dtrace/www/en/projects/bigdisk/index.sgml#2 integrate .. //depot/projects/dtrace/www/en/projects/busdma/index.sgml#5 integrate .. //depot/projects/dtrace/www/en/projects/ideas/index.sgml#7 integrate .. //depot/projects/dtrace/www/en/projects/summerofcode-2005.sgml#3 integrate .. //depot/projects/dtrace/www/en/projects/summerofcode.sgml#8 integrate .. //depot/projects/dtrace/www/en/releases/6.1R/errata.html#4 integrate .. //depot/projects/dtrace/www/en/security/security.sgml#4 integrate .. //depot/projects/dtrace/www/en/where.sgml#3 integrate .. //depot/projects/dtrace/www/es/includes.sgml#2 integrate .. //depot/projects/dtrace/www/es/includes.xsl#2 integrate .. //depot/projects/dtrace/www/es/index.xsl#2 integrate .. //depot/projects/dtrace/www/it/Makefile#2 integrate .. //depot/projects/dtrace/www/it/about.sgml#2 integrate .. //depot/projects/dtrace/www/it/includes.header.sgml#2 integrate .. //depot/projects/dtrace/www/it/includes.navabout.sgml#2 integrate .. //depot/projects/dtrace/www/it/includes.navdevelopers.sgml#2 integrate .. //depot/projects/dtrace/www/it/includes.navdocs.sgml#2 integrate .. //depot/projects/dtrace/www/it/includes.navdownload.sgml#2 integrate .. //depot/projects/dtrace/www/it/includes.navports.sgml#1 branch .. //depot/projects/dtrace/www/it/includes.release.sgml#2 integrate .. //depot/projects/dtrace/www/it/includes.xsl#2 integrate .. //depot/projects/dtrace/www/it/index.xsl#2 integrate .. //depot/projects/dtrace/www/it/mailto.sgml#2 integrate .. //depot/projects/dtrace/www/it/platforms/Makefile.inc#2 delete .. //depot/projects/dtrace/www/it/platforms/index.sgml#2 integrate .. //depot/projects/dtrace/www/it/ports/Makefile#1 branch .. //depot/projects/dtrace/www/it/ports/index.sgml#1 branch .. //depot/projects/dtrace/www/it/ports/ports.ent#1 branch .. //depot/projects/dtrace/www/it/where.sgml#2 integrate .. //depot/projects/dtrace/www/ru/platforms/Makefile#2 integrate .. //depot/projects/dtrace/www/ru/platforms/alpha.sgml#2 integrate .. //depot/projects/dtrace/www/ru/platforms/amd64.sgml#2 integrate .. //depot/projects/dtrace/www/ru/platforms/arm.sgml#2 integrate .. //depot/projects/dtrace/www/ru/platforms/i386.sgml#2 integrate .. //depot/projects/dtrace/www/ru/platforms/ia64.sgml#2 integrate .. //depot/projects/dtrace/www/ru/platforms/index.sgml#2 integrate .. //depot/projects/dtrace/www/ru/platforms/mips.sgml#2 integrate .. //depot/projects/dtrace/www/ru/platforms/pc98.sgml#2 integrate .. //depot/projects/dtrace/www/ru/platforms/ppc.sgml#2 integrate .. //depot/projects/dtrace/www/ru/platforms/sparc.sgml#2 integrate .. //depot/projects/dtrace/www/ru/platforms/x86-64.sgml#2 integrate .. //depot/projects/dtrace/www/ru/platforms/xbox.sgml#2 integrate .. //depot/projects/dtrace/www/share/sgml/usergroups.xml#4 integrate Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/committers-guide/article.sgml#4 (text+ko) ==== @@ -13,7 +13,7 @@ - $FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.239 2006/05/19 17:29:37 bmah Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.240 2006/06/02 20:50:17 scottl Exp $ 1999 @@ -1515,8 +1515,6 @@ &a.murray; &a.dwhite; &a.rwatson; - &a.jhb; - &a.scottl; &a.kensmith; &a.hrs; &a.mux; ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#11 (text+ko) ==== @@ -1,4 +1,4 @@ - + + + The &os; Documentation Engineering Team @@ -258,10 +258,6 @@ - &a.scottl; - - - &a.bmah; @@ -270,7 +266,7 @@ - &a.kensmith; + &a.kensmith; (Lead) @@ -302,10 +298,6 @@ - &a.scottl; - - - &a.murray; @@ -358,10 +350,6 @@ - &a.scottl; - - - &a.murray; @@ -422,10 +410,6 @@ - &a.scottl; - - - &a.tmm; ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.who.sgml#2 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -60,7 +60,7 @@ Coordination - &a.re; headed by &a.scottl; + &a.re; headed by &a.kensmith; ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/faq/book.sgml#5 (text+ko) ==== @@ -10,7 +10,7 @@ The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.781 2006/05/10 19:00:46 keramida Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.783 2006/06/03 15:46:30 mwlucas Exp $ 1995 @@ -5406,8 +5406,8 @@ - Yes. If you are running FreeBSD 5.0 or later, see - &man.gbde.8;. For earlier releases, see the Yes. FreeBSD 5.0 includes &man.gbde.8;, and FreeBSD 6.0 + added &man.geli.8;. For earlier releases, see the security/cfs port. @@ -5505,7 +5505,7 @@ Boot: 1:da(0,a)/kernel - On FreeBSD 2.2.5 and later, you can configure + You can configure &man.boot.8; to automatically do this for you at boot time. ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#3 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -551,9 +551,9 @@ tree to rebuild the system. - Take a Backup + Make a Backup - It cannot be stressed enough how important it is to take a + It cannot be stressed enough how important it is to make a backup of your system before you do this. While rebuilding the world is (as long as you follow these instructions) an easy task to do, there will inevitably be times @@ -712,21 +712,13 @@ In some cases make buildworld will check to see if these users or groups exist. - A recent example of this is when the + An example of this is when the smmsp user was added. Users had the installation process fail for them when &man.mtree.8; was trying to create /var/spool/clientmqueue. - The solution is to examine - /usr/src/etc/group and compare its list of - groups with your own. If there are any groups in the new file that - are not in your file then copy them over. Similarly, you should - rename any groups in /etc/group which have - the same GID but a different name to those in - /usr/src/etc/group. - - Since 4.6-RELEASE you can run &man.mergemaster.8; in + The solution is to run &man.mergemaster.8; in pre-buildworld mode by providing the option. This will compare only those files that are essential for the success of buildworld or @@ -779,7 +771,7 @@ mode. Alternatively, reboot the system, and at the boot prompt, - enter the flag. The system will then boot + select the single user option. The system will then boot single user. At the shell prompt you should then run: &prompt.root; fsck -p @@ -828,8 +820,8 @@ &prompt.root; rm -rf * - - Recompile the Source + + Recompile the Base System Saving the Output @@ -920,19 +912,16 @@ &prompt.root; make target - Beginning with version 2.2.5 of &os; (actually, it was - first created on the &os.current; branch, and then retrofitted to - &os.stable; midway between 2.2.2 and 2.2.5) the - world target has been split in - two: buildworld and - installworld. + Where target will be one of + many build options. The first target should always be + buildworld. As the names imply, buildworld builds a complete new tree under /usr/obj, - and installworld installs this tree on + and installworld, another target, installs this tree on the current machine. - This is very useful for 2 reasons. First, it allows you + Having separate options is very useful for two reasons. First, it allows you to do the build safe in the knowledge that no components of your running system will be affected. The build is self hosted. Because of this, you can safely @@ -958,7 +947,7 @@ &prompt.root; make buildworld - It is now possible to specify a option to + It is possible to specify a option to make which will cause it to spawn several simultaneous processes. This is most useful on multi-CPU machines. However, since much of the compiling process is IO bound rather @@ -975,11 +964,6 @@ If you have a multi-CPU machine and you are using an SMP configured kernel try values between 6 and 10 and see how they speed things up. - - Be aware that this is still somewhat experimental, and commits - to the source tree may occasionally break this feature. If the - world fails to compile using this parameter try again without it - before you report any problems. @@ -989,8 +973,8 @@ timings - Many factors influence the build time, but currently a 500 MHz - &pentium; III with 128 MB of RAM takes about 2 hours to build + Many factors influence the build time, but fairly recent + machines may only take a one or two hours to build the &os.stable; tree, with no tricks or shortcuts used during the process. A &os.current; tree will take somewhat longer. @@ -1019,7 +1003,7 @@ can then build a new kernel based on your normal kernel configuration file. - On modern versions of FreeBSD it is important to On &os; it is important to build world before building a new kernel. @@ -1052,7 +1036,7 @@ . - + Install the New System Binaries If you were building a version of &os; recent enough to have @@ -1164,7 +1148,7 @@ After &man.mergemaster.8; is done with the system files you will be prompted for other options. &man.mergemaster.8; may ask if you want to rebuild - the password file and/or run &man.MAKEDEV.8; if you run a FreeBSD version prior to 5.0, and will finish up with an option to + the password file and will finish up with an option to remove left-over temporary files. @@ -1182,7 +1166,7 @@ not in /usr/src/etc. If you are using &man.mergemaster.8; (as recommended), - you can skip forward to the next + you can skip forward to the next section. The simplest way to do this by hand is to install the @@ -1329,103 +1313,8 @@ - - - Update <filename>/dev</filename> - - - DEVFS - If you are running FreeBSD 5.0 or later you can safely - skip this section. These versions use &man.devfs.5; to - allocate device nodes transparently for the user. - - - In most cases, the &man.mergemaster.8; tool will realize when - it is necessary to update the device nodes, and offer to complete it - automatically. These instructions tell how to update the device - nodes manually. - - For safety's sake, this is a multi-step process. - - - - Copy /var/tmp/root/dev/MAKEDEV to - /dev: - - &prompt.root; cp /var/tmp/root/dev/MAKEDEV /dev - - MAKEDEV - - - If you used &man.mergemaster.8; to - update /etc, then your - MAKEDEV script should have been updated - already, though it cannot hurt to check (with &man.diff.1;) - and copy it manually if necessary. - - - - Now, take a snapshot of your current - /dev. This snapshot needs to contain the - permissions, ownerships, major and minor numbers of each filename, - but it should not contain the time stamps. The easiest way to do - this is to use &man.awk.1; to strip out some of the - information: - - &prompt.root; cd /dev -&prompt.root; ls -l | awk '{print $1, $2, $3, $4, $5, $6, $NF}' > /var/tmp/dev.out - - - - Remake all the device nodes: - - &prompt.root; sh MAKEDEV all - - - - Write another snapshot of the directory, this time to - /var/tmp/dev2.out. Now look through these - two files for any device node that you missed creating. There should - not be any, but it is better to be safe than sorry. - - &prompt.root; diff /var/tmp/dev.out /var/tmp/dev2.out - - You are most likely to notice disk slice discrepancies which - will involve commands such as: - - &prompt.root; sh MAKEDEV sd0s1 - - to recreate the slice entries. Your precise circumstances may - vary. - - - - - Update <filename>/stand</filename> - - - This step is included only for completeness. It can safely be - omitted. If you are using FreeBSD 5.2 or later, the - /rescue directory is automatically updated - for the user with current, statically compiled binaries during - make installworld, thus obsoleting the need - to update /stand (which does not exist at - all on &os; 6.0 and later). - - - For the sake of completeness, you may want to update the files in - /stand as well. These files consist of hard - links to the /stand/sysinstall binary. This - binary should be statically linked, so that it can work when no other - file systems (and in particular /usr) have been - mounted. - - &prompt.root; cd /usr/src/release/sysinstall -&prompt.root; make all install - - - + Rebooting You are now done. After you have verified that everything appears @@ -1572,9 +1461,6 @@ &prompt.root; cd /usr/src &prompt.root; make -DNO_CLEAN all - On &os; 5.X and older, use - -DNOCLEAN instead. - This will not undo the work of the previous make buildworld. ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml#4 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -2231,7 +2231,15 @@ firewall_enable="YES" - Set the script to run to activate your rules: + To select one of the default firewall types provided by + &os;, select one by reading the + /etc/rc.firewall file and place it in + the following: + + firewall_type="open" + + Or load custom rules by setting the following variable to the + file containing them: firewall_script="/etc/ipfw.rules" ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#3 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -62,11 +62,6 @@ - How to create any entries in /dev that may - be required. - - - How to troubleshoot if things go wrong. ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#3 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -596,6 +596,12 @@ If you want to learn more about CVSup, see Using CVSup. + Make sure /usr/ports + is empty before you run CVSup for + the first time! If you already have the Ports Collection present, + obtained from another source, CVSup + will not prune removed patch files. + Install the net/cvsup-without-gui package: ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#9 (text+ko) ==== @@ -1,7 +1,7 @@ +