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

4 files changed, 8 insertions, 31 deletions

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;