diff options
| author | jlemon <jlemon@FreeBSD.org> | 1999-06-01 18:20:36 +0000 |
|---|---|---|
| committer | jlemon <jlemon@FreeBSD.org> | 1999-06-01 18:20:36 +0000 |
| commit | b5d4171ff60677d883a8f4fdf912b23d5de9a433 (patch) | |
| tree | 37d000a80ae9f6ab9ca36152f3fd48600aa82ae6 /sys/kern/subr_trap.c | |
| parent | d4d2c873635d9e513e6e5720150fd4e44067d68f (diff) | |
| download | FreeBSD-src-b5d4171ff60677d883a8f4fdf912b23d5de9a433.zip FreeBSD-src-b5d4171ff60677d883a8f4fdf912b23d5de9a433.tar.gz | |
Unifdef VM86.
Reviewed by: silence on on -current
Diffstat (limited to 'sys/kern/subr_trap.c')
| -rw-r--r-- | sys/kern/subr_trap.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c index 411d67f..df6e295 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.136 1999/04/28 01:03:26 luoqi Exp $ + * $Id: trap.c,v 1.137 1999/05/06 18:12:17 peter Exp $ */ /* @@ -47,7 +47,6 @@ #include "opt_ktrace.h" #include "opt_clock.h" #include "opt_trap.h" -#include "opt_vm86.h" #include <sys/param.h> #include <sys/systm.h> @@ -90,9 +89,7 @@ #include <machine/clock.h> #endif -#ifdef VM86 #include <machine/vm86.h> -#endif #ifdef DDB extern int in_Debugger, debugger_on_panic; @@ -266,7 +263,6 @@ restart: type = frame.tf_trapno; code = frame.tf_err; -#ifdef VM86 if (in_vm86call) { if (frame.tf_eflags & PSL_VM && (type == T_PROTFLT || type == T_STKFLT)) { @@ -293,7 +289,6 @@ restart: } goto kernel_trap; /* normal kernel trap handling */ } -#endif if ((ISPL(frame.tf_cs) == SEL_UPL) || (frame.tf_eflags & PSL_VM)) { /* user trap */ @@ -335,14 +330,12 @@ restart: */ case T_PROTFLT: /* general protection fault */ case T_STKFLT: /* stack fault */ -#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 */ @@ -426,9 +419,7 @@ restart: break; } } else { -#ifdef VM86 kernel_trap: -#endif /* kernel trap */ switch (type) { |
