From b5d4171ff60677d883a8f4fdf912b23d5de9a433 Mon Sep 17 00:00:00 2001
From: jlemon <jlemon@FreeBSD.org>
Date: Tue, 1 Jun 1999 18:20:36 +0000
Subject: Unifdef VM86.

Reviewed by:	silence on on -current
---
 sys/i386/isa/ipl.s | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'sys/i386/isa/ipl.s')

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
-- 
cgit v1.1