remove compat_bsdos support

17 files changed, 7 insertions, 2477 deletions

diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 71ea77723b7..54e042e6a85 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.687 2010/07/03 03:59:16 krw Exp $
+#	$OpenBSD: GENERIC,v 1.688 2010/07/05 22:20:22 tedu Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -26,7 +26,6 @@ option		APERTURE	# in-kernel aperture driver for XFree86
 option		COMPAT_SVR4	# binary compatibility with SVR4
 option		COMPAT_LINUX	# binary compatibility with Linux
 option		COMPAT_FREEBSD	# binary compatibility with FreeBSD
-option		COMPAT_BSDOS	# binary compatibility with BSD/OS
 option		COMPAT_AOUT	# a.out binaries are emulated
 
 option		PROCFS		# /proc
diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c
index 409ecde3841..86faadd6e65 100644
--- a/sys/arch/i386/i386/machdep.c
+++ b/sys/arch/i386/i386/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.477 2010/07/03 04:54:32 kettenis Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.478 2010/07/05 22:20:22 tedu Exp $	*/
 /*	$NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $	*/
 
 /*-
@@ -2932,12 +2932,6 @@ init386(paddr_t first_avail)
 	setsegment(&gdt[GCPU_SEL].sd, &cpu_info_primary,
 	    sizeof(struct cpu_info)-1, SDT_MEMRWA, SEL_KPL, 0, 0);
 
-	/* make ldt gates and memory segments */
-#ifdef COMPAT_BSDOS
-	setgate(&ldt[LBSDICALLS_SEL].gd, &IDTVEC(osyscall), 1, SDT_SYS386CGT,
-	    SEL_UPL, GCODE_SEL);
-#endif
-
 	/* exceptions */
 	setgate(&idt[  0], &IDTVEC(div),     0, SDT_SYS386TGT, SEL_KPL, GCODE_SEL);
 	setgate(&idt[  1], &IDTVEC(dbg),     0, SDT_SYS386TGT, SEL_KPL, GCODE_SEL);
diff --git a/sys/arch/i386/i386/trap.c b/sys/arch/i386/i386/trap.c
index c6ff5ee3ce9..4170dd3794e 100644
--- a/sys/arch/i386/i386/trap.c
+++ b/sys/arch/i386/i386/trap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.c,v 1.91 2010/07/01 19:47:07 tedu Exp $	*/
+/*	$OpenBSD: trap.c,v 1.92 2010/07/05 22:20:22 tedu Exp $	*/
 /*	$NetBSD: trap.c,v 1.95 1996/05/05 06:50:02 mycroft Exp $	*/
 
 /*-
@@ -79,9 +79,6 @@ extern struct emul emul_linux_aout, emul_linux_elf;
 #ifdef COMPAT_FREEBSD
 extern struct emul emul_freebsd_aout, emul_freebsd_elf;
 #endif
-#ifdef COMPAT_BSDOS
-extern struct emul emul_bsdos;
-#endif
 #ifdef COMPAT_AOUT
 extern struct emul emul_aout;
 #endif
@@ -637,9 +634,6 @@ syscall(struct trapframe *frame)
 #ifdef COMPAT_AOUT
 		    && p->p_emul != &emul_aout
 #endif
-#ifdef COMPAT_BSDOS
-		    && p->p_emul != &emul_bsdos
-#endif
 		    )
 			break;
 		copyin(params + _QUAD_LOWWORD * sizeof(int), &code, sizeof(int));
diff --git a/sys/compat/bsdos/Makefile b/sys/compat/bsdos/Makefile
deleted file mode 100644
index b0be30e2d85..00000000000
--- a/sys/compat/bsdos/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#	$OpenBSD: Makefile,v 1.2 2001/08/26 03:23:44 deraadt Exp $
-
-SYS=	../..
-DEP=	syscalls.conf syscalls.master ${SYS}/kern/makesyscalls.sh
-OBJS=	bsdos_sysent.c bsdos_syscalls.c \
-	bsdos_syscall.h bsdos_syscallargs.h
-
-${OBJS}: ${DEP}
-	sh ${SYS}/kern/makesyscalls.sh syscalls.conf syscalls.master
diff --git a/sys/compat/bsdos/bsdos_exec.c b/sys/compat/bsdos/bsdos_exec.c
deleted file mode 100644
index f8011c9044f..00000000000
--- a/sys/compat/bsdos/bsdos_exec.c
+++ /dev/null
@@ -1,152 +0,0 @@
-/*	$OpenBSD: bsdos_exec.c,v 1.5 2009/03/05 19:52:23 kettenis Exp $	*/
-
-/*
- * Copyright (c) 1993, 1994 Christopher G. Demetriou
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 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 Christopher G. Demetriou.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
- */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/proc.h>
-#include <sys/signalvar.h>
-#include <sys/malloc.h>
-#include <sys/vnode.h>
-#include <sys/core.h>
-#include <sys/exec.h>
-#include <sys/resourcevar.h>
-#include <uvm/uvm_extern.h>
-
-#if 0
-#include <machine/bsdos_machdep.h>
-#endif
-
-#include <compat/bsdos/bsdos_exec.h>
-#include <compat/bsdos/bsdos_syscall.h>
-
-extern struct sysent bsdos_sysent[];
-#ifdef SYSCALL_DEBUG
-extern char *bsdos_syscallnames[];
-#endif
-
-extern char sigcode[], esigcode[];
-
-struct emul emul_bsdos = {
-	"bsdos",
-	NULL,
-	sendsig,
-	BSDOS_SYS_syscall,
-	BSDOS_SYS_MAXSYSCALL,
-	bsdos_sysent,
-#ifdef SYSCALL_DEBUG
-	bsdos_syscallnames,
-#else
-	NULL,
-#endif
-	0,
-	copyargs,
-	setregs,
-	NULL,
-	coredump_trad,
-	sigcode,
-	esigcode,
-};
-
-/*
- * exec_aout_makecmds(): Check if it's an a.out-format executable.
- *
- * Given a proc pointer and an exec package pointer, see if the referent
- * of the epp is in a.out format.  First check 'standard' magic numbers for
- * this architecture.  If that fails, try a cpu-dependent hook.
- *
- * This function, in the former case, or the hook, in the latter, is
- * responsible for creating a set of vmcmds which can be used to build
- * the process's vm space and inserting them into the exec package.
- */
-
-int
-exec_bsdos_aout_makecmds(p, epp)
-	struct proc *p;
-	struct exec_package *epp;
-{
-	u_long midmag, magic;
-	u_short mid;
-	int error = ENOEXEC;
-	struct exec *execp = epp->ep_hdr;
-
-	if (epp->ep_hdrvalid < sizeof(struct exec))
-		return ENOEXEC;
-
-	midmag = ntohl(execp->a_midmag);
-	mid = (midmag >> 16) & 0xffff;
-	magic = midmag & 0xffff;
-
-	if (magic == 0) {
-		magic = (execp->a_midmag & 0xffff);
-		mid = MID_BSDOS;
-	}
-
-	midmag = mid << 16 | magic;
-
-	switch (midmag) {
-	case (MID_BSDOS << 16) | ZMAGIC:
-		/*
-		 * 386BSD's ZMAGIC format:
-		 */
-		error = exec_aout_prep_oldzmagic(p, epp);
-		break;
-	case (MID_BSDOS << 16) | QMAGIC:
-		/*
-		 * BSDI's QMAGIC format:
-		 * same as new ZMAGIC format, but with different magic number.
-		 */
-		error = exec_aout_prep_zmagic(p, epp);
-		break;
-	case (MID_BSDOS << 16) | NMAGIC:
-		/*
-		 * BSDI's NMAGIC format:
-		 * same as NMAGIC format, but with different magic number
-		 * and with text starting at 0.
-		 */
-		error = exec_aout_prep_oldnmagic(p, epp);
-		break;
-	case (MID_BSDOS << 16) | OMAGIC:
-		/*
-		 * BSDI's OMAGIC format:
-		 * same as OMAGIC format, but with different magic number
-		 * and with text starting at 0.
-		 */
-		error = exec_aout_prep_oldomagic(p, epp);
-		break;
-	}
-	if (error == 0)
-		epp->ep_emul = &emul_bsdos;
-	else
-		kill_vmcmds(&epp->ep_vmcmds);
-
-	return error;
-}
diff --git a/sys/compat/bsdos/bsdos_exec.h b/sys/compat/bsdos/bsdos_exec.h
deleted file mode 100644
index e685595829d..00000000000
--- a/sys/compat/bsdos/bsdos_exec.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*	$OpenBSD: bsdos_exec.h,v 1.3 2003/06/02 23:27:59 millert Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 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. Neither the name of the University 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 REGENTS 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 REGENTS 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.
- *
- *	from: @(#)exec.h	8.1 (Berkeley) 6/11/93
- */
-
-#ifndef	_BSDOS_EXEC_H
-#define	_BSDOS_EXEC_H
-
-#define MID_BSDOS		MID_ZERO
-
-#define	BSDOS_AOUT_HDR_SIZE	sizeof(struct exec)
-
-int exec_bsdos_aout_makecmds(struct proc *, struct exec_package *);
-
-#endif /* !_BSDOS_EXEC_H */
diff --git a/sys/compat/bsdos/bsdos_ioctl.c b/sys/compat/bsdos/bsdos_ioctl.c
deleted file mode 100644
index 56f18999f07..00000000000
--- a/sys/compat/bsdos/bsdos_ioctl.c
+++ /dev/null
@@ -1,131 +0,0 @@
-/*	$OpenBSD: bsdos_ioctl.c,v 1.4 2003/06/17 21:56:25 millert Exp $	*/
-
-/*
- * Copyright (c) 1999 Todd C. Miller <Todd.Miller@courtesan.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/proc.h>
-#include <sys/mount.h>
-
-#include <sys/syscallargs.h>
-
-#include <compat/bsdos/bsdos_syscallargs.h>
-#include <compat/bsdos/bsdos_ioctl.h>
-
-#include <compat/ossaudio/ossaudio.h>
-#include <compat/ossaudio/ossaudiovar.h>
-
-#include <compat/common/compat_util.h>
-
-static void bsdos_to_oss(struct bsdos_sys_ioctl_args *, struct oss_sys_ioctl_args *);
-
-/*
- * BSD/OS and OSS have different values for IOC_*.  Also,
- * sizeof(bsdos_audio_buf_info) != sizeof(oss_audio_buf_info) which
- * is encoded in OSS_SNDCTL_DSP_GETOSPACE and OSS_SNDCTL_DSP_GETISPACE.
- */
-static void
-bsdos_to_oss(bap, oap)
-	struct bsdos_sys_ioctl_args *bap;
-	struct oss_sys_ioctl_args *oap;
-{
-	u_long bcom, ocom;
-
-	bcom = SCARG(bap, com);
-	ocom = bcom & ~BSDOS_IOC_DIRMASK;
-	switch (bcom & BSDOS_IOC_DIRMASK) {
-	case BSDOS_IOC_VOID:
-		ocom |= OSS_IOC_VOID;
-		break;
-	case BSDOS_IOC_OUT:
-		if (bcom == BSDOS_SNDCTL_DSP_GETOSPACE)
-			ocom = OSS_SNDCTL_DSP_GETOSPACE;
-		else if (bcom == BSDOS_SNDCTL_DSP_GETISPACE)
-			ocom = OSS_SNDCTL_DSP_GETISPACE;
-		else
-			ocom |= OSS_IOC_OUT;
-		break;
-	case BSDOS_IOC_IN:
-		ocom |= OSS_IOC_IN;
-		break;
-	case BSDOS_IOC_INOUT:
-		ocom |= OSS_IOC_INOUT;
-		break;
-	}
-	SCARG(oap, fd) = SCARG(bap, fd);
-	SCARG(oap, com) = ocom;
-	SCARG(oap, data) = SCARG(bap, data);
-}
-
-int
-bsdos_sys_ioctl(p, v, retval)
-	struct proc *p;
-	void *v;
-	register_t *retval;
-{
-	struct bsdos_sys_ioctl_args /* {
-		syscallarg(int) fd;
-		syscallarg(u_long) com;
-		syscallarg(caddr_t) data;
-	} */ *uap = v;
-        struct oss_sys_ioctl_args ap;
-
-	/*
-	 * XXX should support 'T' timer ioctl's
-	 * XXX also /dev/sequencer and /dev/patmgr#
-	 */
-	switch (BSDOS_IOCGROUP(SCARG(uap, com))) {
-	case 'M':
-		bsdos_to_oss(uap, &ap);
-		return (oss_ioctl_mixer(p, &ap, retval));
-	case 'Q':
-		bsdos_to_oss(uap, &ap);
-		return (oss_ioctl_sequencer(p, &ap, retval));
-	case 'P':
-		bsdos_to_oss(uap, &ap);
-		/*
-		 * Special handling since the BSD/OS audio_buf_info
-		 * struct lacks a fragstotal member.
-		 */
-		if (SCARG(uap, com) == BSDOS_SNDCTL_DSP_GETOSPACE ||
-		    SCARG(uap, com) == BSDOS_SNDCTL_DSP_GETISPACE)
-		{
-			struct oss_audio_buf_info oss_buf, *oss_bufp;
-			struct bsdos_audio_buf_info bsdos_buf;
-			caddr_t sg = stackgap_init(p->p_emul);
-			int error;
-
-			oss_bufp = stackgap_alloc(&sg, sizeof(*oss_bufp));
-			SCARG(&ap, data) = (void *) oss_bufp;
-			error = oss_ioctl_audio(p, &ap, retval);
-			if (error)
-				return (error);
-			error = copyin(oss_bufp, &oss_buf, sizeof(oss_buf));
-			if (error)
-				return (error);
-			bsdos_buf.fragments = oss_buf.fragstotal;
-			bsdos_buf.fragsize = oss_buf.fragsize;
-			bsdos_buf.bytes = oss_buf.bytes;
-			error = copyout(&bsdos_buf, SCARG(uap, data),
-			    sizeof(bsdos_buf));
-			if (error)
-				return (error);
-		} else
-			return (oss_ioctl_audio(p, &ap, retval));
-	}
-	return (sys_ioctl(p, uap, retval));
-}
diff --git a/sys/compat/bsdos/bsdos_ioctl.h b/sys/compat/bsdos/bsdos_ioctl.h
deleted file mode 100644
index 6e73420da4f..00000000000
--- a/sys/compat/bsdos/bsdos_ioctl.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*	$OpenBSD: bsdos_ioctl.h,v 1.3 2003/06/17 21:56:25 millert Exp $	*/
-
-/*
- * Copyright (c) 1999 Todd C. Miller <Todd.Miller@courtesan.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef _BSDOS_IOCTL_H
-#define _BSDOS_IOCTL_H
-
-struct bsdos_audio_buf_info {
-	int fragments;
-	int fragsize;
-	int bytes;
-};
-
-#define BSDOS_IOCPARM_MASK	0x1fff
-#define	BSDOS_IOCGROUP(x)	(((x) >> 8) & 0xff)
-
-#define BSDOS_IOC_VOID		(unsigned long)0x20000000
-#define BSDOS_IOC_OUT		(unsigned long)0x40000000
-#define BSDOS_IOC_IN		(unsigned long)0x80000000
-#define BSDOS_IOC_INOUT		(BSDOS_IOC_IN|BSDOS_IOC_OUT)
-#define BSDOS_IOC_DIRMASK	(unsigned long)0xe0000000
-
-#define _BSDOS_IOC(inout,group,num,len) \
-	(inout | ((len & BSDOS_IOCPARM_MASK) << 16) | ((group) << 8) | (num))
-#define _BSDOS_IOR(g,n,t)		_BSDOS_IOC(BSDOS_IOC_OUT, (g), (n), sizeof(t))
-
-#define BSDOS_SNDCTL_DSP_GETOSPACE	_BSDOS_IOR('P', 12, struct bsdos_audio_buf_info)
-#define BSDOS_SNDCTL_DSP_GETISPACE	_BSDOS_IOR('P', 13, struct bsdos_audio_buf_info)
-
-#endif /* _BSDOS_IOCTL_H */
diff --git a/sys/compat/bsdos/bsdos_syscall.h b/sys/compat/bsdos/bsdos_syscall.h
deleted file mode 100644
index f42d51e87f2..00000000000
--- a/sys/compat/bsdos/bsdos_syscall.h
+++ /dev/null
@@ -1,549 +0,0 @@
-/*	$OpenBSD: bsdos_syscall.h,v 1.22 2010/05/23 11:37:29 deraadt Exp $	*/
-
-/*
- * System call numbers.
- *
- * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.19 2010/05/23 11:35:18 deraadt Exp 
- */
-
-/* syscall: "syscall" ret: "int" args: */
-#define	BSDOS_SYS_syscall	0
-
-/* syscall: "exit" ret: "int" args: "int" */
-#define	BSDOS_SYS_exit	1
-
-/* syscall: "fork" ret: "int" args: */
-#define	BSDOS_SYS_fork	2
-
-/* syscall: "read" ret: "int" args: "int" "char *" "u_int" */
-#define	BSDOS_SYS_read	3
-
-/* syscall: "write" ret: "int" args: "int" "char *" "u_int" */
-#define	BSDOS_SYS_write	4
-
-/* syscall: "open" ret: "int" args: "char *" "int" "int" */
-#define	BSDOS_SYS_open	5
-
-/* syscall: "close" ret: "int" args: "int" */
-#define	BSDOS_SYS_close	6
-
-/* syscall: "wait4" ret: "int" args: "int" "int *" "int" "struct rusage *" */
-#define	BSDOS_SYS_wait4	7
-
-/* syscall: "ocreat" ret: "int" args: "char *" "int" */
-#define	BSDOS_SYS_ocreat	8
-
-/* syscall: "link" ret: "int" args: "char *" "char *" */
-#define	BSDOS_SYS_link	9
-
-/* syscall: "unlink" ret: "int" args: "char *" */
-#define	BSDOS_SYS_unlink	10
-
-				/* 11 is obsolete execv */
-/* syscall: "chdir" ret: "int" args: "char *" */
-#define	BSDOS_SYS_chdir	12
-
-/* syscall: "fchdir" ret: "int" args: "int" */
-#define	BSDOS_SYS_fchdir	13
-
-/* syscall: "mknod" ret: "int" args: "char *" "int" "int" */
-#define	BSDOS_SYS_mknod	14
-
-/* syscall: "chmod" ret: "int" args: "char *" "int" */
-#define	BSDOS_SYS_chmod	15
-
-/* syscall: "chown" ret: "int" args: "char *" "int" "int" */
-#define	BSDOS_SYS_chown	16
-
-/* syscall: "break" ret: "int" args: "char *" */
-#define	BSDOS_SYS_break	17
-
-/* syscall: "getfsstat" ret: "int" args: "struct ostatfs *" "long" "int" */
-#define	BSDOS_SYS_getfsstat	18
-
-/* syscall: "olseek" ret: "long" args: "int" "long" "int" */
-#define	BSDOS_SYS_olseek	19
-
-/* syscall: "getpid" ret: "pid_t" args: */
-#define	BSDOS_SYS_getpid	20
-
-/* syscall: "mount" ret: "int" args: "int" "char *" "int" "caddr_t" */
-#define	BSDOS_SYS_mount	21
-
-/* syscall: "unmount" ret: "int" args: "char *" "int" */
-#define	BSDOS_SYS_unmount	22
-
-/* syscall: "setuid" ret: "int" args: "uid_t" */
-#define	BSDOS_SYS_setuid	23
-
-/* syscall: "getuid" ret: "uid_t" args: */
-#define	BSDOS_SYS_getuid	24
-
-/* syscall: "geteuid" ret: "uid_t" args: */
-#define	BSDOS_SYS_geteuid	25
-
-/* syscall: "ptrace" ret: "int" args: "int" "pid_t" "caddr_t" "int" */
-#define	BSDOS_SYS_ptrace	26
-
-/* syscall: "recvmsg" ret: "int" args: "int" "struct msghdr *" "int" */
-#define	BSDOS_SYS_recvmsg	27
-
-/* syscall: "sendmsg" ret: "int" args: "int" "caddr_t" "int" */
-#define	BSDOS_SYS_sendmsg	28
-
-/* syscall: "recvfrom" ret: "int" args: "int" "caddr_t" "size_t" "int" "caddr_t" "int *" */
-#define	BSDOS_SYS_recvfrom	29
-
-/* syscall: "accept" ret: "int" args: "int" "caddr_t" "int *" */
-#define	BSDOS_SYS_accept	30
-
-/* syscall: "getpeername" ret: "int" args: "int" "caddr_t" "int *" */
-#define	BSDOS_SYS_getpeername	31
-
-/* syscall: "getsockname" ret: "int" args: "int" "caddr_t" "int *" */
-#define	BSDOS_SYS_getsockname	32
-
-/* syscall: "access" ret: "int" args: "char *" "int" */
-#define	BSDOS_SYS_access	33
-
-/* syscall: "chflags" ret: "int" args: "char *" "int" */
-#define	BSDOS_SYS_chflags	34
-
-/* syscall: "fchflags" ret: "int" args: "int" "int" */
-#define	BSDOS_SYS_fchflags	35
-
-/* syscall: "sync" ret: "int" args: */
-#define	BSDOS_SYS_sync	36
-
-/* syscall: "kill" ret: "int" args: "int" "int" */
-#define	BSDOS_SYS_kill	37
-
-/* syscall: "stat43" ret: "int" args: "char *" "struct stat43 *" */
-#define	BSDOS_SYS_stat43	38
-
-/* syscall: "getppid" ret: "pid_t" args: */
-#define	BSDOS_SYS_getppid	39
-
-/* syscall: "lstat43" ret: "int" args: "char *" "struct stat43 *" */
-#define	BSDOS_SYS_lstat43	40
-
-/* syscall: "dup" ret: "int" args: "u_int" */
-#define	BSDOS_SYS_dup	41
-
-/* syscall: "opipe" ret: "int" args: */
-#define	BSDOS_SYS_opipe	42
-
-/* syscall: "getegid" ret: "gid_t" args: */
-#define	BSDOS_SYS_getegid	43
-
-/* syscall: "profil" ret: "int" args: "caddr_t" "u_int" "u_int" "u_int" */
-#define	BSDOS_SYS_profil	44
-
-/* syscall: "ktrace" ret: "int" args: "char *" "int" "int" "int" */
-#define	BSDOS_SYS_ktrace	45
-
-/* syscall: "sigaction" ret: "int" args: "int" "struct sigaction *" "struct sigaction *" */
-#define	BSDOS_SYS_sigaction	46
-
-/* syscall: "getgid" ret: "gid_t" args: */
-#define	BSDOS_SYS_getgid	47
-
-/* syscall: "sigprocmask" ret: "int" args: "int" "sigset_t" */
-#define	BSDOS_SYS_sigprocmask	48
-
-/* syscall: "getlogin" ret: "int" args: "char *" "u_int" */
-#define	BSDOS_SYS_getlogin	49
-
-/* syscall: "setlogin" ret: "int" args: "char *" */
-#define	BSDOS_SYS_setlogin	50
-
-/* syscall: "acct" ret: "int" args: "char *" */
-#define	BSDOS_SYS_acct	51
-
-/* syscall: "sigpending" ret: "int" args: */
-#define	BSDOS_SYS_sigpending	52
-
-/* syscall: "osigaltstack" ret: "int" args: "struct osigaltstack *" "struct osigaltstack *" */
-#define	BSDOS_SYS_osigaltstack	53
-
-/* syscall: "ioctl" ret: "int" args: "int" "u_long" "caddr_t" */
-#define	BSDOS_SYS_ioctl	54
-
-/* syscall: "reboot" ret: "int" args: "int" */
-#define	BSDOS_SYS_reboot	55
-
-/* syscall: "revoke" ret: "int" args: "char *" */
-#define	BSDOS_SYS_revoke	56
-
-/* syscall: "symlink" ret: "int" args: "char *" "char *" */
-#define	BSDOS_SYS_symlink	57
-
-/* syscall: "readlink" ret: "int" args: "char *" "char *" "int" */
-#define	BSDOS_SYS_readlink	58
-
-/* syscall: "execve" ret: "int" args: "char *" "char **" "char **" */
-#define	BSDOS_SYS_execve	59
-
-/* syscall: "umask" ret: "int" args: "int" */
-#define	BSDOS_SYS_umask	60
-
-/* syscall: "chroot" ret: "int" args: "char *" */
-#define	BSDOS_SYS_chroot	61
-
-/* syscall: "fstat43" ret: "int" args: "int" "struct stat43 *" */
-#define	BSDOS_SYS_fstat43	62
-
-/* syscall: "ogetkerninfo" ret: "int" args: "int" "char *" "int *" "int" */
-#define	BSDOS_SYS_ogetkerninfo	63
-
-/* syscall: "ogetpagesize" ret: "int" args: */
-#define	BSDOS_SYS_ogetpagesize	64
-
-/* syscall: "msync" ret: "int" args: "void *" "size_t" "int" */
-#define	BSDOS_SYS_msync	65
-
-/* syscall: "vfork" ret: "int" args: */
-#define	BSDOS_SYS_vfork	66
-
-				/* 67 is obsolete vread */
-				/* 68 is obsolete vwrite */
-/* syscall: "sbrk" ret: "int" args: "int" */
-#define	BSDOS_SYS_sbrk	69
-
-/* syscall: "sstk" ret: "int" args: "int" */
-#define	BSDOS_SYS_sstk	70
-
-/* syscall: "ommap" ret: "int" args: "caddr_t" "size_t" "int" "int" "int" "long" */
-#define	BSDOS_SYS_ommap	71
-
-				/* 72 is obsolete vadvise */
-/* syscall: "munmap" ret: "int" args: "caddr_t" "size_t" */
-#define	BSDOS_SYS_munmap	73
-
-/* syscall: "mprotect" ret: "int" args: "caddr_t" "size_t" "int" */
-#define	BSDOS_SYS_mprotect	74
-
-/* syscall: "madvise" ret: "int" args: "caddr_t" "size_t" "int" */
-#define	BSDOS_SYS_madvise	75
-
-				/* 76 is obsolete vhangup */
-				/* 77 is obsolete vlimit */
-/* syscall: "mincore" ret: "int" args: "caddr_t" "size_t" "char *" */
-#define	BSDOS_SYS_mincore	78
-
-/* syscall: "getgroups" ret: "int" args: "u_int" "gid_t *" */
-#define	BSDOS_SYS_getgroups	79
-
-/* syscall: "setgroups" ret: "int" args: "u_int" "gid_t *" */
-#define	BSDOS_SYS_setgroups	80
-
-/* syscall: "getpgrp" ret: "int" args: */
-#define	BSDOS_SYS_getpgrp	81
-
-/* syscall: "setpgid" ret: "int" args: "int" "int" */
-#define	BSDOS_SYS_setpgid	82
-
-/* syscall: "setitimer" ret: "int" args: "u_int" "struct itimerval *" "struct itimerval *" */
-#define	BSDOS_SYS_setitimer	83
-
-/* syscall: "owait" ret: "int" args: */
-#define	BSDOS_SYS_owait	84
-
-/* syscall: "swapon" ret: "int" args: "char *" */
-#define	BSDOS_SYS_swapon	85
-
-/* syscall: "getitimer" ret: "int" args: "u_int" "struct itimerval *" */
-#define	BSDOS_SYS_getitimer	86
-
-/* syscall: "ogethostname" ret: "int" args: "char *" "u_int" */
-#define	BSDOS_SYS_ogethostname	87
-
-/* syscall: "osethostname" ret: "int" args: "char *" "u_int" */
-#define	BSDOS_SYS_osethostname	88
-
-/* syscall: "ogetdtablesize" ret: "int" args: */
-#define	BSDOS_SYS_ogetdtablesize	89
-
-/* syscall: "dup2" ret: "int" args: "u_int" "u_int" */
-#define	BSDOS_SYS_dup2	90
-
-/* syscall: "fcntl" ret: "int" args: "int" "int" "void *" */
-#define	BSDOS_SYS_fcntl	92
-
-/* syscall: "select" ret: "int" args: "u_int" "fd_set *" "fd_set *" "fd_set *" "struct timeval *" */
-#define	BSDOS_SYS_select	93
-
-/* syscall: "fsync" ret: "int" args: "int" */
-#define	BSDOS_SYS_fsync	95
-
-/* syscall: "setpriority" ret: "int" args: "int" "int" "int" */
-#define	BSDOS_SYS_setpriority	96
-
-/* syscall: "socket" ret: "int" args: "int" "int" "int" */
-#define	BSDOS_SYS_socket	97
-
-/* syscall: "connect" ret: "int" args: "int" "caddr_t" "int" */
-#define	BSDOS_SYS_connect	98
-
-/* syscall: "oaccept" ret: "int" args: "int" "caddr_t" "int *" */
-#define	BSDOS_SYS_oaccept	99
-
-/* syscall: "getpriority" ret: "int" args: "int" "int" */
-#define	BSDOS_SYS_getpriority	100
-
-/* syscall: "osend" ret: "int" args: "int" "caddr_t" "int" "int" */
-#define	BSDOS_SYS_osend	101
-
-/* syscall: "orecv" ret: "int" args: "int" "caddr_t" "int" "int" */
-#define	BSDOS_SYS_orecv	102
-
-/* syscall: "sigreturn" ret: "int" args: "struct sigcontext *" */
-#define	BSDOS_SYS_sigreturn	103
-
-/* syscall: "bind" ret: "int" args: "int" "caddr_t" "int" */
-#define	BSDOS_SYS_bind	104
-
-/* syscall: "setsockopt" ret: "int" args: "int" "int" "int" "caddr_t" "int" */
-#define	BSDOS_SYS_setsockopt	105
-
-/* syscall: "listen" ret: "int" args: "int" "int" */
-#define	BSDOS_SYS_listen	106
-
-				/* 107 is obsolete vtimes */
-/* syscall: "osigvec" ret: "int" args: "int" "struct sigvec *" "struct sigvec *" */
-#define	BSDOS_SYS_osigvec	108
-
-/* syscall: "osigblock" ret: "int" args: "int" */
-#define	BSDOS_SYS_osigblock	109
-
-/* syscall: "osigsetmask" ret: "int" args: "int" */
-#define	BSDOS_SYS_osigsetmask	110
-
-/* syscall: "sigsuspend" ret: "int" args: "int" */
-#define	BSDOS_SYS_sigsuspend	111
-
-/* syscall: "osigstack" ret: "int" args: "struct sigstack *" "struct sigstack *" */
-#define	BSDOS_SYS_osigstack	112
-
-/* syscall: "orecvmsg" ret: "int" args: "int" "struct omsghdr *" "int" */
-#define	BSDOS_SYS_orecvmsg	113
-
-/* syscall: "osendmsg" ret: "int" args: "int" "caddr_t" "int" */
-#define	BSDOS_SYS_osendmsg	114
-
-/* syscall: "vtrace" ret: "int" args: "int" "int" */
-#define	BSDOS_SYS_vtrace	115
-
-				/* 115 is obsolete vtrace */
-/* syscall: "gettimeofday" ret: "int" args: "struct timeval *" "struct timezone *" */
-#define	BSDOS_SYS_gettimeofday	116
-
-/* syscall: "getrusage" ret: "int" args: "int" "struct rusage *" */
-#define	BSDOS_SYS_getrusage	117
-
-/* syscall: "getsockopt" ret: "int" args: "int" "int" "int" "caddr_t" "int *" */
-#define	BSDOS_SYS_getsockopt	118
-
-				/* 119 is obsolete resuba */
-/* syscall: "readv" ret: "int" args: "int" "struct iovec *" "u_int" */
-#define	BSDOS_SYS_readv	120
-
-/* syscall: "writev" ret: "int" args: "int" "struct iovec *" "u_int" */
-#define	BSDOS_SYS_writev	121
-
-/* syscall: "settimeofday" ret: "int" args: "struct timeval *" "struct timezone *" */
-#define	BSDOS_SYS_settimeofday	122
-
-/* syscall: "fchown" ret: "int" args: "int" "int" "int" */
-#define	BSDOS_SYS_fchown	123
-
-/* syscall: "fchmod" ret: "int" args: "int" "int" */
-#define	BSDOS_SYS_fchmod	124
-
-/* syscall: "orecvfrom" ret: "int" args: "int" "caddr_t" "size_t" "int" "caddr_t" "int *" */
-#define	BSDOS_SYS_orecvfrom	125
-
-/* syscall: "setreuid" ret: "int" args: "uid_t" "uid_t" */
-#define	BSDOS_SYS_setreuid	126
-
-/* syscall: "setregid" ret: "int" args: "gid_t" "gid_t" */
-#define	BSDOS_SYS_setregid	127
-
-/* syscall: "rename" ret: "int" args: "char *" "char *" */
-#define	BSDOS_SYS_rename	128
-
-/* syscall: "otruncate" ret: "int" args: "char *" "long" */
-#define	BSDOS_SYS_otruncate	129
-
-/* syscall: "oftruncate" ret: "int" args: "int" "long" */
-#define	BSDOS_SYS_oftruncate	130
-
-/* syscall: "flock" ret: "int" args: "int" "int" */
-#define	BSDOS_SYS_flock	131
-
-/* syscall: "mkfifo" ret: "int" args: "char *" "int" */
-#define	BSDOS_SYS_mkfifo	132
-
-/* syscall: "sendto" ret: "int" args: "int" "caddr_t" "size_t" "int" "caddr_t" "int" */
-#define	BSDOS_SYS_sendto	133
-
-/* syscall: "shutdown" ret: "int" args: "int" "int" */
-#define	BSDOS_SYS_shutdown	134
-
-/* syscall: "socketpair" ret: "int" args: "int" "int" "int" "int *" */
-#define	BSDOS_SYS_socketpair	135
-
-/* syscall: "mkdir" ret: "int" args: "char *" "int" */
-#define	BSDOS_SYS_mkdir	136
-
-/* syscall: "rmdir" ret: "int" args: "char *" */
-#define	BSDOS_SYS_rmdir	137
-
-/* syscall: "utimes" ret: "int" args: "char *" "struct timeval *" */
-#define	BSDOS_SYS_utimes	138
-
-				/* 139 is obsolete 4.2 sigreturn */
-/* syscall: "adjtime" ret: "int" args: "struct timeval *" "struct timeval *" */
-#define	BSDOS_SYS_adjtime	140
-
-/* syscall: "ogetpeername" ret: "int" args: "int" "caddr_t" "int *" */
-#define	BSDOS_SYS_ogetpeername	141
-
-/* syscall: "ogethostid" ret: "int32_t" args: */
-#define	BSDOS_SYS_ogethostid	142
-
-/* syscall: "osethostid" ret: "int" args: "int32_t" */
-#define	BSDOS_SYS_osethostid	143
-
-/* syscall: "ogetrlimit" ret: "int" args: "u_int" "struct ogetrlimit *" */
-#define	BSDOS_SYS_ogetrlimit	144
-
-/* syscall: "osetrlimit" ret: "int" args: "u_int" "struct ogetrlimit *" */
-#define	BSDOS_SYS_osetrlimit	145
-
-/* syscall: "okillpg" ret: "int" args: "int" "int" */
-#define	BSDOS_SYS_okillpg	146
-
-/* syscall: "setsid" ret: "int" args: */
-#define	BSDOS_SYS_setsid	147
-
-/* syscall: "quotactl" ret: "int" args: "char *" "int" "int" "caddr_t" */
-#define	BSDOS_SYS_quotactl	148
-
-/* syscall: "oquota" ret: "int" args: */
-#define	BSDOS_SYS_oquota	149
-
-/* syscall: "ogetsockname" ret: "int" args: "int" "caddr_t" "int *" */
-#define	BSDOS_SYS_ogetsockname	150
-
-/* syscall: "nfssvc" ret: "int" args: "int" "caddr_t" */
-#define	BSDOS_SYS_nfssvc	155
-
-/* syscall: "ogetdirentries" ret: "int" args: "int" "char *" "u_int" "long *" */
-#define	BSDOS_SYS_ogetdirentries	156
-
-/* syscall: "statfs" ret: "int" args: "char *" "struct ostatfs *" */
-#define	BSDOS_SYS_statfs	157
-
-/* syscall: "fstatfs" ret: "int" args: "int" "struct ostatfs *" */
-#define	BSDOS_SYS_fstatfs	158
-
-/* syscall: "getfh" ret: "int" args: "char *" "fhandle_t *" */
-#define	BSDOS_SYS_getfh	161
-
-/* syscall: "shmsys" ret: "int" args: "int" "int" "int" "int" */
-#define	BSDOS_SYS_shmsys	171
-
-/* syscall: "setgid" ret: "int" args: "gid_t" */
-#define	BSDOS_SYS_setgid	181
-
-/* syscall: "setegid" ret: "int" args: "gid_t" */
-#define	BSDOS_SYS_setegid	182
-
-/* syscall: "seteuid" ret: "int" args: "uid_t" */
-#define	BSDOS_SYS_seteuid	183
-
-/* syscall: "stat35" ret: "int" args: "char *" "struct stat35 *" */
-#define	BSDOS_SYS_stat35	188
-
-/* syscall: "fstat35" ret: "int" args: "int" "struct stat35 *" */
-#define	BSDOS_SYS_fstat35	189
-
-/* syscall: "lstat35" ret: "int" args: "char *" "struct stat35 *" */
-#define	BSDOS_SYS_lstat35	190
-
-/* syscall: "pathconf" ret: "int" args: "char *" "int" */
-#define	BSDOS_SYS_pathconf	191
-
-/* syscall: "fpathconf" ret: "int" args: "int" "int" */
-#define	BSDOS_SYS_fpathconf	192
-
-/* syscall: "getrlimit" ret: "int" args: "u_int" "struct rlimit *" */
-#define	BSDOS_SYS_getrlimit	194
-
-/* syscall: "setrlimit" ret: "int" args: "u_int" "struct rlimit *" */
-#define	BSDOS_SYS_setrlimit	195
-
-/* syscall: "getdirentries" ret: "int" args: "int" "char *" "u_int" "long *" */
-#define	BSDOS_SYS_getdirentries	196
-
-/* syscall: "mmap" ret: "caddr_t" args: "caddr_t" "size_t" "int" "int" "int" "long" "off_t" */
-#define	BSDOS_SYS_mmap	197
-
-/* syscall: "__syscall" ret: "int" args: */
-#define	BSDOS_SYS___syscall	198
-
-/* syscall: "lseek" ret: "off_t" args: "int" "int" "off_t" "int" */
-#define	BSDOS_SYS_lseek	199
-
-/* syscall: "truncate" ret: "int" args: "char *" "int" "off_t" */
-#define	BSDOS_SYS_truncate	200
-
-/* syscall: "ftruncate" ret: "int" args: "int" "int" "off_t" */
-#define	BSDOS_SYS_ftruncate	201
-
-/* syscall: "__sysctl" ret: "int" args: "int *" "u_int" "void *" "size_t *" "void *" "size_t" */
-#define	BSDOS_SYS___sysctl	202
-
-/* syscall: "mlock" ret: "int" args: "caddr_t" "size_t" */
-#define	BSDOS_SYS_mlock	203
-
-/* syscall: "munlock" ret: "int" args: "caddr_t" "size_t" */
-#define	BSDOS_SYS_munlock	204
-
-/* syscall: "__semctl" ret: "int" args: "int" "int" "int" "union semun *" */
-#define	BSDOS_SYS___semctl	220
-
-/* syscall: "semget" ret: "int" args: "key_t" "int" "int" */
-#define	BSDOS_SYS_semget	221
-
-/* syscall: "semop" ret: "int" args: "int" "struct sembuf *" "u_int" */
-#define	BSDOS_SYS_semop	222
-
-				/* 223 is obsolete sys_semconfig */
-/* syscall: "msgctl" ret: "int" args: "int" "int" "struct msqid_ds *" */
-#define	BSDOS_SYS_msgctl	224
-
-/* syscall: "msgget" ret: "int" args: "key_t" "int" */
-#define	BSDOS_SYS_msgget	225
-
-/* syscall: "msgsnd" ret: "int" args: "int" "void *" "size_t" "int" */
-#define	BSDOS_SYS_msgsnd	226
-
-/* syscall: "msgrcv" ret: "int" args: "int" "void *" "size_t" "long" "int" */
-#define	BSDOS_SYS_msgrcv	227
-
-/* syscall: "shmat" ret: "int" args: "int" "void *" "int" */
-#define	BSDOS_SYS_shmat	228
-
-/* syscall: "shmctl" ret: "int" args: "int" "int" "struct shmid_ds *" */
-#define	BSDOS_SYS_shmctl	229
-
-/* syscall: "shmdt" ret: "int" args: "void *" */
-#define	BSDOS_SYS_shmdt	230
-
-/* syscall: "shmget" ret: "int" args: "key_t" "int" "int" */
-#define	BSDOS_SYS_shmget	231
-
-#define	BSDOS_SYS_MAXSYSCALL	232
diff --git a/sys/compat/bsdos/bsdos_syscallargs.h b/sys/compat/bsdos/bsdos_syscallargs.h
deleted file mode 100644
index 3b30d6406ee..00000000000
--- a/sys/compat/bsdos/bsdos_syscallargs.h
+++ /dev/null
@@ -1,241 +0,0 @@
-/*	$OpenBSD: bsdos_syscallargs.h,v 1.23 2010/05/23 11:37:29 deraadt Exp $	*/
-
-/*
- * System call argument lists.
- *
- * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.19 2010/05/23 11:35:18 deraadt Exp 
- */
-
-#ifdef	syscallarg
-#undef	syscallarg
-#endif
-
-#define	syscallarg(x)							\
-	union {								\
-		register_t pad;						\
-		struct { x datum; } le;					\
-		struct {						\
-			int8_t pad[ (sizeof (register_t) < sizeof (x))	\
-				? 0					\
-				: sizeof (register_t) - sizeof (x)];	\
-			x datum;					\
-		} be;							\
-	}
-
-struct bsdos_sys_ioctl_args {
-	syscallarg(int) fd;
-	syscallarg(u_long) com;
-	syscallarg(caddr_t) data;
-};
-
-/*
- * System call prototypes.
- */
-
-int	sys_nosys(struct proc *, void *, register_t *);
-int	sys_exit(struct proc *, void *, register_t *);
-int	sys_fork(struct proc *, void *, register_t *);
-int	sys_read(struct proc *, void *, register_t *);
-int	sys_write(struct proc *, void *, register_t *);
-int	sys_open(struct proc *, void *, register_t *);
-int	sys_close(struct proc *, void *, register_t *);
-int	sys_wait4(struct proc *, void *, register_t *);
-int	compat_43_sys_creat(struct proc *, void *, register_t *);
-int	sys_link(struct proc *, void *, register_t *);
-int	sys_unlink(struct proc *, void *, register_t *);
-int	sys_chdir(struct proc *, void *, register_t *);
-int	sys_fchdir(struct proc *, void *, register_t *);
-int	sys_mknod(struct proc *, void *, register_t *);
-int	sys_chmod(struct proc *, void *, register_t *);
-int	sys_chown(struct proc *, void *, register_t *);
-int	sys_obreak(struct proc *, void *, register_t *);
-int	compat_25_sys_getfsstat(struct proc *, void *, register_t *);
-int	compat_43_sys_lseek(struct proc *, void *, register_t *);
-int	sys_getpid(struct proc *, void *, register_t *);
-int	sys_mount(struct proc *, void *, register_t *);
-int	sys_unmount(struct proc *, void *, register_t *);
-int	sys_setuid(struct proc *, void *, register_t *);
-int	sys_getuid(struct proc *, void *, register_t *);
-int	sys_geteuid(struct proc *, void *, register_t *);
-#ifdef PTRACE
-int	sys_ptrace(struct proc *, void *, register_t *);
-#else
-#endif
-int	sys_recvmsg(struct proc *, void *, register_t *);
-int	sys_sendmsg(struct proc *, void *, register_t *);
-int	sys_recvfrom(struct proc *, void *, register_t *);
-int	sys_accept(struct proc *, void *, register_t *);
-int	sys_getpeername(struct proc *, void *, register_t *);
-int	sys_getsockname(struct proc *, void *, register_t *);
-int	sys_access(struct proc *, void *, register_t *);
-int	sys_chflags(struct proc *, void *, register_t *);
-int	sys_fchflags(struct proc *, void *, register_t *);
-int	sys_sync(struct proc *, void *, register_t *);
-int	sys_kill(struct proc *, void *, register_t *);
-int	compat_43_sys_stat(struct proc *, void *, register_t *);
-int	sys_getppid(struct proc *, void *, register_t *);
-int	compat_43_sys_lstat(struct proc *, void *, register_t *);
-int	sys_dup(struct proc *, void *, register_t *);
-int	sys_opipe(struct proc *, void *, register_t *);
-int	sys_getegid(struct proc *, void *, register_t *);
-int	sys_profil(struct proc *, void *, register_t *);
-#ifdef KTRACE
-int	sys_ktrace(struct proc *, void *, register_t *);
-#else
-#endif
-int	sys_sigaction(struct proc *, void *, register_t *);
-int	sys_getgid(struct proc *, void *, register_t *);
-int	sys_sigprocmask(struct proc *, void *, register_t *);
-int	sys_getlogin(struct proc *, void *, register_t *);
-int	sys_setlogin(struct proc *, void *, register_t *);
-#ifdef ACCOUNTING
-int	sys_acct(struct proc *, void *, register_t *);
-#else
-#endif
-int	sys_sigpending(struct proc *, void *, register_t *);
-int	sys_osigaltstack(struct proc *, void *, register_t *);
-int	bsdos_sys_ioctl(struct proc *, void *, register_t *);
-int	sys_reboot(struct proc *, void *, register_t *);
-int	sys_revoke(struct proc *, void *, register_t *);
-int	sys_symlink(struct proc *, void *, register_t *);
-int	sys_readlink(struct proc *, void *, register_t *);
-int	sys_execve(struct proc *, void *, register_t *);
-int	sys_umask(struct proc *, void *, register_t *);
-int	sys_chroot(struct proc *, void *, register_t *);
-int	compat_43_sys_fstat(struct proc *, void *, register_t *);
-int	compat_43_sys_getkerninfo(struct proc *, void *, register_t *);
-int	compat_43_sys_getpagesize(struct proc *, void *, register_t *);
-int	sys_msync(struct proc *, void *, register_t *);
-int	sys_vfork(struct proc *, void *, register_t *);
-int	sys_sbrk(struct proc *, void *, register_t *);
-int	sys_sstk(struct proc *, void *, register_t *);
-int	compat_43_sys_mmap(struct proc *, void *, register_t *);
-int	sys_munmap(struct proc *, void *, register_t *);
-int	sys_mprotect(struct proc *, void *, register_t *);
-int	sys_madvise(struct proc *, void *, register_t *);
-int	sys_mincore(struct proc *, void *, register_t *);
-int	sys_getgroups(struct proc *, void *, register_t *);
-int	sys_setgroups(struct proc *, void *, register_t *);
-int	sys_getpgrp(struct proc *, void *, register_t *);
-int	sys_setpgid(struct proc *, void *, register_t *);
-int	sys_setitimer(struct proc *, void *, register_t *);
-int	compat_43_sys_wait(struct proc *, void *, register_t *);
-int	compat_25_sys_swapon(struct proc *, void *, register_t *);
-int	sys_getitimer(struct proc *, void *, register_t *);
-int	compat_43_sys_gethostname(struct proc *, void *, register_t *);
-int	compat_43_sys_sethostname(struct proc *, void *, register_t *);
-int	compat_43_sys_getdtablesize(struct proc *, void *, register_t *);
-int	sys_dup2(struct proc *, void *, register_t *);
-int	sys_fcntl(struct proc *, void *, register_t *);
-int	sys_select(struct proc *, void *, register_t *);
-int	sys_fsync(struct proc *, void *, register_t *);
-int	sys_setpriority(struct proc *, void *, register_t *);
-int	sys_socket(struct proc *, void *, register_t *);
-int	sys_connect(struct proc *, void *, register_t *);
-int	compat_43_sys_accept(struct proc *, void *, register_t *);
-int	sys_getpriority(struct proc *, void *, register_t *);
-int	compat_43_sys_send(struct proc *, void *, register_t *);
-int	compat_43_sys_recv(struct proc *, void *, register_t *);
-int	sys_sigreturn(struct proc *, void *, register_t *);
-int	sys_bind(struct proc *, void *, register_t *);
-int	sys_setsockopt(struct proc *, void *, register_t *);
-int	sys_listen(struct proc *, void *, register_t *);
-int	compat_43_sys_sigvec(struct proc *, void *, register_t *);
-int	compat_43_sys_sigblock(struct proc *, void *, register_t *);
-int	compat_43_sys_sigsetmask(struct proc *, void *, register_t *);
-int	sys_sigsuspend(struct proc *, void *, register_t *);
-int	compat_43_sys_sigstack(struct proc *, void *, register_t *);
-int	compat_43_sys_recvmsg(struct proc *, void *, register_t *);
-int	compat_43_sys_sendmsg(struct proc *, void *, register_t *);
-#ifdef TRACE
-int	sys_vtrace(struct proc *, void *, register_t *);
-#else
-#endif
-int	sys_gettimeofday(struct proc *, void *, register_t *);
-int	sys_getrusage(struct proc *, void *, register_t *);
-int	sys_getsockopt(struct proc *, void *, register_t *);
-int	sys_readv(struct proc *, void *, register_t *);
-int	sys_writev(struct proc *, void *, register_t *);
-int	sys_settimeofday(struct proc *, void *, register_t *);
-int	sys_fchown(struct proc *, void *, register_t *);
-int	sys_fchmod(struct proc *, void *, register_t *);
-int	compat_43_sys_recvfrom(struct proc *, void *, register_t *);
-int	sys_setreuid(struct proc *, void *, register_t *);
-int	sys_setregid(struct proc *, void *, register_t *);
-int	sys_rename(struct proc *, void *, register_t *);
-int	compat_43_sys_truncate(struct proc *, void *, register_t *);
-int	compat_43_sys_ftruncate(struct proc *, void *, register_t *);
-int	sys_flock(struct proc *, void *, register_t *);
-int	sys_mkfifo(struct proc *, void *, register_t *);
-int	sys_sendto(struct proc *, void *, register_t *);
-int	sys_shutdown(struct proc *, void *, register_t *);
-int	sys_socketpair(struct proc *, void *, register_t *);
-int	sys_mkdir(struct proc *, void *, register_t *);
-int	sys_rmdir(struct proc *, void *, register_t *);
-int	sys_utimes(struct proc *, void *, register_t *);
-int	sys_adjtime(struct proc *, void *, register_t *);
-int	compat_43_sys_getpeername(struct proc *, void *, register_t *);
-int	compat_43_sys_gethostid(struct proc *, void *, register_t *);
-int	compat_43_sys_sethostid(struct proc *, void *, register_t *);
-int	compat_43_sys_getrlimit(struct proc *, void *, register_t *);
-int	compat_43_sys_setrlimit(struct proc *, void *, register_t *);
-int	compat_43_sys_killpg(struct proc *, void *, register_t *);
-int	sys_setsid(struct proc *, void *, register_t *);
-int	sys_quotactl(struct proc *, void *, register_t *);
-int	compat_43_sys_quota(struct proc *, void *, register_t *);
-int	compat_43_sys_getsockname(struct proc *, void *, register_t *);
-#if defined(NFSCLIENT) || defined(NFSSERVER)
-int	sys_nfssvc(struct proc *, void *, register_t *);
-#else
-#endif
-int	compat_43_sys_getdirentries(struct proc *, void *, register_t *);
-int	compat_25_sys_statfs(struct proc *, void *, register_t *);
-int	compat_25_sys_fstatfs(struct proc *, void *, register_t *);
-#ifdef NFSCLIENT
-int	sys_getfh(struct proc *, void *, register_t *);
-#else
-#endif
-#if defined(SYSVSHM) && !defined(__alpha__)
-int	compat_10_sys_shmsys(struct proc *, void *, register_t *);
-#else
-#endif
-int	sys_setgid(struct proc *, void *, register_t *);
-int	sys_setegid(struct proc *, void *, register_t *);
-int	sys_seteuid(struct proc *, void *, register_t *);
-int	compat_35_sys_stat(struct proc *, void *, register_t *);
-int	compat_35_sys_fstat(struct proc *, void *, register_t *);
-int	compat_35_sys_lstat(struct proc *, void *, register_t *);
-int	sys_pathconf(struct proc *, void *, register_t *);
-int	sys_fpathconf(struct proc *, void *, register_t *);
-int	sys_getrlimit(struct proc *, void *, register_t *);
-int	sys_setrlimit(struct proc *, void *, register_t *);
-int	sys_getdirentries(struct proc *, void *, register_t *);
-int	sys_mmap(struct proc *, void *, register_t *);
-int	sys_nosys(struct proc *, void *, register_t *);
-int	sys_lseek(struct proc *, void *, register_t *);
-int	sys_truncate(struct proc *, void *, register_t *);
-int	sys_ftruncate(struct proc *, void *, register_t *);
-int	sys___sysctl(struct proc *, void *, register_t *);
-int	sys_mlock(struct proc *, void *, register_t *);
-int	sys_munlock(struct proc *, void *, register_t *);
-#ifdef SYSVSEM
-int	sys___semctl(struct proc *, void *, register_t *);
-int	sys_semget(struct proc *, void *, register_t *);
-int	sys_semop(struct proc *, void *, register_t *);
-#else
-#endif
-#ifdef SYSVMSG
-int	sys_msgctl(struct proc *, void *, register_t *);
-int	sys_msgget(struct proc *, void *, register_t *);
-int	sys_msgsnd(struct proc *, void *, register_t *);
-int	sys_msgrcv(struct proc *, void *, register_t *);
-#else
-#endif
-#ifdef SYSVSHM
-int	sys_shmat(struct proc *, void *, register_t *);
-int	sys_shmctl(struct proc *, void *, register_t *);
-int	sys_shmdt(struct proc *, void *, register_t *);
-int	sys_shmget(struct proc *, void *, register_t *);
-#else
-#endif
diff --git a/sys/compat/bsdos/bsdos_syscalls.c b/sys/compat/bsdos/bsdos_syscalls.c
deleted file mode 100644
index fcdb5a56cdd..00000000000
--- a/sys/compat/bsdos/bsdos_syscalls.c
+++ /dev/null
@@ -1,292 +0,0 @@
-/*	$OpenBSD: bsdos_syscalls.c,v 1.22 2010/05/23 11:37:29 deraadt Exp $	*/
-
-/*
- * System call names.
- *
- * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.19 2010/05/23 11:35:18 deraadt Exp 
- */
-
-char *bsdos_syscallnames[] = {
-	"syscall",			/* 0 = syscall */
-	"exit",			/* 1 = exit */
-	"fork",			/* 2 = fork */
-	"read",			/* 3 = read */
-	"write",			/* 4 = write */
-	"open",			/* 5 = open */
-	"close",			/* 6 = close */
-	"wait4",			/* 7 = wait4 */
-	"ocreat",			/* 8 = ocreat */
-	"link",			/* 9 = link */
-	"unlink",			/* 10 = unlink */
-	"#11 (obsolete execv)",		/* 11 = obsolete execv */
-	"chdir",			/* 12 = chdir */
-	"fchdir",			/* 13 = fchdir */
-	"mknod",			/* 14 = mknod */
-	"chmod",			/* 15 = chmod */
-	"chown",			/* 16 = chown */
-	"break",			/* 17 = break */
-	"getfsstat",			/* 18 = getfsstat */
-	"olseek",			/* 19 = olseek */
-	"getpid",			/* 20 = getpid */
-	"mount",			/* 21 = mount */
-	"unmount",			/* 22 = unmount */
-	"setuid",			/* 23 = setuid */
-	"getuid",			/* 24 = getuid */
-	"geteuid",			/* 25 = geteuid */
-#ifdef PTRACE
-	"ptrace",			/* 26 = ptrace */
-#else
-	"#26 (unimplemented ptrace)",		/* 26 = unimplemented ptrace */
-#endif
-	"recvmsg",			/* 27 = recvmsg */
-	"sendmsg",			/* 28 = sendmsg */
-	"recvfrom",			/* 29 = recvfrom */
-	"accept",			/* 30 = accept */
-	"getpeername",			/* 31 = getpeername */
-	"getsockname",			/* 32 = getsockname */
-	"access",			/* 33 = access */
-	"chflags",			/* 34 = chflags */
-	"fchflags",			/* 35 = fchflags */
-	"sync",			/* 36 = sync */
-	"kill",			/* 37 = kill */
-	"stat43",			/* 38 = stat43 */
-	"getppid",			/* 39 = getppid */
-	"lstat43",			/* 40 = lstat43 */
-	"dup",			/* 41 = dup */
-	"opipe",			/* 42 = opipe */
-	"getegid",			/* 43 = getegid */
-	"profil",			/* 44 = profil */
-#ifdef KTRACE
-	"ktrace",			/* 45 = ktrace */
-#else
-	"#45 (unimplemented ktrace)",		/* 45 = unimplemented ktrace */
-#endif
-	"sigaction",			/* 46 = sigaction */
-	"getgid",			/* 47 = getgid */
-	"sigprocmask",			/* 48 = sigprocmask */
-	"getlogin",			/* 49 = getlogin */
-	"setlogin",			/* 50 = setlogin */
-#ifdef ACCOUNTING
-	"acct",			/* 51 = acct */
-#else
-	"#51 (unimplemented acct)",		/* 51 = unimplemented acct */
-#endif
-	"sigpending",			/* 52 = sigpending */
-	"osigaltstack",			/* 53 = osigaltstack */
-	"ioctl",			/* 54 = ioctl */
-	"reboot",			/* 55 = reboot */
-	"revoke",			/* 56 = revoke */
-	"symlink",			/* 57 = symlink */
-	"readlink",			/* 58 = readlink */
-	"execve",			/* 59 = execve */
-	"umask",			/* 60 = umask */
-	"chroot",			/* 61 = chroot */
-	"fstat43",			/* 62 = fstat43 */
-	"ogetkerninfo",			/* 63 = ogetkerninfo */
-	"ogetpagesize",			/* 64 = ogetpagesize */
-	"msync",			/* 65 = msync */
-	"vfork",			/* 66 = vfork */
-	"#67 (obsolete vread)",		/* 67 = obsolete vread */
-	"#68 (obsolete vwrite)",		/* 68 = obsolete vwrite */
-	"sbrk",			/* 69 = sbrk */
-	"sstk",			/* 70 = sstk */
-	"ommap",			/* 71 = ommap */
-	"#72 (obsolete vadvise)",		/* 72 = obsolete vadvise */
-	"munmap",			/* 73 = munmap */
-	"mprotect",			/* 74 = mprotect */
-	"madvise",			/* 75 = madvise */
-	"#76 (obsolete vhangup)",		/* 76 = obsolete vhangup */
-	"#77 (obsolete vlimit)",		/* 77 = obsolete vlimit */
-	"mincore",			/* 78 = mincore */
-	"getgroups",			/* 79 = getgroups */
-	"setgroups",			/* 80 = setgroups */
-	"getpgrp",			/* 81 = getpgrp */
-	"setpgid",			/* 82 = setpgid */
-	"setitimer",			/* 83 = setitimer */
-	"owait",			/* 84 = owait */
-	"swapon",			/* 85 = swapon */
-	"getitimer",			/* 86 = getitimer */
-	"ogethostname",			/* 87 = ogethostname */
-	"osethostname",			/* 88 = osethostname */
-	"ogetdtablesize",			/* 89 = ogetdtablesize */
-	"dup2",			/* 90 = dup2 */
-	"#91 (unimplemented getdopt)",		/* 91 = unimplemented getdopt */
-	"fcntl",			/* 92 = fcntl */
-	"select",			/* 93 = select */
-	"#94 (unimplemented setdopt)",		/* 94 = unimplemented setdopt */
-	"fsync",			/* 95 = fsync */
-	"setpriority",			/* 96 = setpriority */
-	"socket",			/* 97 = socket */
-	"connect",			/* 98 = connect */
-	"oaccept",			/* 99 = oaccept */
-	"getpriority",			/* 100 = getpriority */
-	"osend",			/* 101 = osend */
-	"orecv",			/* 102 = orecv */
-	"sigreturn",			/* 103 = sigreturn */
-	"bind",			/* 104 = bind */
-	"setsockopt",			/* 105 = setsockopt */
-	"listen",			/* 106 = listen */
-	"#107 (obsolete vtimes)",		/* 107 = obsolete vtimes */
-	"osigvec",			/* 108 = osigvec */
-	"osigblock",			/* 109 = osigblock */
-	"osigsetmask",			/* 110 = osigsetmask */
-	"sigsuspend",			/* 111 = sigsuspend */
-	"osigstack",			/* 112 = osigstack */
-	"orecvmsg",			/* 113 = orecvmsg */
-	"osendmsg",			/* 114 = osendmsg */
-#ifdef TRACE
-	"vtrace",			/* 115 = vtrace */
-#else
-	"#115 (obsolete vtrace)",		/* 115 = obsolete vtrace */
-#endif
-	"gettimeofday",			/* 116 = gettimeofday */
-	"getrusage",			/* 117 = getrusage */
-	"getsockopt",			/* 118 = getsockopt */
-	"#119 (obsolete resuba)",		/* 119 = obsolete resuba */
-	"readv",			/* 120 = readv */
-	"writev",			/* 121 = writev */
-	"settimeofday",			/* 122 = settimeofday */
-	"fchown",			/* 123 = fchown */
-	"fchmod",			/* 124 = fchmod */
-	"orecvfrom",			/* 125 = orecvfrom */
-	"setreuid",			/* 126 = setreuid */
-	"setregid",			/* 127 = setregid */
-	"rename",			/* 128 = rename */
-	"otruncate",			/* 129 = otruncate */
-	"oftruncate",			/* 130 = oftruncate */
-	"flock",			/* 131 = flock */
-	"mkfifo",			/* 132 = mkfifo */
-	"sendto",			/* 133 = sendto */
-	"shutdown",			/* 134 = shutdown */
-	"socketpair",			/* 135 = socketpair */
-	"mkdir",			/* 136 = mkdir */
-	"rmdir",			/* 137 = rmdir */
-	"utimes",			/* 138 = utimes */
-	"#139 (obsolete 4.2 sigreturn)",		/* 139 = obsolete 4.2 sigreturn */
-	"adjtime",			/* 140 = adjtime */
-	"ogetpeername",			/* 141 = ogetpeername */
-	"ogethostid",			/* 142 = ogethostid */
-	"osethostid",			/* 143 = osethostid */
-	"ogetrlimit",			/* 144 = ogetrlimit */
-	"osetrlimit",			/* 145 = osetrlimit */
-	"okillpg",			/* 146 = okillpg */
-	"setsid",			/* 147 = setsid */
-	"quotactl",			/* 148 = quotactl */
-	"oquota",			/* 149 = oquota */
-	"ogetsockname",			/* 150 = ogetsockname */
-	"#151 (unimplemented sem_lock)",		/* 151 = unimplemented sem_lock */
-	"#152 (unimplemented sem_wakeup)",		/* 152 = unimplemented sem_wakeup */
-	"#153 (unimplemented asyncdaemon)",		/* 153 = unimplemented asyncdaemon */
-	"#154 (unimplemented)",		/* 154 = unimplemented */
-#if defined(NFSCLIENT) || defined(NFSSERVER)
-	"nfssvc",			/* 155 = nfssvc */
-#else
-	"#155 (unimplemented)",		/* 155 = unimplemented */
-#endif
-	"ogetdirentries",			/* 156 = ogetdirentries */
-	"statfs",			/* 157 = statfs */
-	"fstatfs",			/* 158 = fstatfs */
-	"#159 (unimplemented)",		/* 159 = unimplemented */
-	"#160 (unimplemented)",		/* 160 = unimplemented */
-#ifdef NFSCLIENT
-	"getfh",			/* 161 = getfh */
-#else
-	"#161 (unimplemented getfh)",		/* 161 = unimplemented getfh */
-#endif
-	"#162 (unimplemented)",		/* 162 = unimplemented */
-	"#163 (unimplemented)",		/* 163 = unimplemented */
-	"#164 (unimplemented)",		/* 164 = unimplemented */
-	"#165 (unimplemented)",		/* 165 = unimplemented */
-	"#166 (unimplemented)",		/* 166 = unimplemented */
-	"#167 (unimplemented)",		/* 167 = unimplemented */
-	"#168 (unimplemented)",		/* 168 = unimplemented */
-	"#169 (unimplemented)",		/* 169 = unimplemented */
-	"#170 (unimplemented)",		/* 170 = unimplemented */
-#if defined(SYSVSHM) && !defined(__alpha__)
-	"shmsys",			/* 171 = shmsys */
-#else
-	"#171 (unimplemented shmsys)",		/* 171 = unimplemented shmsys */
-#endif
-	"#172 (unimplemented)",		/* 172 = unimplemented */
-	"#173 (unimplemented)",		/* 173 = unimplemented */
-	"#174 (unimplemented)",		/* 174 = unimplemented */
-	"#175 (unimplemented)",		/* 175 = unimplemented */
-	"#176 (unimplemented)",		/* 176 = unimplemented */
-	"#177 (unimplemented sfork)",		/* 177 = unimplemented sfork */
-	"#178 (unimplemented)",		/* 178 = unimplemented */
-	"#179 (unimplemented getdescriptor)",		/* 179 = unimplemented getdescriptor */
-	"#180 (unimplemented setdescriptor)",		/* 180 = unimplemented setdescriptor */
-	"setgid",			/* 181 = setgid */
-	"setegid",			/* 182 = setegid */
-	"seteuid",			/* 183 = seteuid */
-	"#184 (unimplemented)",		/* 184 = unimplemented */
-	"#185 (unimplemented)",		/* 185 = unimplemented */
-	"#186 (unimplemented)",		/* 186 = unimplemented */
-	"#187 (unimplemented)",		/* 187 = unimplemented */
-	"stat35",			/* 188 = stat35 */
-	"fstat35",			/* 189 = fstat35 */
-	"lstat35",			/* 190 = lstat35 */
-	"pathconf",			/* 191 = pathconf */
-	"fpathconf",			/* 192 = fpathconf */
-	"#193 (unimplemented)",		/* 193 = unimplemented */
-	"getrlimit",			/* 194 = getrlimit */
-	"setrlimit",			/* 195 = setrlimit */
-	"getdirentries",			/* 196 = getdirentries */
-	"mmap",			/* 197 = mmap */
-	"__syscall",			/* 198 = __syscall */
-	"lseek",			/* 199 = lseek */
-	"truncate",			/* 200 = truncate */
-	"ftruncate",			/* 201 = ftruncate */
-	"__sysctl",			/* 202 = __sysctl */
-	"mlock",			/* 203 = mlock */
-	"munlock",			/* 204 = munlock */
-	"#205 (unimplemented sys_undelete)",		/* 205 = unimplemented sys_undelete */
-	"#206 (unimplemented)",		/* 206 = unimplemented */
-	"#207 (unimplemented)",		/* 207 = unimplemented */
-	"#208 (unimplemented)",		/* 208 = unimplemented */
-	"#209 (unimplemented)",		/* 209 = unimplemented */
-	"#210 (unimplemented)",		/* 210 = unimplemented */
-	"#211 (unimplemented)",		/* 211 = unimplemented */
-	"#212 (unimplemented)",		/* 212 = unimplemented */
-	"#213 (unimplemented)",		/* 213 = unimplemented */
-	"#214 (unimplemented)",		/* 214 = unimplemented */
-	"#215 (unimplemented)",		/* 215 = unimplemented */
-	"#216 (unimplemented)",		/* 216 = unimplemented */
-	"#217 (unimplemented)",		/* 217 = unimplemented */
-	"#218 (unimplemented)",		/* 218 = unimplemented */
-	"#219 (unimplemented)",		/* 219 = unimplemented */
-#ifdef SYSVSEM
-	"__semctl",			/* 220 = __semctl */
-	"semget",			/* 221 = semget */
-	"semop",			/* 222 = semop */
-	"#223 (obsolete sys_semconfig)",		/* 223 = obsolete sys_semconfig */
-#else
-	"#220 (unimplemented semctl)",		/* 220 = unimplemented semctl */
-	"#221 (unimplemented semget)",		/* 221 = unimplemented semget */
-	"#222 (unimplemented semop)",		/* 222 = unimplemented semop */
-	"#223 (unimplemented semconfig)",		/* 223 = unimplemented semconfig */
-#endif
-#ifdef SYSVMSG
-	"msgctl",			/* 224 = msgctl */
-	"msgget",			/* 225 = msgget */
-	"msgsnd",			/* 226 = msgsnd */
-	"msgrcv",			/* 227 = msgrcv */
-#else
-	"#224 (unimplemented msgctl)",		/* 224 = unimplemented msgctl */
-	"#225 (unimplemented msgget)",		/* 225 = unimplemented msgget */
-	"#226 (unimplemented msgsnd)",		/* 226 = unimplemented msgsnd */
-	"#227 (unimplemented msgrcv)",		/* 227 = unimplemented msgrcv */
-#endif
-#ifdef SYSVSHM
-	"shmat",			/* 228 = shmat */
-	"shmctl",			/* 229 = shmctl */
-	"shmdt",			/* 230 = shmdt */
-	"shmget",			/* 231 = shmget */
-#else
-	"#228 (unimplemented shmat)",		/* 228 = unimplemented shmat */
-	"#229 (unimplemented shmctl)",		/* 229 = unimplemented shmctl */
-	"#230 (unimplemented shmdt)",		/* 230 = unimplemented shmdt */
-	"#231 (unimplemented shmget)",		/* 231 = unimplemented shmget */
-#endif
-};
diff --git a/sys/compat/bsdos/bsdos_sysent.c b/sys/compat/bsdos/bsdos_sysent.c
deleted file mode 100644
index 6fef819669b..00000000000
--- a/sys/compat/bsdos/bsdos_sysent.c
+++ /dev/null
@@ -1,553 +0,0 @@
-/*	$OpenBSD: bsdos_sysent.c,v 1.22 2010/05/23 11:37:29 deraadt Exp $	*/
-
-/*
- * System call switch table.
- *
- * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.19 2010/05/23 11:35:18 deraadt Exp 
- */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/signal.h>
-#include <sys/mount.h>
-#include <sys/syscallargs.h>
-#include <compat/bsdos/bsdos_syscallargs.h>
-
-#define	s(type)	sizeof(type)
-
-struct sysent bsdos_sysent[] = {
-	{ 0, 0, 0,
-	    sys_nosys },			/* 0 = syscall */
-	{ 1, s(struct sys_exit_args), 0,
-	    sys_exit },				/* 1 = exit */
-	{ 0, 0, 0,
-	    sys_fork },				/* 2 = fork */
-	{ 3, s(struct sys_read_args), 0,
-	    sys_read },				/* 3 = read */
-	{ 3, s(struct sys_write_args), 0,
-	    sys_write },			/* 4 = write */
-	{ 3, s(struct sys_open_args), 0,
-	    sys_open },				/* 5 = open */
-	{ 1, s(struct sys_close_args), 0,
-	    sys_close },			/* 6 = close */
-	{ 4, s(struct sys_wait4_args), 0,
-	    sys_wait4 },			/* 7 = wait4 */
-	{ 2, s(struct compat_43_sys_creat_args), 0,
-	    compat_43_sys_creat },		/* 8 = ocreat */
-	{ 2, s(struct sys_link_args), 0,
-	    sys_link },				/* 9 = link */
-	{ 1, s(struct sys_unlink_args), 0,
-	    sys_unlink },			/* 10 = unlink */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 11 = obsolete execv */
-	{ 1, s(struct sys_chdir_args), 0,
-	    sys_chdir },			/* 12 = chdir */
-	{ 1, s(struct sys_fchdir_args), 0,
-	    sys_fchdir },			/* 13 = fchdir */
-	{ 3, s(struct sys_mknod_args), 0,
-	    sys_mknod },			/* 14 = mknod */
-	{ 2, s(struct sys_chmod_args), 0,
-	    sys_chmod },			/* 15 = chmod */
-	{ 3, s(struct sys_chown_args), 0,
-	    sys_chown },			/* 16 = chown */
-	{ 1, s(struct sys_obreak_args), 0,
-	    sys_obreak },			/* 17 = break */
-	{ 3, s(struct compat_25_sys_getfsstat_args), 0,
-	    compat_25_sys_getfsstat },		/* 18 = getfsstat */
-	{ 3, s(struct compat_43_sys_lseek_args), 0,
-	    compat_43_sys_lseek },		/* 19 = olseek */
-	{ 0, 0, 0,
-	    sys_getpid },			/* 20 = getpid */
-	{ 4, s(struct sys_mount_args), 0,
-	    sys_mount },			/* 21 = mount */
-	{ 2, s(struct sys_unmount_args), 0,
-	    sys_unmount },			/* 22 = unmount */
-	{ 1, s(struct sys_setuid_args), 0,
-	    sys_setuid },			/* 23 = setuid */
-	{ 0, 0, 0,
-	    sys_getuid },			/* 24 = getuid */
-	{ 0, 0, 0,
-	    sys_geteuid },			/* 25 = geteuid */
-#ifdef PTRACE
-	{ 4, s(struct sys_ptrace_args), 0,
-	    sys_ptrace },			/* 26 = ptrace */
-#else
-	{ 0, 0, 0,
-	    sys_nosys },			/* 26 = unimplemented ptrace */
-#endif
-	{ 3, s(struct sys_recvmsg_args), 0,
-	    sys_recvmsg },			/* 27 = recvmsg */
-	{ 3, s(struct sys_sendmsg_args), 0,
-	    sys_sendmsg },			/* 28 = sendmsg */
-	{ 6, s(struct sys_recvfrom_args), 0,
-	    sys_recvfrom },			/* 29 = recvfrom */
-	{ 3, s(struct sys_accept_args), 0,
-	    sys_accept },			/* 30 = accept */
-	{ 3, s(struct sys_getpeername_args), 0,
-	    sys_getpeername },			/* 31 = getpeername */
-	{ 3, s(struct sys_getsockname_args), 0,
-	    sys_getsockname },			/* 32 = getsockname */
-	{ 2, s(struct sys_access_args), 0,
-	    sys_access },			/* 33 = access */
-	{ 2, s(struct sys_chflags_args), 0,
-	    sys_chflags },			/* 34 = chflags */
-	{ 2, s(struct sys_fchflags_args), 0,
-	    sys_fchflags },			/* 35 = fchflags */
-	{ 0, 0, 0,
-	    sys_sync },				/* 36 = sync */
-	{ 2, s(struct sys_kill_args), 0,
-	    sys_kill },				/* 37 = kill */
-	{ 2, s(struct compat_43_sys_stat_args), 0,
-	    compat_43_sys_stat },		/* 38 = stat43 */
-	{ 0, 0, 0,
-	    sys_getppid },			/* 39 = getppid */
-	{ 2, s(struct compat_43_sys_lstat_args), 0,
-	    compat_43_sys_lstat },		/* 40 = lstat43 */
-	{ 1, s(struct sys_dup_args), 0,
-	    sys_dup },				/* 41 = dup */
-	{ 0, 0, 0,
-	    sys_opipe },			/* 42 = opipe */
-	{ 0, 0, 0,
-	    sys_getegid },			/* 43 = getegid */
-	{ 4, s(struct sys_profil_args), 0,
-	    sys_profil },			/* 44 = profil */
-#ifdef KTRACE
-	{ 4, s(struct sys_ktrace_args), 0,
-	    sys_ktrace },			/* 45 = ktrace */
-#else
-	{ 0, 0, 0,
-	    sys_nosys },			/* 45 = unimplemented ktrace */
-#endif
-	{ 3, s(struct sys_sigaction_args), 0,
-	    sys_sigaction },			/* 46 = sigaction */
-	{ 0, 0, 0,
-	    sys_getgid },			/* 47 = getgid */
-	{ 2, s(struct sys_sigprocmask_args), 0,
-	    sys_sigprocmask },			/* 48 = sigprocmask */
-	{ 2, s(struct sys_getlogin_args), 0,
-	    sys_getlogin },			/* 49 = getlogin */
-	{ 1, s(struct sys_setlogin_args), 0,
-	    sys_setlogin },			/* 50 = setlogin */
-#ifdef ACCOUNTING
-	{ 1, s(struct sys_acct_args), 0,
-	    sys_acct },				/* 51 = acct */
-#else
-	{ 0, 0, 0,
-	    sys_nosys },			/* 51 = unimplemented acct */
-#endif
-	{ 0, 0, 0,
-	    sys_sigpending },			/* 52 = sigpending */
-	{ 2, s(struct sys_osigaltstack_args), 0,
-	    sys_osigaltstack },			/* 53 = osigaltstack */
-	{ 3, s(struct bsdos_sys_ioctl_args), 0,
-	    bsdos_sys_ioctl },			/* 54 = ioctl */
-	{ 1, s(struct sys_reboot_args), 0,
-	    sys_reboot },			/* 55 = reboot */
-	{ 1, s(struct sys_revoke_args), 0,
-	    sys_revoke },			/* 56 = revoke */
-	{ 2, s(struct sys_symlink_args), 0,
-	    sys_symlink },			/* 57 = symlink */
-	{ 3, s(struct sys_readlink_args), 0,
-	    sys_readlink },			/* 58 = readlink */
-	{ 3, s(struct sys_execve_args), 0,
-	    sys_execve },			/* 59 = execve */
-	{ 1, s(struct sys_umask_args), 0,
-	    sys_umask },			/* 60 = umask */
-	{ 1, s(struct sys_chroot_args), 0,
-	    sys_chroot },			/* 61 = chroot */
-	{ 2, s(struct compat_43_sys_fstat_args), 0,
-	    compat_43_sys_fstat },		/* 62 = fstat43 */
-	{ 4, s(struct compat_43_sys_getkerninfo_args), 0,
-	    compat_43_sys_getkerninfo },	/* 63 = ogetkerninfo */
-	{ 0, 0, 0,
-	    compat_43_sys_getpagesize },	/* 64 = ogetpagesize */
-	{ 3, s(struct sys_msync_args), 0,
-	    sys_msync },			/* 65 = msync */
-	{ 0, 0, 0,
-	    sys_vfork },			/* 66 = vfork */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 67 = obsolete vread */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 68 = obsolete vwrite */
-	{ 1, s(struct sys_sbrk_args), 0,
-	    sys_sbrk },				/* 69 = sbrk */
-	{ 1, s(struct sys_sstk_args), 0,
-	    sys_sstk },				/* 70 = sstk */
-	{ 6, s(struct compat_43_sys_mmap_args), 0,
-	    compat_43_sys_mmap },		/* 71 = ommap */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 72 = obsolete vadvise */
-	{ 2, s(struct sys_munmap_args), 0,
-	    sys_munmap },			/* 73 = munmap */
-	{ 3, s(struct sys_mprotect_args), 0,
-	    sys_mprotect },			/* 74 = mprotect */
-	{ 3, s(struct sys_madvise_args), 0,
-	    sys_madvise },			/* 75 = madvise */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 76 = obsolete vhangup */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 77 = obsolete vlimit */
-	{ 3, s(struct sys_mincore_args), 0,
-	    sys_mincore },			/* 78 = mincore */
-	{ 2, s(struct sys_getgroups_args), 0,
-	    sys_getgroups },			/* 79 = getgroups */
-	{ 2, s(struct sys_setgroups_args), 0,
-	    sys_setgroups },			/* 80 = setgroups */
-	{ 0, 0, 0,
-	    sys_getpgrp },			/* 81 = getpgrp */
-	{ 2, s(struct sys_setpgid_args), 0,
-	    sys_setpgid },			/* 82 = setpgid */
-	{ 3, s(struct sys_setitimer_args), 0,
-	    sys_setitimer },			/* 83 = setitimer */
-	{ 0, 0, 0,
-	    compat_43_sys_wait },		/* 84 = owait */
-	{ 1, s(struct compat_25_sys_swapon_args), 0,
-	    compat_25_sys_swapon },		/* 85 = swapon */
-	{ 2, s(struct sys_getitimer_args), 0,
-	    sys_getitimer },			/* 86 = getitimer */
-	{ 2, s(struct compat_43_sys_gethostname_args), 0,
-	    compat_43_sys_gethostname },	/* 87 = ogethostname */
-	{ 2, s(struct compat_43_sys_sethostname_args), 0,
-	    compat_43_sys_sethostname },	/* 88 = osethostname */
-	{ 0, 0, 0,
-	    compat_43_sys_getdtablesize },	/* 89 = ogetdtablesize */
-	{ 2, s(struct sys_dup2_args), 0,
-	    sys_dup2 },				/* 90 = dup2 */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 91 = unimplemented getdopt */
-	{ 3, s(struct sys_fcntl_args), 0,
-	    sys_fcntl },			/* 92 = fcntl */
-	{ 5, s(struct sys_select_args), 0,
-	    sys_select },			/* 93 = select */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 94 = unimplemented setdopt */
-	{ 1, s(struct sys_fsync_args), 0,
-	    sys_fsync },			/* 95 = fsync */
-	{ 3, s(struct sys_setpriority_args), 0,
-	    sys_setpriority },			/* 96 = setpriority */
-	{ 3, s(struct sys_socket_args), 0,
-	    sys_socket },			/* 97 = socket */
-	{ 3, s(struct sys_connect_args), 0,
-	    sys_connect },			/* 98 = connect */
-	{ 3, s(struct compat_43_sys_accept_args), 0,
-	    compat_43_sys_accept },		/* 99 = oaccept */
-	{ 2, s(struct sys_getpriority_args), 0,
-	    sys_getpriority },			/* 100 = getpriority */
-	{ 4, s(struct compat_43_sys_send_args), 0,
-	    compat_43_sys_send },		/* 101 = osend */
-	{ 4, s(struct compat_43_sys_recv_args), 0,
-	    compat_43_sys_recv },		/* 102 = orecv */
-	{ 1, s(struct sys_sigreturn_args), 0,
-	    sys_sigreturn },			/* 103 = sigreturn */
-	{ 3, s(struct sys_bind_args), 0,
-	    sys_bind },				/* 104 = bind */
-	{ 5, s(struct sys_setsockopt_args), 0,
-	    sys_setsockopt },			/* 105 = setsockopt */
-	{ 2, s(struct sys_listen_args), 0,
-	    sys_listen },			/* 106 = listen */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 107 = obsolete vtimes */
-	{ 3, s(struct compat_43_sys_sigvec_args), 0,
-	    compat_43_sys_sigvec },		/* 108 = osigvec */
-	{ 1, s(struct compat_43_sys_sigblock_args), 0,
-	    compat_43_sys_sigblock },		/* 109 = osigblock */
-	{ 1, s(struct compat_43_sys_sigsetmask_args), 0,
-	    compat_43_sys_sigsetmask },		/* 110 = osigsetmask */
-	{ 1, s(struct sys_sigsuspend_args), 0,
-	    sys_sigsuspend },			/* 111 = sigsuspend */
-	{ 2, s(struct compat_43_sys_sigstack_args), 0,
-	    compat_43_sys_sigstack },		/* 112 = osigstack */
-	{ 3, s(struct compat_43_sys_recvmsg_args), 0,
-	    compat_43_sys_recvmsg },		/* 113 = orecvmsg */
-	{ 3, s(struct compat_43_sys_sendmsg_args), 0,
-	    compat_43_sys_sendmsg },		/* 114 = osendmsg */
-#ifdef TRACE
-	{ 2, s(struct sys_vtrace_args), 0,
-	    sys_vtrace },			/* 115 = vtrace */
-#else
-	{ 0, 0, 0,
-	    sys_nosys },			/* 115 = obsolete vtrace */
-#endif
-	{ 2, s(struct sys_gettimeofday_args), 0,
-	    sys_gettimeofday },			/* 116 = gettimeofday */
-	{ 2, s(struct sys_getrusage_args), 0,
-	    sys_getrusage },			/* 117 = getrusage */
-	{ 5, s(struct sys_getsockopt_args), 0,
-	    sys_getsockopt },			/* 118 = getsockopt */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 119 = obsolete resuba */
-	{ 3, s(struct sys_readv_args), 0,
-	    sys_readv },			/* 120 = readv */
-	{ 3, s(struct sys_writev_args), 0,
-	    sys_writev },			/* 121 = writev */
-	{ 2, s(struct sys_settimeofday_args), 0,
-	    sys_settimeofday },			/* 122 = settimeofday */
-	{ 3, s(struct sys_fchown_args), 0,
-	    sys_fchown },			/* 123 = fchown */
-	{ 2, s(struct sys_fchmod_args), 0,
-	    sys_fchmod },			/* 124 = fchmod */
-	{ 6, s(struct compat_43_sys_recvfrom_args), 0,
-	    compat_43_sys_recvfrom },		/* 125 = orecvfrom */
-	{ 2, s(struct sys_setreuid_args), 0,
-	    sys_setreuid },			/* 126 = setreuid */
-	{ 2, s(struct sys_setregid_args), 0,
-	    sys_setregid },			/* 127 = setregid */
-	{ 2, s(struct sys_rename_args), 0,
-	    sys_rename },			/* 128 = rename */
-	{ 2, s(struct compat_43_sys_truncate_args), 0,
-	    compat_43_sys_truncate },		/* 129 = otruncate */
-	{ 2, s(struct compat_43_sys_ftruncate_args), 0,
-	    compat_43_sys_ftruncate },		/* 130 = oftruncate */
-	{ 2, s(struct sys_flock_args), 0,
-	    sys_flock },			/* 131 = flock */
-	{ 2, s(struct sys_mkfifo_args), 0,
-	    sys_mkfifo },			/* 132 = mkfifo */
-	{ 6, s(struct sys_sendto_args), 0,
-	    sys_sendto },			/* 133 = sendto */
-	{ 2, s(struct sys_shutdown_args), 0,
-	    sys_shutdown },			/* 134 = shutdown */
-	{ 4, s(struct sys_socketpair_args), 0,
-	    sys_socketpair },			/* 135 = socketpair */
-	{ 2, s(struct sys_mkdir_args), 0,
-	    sys_mkdir },			/* 136 = mkdir */
-	{ 1, s(struct sys_rmdir_args), 0,
-	    sys_rmdir },			/* 137 = rmdir */
-	{ 2, s(struct sys_utimes_args), 0,
-	    sys_utimes },			/* 138 = utimes */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 139 = obsolete 4.2 sigreturn */
-	{ 2, s(struct sys_adjtime_args), 0,
-	    sys_adjtime },			/* 140 = adjtime */
-	{ 3, s(struct compat_43_sys_getpeername_args), 0,
-	    compat_43_sys_getpeername },	/* 141 = ogetpeername */
-	{ 0, 0, 0,
-	    compat_43_sys_gethostid },		/* 142 = ogethostid */
-	{ 1, s(struct compat_43_sys_sethostid_args), 0,
-	    compat_43_sys_sethostid },		/* 143 = osethostid */
-	{ 2, s(struct compat_43_sys_getrlimit_args), 0,
-	    compat_43_sys_getrlimit },		/* 144 = ogetrlimit */
-	{ 2, s(struct compat_43_sys_setrlimit_args), 0,
-	    compat_43_sys_setrlimit },		/* 145 = osetrlimit */
-	{ 2, s(struct compat_43_sys_killpg_args), 0,
-	    compat_43_sys_killpg },		/* 146 = okillpg */
-	{ 0, 0, 0,
-	    sys_setsid },			/* 147 = setsid */
-	{ 4, s(struct sys_quotactl_args), 0,
-	    sys_quotactl },			/* 148 = quotactl */
-	{ 0, 0, 0,
-	    compat_43_sys_quota },		/* 149 = oquota */
-	{ 3, s(struct compat_43_sys_getsockname_args), 0,
-	    compat_43_sys_getsockname },	/* 150 = ogetsockname */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 151 = unimplemented sem_lock */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 152 = unimplemented sem_wakeup */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 153 = unimplemented asyncdaemon */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 154 = unimplemented */
-#if defined(NFSCLIENT) || defined(NFSSERVER)
-	{ 2, s(struct sys_nfssvc_args), 0,
-	    sys_nfssvc },			/* 155 = nfssvc */
-#else
-	{ 0, 0, 0,
-	    sys_nosys },			/* 155 = unimplemented */
-#endif
-	{ 4, s(struct compat_43_sys_getdirentries_args), 0,
-	    compat_43_sys_getdirentries },	/* 156 = ogetdirentries */
-	{ 2, s(struct compat_25_sys_statfs_args), 0,
-	    compat_25_sys_statfs },		/* 157 = statfs */
-	{ 2, s(struct compat_25_sys_fstatfs_args), 0,
-	    compat_25_sys_fstatfs },		/* 158 = fstatfs */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 159 = unimplemented */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 160 = unimplemented */
-#ifdef NFSCLIENT
-	{ 2, s(struct sys_getfh_args), 0,
-	    sys_getfh },			/* 161 = getfh */
-#else
-	{ 0, 0, 0,
-	    sys_nosys },			/* 161 = unimplemented getfh */
-#endif
-	{ 0, 0, 0,
-	    sys_nosys },			/* 162 = unimplemented */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 163 = unimplemented */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 164 = unimplemented */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 165 = unimplemented */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 166 = unimplemented */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 167 = unimplemented */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 168 = unimplemented */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 169 = unimplemented */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 170 = unimplemented */
-#if defined(SYSVSHM) && !defined(__alpha__)
-	{ 4, s(struct compat_10_sys_shmsys_args), 0,
-	    compat_10_sys_shmsys },		/* 171 = shmsys */
-#else
-	{ 0, 0, 0,
-	    sys_nosys },			/* 171 = unimplemented shmsys */
-#endif
-	{ 0, 0, 0,
-	    sys_nosys },			/* 172 = unimplemented */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 173 = unimplemented */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 174 = unimplemented */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 175 = unimplemented */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 176 = unimplemented */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 177 = unimplemented sfork */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 178 = unimplemented */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 179 = unimplemented getdescriptor */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 180 = unimplemented setdescriptor */
-	{ 1, s(struct sys_setgid_args), 0,
-	    sys_setgid },			/* 181 = setgid */
-	{ 1, s(struct sys_setegid_args), 0,
-	    sys_setegid },			/* 182 = setegid */
-	{ 1, s(struct sys_seteuid_args), 0,
-	    sys_seteuid },			/* 183 = seteuid */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 184 = unimplemented */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 185 = unimplemented */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 186 = unimplemented */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 187 = unimplemented */
-	{ 2, s(struct compat_35_sys_stat_args), 0,
-	    compat_35_sys_stat },		/* 188 = stat35 */
-	{ 2, s(struct compat_35_sys_fstat_args), 0,
-	    compat_35_sys_fstat },		/* 189 = fstat35 */
-	{ 2, s(struct compat_35_sys_lstat_args), 0,
-	    compat_35_sys_lstat },		/* 190 = lstat35 */
-	{ 2, s(struct sys_pathconf_args), 0,
-	    sys_pathconf },			/* 191 = pathconf */
-	{ 2, s(struct sys_fpathconf_args), 0,
-	    sys_fpathconf },			/* 192 = fpathconf */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 193 = unimplemented */
-	{ 2, s(struct sys_getrlimit_args), 0,
-	    sys_getrlimit },			/* 194 = getrlimit */
-	{ 2, s(struct sys_setrlimit_args), 0,
-	    sys_setrlimit },			/* 195 = setrlimit */
-	{ 4, s(struct sys_getdirentries_args), 0,
-	    sys_getdirentries },		/* 196 = getdirentries */
-	{ 7, s(struct sys_mmap_args), 0,
-	    sys_mmap },				/* 197 = mmap */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 198 = __syscall */
-	{ 4, s(struct sys_lseek_args), 0,
-	    sys_lseek },			/* 199 = lseek */
-	{ 3, s(struct sys_truncate_args), 0,
-	    sys_truncate },			/* 200 = truncate */
-	{ 3, s(struct sys_ftruncate_args), 0,
-	    sys_ftruncate },			/* 201 = ftruncate */
-	{ 6, s(struct sys___sysctl_args), 0,
-	    sys___sysctl },			/* 202 = __sysctl */
-	{ 2, s(struct sys_mlock_args), 0,
-	    sys_mlock },			/* 203 = mlock */
-	{ 2, s(struct sys_munlock_args), 0,
-	    sys_munlock },			/* 204 = munlock */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 205 = unimplemented sys_undelete */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 206 = unimplemented */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 207 = unimplemented */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 208 = unimplemented */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 209 = unimplemented */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 210 = unimplemented */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 211 = unimplemented */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 212 = unimplemented */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 213 = unimplemented */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 214 = unimplemented */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 215 = unimplemented */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 216 = unimplemented */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 217 = unimplemented */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 218 = unimplemented */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 219 = unimplemented */
-#ifdef SYSVSEM
-	{ 4, s(struct sys___semctl_args), 0,
-	    sys___semctl },			/* 220 = __semctl */
-	{ 3, s(struct sys_semget_args), 0,
-	    sys_semget },			/* 221 = semget */
-	{ 3, s(struct sys_semop_args), 0,
-	    sys_semop },			/* 222 = semop */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 223 = obsolete sys_semconfig */
-#else
-	{ 0, 0, 0,
-	    sys_nosys },			/* 220 = unimplemented semctl */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 221 = unimplemented semget */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 222 = unimplemented semop */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 223 = unimplemented semconfig */
-#endif
-#ifdef SYSVMSG
-	{ 3, s(struct sys_msgctl_args), 0,
-	    sys_msgctl },			/* 224 = msgctl */
-	{ 2, s(struct sys_msgget_args), 0,
-	    sys_msgget },			/* 225 = msgget */
-	{ 4, s(struct sys_msgsnd_args), 0,
-	    sys_msgsnd },			/* 226 = msgsnd */
-	{ 5, s(struct sys_msgrcv_args), 0,
-	    sys_msgrcv },			/* 227 = msgrcv */
-#else
-	{ 0, 0, 0,
-	    sys_nosys },			/* 224 = unimplemented msgctl */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 225 = unimplemented msgget */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 226 = unimplemented msgsnd */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 227 = unimplemented msgrcv */
-#endif
-#ifdef SYSVSHM
-	{ 3, s(struct sys_shmat_args), 0,
-	    sys_shmat },			/* 228 = shmat */
-	{ 3, s(struct sys_shmctl_args), 0,
-	    sys_shmctl },			/* 229 = shmctl */
-	{ 1, s(struct sys_shmdt_args), 0,
-	    sys_shmdt },			/* 230 = shmdt */
-	{ 3, s(struct sys_shmget_args), 0,
-	    sys_shmget },			/* 231 = shmget */
-#else
-	{ 0, 0, 0,
-	    sys_nosys },			/* 228 = unimplemented shmat */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 229 = unimplemented shmctl */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 230 = unimplemented shmdt */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 231 = unimplemented shmget */
-#endif
-};
-
diff --git a/sys/compat/bsdos/files.bsdos b/sys/compat/bsdos/files.bsdos
deleted file mode 100644
index 881ba088f94..00000000000
--- a/sys/compat/bsdos/files.bsdos
+++ /dev/null
@@ -1,12 +0,0 @@
-#	$OpenBSD: files.bsdos,v 1.4 2005/03/08 20:00:24 tdeval Exp $
-#
-# Config file description for machine-independent BSD/OS compat code.
-# Included by ports that need it.
-
-# ports should define any machine-specific files they need in their
-# own file lists.
-
-file	compat/bsdos/bsdos_exec.c		compat_bsdos
-file	compat/bsdos/bsdos_ioctl.c		compat_bsdos
-file	compat/bsdos/bsdos_sysent.c		compat_bsdos
-file	compat/bsdos/bsdos_syscalls.c		compat_bsdos & syscall_debug
diff --git a/sys/compat/bsdos/syscalls.conf b/sys/compat/bsdos/syscalls.conf
deleted file mode 100644
index ee3429c77f6..00000000000
--- a/sys/compat/bsdos/syscalls.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-#	$OpenBSD: syscalls.conf,v 1.1 1997/09/02 08:54:17 downsj Exp $
-
-sysnames="bsdos_syscalls.c"
-sysnumhdr="bsdos_syscall.h"
-syssw="bsdos_sysent.c"
-sysarghdr="bsdos_syscallargs.h"
-compatopts=""
-libcompatopts=""
-
-switchname="bsdos_sysent"
-namesname="bsdos_syscallnames"
-constprefix="BSDOS_SYS_"
diff --git a/sys/compat/bsdos/syscalls.master b/sys/compat/bsdos/syscalls.master
deleted file mode 100644
index 1ac5d1174ed..00000000000
--- a/sys/compat/bsdos/syscalls.master
+++ /dev/null
@@ -1,412 +0,0 @@
-	$OpenBSD: syscalls.master,v 1.19 2010/05/23 11:35:18 deraadt Exp $
-
-; OpenBSD COMPAT_BSDOS system call name/number "master" file.
-; (See syscalls.conf to see what it is processed into.)
-;
-; Fields: number type [type-dependent ...]
-;	number	system call number, must be in order
-;	type	one of NOARGS, OBSOL, UNIMPL, NODEF, NOARGS, or one of
-;		the compatibility options defined in syscalls.conf.
-;
-; types:
-;	NOARGS	always included
-;	OBSOL	obsolete, not included in system
-;	UNIMPL	unimplemented, not included in system
-;	NODEF	included, but don't define the syscall number
-;	NOARGS	included, but don't define the syscall args structure
-;
-; The compat options are defined in the syscalls.conf file, and the
-; compat option name is prefixed to the syscall name.  Other than
-; that, they're like NODEF (for 'compat' options), or NOARGS (for
-; 'libcompat' options).
-;
-; The type-dependent arguments are as follows:
-; For NOARGS, NODEF, NOARGS, and compat syscalls:
-;	{ pseudo-proto } [alias]
-; For other syscalls:
-;	[comment]
-;
-; #ifdef's, etc. may be included, and are copied to the output files.
-; #include's are copied to the syscall switch definition file only.
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/signal.h>
-#include <sys/mount.h>
-#include <sys/syscallargs.h>
-
-#include <compat/bsdos/bsdos_syscallargs.h>
-
-; Reserved/unimplemented system calls in the range 0-150 inclusive
-; are reserved for use in future Berkeley releases.
-; Additional system calls implemented in vendor and other
-; redistributions should be placed in the reserved range at the end
-; of the current calls.
-
-0	NOARGS		{ int sys_nosys(void); } syscall
-1	NOARGS		{ int sys_exit(int rval); }
-2	NOARGS		{ int sys_fork(void); }
-3	NOARGS		{ int sys_read(int fd, char *buf, u_int nbyte); }
-4	NOARGS		{ int sys_write(int fd, char *buf, u_int nbyte); }
-5	NOARGS		{ int sys_open(char *path, int flags, int mode); }
-6	NOARGS		{ int sys_close(int fd); }
-7	NOARGS		{ int sys_wait4(int pid, int *status, int options, \
-			    struct rusage *rusage); }
-8	NOARGS		{ int compat_43_sys_creat(char *path, \
-			    int mode); } ocreat
-9	NOARGS		{ int sys_link(char *path, char *link); }
-10	NOARGS		{ int sys_unlink(char *path); }
-11	OBSOL		execv
-12	NOARGS		{ int sys_chdir(char *path); }
-13	NOARGS		{ int sys_fchdir(int fd); }
-14	NOARGS		{ int sys_mknod(char *path, int mode, int dev); }
-15	NOARGS		{ int sys_chmod(char *path, int mode); }
-16	NOARGS		{ int sys_chown(char *path, int uid, int gid); }
-17	NOARGS		{ int sys_obreak(char *nsize); } break
-18	NOARGS		{ int compat_25_sys_getfsstat(struct ostatfs *buf, \
-			    long bufsize, int flags); }
-19	NOARGS		{ long compat_43_sys_lseek(int fd, long offset, \
-			    int whence); } olseek
-20	NOARGS		{ pid_t sys_getpid(void); }
-21	NOARGS		{ int sys_mount(int type, char *path, \
-			    int flags, caddr_t data); }
-22	NOARGS		{ int sys_unmount(char *path, int flags); }
-23	NOARGS		{ int sys_setuid(uid_t uid); }
-24	NOARGS		{ uid_t sys_getuid(void); }
-25	NOARGS		{ uid_t sys_geteuid(void); }
-#ifdef PTRACE
-26	NOARGS		{ int sys_ptrace(int req, pid_t pid, \
-			    caddr_t addr, int data); }
-#else
-26	UNIMPL		ptrace
-#endif
-27	NOARGS		{ int sys_recvmsg(int s, struct msghdr *msg, \
-			    int flags); }
-28	NOARGS		{ int sys_sendmsg(int s, caddr_t msg, int flags); }
-29	NOARGS		{ int sys_recvfrom(int s, caddr_t buf, size_t len, \
-			    int flags, caddr_t from, int *fromlenaddr); }
-30	NOARGS		{ int sys_accept(int s, caddr_t name, int *anamelen); }
-31	NOARGS		{ int sys_getpeername(int fdes, caddr_t asa, \
-			    int *alen); }
-32	NOARGS		{ int sys_getsockname(int fdes, caddr_t asa, \
-			    int *alen); }
-33	NOARGS		{ int sys_access(char *path, int flags); }
-34	NOARGS		{ int sys_chflags(char *path, int flags); }
-35	NOARGS		{ int sys_fchflags(int fd, int flags); }
-36	NOARGS		{ int sys_sync(void); }
-37	NOARGS		{ int sys_kill(int pid, int signum); }
-38	NOARGS		{ int compat_43_sys_stat(char *path, \
-			    struct stat43 *ub); } stat43
-39	NOARGS		{ pid_t sys_getppid(void); }
-40	NOARGS		{ int compat_43_sys_lstat(char *path, \
-			    struct stat43 *ub); } lstat43
-41	NOARGS		{ int sys_dup(u_int fd); }
-42	NOARGS		{ int sys_opipe(void); }
-43	NOARGS		{ gid_t sys_getegid(void); }
-44	NOARGS		{ int sys_profil(caddr_t samples, u_int size, \
-			    u_int offset, u_int scale); }
-#ifdef KTRACE
-45	NOARGS		{ int sys_ktrace(char *fname, int ops, int facs, \
-			    int pid); }
-#else
-45	UNIMPL		ktrace
-#endif
-46	NOARGS		{ int sys_sigaction(int signum, struct sigaction *nsa, \
-			    struct sigaction *osa); }
-47	NOARGS		{ gid_t sys_getgid(void); }
-48	NOARGS		{ int sys_sigprocmask(int how, sigset_t mask); }
-49	NOARGS		{ int sys_getlogin(char *namebuf, u_int namelen); }
-50	NOARGS		{ int sys_setlogin(char *namebuf); }
-#ifdef ACCOUNTING
-51	NOARGS		{ int sys_acct(char *path); }
-#else
-51	UNIMPL		acct
-#endif
-52	NOARGS		{ int sys_sigpending(void); }
-53	NOARGS		{ int sys_osigaltstack(struct osigaltstack *nss, \
-			    struct osigaltstack *oss); }
-54	STD		{ int bsdos_sys_ioctl(int fd, u_long com, \
-			    caddr_t data); }
-55	NOARGS		{ int sys_reboot(int opt); }
-56	NOARGS		{ int sys_revoke(char *path); }
-57	NOARGS		{ int sys_symlink(char *path, char *link); }
-58	NOARGS		{ int sys_readlink(char *path, char *buf, int count); }
-59	NOARGS		{ int sys_execve(char *path, char **argp, \
-			    char **envp); }
-60	NOARGS		{ int sys_umask(int newmask); }
-61	NOARGS		{ int sys_chroot(char *path); }
-62	NOARGS		{ int compat_43_sys_fstat(int fd, struct stat43 *sb); } \
-			    fstat43
-63	NOARGS		{ int compat_43_sys_getkerninfo(int op, char *where, \
-			    int *size, int arg); } ogetkerninfo
-64	NOARGS		{ int compat_43_sys_getpagesize(void); } ogetpagesize
-65	NOARGS		{ int sys_msync(void *addr, size_t len, int flags); }
-66	NOARGS		{ int sys_vfork(void); }
-67	OBSOL		vread
-68	OBSOL		vwrite
-69	NOARGS		{ int sys_sbrk(int incr); }
-70	NOARGS		{ int sys_sstk(int incr); }
-71	NOARGS		{ int compat_43_sys_mmap(caddr_t addr, size_t len, \
-			    int prot, int flags, int fd, long pos); } ommap
-72	OBSOL		vadvise
-73	NOARGS		{ int sys_munmap(caddr_t addr, size_t len); }
-74	NOARGS		{ int sys_mprotect(caddr_t addr, size_t len, \
-			    int prot); }
-75	NOARGS		{ int sys_madvise(caddr_t addr, size_t len, \
-			    int behav); }
-76	OBSOL		vhangup
-77	OBSOL		vlimit
-78	NOARGS		{ int sys_mincore(caddr_t addr, size_t len, char *vec); }
-79	NOARGS		{ int sys_getgroups(u_int gidsetsize, gid_t *gidset); }
-80	NOARGS		{ int sys_setgroups(u_int gidsetsize, gid_t *gidset); }
-81	NOARGS		{ int sys_getpgrp(void); }
-82	NOARGS		{ int sys_setpgid(int pid, int pgid); }
-83	NOARGS		{ int sys_setitimer(u_int which, \
-			    struct itimerval *itv, struct itimerval *oitv); }
-84	NOARGS		{ int compat_43_sys_wait(void); } owait
-85	NOARGS		{ int compat_25_sys_swapon(char *name); }
-86	NOARGS		{ int sys_getitimer(u_int which, \
-			    struct itimerval *itv); }
-87	NOARGS		{ int compat_43_sys_gethostname(char *hostname, \
-			    u_int len); } ogethostname
-88	NOARGS		{ int compat_43_sys_sethostname(char *hostname, \
-			    u_int len); } osethostname
-89	NOARGS		{ int compat_43_sys_getdtablesize(void); } \
-			    ogetdtablesize
-90	NOARGS		{ int sys_dup2(u_int from, u_int to); }
-91	UNIMPL		getdopt
-92	NOARGS		{ int sys_fcntl(int fd, int cmd, void *arg); }
-93	NOARGS		{ int sys_select(u_int nd, fd_set *in, fd_set *ou, \
-			    fd_set *ex, struct timeval *tv); }
-94	UNIMPL		setdopt
-95	NOARGS		{ int sys_fsync(int fd); }
-96	NOARGS		{ int sys_setpriority(int which, int who, int prio); }
-97	NOARGS		{ int sys_socket(int domain, int type, int protocol); }
-98	NOARGS		{ int sys_connect(int s, caddr_t name, int namelen); }
-99	NOARGS		{ int compat_43_sys_accept(int s, caddr_t name, \
-			    int *anamelen); } oaccept
-100	NOARGS		{ int sys_getpriority(int which, int who); }
-101	NOARGS		{ int compat_43_sys_send(int s, caddr_t buf, int len, \
-			    int flags); } osend
-102	NOARGS		{ int compat_43_sys_recv(int s, caddr_t buf, int len, \
-			    int flags); } orecv
-103	NOARGS		{ int sys_sigreturn( struct sigcontext *scp); }
-104	NOARGS		{ int sys_bind(int s, caddr_t name, int namelen); }
-105	NOARGS		{ int sys_setsockopt(int s, int level, int name, \
-			    caddr_t val, int valsize); }
-106	NOARGS		{ int sys_listen(int s, int backlog); }
-107	OBSOL		vtimes
-108	NOARGS		{ int compat_43_sys_sigvec(int signum, \
-			    struct sigvec *nsv, struct sigvec *osv); } osigvec
-109	NOARGS		{ int compat_43_sys_sigblock(int mask); } osigblock
-110	NOARGS		{ int compat_43_sys_sigsetmask(int mask); } osigsetmask
-111	NOARGS		{ int sys_sigsuspend(int mask); }
-112	NOARGS		{ int compat_43_sys_sigstack(struct sigstack *nss, \
-			    struct sigstack *oss); } osigstack
-113	NOARGS		{ int compat_43_sys_recvmsg(int s, \
-			    struct omsghdr *msg, int flags); } orecvmsg
-114	NOARGS		{ int compat_43_sys_sendmsg(int s, caddr_t msg, \
-			    int flags); } osendmsg
-#ifdef TRACE
-115	NOARGS		{ int sys_vtrace(int request, int value); }
-#else
-115	OBSOL		vtrace
-#endif
-116	NOARGS		{ int sys_gettimeofday(struct timeval *tp, \
-			    struct timezone *tzp); }
-117	NOARGS		{ int sys_getrusage(int who, struct rusage *rusage); }
-118	NOARGS		{ int sys_getsockopt(int s, int level, int name, \
-			    caddr_t val, int *avalsize); }
-119	OBSOL		resuba
-120	NOARGS		{ int sys_readv(int fd, struct iovec *iovp, \
-			    u_int iovcnt); }
-121	NOARGS		{ int sys_writev(int fd, struct iovec *iovp, \
-			    u_int iovcnt); }
-122	NOARGS		{ int sys_settimeofday(struct timeval *tv, \
-			    struct timezone *tzp); }
-123	NOARGS		{ int sys_fchown(int fd, int uid, int gid); }
-124	NOARGS		{ int sys_fchmod(int fd, int mode); }
-125	NOARGS		{ int compat_43_sys_recvfrom(int s, caddr_t buf, \
-			    size_t len, int flags, caddr_t from, \
-			    int *fromlenaddr); } orecvfrom
-126	NOARGS		{ int sys_setreuid(uid_t ruid, uid_t euid); }
-127	NOARGS		{ int sys_setregid(gid_t rgid, gid_t egid); }
-128	NOARGS		{ int sys_rename(char *from, char *to); }
-129	NOARGS		{ int compat_43_sys_truncate(char *path, \
-			    long length); } otruncate
-130	NOARGS		{ int compat_43_sys_ftruncate(int fd, long length); } \
-			    oftruncate
-131	NOARGS		{ int sys_flock(int fd, int how); }
-132	NOARGS		{ int sys_mkfifo(char *path, int mode); }
-133	NOARGS		{ int sys_sendto(int s, caddr_t buf, size_t len, \
-			    int flags, caddr_t to, int tolen); }
-134	NOARGS		{ int sys_shutdown(int s, int how); }
-135	NOARGS		{ int sys_socketpair(int domain, int type, \
-			    int protocol, int *rsv); }
-136	NOARGS		{ int sys_mkdir(char *path, int mode); }
-137	NOARGS		{ int sys_rmdir(char *path); }
-138	NOARGS		{ int sys_utimes(char *path, struct timeval *tptr); }
-139	OBSOL		4.2 sigreturn
-140	NOARGS		{ int sys_adjtime(struct timeval *delta, \
-			    struct timeval *olddelta); }
-141	NOARGS		{ int compat_43_sys_getpeername(int fdes, caddr_t asa, \
-			    int *alen); } ogetpeername
-142	NOARGS		{ int32_t compat_43_sys_gethostid(void); } ogethostid
-143	NOARGS		{ int compat_43_sys_sethostid(int32_t hostid); } \
-			    osethostid
-144	NOARGS		{ int compat_43_sys_getrlimit(u_int which, \
-			    struct ogetrlimit *rlp); } ogetrlimit
-145	NOARGS		{ int compat_43_sys_setrlimit(u_int which, \
-			    struct ogetrlimit *rlp); } osetrlimit
-146	NOARGS		{ int compat_43_sys_killpg(int pgid, int signum); } \
-			    okillpg
-147	NOARGS		{ int sys_setsid(void); }
-148	NOARGS		{ int sys_quotactl(char *path, int cmd, int uid, \
-			    caddr_t arg); }
-149	NOARGS		{ int compat_43_sys_quota(void); } oquota
-150	NOARGS		{ int compat_43_sys_getsockname(int fdec, caddr_t asa, \
-			    int *alen); } ogetsockname
-
-; Syscalls 151-180 inclusive are reserved for vendor-specific
-; system calls.  (This includes various calls added for compatibity
-; with other Unix variants.)
-; Some of these calls are now supported by BSD...
-;
-151	UNIMPL		sem_lock
-152	UNIMPL		sem_wakeup
-153	UNIMPL		asyncdaemon
-154	UNIMPL
-#if defined(NFSCLIENT) || defined(NFSSERVER)
-155	NOARGS		{ int sys_nfssvc(int flag, caddr_t argp); }
-#else
-155	UNIMPL
-#endif
-156	NOARGS		{ int compat_43_sys_getdirentries(int fd, char *buf, \
-			    u_int count, long *basep); } ogetdirentries
-157	NOARGS		{ int compat_25_sys_statfs(char *path, \
-			    struct ostatfs *buf); }
-158	NOARGS		{ int compat_25_sys_fstatfs(int fd, \
-			    struct ostatfs *buf); }
-159	UNIMPL
-160	UNIMPL
-#ifdef NFSCLIENT
-161	NOARGS		{ int sys_getfh(char *fname, fhandle_t *fhp); }
-#else
-161	UNIMPL		getfh
-#endif
-162	UNIMPL
-163	UNIMPL
-164	UNIMPL
-165	UNIMPL
-166	UNIMPL
-167	UNIMPL
-168	UNIMPL
-169	UNIMPL
-170	UNIMPL
-; XXX more generally, never on machines where sizeof(void *) != sizeof(int)
-#if defined(SYSVSHM) && !defined(__alpha__)
-171	NOARGS		{ int compat_10_sys_shmsys(int which, int a2, int a3, \
-			    int a4); }
-#else
-171	UNIMPL		shmsys
-#endif
-172	UNIMPL
-173	UNIMPL
-174	UNIMPL
-175	UNIMPL
-176	UNIMPL
-177	UNIMPL		sfork
-178	UNIMPL
-179	UNIMPL		getdescriptor
-180	UNIMPL		setdescriptor
-
-; Syscalls 180-199 are used by/reserved for BSD
-181	NOARGS		{ int sys_setgid(gid_t gid); }
-182	NOARGS		{ int sys_setegid(gid_t egid); }
-183	NOARGS		{ int sys_seteuid(uid_t euid); }
-184	UNIMPL
-185	UNIMPL
-186	UNIMPL
-187	UNIMPL
-188	NOARGS		{ int compat_35_sys_stat(char *path, \
-			    struct stat35 *ub); } stat35
-189	NOARGS		{ int compat_35_sys_fstat(int fd, \
-			    struct stat35 *sb); } fstat35
-190	NOARGS		{ int compat_35_sys_lstat(char *path, \
-			    struct stat35 *ub); } lstat35
-191	NOARGS		{ int sys_pathconf(char *path, int name); }
-192	NOARGS		{ int sys_fpathconf(int fd, int name); }
-193	UNIMPL
-194	NOARGS		{ int sys_getrlimit(u_int which, struct rlimit *rlp); }
-195	NOARGS		{ int sys_setrlimit(u_int which, struct rlimit *rlp); }
-196	NOARGS		{ int sys_getdirentries(int fd, char *buf, \
-			    u_int count, long *basep); }
-197	NOARGS		{ caddr_t sys_mmap(caddr_t addr, size_t len, int prot, \
-			    int flags, int fd, long pad, off_t pos); }
-198	NOARGS		{ int sys_nosys(void); } __syscall
-199	NOARGS		{ off_t sys_lseek(int fd, int pad, off_t offset, \
-			    int whence); }
-200	NOARGS		{ int sys_truncate(char *path, int pad, off_t length); }
-201	NOARGS		{ int sys_ftruncate(int fd, int pad, off_t length); }
-202	NOARGS		{ int sys___sysctl(int *name, u_int namelen, \
-			    void *old, size_t *oldlenp, void *new, \
-			    size_t newlen); }
-203	NOARGS		{ int sys_mlock(caddr_t addr, size_t len); }
-204	NOARGS		{ int sys_munlock(caddr_t addr, size_t len); }
-205	UNIMPL		sys_undelete
-206	UNIMPL
-207	UNIMPL
-208	UNIMPL
-209	UNIMPL
-210	UNIMPL
-211	UNIMPL
-212	UNIMPL
-213	UNIMPL
-214	UNIMPL
-215	UNIMPL
-216	UNIMPL
-217	UNIMPL
-218	UNIMPL
-219	UNIMPL
-; BSD/OS 3.0 starts here with the Net/OpenBSD SYSV* syscalls.  This needs
-; checking against manpages to see how/if these differ.  (Probably not at all.)
-#ifdef SYSVSEM
-220	NOARGS		{ int sys___semctl(int semid, int semnum, int cmd, \
-			    union semun *arg); }
-221	NOARGS		{ int sys_semget(key_t key, int nsems, int semflg); }
-222	NOARGS		{ int sys_semop(int semid, struct sembuf *sops, \
-			    u_int nsops); }
-; 223 is UNIMPL in BSD/OS
-223	OBSOL		sys_semconfig
-#else
-220	UNIMPL		semctl
-221	UNIMPL		semget
-222	UNIMPL		semop
-223	UNIMPL		semconfig
-#endif
-#ifdef SYSVMSG
-224	NOARGS		{ int sys_msgctl(int msqid, int cmd, \
-			    struct msqid_ds *buf); }
-225	NOARGS		{ int sys_msgget(key_t key, int msgflg); }
-226	NOARGS		{ int sys_msgsnd(int msqid, void *msgp, size_t msgsz, \
-			    int msgflg); }
-227	NOARGS		{ int sys_msgrcv(int msqid, void *msgp, size_t msgsz, \
-			    long msgtyp, int msgflg); }
-#else
-224	UNIMPL		msgctl
-225	UNIMPL		msgget
-226	UNIMPL		msgsnd
-227	UNIMPL		msgrcv
-#endif
-#ifdef SYSVSHM
-228	NOARGS		{ int sys_shmat(int shmid, void *shmaddr, int shmflg); }
-229	NOARGS		{ int sys_shmctl(int shmid, int cmd, \
-			    struct shmid_ds *buf); }
-230	NOARGS		{ int sys_shmdt(void *shmaddr); }
-231	NOARGS		{ int sys_shmget(key_t key, int size, int shmflg); }
-#else
-228	UNIMPL		shmat
-229	UNIMPL		shmctl
-230	UNIMPL		shmdt
-231	UNIMPL		shmget
-#endif
diff --git a/sys/kern/exec_conf.c b/sys/kern/exec_conf.c
index a25f1832285..705b5f6b40e 100644
--- a/sys/kern/exec_conf.c
+++ b/sys/kern/exec_conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exec_conf.c,v 1.24 2010/07/02 19:57:15 tedu Exp $	*/
+/*	$OpenBSD: exec_conf.c,v 1.25 2010/07/05 22:20:22 tedu Exp $	*/
 /*	$NetBSD: exec_conf.c,v 1.16 1995/12/09 05:34:47 cgd Exp $	*/
 
 /*
@@ -51,10 +51,6 @@
 #include <compat/linux/linux_exec.h>
 #endif
 
-#ifdef COMPAT_BSDOS
-#include <compat/bsdos/bsdos_exec.h>
-#endif
-
 #ifdef COMPAT_FREEBSD
 #include <compat/freebsd/freebsd_exec.h>
 #endif
@@ -64,7 +60,7 @@
 #endif
 
 extern struct emul emul_native, emul_elf32, emul_elf64, emul_aout,
-	emul_bsdos, emul_freebsd_aout, emul_freebsd_elf,
+	emul_freebsd_aout, emul_freebsd_elf,
 	emul_linux_elf, emul_linux_aout, emul_netbsd_elf64,
 	emul_sunos, emul_svr4;
 
@@ -90,9 +86,6 @@ struct execsw execsw[] = {
 	{ LINUX_AOUT_HDR_SIZE, exec_linux_aout_makecmds, &emul_linux_aout }, /* linux a.out */
 	{ sizeof(Elf32_Ehdr), exec_linux_elf32_makecmds, &emul_linux_elf },
 #endif
-#ifdef COMPAT_BSDOS
-	{ BSDOS_AOUT_HDR_SIZE, exec_bsdos_aout_makecmds, &emul_bsdos },	/* bsdos */
-#endif
 #ifdef COMPAT_FREEBSD
 	{ FREEBSD_AOUT_HDR_SIZE, exec_freebsd_aout_makecmds, &emul_freebsd_aout },	/* freebsd */
 	{ sizeof(Elf32_Ehdr), exec_freebsd_elf32_makecmds, &emul_freebsd_elf },
diff --git a/sys/sys/socket.h b/sys/sys/socket.h
index ca2dfb3ed1b..2c9d895a334 100644
--- a/sys/sys/socket.h
+++ b/sys/sys/socket.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: socket.h,v 1.69 2010/07/03 04:44:51 guenther Exp $	*/
+/*	$OpenBSD: socket.h,v 1.70 2010/07/05 22:20:22 tedu Exp $	*/
 /*	$NetBSD: socket.h,v 1.14 1996/02/09 18:25:36 christos Exp $	*/
 
 /*
@@ -503,7 +503,7 @@ int	setrtable(int);
 __END_DECLS
 #else
 # if defined(COMPAT_43) || defined(COMPAT_LINUX) || \
-     defined(COMPAT_FREEBSD) || defined(COMPAT_BSDOS)
+     defined(COMPAT_FREEBSD)
 #  define COMPAT_OLDSOCK
 #  define MSG_COMPAT	0x8000
 # endif