Unifdef VM86.

Reviewed by:	silence on on -current

3 files changed, 5 insertions, 14 deletions

diff --git a/sys/i386/isa/apic_vector.s b/sys/i386/isa/apic_vector.s
index 66d53a6..11d370e 100644
--- a/sys/i386/isa/apic_vector.s
+++ b/sys/i386/isa/apic_vector.s
@@ -1,6 +1,6 @@
 /*
  *	from: vector.s, 386BSD 0.1 unknown origin
- *	$Id: apic_vector.s,v 1.37 1999/04/28 01:04:12 luoqi Exp $
+ *	$Id: apic_vector.s,v 1.38 1999/05/28 14:08:57 bde Exp $
  */
 
 
@@ -628,10 +628,8 @@ _Xcpucheckstate:
 	andl	$3, %eax
 	cmpl	$3, %eax
 	je	1f
-#ifdef VM86
 	testl	$PSL_VM, 24(%esp)
 	jne	1f
-#endif
 	incl	%ebx			/* system or interrupt */
 #ifdef CPL_AND_CML	
 	cmpl	$0, _inside_intr
diff --git a/sys/i386/isa/ipl.s b/sys/i386/isa/ipl.s
index 0ee85d2..66f31cf 100644
--- a/sys/i386/isa/ipl.s
+++ b/sys/i386/isa/ipl.s
@@ -36,7 +36,7 @@
  *
  *	@(#)ipl.s
  *
- *	$Id: ipl.s,v 1.26 1999/04/28 01:04:14 luoqi Exp $
+ *	$Id: ipl.s,v 1.27 1999/05/06 09:44:54 bde Exp $
  */
 
 
@@ -155,7 +155,6 @@ doreti_exit:
 	FAST_ICPL_UNLOCK		/* preserves %eax */
 	MPLOCKED decb _intr_nesting_level
 	MEXITCOUNT
-#ifdef VM86
 #ifdef CPL_AND_CML
 	/* XXX CPL_AND_CML needs work */
 #error not ready for vm86
@@ -181,7 +180,6 @@ doreti_stop:
 	nop
 1:
 	FAST_ICPL_UNLOCK		/* preserves %eax */
-#endif /* VM86 */
 
 #ifdef SMP
 #ifdef INTR_SIMPLELOCK
@@ -346,10 +344,8 @@ doreti_swi:
 	ALIGN_TEXT
 swi_ast:
 	addl	$8,%esp			/* discard raddr & cpl to get trap frame */
-#ifdef VM86
 	cmpl	$1,_in_vm86call
 	je	1f			/* stay in kernel mode */
-#endif
 	testb	$SEL_RPL_MASK,TF_CS(%esp)
 	je	swi_ast_phantom
 swi_ast_user:
@@ -365,7 +361,6 @@ swi_ast_user:
 
 	ALIGN_TEXT
 swi_ast_phantom:
-#ifdef VM86
 	/*
 	 * check for ast from vm86 mode.  Placed down here so the jumps do
 	 * not get taken for mainline code.
@@ -373,7 +368,6 @@ swi_ast_phantom:
 	testl	$PSL_VM,TF_EFLAGS(%esp)
 	jne	swi_ast_user
 1:
-#endif /* VM86 */
 	/*
 	 * These happen when there is an interrupt in a trap handler before
 	 * ASTs can be masked or in an lcall handler before they can be
diff --git a/sys/i386/isa/vesa.c b/sys/i386/isa/vesa.c
index 1d0763e..d734c64 100644
--- a/sys/i386/isa/vesa.c
+++ b/sys/i386/isa/vesa.c
@@ -23,20 +23,19 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: vesa.c,v 1.22 1999/03/31 15:27:00 yokota Exp $
+ * $Id: vesa.c,v 1.23 1999/05/09 15:57:52 peter Exp $
  */
 
 #include "vga.h"
 #include "opt_vga.h"
 #include "opt_vesa.h"
-#include "opt_vm86.h"
 #include "opt_fb.h"
 
 #ifdef VGA_NO_MODE_CHANGE
 #undef VESA
 #endif
 
-#if (NVGA > 0 && defined(VESA) && defined(VM86)) || defined(KLD_MODULE)
+#if (NVGA > 0 && defined(VESA)) || defined(KLD_MODULE)
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1153,4 +1152,4 @@ static moduledata_t vesa_mod = {
 
 DECLARE_MODULE(vesa, vesa_mod, SI_SUB_DRIVERS, SI_ORDER_MIDDLE);
 
-#endif /* (NVGA > 0 && VESA && VM86) || KLD_MODULE */
+#endif /* (NVGA > 0 && VESA) || KLD_MODULE */