Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 27 Mar 2007 07:57:59 GMT
From:      Chris Jones <cdjones@FreeBSD.org>
To:        Perforce Change Reviews <perforce@FreeBSD.org>
Subject:   PERFORCE change 116634 for review
Message-ID:  <200703270757.l2R7vxRW038315@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=116634

Change 116634 by cdjones@cdjones_iconoclast on 2007/03/27 07:57:04

	Integrate from current.

Affected files ...

.. //depot/projects/soc2006/cdjones_jail/src/sys/conf/Makefile.sun4v#1 branch
.. //depot/projects/soc2006/cdjones_jail/src/sys/conf/files.sun4v#1 branch
.. //depot/projects/soc2006/cdjones_jail/src/sys/conf/options.sun4v#1 branch
.. //depot/projects/soc2006/cdjones_jail/src/sys/kern/Make.tags.inc#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/kern/Makefile#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/kern/bus_if.m#6 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/kern/makesyscalls.sh#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/kern/syscalls.master#6 edit
.. //depot/projects/soc2006/cdjones_jail/src/sys/kern/vnode_if.src#6 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/_bus_dma.h#1 branch
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/_elf_solaris.h#1 branch
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/_lock.h#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/_mutex.h#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/_semaphore.h#1 branch
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/acl.h#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/apm.h#1 branch
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/ata.h#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/bio.h#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/buf.h#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/bufobj.h#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/bus.h#6 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/bus_dma.h#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/cdefs.h#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/clock.h#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/condvar.h#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/conf.h#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/cons.h#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/consio.h#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/copyright.h#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/cpu.h#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/digiio.h#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/dirent.h#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/domain.h#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/elf.h#1 branch
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/elf32.h#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/elf64.h#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/elf_common.h#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/event.h#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/eventhandler.h#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/extattr.h#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/file.h#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/firmware.h#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/imgact.h#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/interrupt.h#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/ioccom.h#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/ipmi.h#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/jail.h#22 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/kbio.h#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/kernel.h#6 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/kobj.h#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/ksem.h#1 branch
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/libkern.h#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/lock.h#6 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/lock_profile.h#1 branch
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/lockmgr.h#6 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/mac.h#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/mbuf.h#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/mount.h#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/mouse.h#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/msgbuf.h#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/mutex.h#6 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/param.h#7 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/pcpu.h#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/pioctl.h#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/posix4.h#1 branch
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/priority.h#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/priv.h#1 branch
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/proc.h#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/protosw.h#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/queue.h#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/rtprio.h#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/runq.h#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/sched.h#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/sem.h#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/semaphore.h#1 branch
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/signalvar.h#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/sleepqueue.h#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/socket.h#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/socketvar.h#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/sockio.h#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/soundcard.h#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/stat.h#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/sx.h#6 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/syscall.h#6 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/syscall.mk#6 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/syscallsubr.h#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/sysctl.h#6 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/sysent.h#6 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/sysproto.h#6 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/systm.h#6 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/thr.h#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/time.h#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/ttycom.h#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/types.h#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/ucred.h#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/uio.h#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/umtx.h#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/unpcb.h#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/vmmeter.h#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/vnode.h#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/watchdog.h#5 integrate
.. //depot/projects/soc2006/cdjones_jail/src/sys/vm/redzone.c#1 branch
.. //depot/projects/soc2006/cdjones_jail/src/sys/vm/redzone.h#1 branch
.. //depot/projects/soc2006/cdjones_jail/src/usr.sbin/jail/jail.8#6 integrate

Differences ...

==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/Make.tags.inc#5 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/kern/Make.tags.inc,v 1.15 2003/03/05 19:24:21 peter Exp $
+# $FreeBSD: src/sys/kern/Make.tags.inc,v 1.17 2007/02/11 14:01:32 rodrigc Exp $
 #	@(#)Make.tags.inc	8.1 (Berkeley) 6/11/93
 
 SYS?=	${.CURDIR}/..
@@ -47,7 +47,6 @@
 	${SYS}/netnatm/*.[ch] \
 	${SYS}/nfs/*.[ch] \
 	${SYS}/pci/*.[ch] \
-	${SYS}/posix4/*.[ch] \
 	${SYS}/ufs/ffs/*.[ch] \
 	${SYS}/ufs/ufs/*.[ch] \
 	${SYS}/vm/*.[ch] \
@@ -64,7 +63,6 @@
 	${SYS}/netnatm \
 	${SYS}/nfs \
 	${SYS}/pci \
-	${SYS}/posix4 \
 	${SYS}/vm \
 	${SYS}/sys
 
@@ -96,6 +94,6 @@
 	${SYS}/fs/specfs \
 	${SYS}/fs/umapfs \
 	${SYS}/fs/unionfs \
-	${SYS}/isofs/cd9660 \
+	${SYS}/fs/cd9660 \
 	${SYS}/ufs/ffs \
 	${SYS}/ufs/ufs

==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/Makefile#5 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 3/21/94
-# $FreeBSD: src/sys/kern/Makefile,v 1.11.12.1 2005/07/18 19:54:49 jhb Exp $
+# $FreeBSD: src/sys/kern/Makefile,v 1.13 2006/08/05 19:25:14 jb Exp $
 
 # Makefile for kernel tags files, init_sysent, etc.
 
@@ -11,10 +11,11 @@
 sysent:  init_sysent.c syscalls.c ../sys/syscall.h ../sys/syscall.mk \
 ../sys/sysproto.h
 
-init_sysent.c syscalls.c ../sys/syscall.h \
+init_sysent.c syscalls.c systrace_args.c ../sys/syscall.h \
 ../sys/syscall.mk ../sys/sysproto.h: makesyscalls.sh syscalls.master
 	-mv -f init_sysent.c init_sysent.c.bak
 	-mv -f syscalls.c syscalls.c.bak
+	-mv -f systrace_args.c systrace_args.c.bak
 	-mv -f ../sys/syscall.h ../sys/syscall.h.bak
 	-mv -f ../sys/syscall.mk ../sys/syscall.mk.bak
 	-mv -f ../sys/sysproto.h ../sys/sysproto.h.bak

==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/bus_if.m#6 (text+ko) ====

@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: src/sys/kern/bus_if.m,v 1.29.2.1 2006/07/12 22:57:57 imp Exp $
+# $FreeBSD: src/sys/kern/bus_if.m,v 1.34 2007/02/23 12:19:01 piso Exp $
 #
 
 #include <sys/bus.h>
@@ -326,6 +326,7 @@
 	device_t	_child;
 	struct resource *_irq;
 	int		_flags;
+	driver_filter_t	*_filter;
 	driver_intr_t	*_intr;
 	void		*_arg;
 	void		**_cookiep;
@@ -529,3 +530,36 @@
 	const char *	_dname;
 	int		_dunit;
 };
+
+/**
+ * @brief Returns bus_dma_tag_t for use w/ devices on the bus.
+ *
+ * @param _dev		the parent device of @p _child
+ * @param _child	the device to which the tag will belong
+ */
+METHOD bus_dma_tag_t get_dma_tag {
+	device_t	_dev;
+	device_t	_child;
+} DEFAULT bus_generic_get_dma_tag;
+
+/**
+ * @brief Notify a (bus) driver about a child that the hints mechanism
+ * believes it has discovered.
+ *
+ * The bus is responsible for then adding the child in the right order
+ * and discovering other things about the child.  The bus driver is
+ * free to ignore this hint, to do special things, etc.  It is all up
+ * to the bus driver to interpret.
+ *
+ * This method is only called in response to the parent bus asking for
+ * hinted devices to be enumerated.
+ *
+ * @param _dev		the bus device
+ * @param _dname	the name of the device w/o unit numbers
+ * @param _dunit	the unit number of the device
+ */
+METHOD void hinted_child {
+	device_t	_dev;
+	const char *	_dname;
+	int		_dunit;
+};

==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/makesyscalls.sh#5 (text+ko) ====

@@ -1,6 +1,6 @@
 #! /bin/sh -
 #	@(#)makesyscalls.sh	8.1 (Berkeley) 6/10/93
-# $FreeBSD: src/sys/kern/makesyscalls.sh,v 1.62 2005/05/30 15:09:15 rwatson Exp $
+# $FreeBSD: src/sys/kern/makesyscalls.sh,v 1.67 2006/11/11 16:26:56 trhodes Exp $
 
 set -e
 
@@ -18,8 +18,10 @@
 syscallprefix="SYS_"
 switchname="sysent"
 namesname="syscallnames"
+systrace="systrace_args.c"
 
 # tmp files:
+sysaue="sysent.aue.$$"
 sysdcl="sysent.dcl.$$"
 syscompat="sysent.compat.$$"
 syscompatdcl="sysent.compatdcl.$$"
@@ -30,9 +32,9 @@
 sysarg="sysarg.switch.$$"
 sysprotoend="sysprotoend.$$"
 
-trap "rm $sysdcl $syscompat $syscompatdcl $syscompat4 $syscompat4dcl $sysent $sysinc $sysarg $sysprotoend" 0
+trap "rm $sysaue $sysdcl $syscompat $syscompatdcl $syscompat4 $syscompat4dcl $sysent $sysinc $sysarg $sysprotoend" 0
 
-touch $sysdcl $syscompat $syscompatdcl $syscompat4 $syscompat4dcl $sysent $sysinc $sysarg $sysprotoend
+touch $sysaue $sysdcl $syscompat $syscompatdcl $syscompat4 $syscompat4dcl $sysent $sysinc $sysarg $sysprotoend
 
 case $# in
     0)	echo "usage: $0 input-file <config-file>" 1>&2
@@ -58,6 +60,7 @@
 }
 ' < $1 | awk "
 	BEGIN {
+		sysaue = \"$sysaue\"
 		sysdcl = \"$sysdcl\"
 		sysproto = \"$sysproto\"
 		sysprotoend = \"$sysprotoend\"
@@ -73,6 +76,7 @@
 		sysnames = \"$sysnames\"
 		syshdr = \"$syshdr\"
 		sysmk = \"$sysmk\"
+		systrace = \"$systrace\"
 		compat = \"$compat\"
 		compat4 = \"$compat4\"
 		syscallprefix = \"$syscallprefix\"
@@ -102,6 +106,10 @@
 		printf "# FreeBSD system call names.\n" > sysmk
 		printf "# DO NOT EDIT-- this file is automatically generated.\n" > sysmk
 		printf "# $%s$\n", "FreeBSD" > sysmk
+
+		printf "/*\n * System call argument to DTrace register array converstion.\n *\n" > systrace
+		printf " * DO NOT EDIT-- this file is automatically generated.\n" > systrace
+		printf " * $%s$\n", "FreeBSD" > systrace
 	}
 	NR == 1 {
 		gsub("[$]FreeBSD: ", "", $0)
@@ -117,10 +125,9 @@
 		printf "#define\t%s\n\n", sysproto_h > sysarg
 		printf "#include <sys/signal.h>\n" > sysarg
 		printf "#include <sys/acl.h>\n" > sysarg
-		printf "#include <sys/thr.h>\n" > sysarg
-		printf "#include <sys/umtx.h>\n" > sysarg
-		printf "#include <posix4/_semaphore.h>\n\n" > sysarg
+		printf "#include <sys/_semaphore.h>\n" > sysarg
 		printf "#include <sys/ucontext.h>\n\n" > sysarg
+		printf "#include <bsm/audit_kevents.h>\n\n" > sysarg
 		printf "struct proc;\n\n" > sysarg
 		printf "struct thread;\n\n" > sysarg
 		printf "#define\tPAD_(t)\t(sizeof(register_t) <= sizeof(t) ? \\\n" > sysarg
@@ -140,6 +147,11 @@
 
 		printf "# created from%s\nMIASM = ", $0 > sysmk
 
+		printf " * This file is part of the DTrace syscall provider.\n */\n\n" > systrace
+		printf "static void\nsystrace_args(int sysnum, void *params, u_int64_t *uarg, int *n_args)\n{\n" > systrace
+		printf "\tint64_t *iarg  = (int64_t *) uarg;\n" > systrace
+		printf "\tswitch (sysnum) {\n" > systrace
+
 		next
 	}
 	NF == 0 || $1 ~ /^;/ {
@@ -288,41 +300,28 @@
 		auditev = $2;
 	}
 
-	# The 'M' type prefix
-	#
-	{
-		mpsafe = "SYF_MPSAFE | ";
-		if ($3 == "MSTD") {
-			$3 = "STD";
-		} else if ($3 == "MNODEF") {
-			$3 = "NODEF";
-		} else if ($3 == "MNOARGS") {
-			$3 = "NOARGS";
-		} else if ($3 == "MNOPROTO") {
-			$3 = "NOPROTO";
-		} else if ($3 == "MNOIMPL") {
-			$3 = "NOIMPL";
-		} else if ($3 == "MNOSTD") {
-			$3 = "NOSTD";
-		} else if ($3 == "MCOMPAT") {
-			$3 = "COMPAT";
-		} else if ($3 == "MCOMPAT4") {
-			$3 = "COMPAT4";
-		} else if ($3 == "MCPT_NOA") {
-			$3 = "CPT_NOA";
-		} else if ($3 == "MLIBCOMPAT") {
-			$3 = "LIBCOMPAT";
-		} else if ($3 == "MOBSOL") {
-			$3 = "OBSOL";
-		} else if ($3 == "MUNIMPL") {
-			$3 = "UNIMPL";
-		} else {
-			mpsafe = "";
-		}
-	}
 	$3 == "STD" || $3 == "NODEF" || $3 == "NOARGS"  || $3 == "NOPROTO" \
 	    || $3 == "NOIMPL" || $3 == "NOSTD" {
 		parseline()
+		printf("\t/* %s */\n\tcase %d: {\n", funcname, syscall) > systrace
+		if (argc > 0) {
+			printf("\t\tstruct %s *p = params;\n", argalias) > systrace
+			for (i = 1; i <= argc; i++) {
+				if (index(argtype[i], "*") > 0 || argtype[i] == "caddr_t")
+					printf("\t\tuarg[%d] = (intptr_t) p->%s; /* %s */\n", \
+					     i - 1, \
+					     argname[i], argtype[i]) > systrace
+				else if (substr(argtype[i], 1, 1) == "u" || argtype[i] == "size_t")
+					printf("\t\tuarg[%d] = p->%s; /* %s */\n", \
+					     i - 1, \
+					     argname[i], argtype[i]) > systrace
+				else
+					printf("\t\tiarg[%d] = p->%s; /* %s */\n", \
+					     i - 1, \
+					     argname[i], argtype[i]) > systrace
+			}
+		}
+		printf("\t\t*n_args = %d;\n\t\tbreak;\n\t}\n", argc) > systrace
 		if ((!nosys || funcname != "nosys") && \
 		    (funcname != "lkmnosys") && (funcname != "lkmressys")) {
 			if (argc != 0 && $3 != "NOARGS" && $3 != "NOPROTO") {
@@ -347,21 +346,23 @@
 			printf("%s\t%s(struct thread *, struct %s *)",
 			    rettype, funcname, argalias) > sysdcl
 			printf(";\n") > sysdcl
+			printf("#define\t%sAUE_%s\t%s\n", syscallprefix,
+			    funcalias, auditev) > sysaue
 		}
 		if (funcname == "nosys")
 			nosys = 1
 		if (funcname == "lkmnosys")
 			lkmnosys = 1
-		printf("\t{ %s%s, (sy_call_t *)", mpsafe, argssize) > sysent
-		column = 8 + 2 + length(mpsafe) + length(argssize) + 15
+		printf("\t{ %s, (sy_call_t *)", argssize) > sysent
+		column = 8 + 2 + length(argssize) + 15
 		if ($3 == "NOIMPL") {
-			printf("%s },", "nosys, AUE_NULL") > sysent
+			printf("%s },", "nosys, AUE_NULL, NULL, 0, 0") > sysent
 			column = column + length("nosys") + 3
 		} else if ($3 == "NOSTD") {
-			printf("%s },", "lkmressys, AUE_NULL") > sysent
+			printf("%s },", "lkmressys, AUE_NULL, NULL, 0, 0") > sysent
 			column = column + length("lkmressys") + 3
 		} else {
-			printf("%s, %s },", funcname, auditev) > sysent
+			printf("%s, %s, NULL, 0, 0 },", funcname, auditev) > sysent
 			column = column + length(funcname) + length(auditev) + 3
 		} 
 		align_sysent_comment(column)
@@ -406,9 +407,9 @@
 			    argalias) > sysarg
 		printf("%s\t%s%s(struct thread *, struct %s *);\n",
 		    rettype, prefix, funcname, argalias) > outdcl
-		printf("\t{ %s(%s%s,%s), %s },",
-		    wrap, mpsafe, argssize, funcname, auditev) > sysent
-		align_sysent_comment(8 + 9 + length(mpsafe) + \
+		printf("\t{ %s(%s,%s), %s, NULL, 0, 0 },",
+		    wrap, argssize, funcname, auditev) > sysent
+		align_sysent_comment(8 + 9 + \
 		    length(argssize) + 1 + length(funcname) + length(auditev) + 4)
 		printf("/* %d = old %s */\n", syscall, funcalias) > sysent
 		printf("\t\"old.%s\",\t\t/* %d = old %s */\n",
@@ -422,9 +423,9 @@
 		ncompat++
 		parseline()
 		printf("%s\to%s();\n", rettype, funcname) > syscompatdcl
-		printf("\t{ compat(%s%s,%s), %s },",
-		    mpsafe, argssize, funcname, auditev) > sysent
-		align_sysent_comment(8 + 9 + length(mpsafe) + \
+		printf("\t{ compat(%s,%s), %s, NULL, 0, 0 },",
+		    argssize, funcname, auditev) > sysent
+		align_sysent_comment(8 + 9 + \
 		    length(argssize) + 1 + length(funcname) + length(auditev) + 4)
 		printf("/* %d = old %s */\n", syscall, funcalias) > sysent
 		printf("\t\"old.%s\",\t\t/* %d = old %s */\n",
@@ -436,7 +437,7 @@
 		next
 	}
 	$3 == "OBSOL" {
-		printf("\t{ 0, (sy_call_t *)nosys, AUE_NULL },") > sysent
+		printf("\t{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },") > sysent
 		align_sysent_comment(34)
 		printf("/* %d = obsolete %s */\n", syscall, comment) > sysent
 		printf("\t\"obs_%s\",\t\t\t/* %d = obsolete %s */\n",
@@ -447,7 +448,7 @@
 		next
 	}
 	$3 == "UNIMPL" {
-		printf("\t{ 0, (sy_call_t *)nosys, AUE_NULL },\t\t\t/* %d = %s */\n",
+		printf("\t{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },\t\t\t/* %d = %s */\n",
 		    syscall, comment) > sysent
 		printf("\t\"#%d\",\t\t\t/* %d = %s */\n",
 		    syscall, syscall, comment) > sysnames
@@ -485,7 +486,7 @@
 
 		printf("\n#endif /* %s */\n\n", compat4) > syscompat4dcl
 
-		printf("#undef PAD_\n") > sysprotoend
+		printf("\n#undef PAD_\n") > sysprotoend
 		printf("#undef PADL_\n") > sysprotoend
 		printf("#undef PADR_\n") > sysprotoend
 		printf("\n#endif /* !%s */\n", sysproto_h) > sysprotoend
@@ -495,11 +496,12 @@
 		printf("};\n") > sysnames
 		printf("#define\t%sMAXSYSCALL\t%d\n", syscallprefix, syscall) \
 		    > syshdr
+		printf "\tdefault:\n\t\t*n_args = 0;\n\t\tbreak;\n\t};\n}\n" > systrace
 	} '
 
 cat $sysinc $sysent >> $syssw
 cat $sysarg $sysdcl \
 	$syscompat $syscompatdcl \
 	$syscompat4 $syscompat4dcl \
-	$sysprotoend > $sysproto
+	$sysaue $sysprotoend > $sysproto
 

==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/syscalls.master#6 (text+ko) ====

@@ -1,19 +1,18 @@
- $FreeBSD: src/sys/kern/syscalls.master,v 1.198.2.2 2006/03/17 01:47:06 rwatson Exp $
+ $FreeBSD: src/sys/kern/syscalls.master,v 1.231 2006/11/03 15:23:14 rrs Exp $
 ;	from: @(#)syscalls.master	8.2 (Berkeley) 1/13/94
 ;
 ; System call name/number master file.
 ; Processed to created init_sysent.c, syscalls.c and syscall.h.
 
-; Columns: number [M]type nargs name alt{name,tag,rtyp}/comments
+; Columns: number audit type 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
 ;		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.
-;	type	one of [M]STD, [M]OBSOL, [M]UNIMPL, [M]COMPAT, [M]CPT_NOA,
-;		[M]LIBCOMPAT, [M]NODEF, [M]NOARGS, [M]NOPROTO, [M]NOIMPL,
-;		[M]NOSTD, [M]COMPAT4
+;	type	one of STD, OBSOL, UNIMPL, COMPAT, CPT_NOA, LIBCOMPAT,
+;		NODEF, NOARGS, NOPROTO, NOIMPL, NOSTD, COMPAT4
 ;	name	psuedo-prototype of syscall routine
 ;		If one of the following alts is different, then all appear:
 ;	altname	name of system call if different
@@ -22,9 +21,6 @@
 ;		for UNIMPL/OBSOL, name continues with comments
 
 ; types:
-;	[M]	e.g. like MSTD -- means the system call is MP-safe.  If no
-;		M prefix is used, the syscall wrapper will obtain the Giant
-;		lock for the syscall.
 ;	STD	always included
 ;	COMPAT	included on COMPAT #ifdef
 ;	COMPAT4	included on COMPAT4 #ifdef (FreeBSD 4 compat)
@@ -32,8 +28,8 @@
 ;	OBSOL	obsolete, not included in system, only specifies name
 ;	UNIMPL	not implemented, placeholder only
 ;	NOSTD	implemented but as a lkm that can be statically
-;			compiled in sysent entry will be filled with lkmsys
-;			so the SYSCALL_MODULE macro works
+;		compiled in; sysent entry will be filled with lkmsys
+;		so the SYSCALL_MODULE macro works
 ;
 ; Please copy any additions and changes to the following compatability tables:
 ; sys/compat/freebsd32/syscalls.master
@@ -50,247 +46,247 @@
 ; redistributions should be placed in the reserved range at the end
 ; of the current calls.
 
-0	AUE_NULL	MSTD	{ int nosys(void); } syscall nosys_args int
-1	AUE_NULL	MSTD	{ void sys_exit(int rval); } exit \
+0	AUE_NULL	STD	{ int nosys(void); } syscall nosys_args int
+1	AUE_EXIT	STD	{ void sys_exit(int rval); } exit \
 				    sys_exit_args void
-2	AUE_NULL	MSTD	{ int fork(void); }
-3	AUE_NULL	MSTD	{ ssize_t read(int fd, void *buf, \
+2	AUE_FORK	STD	{ int fork(void); }
+3	AUE_NULL	STD	{ ssize_t read(int fd, void *buf, \
 				    size_t nbyte); }
-4	AUE_NULL	MSTD	{ ssize_t write(int fd, const void *buf, \
+4	AUE_NULL	STD	{ ssize_t write(int fd, const void *buf, \
 				    size_t nbyte); }
-5	AUE_NULL	MSTD	{ int open(char *path, int flags, int mode); }
+5	AUE_OPEN_RWTC	STD	{ int open(char *path, int flags, int mode); }
 ; XXX should be		{ int open(const char *path, int flags, ...); }
 ; but we're not ready for `const' or varargs.
 ; XXX man page says `mode_t mode'.
-6	AUE_NULL	MSTD	{ int close(int fd); }
-7	AUE_NULL	MSTD	{ int wait4(int pid, int *status, \
+6	AUE_CLOSE	STD	{ int close(int fd); }
+7	AUE_WAIT4	STD	{ int wait4(int pid, int *status, \
 				    int options, struct rusage *rusage); } \
 				    wait4 wait_args int
-8	AUE_NULL	MCOMPAT	{ int creat(char *path, int mode); }
-9	AUE_NULL	MSTD	{ int link(char *path, char *link); }
-10	AUE_NULL	MSTD	{ int unlink(char *path); }
+8	AUE_CREAT	COMPAT	{ int creat(char *path, int mode); }
+9	AUE_LINK	STD	{ int link(char *path, char *link); }
+10	AUE_UNLINK	STD	{ int unlink(char *path); }
 11	AUE_NULL	OBSOL	execv
-12	AUE_NULL	MSTD	{ int chdir(char *path); }
-13	AUE_NULL	MSTD	{ int fchdir(int fd); }
-14	AUE_NULL	MSTD	{ int mknod(char *path, int mode, int dev); }
-15	AUE_NULL	MSTD	{ int chmod(char *path, int mode); }
-16	AUE_NULL	MSTD	{ int chown(char *path, int uid, int gid); }
-17	AUE_NULL	MSTD	{ int obreak(char *nsize); } break \
+12	AUE_CHDIR	STD	{ int chdir(char *path); }
+13	AUE_FCHDIR	STD	{ int fchdir(int fd); }
+14	AUE_MKNOD	STD	{ int mknod(char *path, int mode, int dev); }
+15	AUE_CHMOD	STD	{ int chmod(char *path, int mode); }
+16	AUE_CHOWN	STD	{ int chown(char *path, int uid, int gid); }
+17	AUE_NULL	STD	{ int obreak(char *nsize); } break \
 				    obreak_args int
-18	AUE_NULL	MCOMPAT4	{ int getfsstat(struct ostatfs *buf, \
+18	AUE_GETFSSTAT	COMPAT4	{ int getfsstat(struct ostatfs *buf, \
 				    long bufsize, int flags); }
-19	AUE_NULL	MCOMPAT	{ long lseek(int fd, long offset, \
+19	AUE_LSEEK	COMPAT	{ long lseek(int fd, long offset, \
 				    int whence); }
-20	AUE_NULL	MSTD	{ pid_t getpid(void); }
-21	AUE_NULL	STD	{ int mount(char *type, char *path, \
+20	AUE_GETPID	STD	{ pid_t getpid(void); }
+21	AUE_MOUNT	STD	{ int mount(char *type, char *path, \
 				    int flags, caddr_t data); }
 ; XXX `path' should have type `const char *' but we're not ready for that.
-22	AUE_NULL	STD	{ int unmount(char *path, int flags); }
-23	AUE_NULL	MSTD	{ int setuid(uid_t uid); }
-24	AUE_NULL	MSTD	{ uid_t getuid(void); }
-25	AUE_NULL	MSTD	{ uid_t geteuid(void); }
-26	AUE_NULL	MSTD	{ int ptrace(int req, pid_t pid, \
+22	AUE_UMOUNT	STD	{ int unmount(char *path, int flags); }
+23	AUE_SETUID	STD	{ int setuid(uid_t uid); }
+24	AUE_GETUID	STD	{ uid_t getuid(void); }
+25	AUE_GETEUID	STD	{ uid_t geteuid(void); }
+26	AUE_PTRACE	STD	{ int ptrace(int req, pid_t pid, \
 				    caddr_t addr, int data); }
-27	AUE_NULL	MSTD	{ int recvmsg(int s, struct msghdr *msg, \
+27	AUE_RECVMSG	STD	{ int recvmsg(int s, struct msghdr *msg, \
 				    int flags); }
-28	AUE_NULL	MSTD	{ int sendmsg(int s, struct msghdr *msg, \
+28	AUE_SENDMSG	STD	{ int sendmsg(int s, struct msghdr *msg, \
 				    int flags); }
-29	AUE_NULL	MSTD	{ int recvfrom(int s, caddr_t buf, \
+29	AUE_RECVFROM	STD	{ int recvfrom(int s, caddr_t buf, \
 				    size_t len, int flags, \
 				    struct sockaddr * __restrict from, \
 				    __socklen_t * __restrict fromlenaddr); }
-30	AUE_NULL	MSTD	{ int accept(int s, \
+30	AUE_ACCEPT	STD	{ int accept(int s, \
 				    struct sockaddr * __restrict name, \
 				    __socklen_t * __restrict anamelen); }
-31	AUE_NULL	MSTD	{ int getpeername(int fdes, \
+31	AUE_GETPEERNAME	STD	{ int getpeername(int fdes, \
 				    struct sockaddr * __restrict asa, \
 				    __socklen_t * __restrict alen); }
-32	AUE_NULL	MSTD	{ int getsockname(int fdes, \
+32	AUE_GETSOCKNAME	STD	{ int getsockname(int fdes, \
 				    struct sockaddr * __restrict asa, \
 				    __socklen_t * __restrict alen); }
-33	AUE_NULL	MSTD	{ int access(char *path, int flags); }
-34	AUE_NULL	MSTD	{ int chflags(char *path, int flags); }
-35	AUE_NULL	MSTD	{ int fchflags(int fd, int flags); }
-36	AUE_NULL	MSTD	{ int sync(void); }
-37	AUE_NULL	MSTD	{ int kill(int pid, int signum); }
-38	AUE_NULL	MCOMPAT	{ int stat(char *path, struct ostat *ub); }
-39	AUE_NULL	MSTD	{ pid_t getppid(void); }
-40	AUE_NULL	MCOMPAT	{ int lstat(char *path, struct ostat *ub); }
-41	AUE_NULL	MSTD	{ int dup(u_int fd); }
-42	AUE_NULL	MSTD	{ int pipe(void); }
-43	AUE_NULL	MSTD	{ gid_t getegid(void); }
-44	AUE_NULL	MSTD	{ int profil(caddr_t samples, size_t size, \
+33	AUE_ACCESS	STD	{ int access(char *path, int flags); }
+34	AUE_CHFLAGS	STD	{ int chflags(char *path, int flags); }
+35	AUE_FCHFLAGS	STD	{ int fchflags(int fd, int flags); }
+36	AUE_SYNC	STD	{ int sync(void); }
+37	AUE_KILL	STD	{ int kill(int pid, int signum); }
+38	AUE_STAT	COMPAT	{ int stat(char *path, struct ostat *ub); }
+39	AUE_GETPPID	STD	{ pid_t getppid(void); }
+40	AUE_LSTAT	COMPAT	{ int lstat(char *path, struct ostat *ub); }
+41	AUE_DUP		STD	{ int dup(u_int fd); }
+42	AUE_PIPE	STD	{ int pipe(void); }
+43	AUE_GETEGID	STD	{ gid_t getegid(void); }
+44	AUE_PROFILE	STD	{ int profil(caddr_t samples, size_t size, \
 				    size_t offset, u_int scale); }
-45	AUE_NULL	MSTD	{ int ktrace(const char *fname, int ops, \
+45	AUE_KTRACE	STD	{ int ktrace(const char *fname, int ops, \
 				    int facs, int pid); }
-46	AUE_NULL	MCOMPAT	{ int sigaction(int signum, \
+46	AUE_SIGACTION	COMPAT	{ int sigaction(int signum, \
 				    struct osigaction *nsa, \
 				    struct osigaction *osa); }
-47	AUE_NULL	MSTD	{ gid_t getgid(void); }
-48	AUE_NULL	MCOMPAT	{ int sigprocmask(int how, osigset_t mask); }
+47	AUE_GETGID	STD	{ gid_t getgid(void); }
+48	AUE_SIGPROCMASK	COMPAT	{ int sigprocmask(int how, osigset_t mask); }
 ; XXX note nonstandard (bogus) calling convention - the libc stub passes
 ; us the mask, not a pointer to it, and we return the old mask as the
 ; (int) return value.
-49	AUE_NULL	MSTD	{ int getlogin(char *namebuf, u_int \
+49	AUE_GETLOGIN	STD	{ int getlogin(char *namebuf, u_int \
 				    namelen); }
-50	AUE_NULL	MSTD	{ int setlogin(char *namebuf); }
-51	AUE_NULL	MSTD	{ int acct(char *path); }
-52	AUE_NULL	MCOMPAT	{ int sigpending(void); }
-53	AUE_NULL	MSTD	{ int sigaltstack(stack_t *ss, \
+50	AUE_SETLOGIN	STD	{ int setlogin(char *namebuf); }
+51	AUE_ACCT	STD	{ int acct(char *path); }
+52	AUE_SIGPENDING	COMPAT	{ int sigpending(void); }
+53	AUE_SIGALTSTACK	STD	{ int sigaltstack(stack_t *ss, \
 				    stack_t *oss); }
-54	AUE_NULL	MSTD	{ int ioctl(int fd, u_long com, \
+54	AUE_IOCTL	STD	{ int ioctl(int fd, u_long com, \
 				    caddr_t data); }
-55	AUE_NULL	MSTD	{ int reboot(int opt); }
-56	AUE_NULL	MSTD	{ int revoke(char *path); }
-57	AUE_NULL	MSTD	{ int symlink(char *path, char *link); }
-58	AUE_NULL	MSTD	{ int readlink(char *path, char *buf, \
+55	AUE_REBOOT	STD	{ int reboot(int opt); }
+56	AUE_REVOKE	STD	{ int revoke(char *path); }
+57	AUE_SYMLINK	STD	{ int symlink(char *path, char *link); }
+58	AUE_READLINK	STD	{ int readlink(char *path, char *buf, \
 				    int count); }
-59	AUE_NULL	MSTD	{ int execve(char *fname, char **argv, \
+59	AUE_EXECVE	STD	{ int execve(char *fname, char **argv, \
 				    char **envv); }
-60	AUE_NULL	MSTD	{ int umask(int newmask); } umask umask_args \
+60	AUE_UMASK	STD	{ int umask(int newmask); } umask umask_args \
 				    int
-61	AUE_NULL	MSTD	{ int chroot(char *path); }
-62	AUE_NULL	MCOMPAT	{ int fstat(int fd, struct ostat *sb); }
-63	AUE_NULL	MCOMPAT	{ int getkerninfo(int op, char *where, \
+61	AUE_CHROOT	STD	{ int chroot(char *path); }
+62	AUE_FSTAT	COMPAT	{ int fstat(int fd, struct ostat *sb); }
+63	AUE_NULL	COMPAT	{ int getkerninfo(int op, char *where, \
 				    size_t *size, int arg); } getkerninfo \
 				    getkerninfo_args int
-64	AUE_NULL	MCOMPAT	{ int getpagesize(void); } getpagesize \
+64	AUE_NULL	COMPAT	{ int getpagesize(void); } getpagesize \
 				    getpagesize_args int
-65	AUE_NULL	MSTD	{ int msync(void *addr, size_t len, \
+65	AUE_MSYNC	STD	{ int msync(void *addr, size_t len, \
 				    int flags); }
-66	AUE_NULL	MSTD	{ int vfork(void); }
+66	AUE_VFORK	STD	{ int vfork(void); }
 67	AUE_NULL	OBSOL	vread
 68	AUE_NULL	OBSOL	vwrite
-69	AUE_NULL	MSTD	{ int sbrk(int incr); }
-70	AUE_NULL	MSTD	{ int sstk(int incr); }
-71	AUE_NULL	MCOMPAT	{ int mmap(void *addr, int len, int prot, \
+69	AUE_SBRK	STD	{ int sbrk(int incr); }
+70	AUE_SSTK	STD	{ int sstk(int incr); }
+71	AUE_MMAP	COMPAT	{ int mmap(void *addr, int len, int prot, \
 				    int flags, int fd, long pos); }
-72	AUE_NULL	MSTD	{ int ovadvise(int anom); } vadvise \
+72	AUE_O_VADVISE	STD	{ int ovadvise(int anom); } vadvise \
 				    ovadvise_args int
-73	AUE_NULL	MSTD	{ int munmap(void *addr, size_t len); }
-74	AUE_NULL	MSTD	{ int mprotect(const void *addr, size_t len, \
+73	AUE_MUNMAP	STD	{ int munmap(void *addr, size_t len); }
+74	AUE_MPROTECT	STD	{ int mprotect(const void *addr, size_t len, \
 				    int prot); }
-75	AUE_NULL	MSTD	{ int madvise(void *addr, size_t len, \
+75	AUE_MADVISE	STD	{ int madvise(void *addr, size_t len, \
 				    int behav); }
 76	AUE_NULL	OBSOL	vhangup
 77	AUE_NULL	OBSOL	vlimit
-78	AUE_NULL	MSTD	{ int mincore(const void *addr, size_t len, \
+78	AUE_MINCORE	STD	{ int mincore(const void *addr, size_t len, \
 				    char *vec); }
-79	AUE_NULL	MSTD	{ int getgroups(u_int gidsetsize, \
+79	AUE_GETGROUPS	STD	{ int getgroups(u_int gidsetsize, \
 				    gid_t *gidset); }
-80	AUE_NULL	MSTD	{ int setgroups(u_int gidsetsize, \
+80	AUE_SETGROUPS	STD	{ int setgroups(u_int gidsetsize, \
 				    gid_t *gidset); }
-81	AUE_NULL	MSTD	{ int getpgrp(void); }
-82	AUE_NULL	MSTD	{ int setpgid(int pid, int pgid); }
-83	AUE_NULL	MSTD	{ int setitimer(u_int which, struct \
+81	AUE_GETPGRP	STD	{ int getpgrp(void); }
+82	AUE_SETPGRP	STD	{ int setpgid(int pid, int pgid); }
+83	AUE_SETITIMER	STD	{ int setitimer(u_int which, struct \
 				    itimerval *itv, struct itimerval *oitv); }
-84	AUE_NULL	MCOMPAT	{ int wait(void); }
-85	AUE_NULL	MSTD	{ int swapon(char *name); }
-86	AUE_NULL	MSTD	{ int getitimer(u_int which, \
+84	AUE_WAIT4	COMPAT	{ int wait(void); }
+85	AUE_SWAPON	STD	{ int swapon(char *name); }
+86	AUE_GETITIMER	STD	{ int getitimer(u_int which, \
 				    struct itimerval *itv); }
-87	AUE_NULL	MCOMPAT	{ int gethostname(char *hostname, \
+87	AUE_SYSCTL	COMPAT	{ int gethostname(char *hostname, \
 				    u_int len); } gethostname \
 				    gethostname_args int
-88	AUE_NULL	MCOMPAT	{ int sethostname(char *hostname, \
+88	AUE_SYSCTL	COMPAT	{ int sethostname(char *hostname, \
 				    u_int len); } sethostname \
 				    sethostname_args int
-89	AUE_NULL	MSTD	{ int getdtablesize(void); }
-90	AUE_NULL	MSTD	{ int dup2(u_int from, u_int to); }
+89	AUE_GETDTABLESIZE	STD	{ int getdtablesize(void); }
+90	AUE_DUP2	STD	{ int dup2(u_int from, u_int to); }
 91	AUE_NULL	UNIMPL	getdopt
-92	AUE_NULL	MSTD	{ int fcntl(int fd, int cmd, long arg); }
+92	AUE_FCNTL	STD	{ int fcntl(int fd, int cmd, long arg); }
 ; XXX should be	{ int fcntl(int fd, int cmd, ...); }
 ; but we're not ready for varargs.
-93	AUE_NULL	MSTD	{ int select(int nd, fd_set *in, fd_set *ou, \
+93	AUE_SELECT	STD	{ int select(int nd, fd_set *in, fd_set *ou, \
 				    fd_set *ex, struct timeval *tv); }
 94	AUE_NULL	UNIMPL	setdopt
-95	AUE_NULL	MSTD	{ int fsync(int fd); }
-96	AUE_NULL	MSTD	{ int setpriority(int which, int who, \
+95	AUE_FSYNC	STD	{ int fsync(int fd); }
+96	AUE_SETPRIORITY	STD	{ int setpriority(int which, int who, \
 				    int prio); }
-97	AUE_NULL	MSTD	{ int socket(int domain, int type, \
+97	AUE_SOCKET	STD	{ int socket(int domain, int type, \
 				    int protocol); }
-98	AUE_NULL	MSTD	{ int connect(int s, caddr_t name, \
+98	AUE_CONNECT	STD	{ int connect(int s, caddr_t name, \
 				    int namelen); }
-99	AUE_NULL	MCPT_NOA { int accept(int s, caddr_t name, \
+99	AUE_ACCEPT	CPT_NOA	{ int accept(int s, caddr_t name, \
 				    int *anamelen); } accept accept_args int
-100	AUE_NULL	MSTD	{ int getpriority(int which, int who); }
-101	AUE_NULL	MCOMPAT	{ int send(int s, caddr_t buf, int len, \
+100	AUE_GETPRIORITY	STD	{ int getpriority(int which, int who); }
+101	AUE_SEND	COMPAT	{ int send(int s, caddr_t buf, int len, \
 				    int flags); }
-102	AUE_NULL	MCOMPAT	{ int recv(int s, caddr_t buf, int len, \
+102	AUE_RECV	COMPAT	{ int recv(int s, caddr_t buf, int len, \
 				    int flags); }
-103	AUE_NULL	MCOMPAT	{ int sigreturn( \
+103	AUE_SIGRETURN	COMPAT	{ int sigreturn( \
 				    struct osigcontext *sigcntxp); }
-104	AUE_NULL	MSTD	{ int bind(int s, caddr_t name, \
+104	AUE_BIND	STD	{ int bind(int s, caddr_t name, \
 				    int namelen); }
-105	AUE_NULL	MSTD	{ int setsockopt(int s, int level, int name, \
+105	AUE_SETSOCKOPT	STD	{ int setsockopt(int s, int level, int name, \
 				    caddr_t val, int valsize); }
-106	AUE_NULL	MSTD	{ int listen(int s, int backlog); }
+106	AUE_LISTEN	STD	{ int listen(int s, int backlog); }
 107	AUE_NULL	OBSOL	vtimes
-108	AUE_NULL	MCOMPAT	{ int sigvec(int signum, struct sigvec *nsv, \
+108	AUE_NULL	COMPAT	{ int sigvec(int signum, struct sigvec *nsv, \
 				    struct sigvec *osv); }
-109	AUE_NULL	MCOMPAT	{ int sigblock(int mask); }
-110	AUE_NULL	MCOMPAT	{ int sigsetmask(int mask); }
-111	AUE_NULL	MCOMPAT	{ int sigsuspend(osigset_t mask); }
+109	AUE_NULL	COMPAT	{ int sigblock(int mask); }
+110	AUE_NULL	COMPAT	{ int sigsetmask(int mask); }
+111	AUE_NULL	COMPAT	{ int sigsuspend(osigset_t mask); }
 ; XXX note nonstandard (bogus) calling convention - the libc stub passes
 ; us the mask, not a pointer to it.
-112	AUE_NULL	MCOMPAT	{ int sigstack(struct sigstack *nss, \
+112	AUE_NULL	COMPAT	{ int sigstack(struct sigstack *nss, \
 				    struct sigstack *oss); }
-113	AUE_NULL	MCOMPAT	{ int recvmsg(int s, struct omsghdr *msg, \
+113	AUE_RECVMSG	COMPAT	{ int recvmsg(int s, struct omsghdr *msg, \
 				    int flags); }
-114	AUE_NULL	MCOMPAT	{ int sendmsg(int s, caddr_t msg, \
+114	AUE_SENDMSG	COMPAT	{ int sendmsg(int s, caddr_t msg, \
 				    int flags); }
 115	AUE_NULL	OBSOL	vtrace
-116	AUE_NULL	MSTD	{ int gettimeofday(struct timeval *tp, \
+116	AUE_GETTIMEOFDAY	STD	{ int gettimeofday(struct timeval *tp, \
 				    struct timezone *tzp); }
-117	AUE_NULL	MSTD	{ int getrusage(int who, \
+117	AUE_GETRUSAGE	STD	{ int getrusage(int who, \
 				    struct rusage *rusage); }
-118	AUE_NULL	MSTD	{ int getsockopt(int s, int level, int name, \
+118	AUE_GETSOCKOPT	STD	{ int getsockopt(int s, int level, int name, \
 				    caddr_t val, int *avalsize); }
 119	AUE_NULL	UNIMPL	resuba (BSD/OS 2.x)
-120	AUE_NULL	MSTD	{ int readv(int fd, struct iovec *iovp, \
+120	AUE_READV	STD	{ int readv(int fd, struct iovec *iovp, \
 				    u_int iovcnt); }
-121	AUE_NULL	MSTD	{ int writev(int fd, struct iovec *iovp, \
+121	AUE_WRITEV	STD	{ int writev(int fd, struct iovec *iovp, \
 				    u_int iovcnt); }
-122	AUE_NULL	MSTD	{ int settimeofday(struct timeval *tv, \
+122	AUE_SETTIMEOFDAY	STD	{ int settimeofday(struct timeval *tv, \
 				    struct timezone *tzp); }
-123	AUE_NULL	MSTD	{ int fchown(int fd, int uid, int gid); }
-124	AUE_NULL	MSTD	{ int fchmod(int fd, int mode); }
-125	AUE_NULL	MCPT_NOA { int recvfrom(int s, caddr_t buf, \
+123	AUE_FCHOWN	STD	{ int fchown(int fd, int uid, int gid); }
+124	AUE_FCHMOD	STD	{ int fchmod(int fd, int mode); }
+125	AUE_RECVFROM	CPT_NOA	{ int recvfrom(int s, caddr_t buf, \
 				    size_t len, int flags, caddr_t from, int \
 				    *fromlenaddr); } recvfrom recvfrom_args \
 				    int
-126	AUE_NULL	MSTD	{ int setreuid(int ruid, int euid); }
-127	AUE_NULL	MSTD	{ int setregid(int rgid, int egid); }
-128	AUE_NULL	MSTD	{ int rename(char *from, char *to); }
-129	AUE_NULL	MCOMPAT	{ int truncate(char *path, long length); }
-130	AUE_NULL	MCOMPAT	{ int ftruncate(int fd, long length); }
-131	AUE_NULL	MSTD	{ int flock(int fd, int how); }
-132	AUE_NULL	MSTD	{ int mkfifo(char *path, int mode); }
-133	AUE_NULL	MSTD	{ int sendto(int s, caddr_t buf, size_t len, \
+126	AUE_SETREUID	STD	{ int setreuid(int ruid, int euid); }
+127	AUE_SETREGID	STD	{ int setregid(int rgid, int egid); }
+128	AUE_RENAME	STD	{ int rename(char *from, char *to); }
+129	AUE_TRUNCATE	COMPAT	{ int truncate(char *path, long length); }
+130	AUE_FTRUNCATE	COMPAT	{ int ftruncate(int fd, long length); }
+131	AUE_FLOCK	STD	{ int flock(int fd, int how); }
+132	AUE_MKFIFO	STD	{ int mkfifo(char *path, int mode); }
+133	AUE_SENDTO	STD	{ int sendto(int s, caddr_t buf, size_t len, \
 				    int flags, caddr_t to, int tolen); }
-134	AUE_NULL	MSTD	{ int shutdown(int s, int how); }
-135	AUE_NULL	MSTD	{ int socketpair(int domain, int type, \
+134	AUE_SHUTDOWN	STD	{ int shutdown(int s, int how); }
+135	AUE_SOCKETPAIR	STD	{ int socketpair(int domain, int type, \
 				    int protocol, int *rsv); }
-136	AUE_NULL	MSTD	{ int mkdir(char *path, int mode); }
-137	AUE_NULL	MSTD	{ int rmdir(char *path); }
-138	AUE_NULL	MSTD	{ int utimes(char *path, \
+136	AUE_MKDIR	STD	{ int mkdir(char *path, int mode); }
+137	AUE_RMDIR	STD	{ int rmdir(char *path); }
+138	AUE_UTIMES	STD	{ int utimes(char *path, \
 				    struct timeval *tptr); }
 139	AUE_NULL	OBSOL	4.2 sigreturn
-140	AUE_NULL	MSTD	{ int adjtime(struct timeval *delta, \
+140	AUE_ADJTIME	STD	{ int adjtime(struct timeval *delta, \
 				    struct timeval *olddelta); }
-141	AUE_NULL	MCOMPAT	{ int getpeername(int fdes, caddr_t asa, \
+141	AUE_GETPEERNAME	COMPAT	{ int getpeername(int fdes, caddr_t asa, \
 				    int *alen); }
-142	AUE_NULL	MCOMPAT	{ long gethostid(void); }
-143	AUE_NULL	MCOMPAT	{ int sethostid(long hostid); }
-144	AUE_NULL	MCOMPAT	{ int getrlimit(u_int which, struct \
+142	AUE_SYSCTL	COMPAT	{ long gethostid(void); }
+143	AUE_SYSCTL	COMPAT	{ int sethostid(long hostid); }
+144	AUE_GETRLIMIT	COMPAT	{ int getrlimit(u_int which, struct \
 				    orlimit *rlp); }
-145	AUE_NULL	MCOMPAT	{ int setrlimit(u_int which, \
+145	AUE_SETRLIMIT	COMPAT	{ int setrlimit(u_int which, \
 				    struct orlimit *rlp); }
-146	AUE_NULL	MCOMPAT	{ int killpg(int pgid, int signum); }
-147	AUE_NULL	MSTD	{ int setsid(void); }
-148	AUE_NULL	MSTD	{ int quotactl(char *path, int cmd, int uid, \
+146	AUE_KILLPG	COMPAT	{ int killpg(int pgid, int signum); }
+147	AUE_SETSID	STD	{ int setsid(void); }
+148	AUE_QUOTACTL	STD	{ int quotactl(char *path, int cmd, int uid, \
 				    caddr_t arg); }
-149	AUE_NULL	MCOMPAT	{ int quota(void); }
-150	AUE_NULL	MCPT_NOA	{ int getsockname(int fdec, \
+149	AUE_O_QUOTA	COMPAT	{ int quota(void); }
+150	AUE_GETSOCKNAME	CPT_NOA	{ int getsockname(int fdec, \
 				    caddr_t asa, int *alen); } getsockname \
 				    getsockname_args int
 
@@ -303,95 +299,95 @@
 153	AUE_NULL	UNIMPL	asyncdaemon (BSD/OS 2.x)
 154	AUE_NULL	UNIMPL	nosys
 ; 155 is initialized by the NFS code, if present.
-155	AUE_NULL	MNOIMPL	{ int nfssvc(int flag, caddr_t argp); }
-156	AUE_NULL	COMPAT	{ int getdirentries(int fd, char *buf, \
+155	AUE_NFS_SVC	NOSTD	{ int nfssvc(int flag, caddr_t argp); }
+156	AUE_GETDIRENTRIES	COMPAT	{ int getdirentries(int fd, char *buf, \
 				    u_int count, long *basep); }
-157	AUE_NULL	MCOMPAT4	{ int statfs(char *path, \
+157	AUE_STATFS	COMPAT4	{ int statfs(char *path, \
 				    struct ostatfs *buf); }
-158	AUE_NULL	MCOMPAT4	{ int fstatfs(int fd, \
+158	AUE_FSTATFS	COMPAT4	{ int fstatfs(int fd, \
 				    struct ostatfs *buf); }
 159	AUE_NULL	UNIMPL	nosys
-160	AUE_NULL	MSTD	{ int lgetfh(char *fname, \
+160	AUE_LGETFH	STD	{ int lgetfh(char *fname, \
 				    struct fhandle *fhp); }
-161	AUE_NULL	MSTD	{ int getfh(char *fname, \
+161	AUE_NFS_GETFH	STD	{ int getfh(char *fname, \
 				    struct fhandle *fhp); }
-162	AUE_NULL	MSTD	{ int getdomainname(char *domainname, \
+162	AUE_SYSCTL	STD	{ int getdomainname(char *domainname, \
 				    int len); }
-163	AUE_NULL	MSTD	{ int setdomainname(char *domainname, \
+163	AUE_SYSCTL	STD	{ int setdomainname(char *domainname, \
 				    int len); }
-164	AUE_NULL	MSTD	{ int uname(struct utsname *name); }
-165	AUE_NULL	MSTD	{ int sysarch(int op, char *parms); }
-166	AUE_NULL	MSTD	{ int rtprio(int function, pid_t pid, \
+164	AUE_NULL	STD	{ int uname(struct utsname *name); }
+165	AUE_SYSARCH	STD	{ int sysarch(int op, char *parms); }
+166	AUE_RTPRIO	STD	{ int rtprio(int function, pid_t pid, \
 				    struct rtprio *rtp); }
 167	AUE_NULL	UNIMPL	nosys
 168	AUE_NULL	UNIMPL	nosys
 ; 169 is initialized by the SYSVSEM code if present or loaded
-169	AUE_NULL	MNOSTD	{ int semsys(int which, int a2, int a3, \
+169	AUE_SEMSYS	NOSTD	{ int semsys(int which, int a2, int a3, \
 				    int a4, int a5); }
 ; 169 is initialized by the SYSVMSG code if present or loaded
 ; XXX should be	{ int semsys(int which, ...); }
-170	AUE_NULL	MNOSTD	{ int msgsys(int which, int a2, int a3, \
+170	AUE_MSGSYS	NOSTD	{ int msgsys(int which, int a2, int a3, \
 				    int a4, int a5, int a6); }
 ; 169 is initialized by the SYSVSHM code if present or loaded
 ; XXX should be	{ int msgsys(int which, ...); }
-171	AUE_NULL	MNOSTD	{ int shmsys(int which, int a2, int a3, \
+171	AUE_SHMSYS	NOSTD	{ int shmsys(int which, int a2, int a3, \
 				    int a4); }
 ; XXX should be	{ int shmsys(int which, ...); }
 172	AUE_NULL	UNIMPL	nosys
-173	AUE_NULL	MSTD	{ ssize_t pread(int fd, void *buf, \
+173	AUE_PREAD	STD	{ ssize_t pread(int fd, void *buf, \
 				    size_t nbyte, int pad, off_t offset); }
-174	AUE_NULL	MSTD	{ ssize_t pwrite(int fd, const void *buf, \
+174	AUE_PWRITE	STD	{ ssize_t pwrite(int fd, const void *buf, \
 				    size_t nbyte, int pad, off_t offset); }
 175	AUE_NULL	UNIMPL	nosys
-176	AUE_NULL	MSTD	{ int ntp_adjtime(struct timex *tp); }
+176	AUE_NTP_ADJTIME	STD	{ int ntp_adjtime(struct timex *tp); }
 177	AUE_NULL	UNIMPL	sfork (BSD/OS 2.x)
 178	AUE_NULL	UNIMPL	getdescriptor (BSD/OS 2.x)
 179	AUE_NULL	UNIMPL	setdescriptor (BSD/OS 2.x)
 180	AUE_NULL	UNIMPL	nosys
 
 ; Syscalls 181-199 are used by/reserved for BSD
-181	AUE_NULL	MSTD	{ int setgid(gid_t gid); }
-182	AUE_NULL	MSTD	{ int setegid(gid_t egid); }
-183	AUE_NULL	MSTD	{ int seteuid(uid_t euid); }
+181	AUE_SETGID	STD	{ int setgid(gid_t gid); }
+182	AUE_SETEGID	STD	{ int setegid(gid_t egid); }
+183	AUE_SETEUID	STD	{ int seteuid(uid_t euid); }
 184	AUE_NULL	UNIMPL	lfs_bmapv
 185	AUE_NULL	UNIMPL	lfs_markv
 186	AUE_NULL	UNIMPL	lfs_segclean
 187	AUE_NULL	UNIMPL	lfs_segwait
-188	AUE_NULL	MSTD	{ int stat(char *path, struct stat *ub); }
-189	AUE_NULL	MSTD	{ int fstat(int fd, struct stat *sb); }
-190	AUE_NULL	MSTD	{ int lstat(char *path, struct stat *ub); }
-191	AUE_NULL	MSTD	{ int pathconf(char *path, int name); }
-192	AUE_NULL	MSTD	{ int fpathconf(int fd, int name); }
+188	AUE_STAT	STD	{ int stat(char *path, struct stat *ub); }
+189	AUE_FSTAT	STD	{ int fstat(int fd, struct stat *sb); }
+190	AUE_LSTAT	STD	{ int lstat(char *path, struct stat *ub); }
+191	AUE_PATHCONF	STD	{ int pathconf(char *path, int name); }
+192	AUE_FPATHCONF	STD	{ int fpathconf(int fd, int name); }
 193	AUE_NULL	UNIMPL	nosys
-194	AUE_NULL	MSTD	{ int getrlimit(u_int which, \
+194	AUE_GETRLIMIT	STD	{ int getrlimit(u_int which, \
 				    struct rlimit *rlp); } getrlimit \
 				    __getrlimit_args int
-195	AUE_NULL	MSTD	{ int setrlimit(u_int which, \
+195	AUE_SETRLIMIT	STD	{ int setrlimit(u_int which, \
 				    struct rlimit *rlp); } setrlimit \

>>> TRUNCATED FOR MAIL (1000 lines) <<<



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200703270757.l2R7vxRW038315>