kill COMPAT_{09,10,11} kernel options. We still need kern_info_09.c and kern_ipc_10.c for other compat modules.

27 files changed, 48 insertions, 133 deletions

diff --git a/sys/arch/hppa/conf/SHEPHERD_PIE b/sys/arch/hppa/conf/SHEPHERD_PIE
index 6f373b26bec..95c960eb5e5 100644
--- a/sys/arch/hppa/conf/SHEPHERD_PIE
+++ b/sys/arch/hppa/conf/SHEPHERD_PIE
@@ -1,4 +1,4 @@
-#	$OpenBSD: SHEPHERD_PIE,v 1.10 2000/08/15 20:31:19 mickey Exp $
+#	$OpenBSD: SHEPHERD_PIE,v 1.11 2001/05/16 05:07:51 millert Exp $
 #
 # Diskless kernel config
 #
@@ -27,8 +27,7 @@ option		KMEMSTATS
 
 option		PMAPDEBUG
 
-option		COMPAT_11	# NetBSD 1.1,
-option		COMPAT_43	# and 4.3BSD
+option		COMPAT_43	# Compatibility with 4.3BSD
 
 #option		LKM		# loadable kernel modules
 
diff --git a/sys/arch/i386/conf/DISKLESS b/sys/arch/i386/conf/DISKLESS
index 4a7fc94a69a..212868813c7 100644
--- a/sys/arch/i386/conf/DISKLESS
+++ b/sys/arch/i386/conf/DISKLESS
@@ -1,4 +1,4 @@
-#	$OpenBSD: DISKLESS,v 1.33 2001/05/05 23:25:26 art Exp $
+#	$OpenBSD: DISKLESS,v 1.34 2001/05/16 05:07:49 millert Exp $
 #	$NetBSD: DISKLESS,v 1.26 1996/05/20 18:17:16 mrg Exp $
 #
 # DISKLESS -- Generic machine setup for diskless boot.
@@ -53,10 +53,7 @@ option		SYSVSHM		# System V-like memory sharing
 
 option		UVM_SWAP_ENCRYPT# support encryption of pages going to swap
 
-option		COMPAT_09	# Kernel compatibility with NetBSD 0.9,
-option		COMPAT_10	# NetBSD 1.0,
-option		COMPAT_11	# NetBSD 1.1,
-option		COMPAT_43	# and 4.3BSD
+option		COMPAT_43	# Kernel compatibility with 4.3BSD
 #option		TCP_COMPAT_42	# TCP bug compatibility with 4.2BSD
 
 option		COMPAT_SVR4	# binary compatibility with SVR4
diff --git a/sys/arch/i386/i386/mem.c b/sys/arch/i386/i386/mem.c
index 7c1c9aaa619..71f8c9bd9b1 100644
--- a/sys/arch/i386/i386/mem.c
+++ b/sys/arch/i386/i386/mem.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: mem.c,v 1.31 1996/05/03 19:42:19 christos Exp $	*/
-/*	$OpenBSD: mem.c,v 1.17 2001/05/05 23:25:39 art Exp $ */
+/*	$OpenBSD: mem.c,v 1.18 2001/05/16 05:07:48 millert Exp $ */
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -94,16 +94,6 @@ mmopen(dev, flag, mode, p)
 	case 2:
 	case 12:
 		break;
-#ifdef COMPAT_10
-	/* This is done by i386_iopl(3) now. */
-	case 14:
-		if (securelevel <= 0 && (flag & FWRITE)) {
-			struct trapframe *fp;
-			fp = curproc->p_md.md_regs;
-			fp->tf_eflags |= PSL_IOPL;
-		}
-		break;
-#endif
 #ifdef APERTURE
 	case 4:
 	        if (suser(p->p_ucred, &p->p_acflag) != 0 || !allowaperture)
diff --git a/sys/arch/i386/isa/pccons.c b/sys/arch/i386/isa/pccons.c
index 0de85a2c530..3f3f19879e9 100644
--- a/sys/arch/i386/isa/pccons.c
+++ b/sys/arch/i386/isa/pccons.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pccons.c,v 1.46 2000/11/13 15:53:34 aaron Exp $	*/
+/*	$OpenBSD: pccons.c,v 1.47 2001/05/16 05:07:48 millert Exp $	*/
 /*	$NetBSD: pccons.c,v 1.99.4.1 1996/06/04 20:03:53 cgd Exp $	*/
 
 /*-
@@ -1906,9 +1906,6 @@ pcmmap(dev, offset, nprot)
 void
 pc_xmode_on()
 {
-#ifdef COMPAT_10
-	struct trapframe *fp;
-#endif
 
 	if (pc_xmode)
 		return;
@@ -1920,13 +1917,6 @@ pc_xmode_on()
 	if (cursor_shape == 0xffff)
 		get_cursor_shape();
 #endif
-
-#ifdef COMPAT_10
-	/* This is done by i386_iopl(3) now. */
-	fp = curproc->p_md.md_regs;
-	if (securelevel <= 0)
-		fp->tf_eflags |= PSL_IOPL;
-#endif
 }
 
 void
diff --git a/sys/arch/i386/isa/pcvt/pcvt_ext.c b/sys/arch/i386/isa/pcvt/pcvt_ext.c
index 1f125296ed1..cce3eed5ca1 100644
--- a/sys/arch/i386/isa/pcvt/pcvt_ext.c
+++ b/sys/arch/i386/isa/pcvt/pcvt_ext.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcvt_ext.c,v 1.29 2001/01/22 18:48:43 deraadt Exp $	*/
+/*	$OpenBSD: pcvt_ext.c,v 1.30 2001/05/16 05:07:48 millert Exp $	*/
 /*
  * Copyright (c) 1992, 1995 Hellmuth Michaelis and Joerg Wunsch.
  *
@@ -2756,14 +2756,14 @@ usl_vt_ioctl(Dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 		 */
 	{
 
-#if defined(COMPAT_10) || defined(COMPAT_11) || defined(COMPAT_LINUX)
+#ifdef COMPAT_LINUX
 		struct trapframe *fp = (struct trapframe *)p->p_md.md_regs;
 #endif
 
 		if (suser(p->p_ucred, &p->p_acflag) || securelevel > 1)
 			return (EPERM);
 
-#if defined(COMPAT_10) || defined(COMPAT_11) || defined(COMPAT_LINUX)
+#ifdef COMPAT_LINUX
 		/* This is done by i386_iopl(3) now. */
 		fp->tf_eflags |= PSL_IOPL;
 #endif
@@ -2775,7 +2775,7 @@ usl_vt_ioctl(Dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 		/* abandon IO access permission */
 	{
 
-#if defined(COMPAT_10) || defined(COMPAT_11) || defined(COMPAT_LINUX)
+#ifdef COMPAT_LINUX
 		/* This is done by i386_iopl(3) now. */
 		struct trapframe *fp = (struct trapframe *)p->p_md.md_regs;
 		fp->tf_eflags &= ~PSL_IOPL;
diff --git a/sys/arch/mvme68k/conf/MVME147 b/sys/arch/mvme68k/conf/MVME147
index bf9e3fc1a2e..b71a74b0612 100644
--- a/sys/arch/mvme68k/conf/MVME147
+++ b/sys/arch/mvme68k/conf/MVME147
@@ -1,4 +1,4 @@
-#	$OpenBSD: MVME147,v 1.11 2001/02/18 17:41:01 deraadt Exp $
+#	$OpenBSD: MVME147,v 1.12 2001/05/16 05:07:49 millert Exp $
 
 machine		mvme68k m68k
 
@@ -37,7 +37,6 @@ option		GATEWAY		# IP packet forwarding
 #option		ISO		# OSI networking
 #option		TPIP
 #option		EON
-#option		COMPAT_09, COMPAT_10
 
 config		bsd	swap generic
 
diff --git a/sys/arch/mvme68k/conf/MVME162 b/sys/arch/mvme68k/conf/MVME162
index 8cbc1817258..8ae08bcaff7 100644
--- a/sys/arch/mvme68k/conf/MVME162
+++ b/sys/arch/mvme68k/conf/MVME162
@@ -1,4 +1,4 @@
-#	$OpenBSD: MVME162,v 1.13 2001/02/18 17:41:02 deraadt Exp $
+#	$OpenBSD: MVME162,v 1.14 2001/05/16 05:07:49 millert Exp $
 
 machine		mvme68k m68k
 
@@ -37,7 +37,6 @@ option		GATEWAY		# IP packet forwarding
 #option		ISO		# OSI networking
 #option		TPIP
 #option		EON
-#option		COMPAT_09, COMPAT_10
 
 config		bsd	swap generic
 
diff --git a/sys/arch/mvme68k/conf/MVME167 b/sys/arch/mvme68k/conf/MVME167
index 4e84a3f240c..cd040a29ab8 100644
--- a/sys/arch/mvme68k/conf/MVME167
+++ b/sys/arch/mvme68k/conf/MVME167
@@ -1,4 +1,4 @@
-#	$OpenBSD: MVME167,v 1.13 2001/02/18 17:41:02 deraadt Exp $
+#	$OpenBSD: MVME167,v 1.14 2001/05/16 05:07:49 millert Exp $
 
 machine		mvme68k m68k
 
@@ -37,7 +37,6 @@ option		GATEWAY		# IP packet forwarding
 #option		ISO		# OSI networking
 #option		TPIP
 #option		EON
-#option		COMPAT_09, COMPAT_10
 
 config		bsd	swap generic
 
diff --git a/sys/arch/pmax/conf/DS3100 b/sys/arch/pmax/conf/DS3100
index 7b693e84944..d36ab33865c 100644
--- a/sys/arch/pmax/conf/DS3100
+++ b/sys/arch/pmax/conf/DS3100
@@ -1,4 +1,4 @@
-#	$OpenBSD: DS3100,v 1.8 2000/05/01 22:25:46 maja Exp $
+#	$OpenBSD: DS3100,v 1.9 2001/05/16 05:07:50 millert Exp $
 #
 # DECstation (3100 or 2100) config file
 #
@@ -62,10 +62,6 @@ option		KTRACE			# ktrace(1) support
 #option		ISO			# osi networking
 #option		TPIP
 #option		EON
-# i think this is not required for us - NetBSD backwards compatibility
-#option		COMPAT_10		# NetBSD 1.0
-#option		COMPAT_11		# NetBSD 1.1
-#option		COMPAT_12		# Netbsd 1.2
 # compat stuff
 #option		COMPAT_ULTRIX		# ultrix compatibility
 
diff --git a/sys/arch/pmax/conf/DS5000_100 b/sys/arch/pmax/conf/DS5000_100
index e8ddd2b74ee..f97875c6219 100644
--- a/sys/arch/pmax/conf/DS5000_100
+++ b/sys/arch/pmax/conf/DS5000_100
@@ -1,4 +1,4 @@
-#	$OpenBSD: DS5000_100,v 1.6 1999/10/01 21:59:33 maja Exp $
+#	$OpenBSD: DS5000_100,v 1.7 2001/05/16 05:07:50 millert Exp $
 #
 # DECstation 5000/100 kernel config
 #
@@ -62,10 +62,6 @@ option		KTRACE			# ktrace(1) support
 #option		ISO			# osi networking
 #option		TPIP
 #option		EON
-# i think this is not required for us - NetBSD backwards compatibility
-#option		COMPAT_10		# NetBSD 1.0
-#option		COMPAT_11		# NetBSD 1.1
-#option		COMPAT_12		# Netbsd 1.2
 # compat stuff
 #option		COMPAT_ULTRIX		# ultrix compatibility
 
diff --git a/sys/arch/pmax/conf/DS5000_200 b/sys/arch/pmax/conf/DS5000_200
index 99f3c44820f..d9a9bb8503e 100644
--- a/sys/arch/pmax/conf/DS5000_200
+++ b/sys/arch/pmax/conf/DS5000_200
@@ -1,4 +1,4 @@
-#	$OpenBSD: DS5000_200,v 1.7 2000/05/01 22:25:46 maja Exp $
+#	$OpenBSD: DS5000_200,v 1.8 2001/05/16 05:07:50 millert Exp $
 #
 # DECstation 5000/200 (KN02 motherboard, codname 3MAX) kernel config
 #
@@ -62,10 +62,6 @@ option		KTRACE			# ktrace(1) support
 #option		ISO			# osi networking
 #option		TPIP
 #option		EON
-# i think this is not required for us - NetBSD backwards compatibility
-#option		COMPAT_10		# NetBSD 1.0
-#option		COMPAT_11		# NetBSD 1.1
-#option		COMPAT_12		# Netbsd 1.2
 # compat stuff
 #option		COMPAT_ULTRIX		# ultrix compatibility
 
diff --git a/sys/arch/pmax/conf/DS5000_240 b/sys/arch/pmax/conf/DS5000_240
index 347107980fc..7ef85118596 100644
--- a/sys/arch/pmax/conf/DS5000_240
+++ b/sys/arch/pmax/conf/DS5000_240
@@ -1,4 +1,4 @@
-#	$OpenBSD: DS5000_240,v 1.8 2000/11/10 01:07:04 miod Exp $
+#	$OpenBSD: DS5000_240,v 1.9 2001/05/16 05:07:50 millert Exp $
 #
 # DECstation 5000/240 kernel config
 #
@@ -62,10 +62,6 @@ option		KTRACE			# ktrace(1) support
 #option		ISO			# osi networking
 #option		TPIP
 #option		EON
-# i think this is not required for us - NetBSD backwards compatibility
-#option		COMPAT_10		# NetBSD 1.0
-#option		COMPAT_11		# NetBSD 1.1
-#option		COMPAT_12		# Netbsd 1.2
 # compat stuff
 #option		COMPAT_ULTRIX		# ultrix compatibility
 
diff --git a/sys/arch/pmax/conf/DS5000_25 b/sys/arch/pmax/conf/DS5000_25
index 7b09ca37de8..98ee1505d11 100644
--- a/sys/arch/pmax/conf/DS5000_25
+++ b/sys/arch/pmax/conf/DS5000_25
@@ -1,4 +1,4 @@
-#	$OpenBSD: DS5000_25,v 1.6 1999/10/01 21:59:33 maja Exp $
+#	$OpenBSD: DS5000_25,v 1.7 2001/05/16 05:07:50 millert Exp $
 #
 # DECstation 5000/20, 5000/25 or 5000/33 kernel config
 #
@@ -62,10 +62,6 @@ option		KTRACE			# ktrace(1) support
 #option		ISO			# osi networking
 #option		TPIP
 #option		EON
-# i think this is not required for us - NetBSD backwards compatibility
-#option		COMPAT_10		# NetBSD 1.0
-#option		COMPAT_11		# NetBSD 1.1
-#option		COMPAT_12		# Netbsd 1.2
 # compat stuff
 #option		COMPAT_ULTRIX		# ultrix compatibility
 
diff --git a/sys/arch/pmax/conf/GENERIC b/sys/arch/pmax/conf/GENERIC
index cf71f0efcd1..a74c3076bfb 100644
--- a/sys/arch/pmax/conf/GENERIC
+++ b/sys/arch/pmax/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.19 2001/03/08 03:37:19 itojun Exp $
+#	$OpenBSD: GENERIC,v 1.20 2001/05/16 05:07:50 millert Exp $
 #
 # GENERIC kernel for the distribition simpleroot
 #
@@ -71,10 +71,6 @@ option		KERNFS			# kernel data-structure filesystem
 #option		EON
 option		IPFILTER		# IP packet filter for security
 option		IPFILTER_LOG		# use /dev/ipl to log IPF
-# i think this is not required for us - NetBSD backwards compatibility
-#option		COMPAT_10		# NetBSD 1.0
-#option		COMPAT_11		# NetBSD 1.1
-#option		COMPAT_12		# Netbsd 1.2
 # compat stuff
 #option		COMPAT_ULTRIX		# ultrix compatibility
 
diff --git a/sys/arch/pmax/conf/GENERIC.NFS b/sys/arch/pmax/conf/GENERIC.NFS
index 7c351fd2262..5b502861ef3 100644
--- a/sys/arch/pmax/conf/GENERIC.NFS
+++ b/sys/arch/pmax/conf/GENERIC.NFS
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC.NFS,v 1.7 2000/09/13 21:03:36 maja Exp $
+#	$OpenBSD: GENERIC.NFS,v 1.8 2001/05/16 05:07:50 millert Exp $
 #
 # GENERIC netboot / nfs root + swap kernel for the distribition simpleroot
 #
@@ -69,10 +69,6 @@ option		KERNFS			# kernel data-structure filesystem
 #option		EON
 option		IPFILTER		# IP packet filter for security
 option		IPFILTER_LOG		# use /dev/ipl to log IPF
-# i think this is not required for us - NetBSD backwards compatibility
-#option		COMPAT_10		# NetBSD 1.0
-#option		COMPAT_11		# NetBSD 1.1
-#option		COMPAT_12		# Netbsd 1.2
 # compat stuff
 #option		COMPAT_ULTRIX		# ultrix compatibility
 
diff --git a/sys/arch/pmax/conf/GENERIC.rz0 b/sys/arch/pmax/conf/GENERIC.rz0
index 40239e412e7..42232b50905 100644
--- a/sys/arch/pmax/conf/GENERIC.rz0
+++ b/sys/arch/pmax/conf/GENERIC.rz0
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC.rz0,v 1.7 2000/09/13 21:03:36 maja Exp $
+#	$OpenBSD: GENERIC.rz0,v 1.8 2001/05/16 05:07:50 millert Exp $
 #
 # GENERIC kernel for the distribition simpleroot with root + swap hardcoded
 # to rz0 - required for use with zip drives for instance
@@ -70,10 +70,6 @@ option		KERNFS			# kernel data-structure filesystem
 #option		EON
 option		IPFILTER		# IP packet filter for security
 option		IPFILTER_LOG		# use /dev/ipl to log IPF
-# i think this is not required for us - NetBSD backwards compatibility
-#option		COMPAT_10		# NetBSD 1.0
-#option		COMPAT_11		# NetBSD 1.1
-#option		COMPAT_12		# Netbsd 1.2
 # compat stuff
 #option		COMPAT_ULTRIX		# ultrix compatibility
 
diff --git a/sys/arch/sparc/conf/SUN4C b/sys/arch/sparc/conf/SUN4C
index a67267d77b3..4fc58d8128d 100644
--- a/sys/arch/sparc/conf/SUN4C
+++ b/sys/arch/sparc/conf/SUN4C
@@ -1,4 +1,4 @@
-# 	$OpenBSD: SUN4C,v 1.29 2001/05/10 10:34:41 art Exp $
+# 	$OpenBSD: SUN4C,v 1.30 2001/05/16 05:07:49 millert Exp $
 # 	$NetBSD: GENERIC,v 1.19 1995/10/08 11:45:39 pk Exp $
 
 machine		sparc
@@ -16,7 +16,6 @@ option		KTRACE			# system call tracing support
 #option		KGDBDEV=0xc01, KGDBRATE=38400	# device & baud rate
 option		RASTERCONSOLE		# fast rasterop console
 option		SYSVMSG,SYSVSEM,SYSVSHM
-option		COMPAT_09, COMPAT_10
 
 option		UVM		# use the UVM virtual memory system ; required
 
diff --git a/sys/arch/vax/conf/NANCY b/sys/arch/vax/conf/NANCY
index b321ada64ec..8c207f9a72d 100644
--- a/sys/arch/vax/conf/NANCY
+++ b/sys/arch/vax/conf/NANCY
@@ -1,4 +1,4 @@
-#	$OpenBSD: NANCY,v 1.5 1997/10/02 19:55:17 niklas Exp $
+#	$OpenBSD: NANCY,v 1.6 2001/05/16 05:07:50 millert Exp $
 #
 # NANCY MV3600 configuration file.
 #
@@ -60,10 +60,6 @@ option		FIFO
 # 4.3BSD Reno programs and get Ultrix compatibility instead.
 # (They cannot coexist).
 #option		COMPAT_43
-#option		COMPAT_09
-#option		COMPAT_10
-option		COMPAT_11
-option		COMPAT_12
 #option		COMPAT_ULTRIX
 #option		TCP_COMPAT_42
 
diff --git a/sys/arch/vax/conf/VOX b/sys/arch/vax/conf/VOX
index db6e7aad268..ca9ba5510ab 100644
--- a/sys/arch/vax/conf/VOX
+++ b/sys/arch/vax/conf/VOX
@@ -1,4 +1,4 @@
-#	$OpenBSD: VOX,v 1.2 1997/10/08 07:13:50 niklas Exp $
+#	$OpenBSD: VOX,v 1.3 2001/05/16 05:07:50 millert Exp $
 #
 # simple VS2000 configuration file.
 #
@@ -51,10 +51,6 @@ option		FIFO
 # 4.3BSD Reno programs and get Ultrix compatibility instead.
 # (They cannot coexist).
 #option		COMPAT_43
-#option		COMPAT_09
-#option		COMPAT_10
-#option		COMPAT_11
-#option		COMPAT_12
 #option		COMPAT_ULTRIX
 #option		TCP_COMPAT_42
 
diff --git a/sys/compat/common/kern_info_09.c b/sys/compat/common/kern_info_09.c
index 54bd6668f84..88faa49a2fc 100644
--- a/sys/compat/common/kern_info_09.c
+++ b/sys/compat/common/kern_info_09.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_info_09.c,v 1.6 1997/11/06 05:58:02 csapuntz Exp $	*/
+/*	$OpenBSD: kern_info_09.c,v 1.7 2001/05/16 05:07:51 millert Exp $	*/
 /*	$NetBSD: kern_info_09.c,v 1.5 1996/02/21 00:10:59 cgd Exp $	*/
 
 /*
@@ -49,6 +49,11 @@
 #include <sys/mount.h>
 #include <sys/syscallargs.h>
 
+/*
+ * Note that while we no longer have a COMPAT_09 kernel option,
+ * there are other COMPAT_* options that need these old functions.
+ */
+
 /* ARGSUSED */
 int
 compat_09_sys_getdomainname(p, v, retval)
diff --git a/sys/compat/common/kern_ipc_10.c b/sys/compat/common/kern_ipc_10.c
index fa545873729..1375c685660 100644
--- a/sys/compat/common/kern_ipc_10.c
+++ b/sys/compat/common/kern_ipc_10.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_ipc_10.c,v 1.4 2000/05/01 23:12:28 deraadt Exp $	*/
+/*	$OpenBSD: kern_ipc_10.c,v 1.5 2001/05/16 05:07:51 millert Exp $	*/
 /*	$NetBSD: kern_ipc_10.c,v 1.4 1995/10/07 06:26:25 mycroft Exp $	*/
 
 /*
@@ -46,6 +46,11 @@
 #include <vm/vm_map.h>
 #include <vm/vm_kern.h>
 
+/*
+ * Note that while we no longer have a COMPAT_10 kernel option,
+ * there are other COMPAT_* options that need these old functions.
+ */
+
 #ifdef SYSVSEM
 int
 compat_10_sys_semsys(p, v, retval)
@@ -101,9 +106,7 @@ compat_10_sys_semsys(p, v, retval)
 		return (EINVAL);
 	}
 }
-#endif
 
-#ifdef SYSVSHM
 int
 compat_10_sys_shmsys(p, v, retval)
 	struct proc *p;
@@ -162,9 +165,7 @@ compat_10_sys_shmsys(p, v, retval)
 		return (EINVAL);
 	}
 }
-#endif
 
-#ifdef SYSVMSG
 int
 compat_10_sys_msgsys(p, v, retval)
 	struct proc *p;
diff --git a/sys/compat/common/kern_sig_43.c b/sys/compat/common/kern_sig_43.c
index b2791b72818..2e3d78712c7 100644
--- a/sys/compat/common/kern_sig_43.c
+++ b/sys/compat/common/kern_sig_43.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_sig_43.c,v 1.4 2001/02/19 16:54:27 art Exp $	*/
+/*	$OpenBSD: kern_sig_43.c,v 1.5 2001/05/16 05:07:51 millert Exp $	*/
 /*	$NetBSD: kern_sig_43.c,v 1.7 1996/03/14 19:31:47 christos Exp $	*/
 
 /*
@@ -209,10 +209,6 @@ compat_43_sys_killpg(p, v, retval)
 		syscallarg(int) signum;
 	} */ *uap = v;
 
-#ifdef COMPAT_09
-	SCARG(uap, pgid) = (short) SCARG(uap, pgid);
-#endif
-
 	if ((u_int)SCARG(uap, signum) >= NSIG)
 		return (EINVAL);
 	return (killpg1(p, SCARG(uap, signum), SCARG(uap, pgid), 0));
diff --git a/sys/conf/GENERIC b/sys/conf/GENERIC
index 3bf3ef1b56f..192aedee7a8 100644
--- a/sys/conf/GENERIC
+++ b/sys/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.72 2001/05/04 03:33:32 deraadt Exp $
+#	$OpenBSD: GENERIC,v 1.73 2001/05/16 05:07:51 millert Exp $
 #
 #	Machine-independent option; used by all architectures for their
 #	GENERIC kernel
@@ -29,10 +29,7 @@ option		SYSVSHM		# System V-like memory sharing
 
 option		UVM_SWAP_ENCRYPT# support encryption of pages going to swap
 
-#option		COMPAT_09	# Kernel compatibility with NetBSD 0.9,
-#option		COMPAT_10	# NetBSD 1.0,
-option		COMPAT_11	# NetBSD 1.1,
-option		COMPAT_43	# and 4.3BSD
+option		COMPAT_43	# Kernel compatibility with  4.3BSD
 #option		TCP_COMPAT_42	# TCP bug compatibility with 4.2BSD
 
 option		LKM		# loadable kernel modules
diff --git a/sys/dev/wscons/wsdisplay_compat_usl.c b/sys/dev/wscons/wsdisplay_compat_usl.c
index 30006863de2..a45872a21d5 100644
--- a/sys/dev/wscons/wsdisplay_compat_usl.c
+++ b/sys/dev/wscons/wsdisplay_compat_usl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsdisplay_compat_usl.c,v 1.5 2001/04/14 04:48:00 aaron Exp $ */
+/* $OpenBSD: wsdisplay_compat_usl.c,v 1.6 2001/05/16 05:07:51 millert Exp $ */
 /* $NetBSD: wsdisplay_compat_usl.c,v 1.12 2000/03/23 07:01:47 thorpej Exp $ */
 
 /*
@@ -426,8 +426,7 @@ wsdisplay_usl_ioctl2(sc, scr, cmd, data, flag, p)
 			return (EPERM);
 		/* FALLTHRU */
 	    case KDDISABIO:
-#if defined(__i386__)
-#if defined(COMPAT_10) || defined(COMPAT_11) || defined(COMPAT_FREEBSD)
+#if defined(__i386__) && defined(COMPAT_FREEBSD)
 		{
 		struct trapframe *fp = (struct trapframe *)p->p_md.md_regs;
 		if (cmd == KDENABIO)
@@ -436,7 +435,6 @@ wsdisplay_usl_ioctl2(sc, scr, cmd, data, flag, p)
 			fp->tf_eflags &= ~PSL_IOPL;
 		}
 #endif
-#endif
 		return (0);
 	    case KDSETRAD:
 		/* XXX ignore for now */
diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c
index bbe76ff7bc7..3884df3cc90 100644
--- a/sys/kern/kern_exit.c
+++ b/sys/kern/kern_exit.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_exit.c,v 1.30 2001/04/02 21:43:11 niklas Exp $	*/
+/*	$OpenBSD: kern_exit.c,v 1.31 2001/05/16 05:07:52 millert Exp $	*/
 /*	$NetBSD: kern_exit.c,v 1.39 1996/04/22 01:38:25 christos Exp $	*/
 
 /*
@@ -425,10 +425,6 @@ sys_wait4(q, v, retval)
 	register struct proc *p, *t;
 	int status, error;
 
-#ifdef COMPAT_09
-	SCARG(uap, pid) = (short)SCARG(uap, pid);
-#endif
-
 	if (SCARG(uap, pid) == 0)
 		SCARG(uap, pid) = -q->p_pgid;
 	if (SCARG(uap, options) &~ (WUNTRACED|WNOHANG))
diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c
index fb6239eedb6..cc9fdc60fe3 100644
--- a/sys/kern/kern_sig.c
+++ b/sys/kern/kern_sig.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_sig.c,v 1.42 2001/04/02 21:43:12 niklas Exp $	*/
+/*	$OpenBSD: kern_sig.c,v 1.43 2001/05/16 05:07:52 millert Exp $	*/
 /*	$NetBSD: kern_sig.c,v 1.54 1996/04/22 01:38:32 christos Exp $	*/
 
 /*
@@ -559,10 +559,6 @@ sys_kill(cp, v, retval)
 	register struct proc *p;
 	register struct pcred *pc = cp->p_cred;
 
-#ifdef COMPAT_09
-	SCARG(uap, pid) = (short) SCARG(uap, pid);
-#endif
-
 	if ((u_int)SCARG(uap, signum) >= NSIG)
 		return (EINVAL);
 	if (SCARG(uap, pid) > 0) {
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c
index a6adf7c457c..a6bbdee1d73 100644
--- a/sys/kern/vfs_syscalls.c
+++ b/sys/kern/vfs_syscalls.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vfs_syscalls.c,v 1.73 2001/05/14 15:11:15 art Exp $	*/
+/*	$OpenBSD: vfs_syscalls.c,v 1.74 2001/05/16 05:07:52 millert Exp $	*/
 /*	$NetBSD: vfs_syscalls.c,v 1.71 1996/04/23 10:29:02 mycroft Exp $	*/
 
 /*
@@ -106,7 +106,7 @@ sys_mount(p, v, retval)
 	register struct vnode *vp;
 	register struct mount *mp;
 	int error, flag = 0;
-#if defined(COMPAT_09) || defined(COMPAT_43)
+#ifdef COMPAT_43
 	u_long fstypenum = 0;
 #endif
 	char fstypename[MFSNAMELEN];
@@ -195,7 +195,7 @@ sys_mount(p, v, retval)
 	}
 	error = copyinstr(SCARG(uap, type), fstypename, MFSNAMELEN, NULL);
 	if (error) {
-#if defined(COMPAT_09) || defined(COMPAT_43)
+#ifdef COMPAT_43
 		/*
 		 * Historically filesystem types were identified by number.
 		 * If we get an integer for the filesystem type instead of a
@@ -218,12 +218,6 @@ sys_mount(p, v, retval)
 		return (error);
 #endif
 	}
-#ifdef	COMPAT_10
-	/* Accept "ufs" as an alias for "ffs" */
-	if (!strncmp(fstypename, "ufs", MFSNAMELEN)) {
-		strncpy( fstypename, "ffs", MFSNAMELEN);
-	}
-#endif
 	for (vfsp = vfsconf; vfsp; vfsp = vfsp->vfc_next) {
 		if (!strcmp(vfsp->vfc_name, fstypename))
 			break;
@@ -231,7 +225,7 @@ sys_mount(p, v, retval)
 
 	if (vfsp == NULL) {
 		vput(vp);
-		return EOPNOTSUPP;
+		return (EOPNOTSUPP);
 	}
 
 	if (vp->v_mountedhere != NULL) {
@@ -2646,7 +2640,7 @@ statfs_to_ostatfs(p, mp, sp, osp)
 	struct statfs *sp;
 	struct ostatfs *osp;
 {
-#if defined(COMPAT_09) || defined(COMPAT_43)
+#ifdef COMPAT_43
 	osp->f_type = mp->mnt_vfc->vfc_typenum;
 #else
 	osp->f_type = 0;