From ada62b471afc09bbc6bb921f07607358e3d087c8 Mon Sep 17 00:00:00 2001
From: jlemon <jlemon@FreeBSD.org>
Date: Thu, 28 Aug 1997 14:36:56 +0000
Subject: Remove the vm86 support as an LKM, and link it directly into the
 kernel if 'options "VM86"' is in the config file.  The LKM was really for
 development, and has probably outlived its usefulness.

---
 sys/kern/subr_trap.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'sys/kern/subr_trap.c')

diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c
index 5895361..b27583f 100644
--- a/sys/kern/subr_trap.c
+++ b/sys/kern/subr_trap.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)trap.c	7.4 (Berkeley) 5/13/91
- *	$Id: trap.c,v 1.107 1997/08/21 06:32:39 charnier Exp $
+ *	$Id: trap.c,v 1.108 1997/08/26 18:10:33 peter Exp $
  */
 
 /*
@@ -85,7 +85,6 @@
 
 extern struct i386tss common_tss;
 
-int (*vm86_emulate) __P((struct vm86frame *));
 int (*pmath_emulate) __P((struct trapframe *));
 
 extern void trap __P((struct trapframe frame));
@@ -246,12 +245,14 @@ trap(frame)
 			 */
 		case T_PROTFLT:		/* general protection fault */
 		case T_STKFLT:		/* stack fault */
-			if (vm86_emulate && (frame.tf_eflags & PSL_VM)) {
-				i = (*vm86_emulate)((struct vm86frame *)&frame);
+#ifdef VM86
+			if (frame.tf_eflags & PSL_VM) {
+				i = vm86_emulate((struct vm86frame *)&frame);
 				if (i == 0)
 					goto out;
 				break;
 			}
+#endif /* VM86 */
 			/* FALL THROUGH */
 
 		case T_SEGNPFLT:	/* segment not present fault */
-- 
cgit v1.1