diff options
| author | charnier <charnier@FreeBSD.org> | 1997-08-21 06:33:04 +0000 |
|---|---|---|
| committer | charnier <charnier@FreeBSD.org> | 1997-08-21 06:33:04 +0000 |
| commit | ec0491b457704b183e5677671c5f9c091b706bad (patch) | |
| tree | 97135bfb08c05cabc164f0bca66b668fa0244b79 /sys/kern/subr_trap.c | |
| parent | 7511b8f464a83d4d3fcab8607f7c224a08b65a74 (diff) | |
| download | FreeBSD-src-ec0491b457704b183e5677671c5f9c091b706bad.zip FreeBSD-src-ec0491b457704b183e5677671c5f9c091b706bad.tar.gz | |
Revert my previous commit about using CS_SECURE macro.
Requested by: Bruce.
Diffstat (limited to 'sys/kern/subr_trap.c')
| -rw-r--r-- | sys/kern/subr_trap.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c index de901c0..ac139d5 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.1 1997/08/19 20:26:01 smp Exp smp $ + * $Id: trap.c,v 1.106 1997/08/20 05:25:48 fsmp Exp $ */ /* @@ -206,7 +206,7 @@ trap(frame) type = frame.tf_trapno; code = frame.tf_err; - if (CS_SECURE(frame.tf_cs) || (frame.tf_eflags & PSL_VM)) { + if ((ISPL(frame.tf_cs) == SEL_UPL) || (frame.tf_eflags & PSL_VM)) { /* user trap */ sticks = p->p_sticks; @@ -722,7 +722,7 @@ trap_fatal(frame) printf("\n\nFatal trap %d: %s while in %s mode\n", type, trap_msg[type], frame->tf_eflags & PSL_VM ? "vm86" : - CS_SECURE(frame->tf_cs) ? "user" : "kernel"); + ISPL(frame->tf_cs) == SEL_UPL ? "user" : "kernel"); #ifdef SMP printf("cpuid = %d\n", cpuid); #endif @@ -735,7 +735,7 @@ trap_fatal(frame) } printf("instruction pointer = 0x%x:0x%x\n", frame->tf_cs & 0xffff, frame->tf_eip); - if (CS_SECURE(frame->tf_cs) || (frame->tf_eflags & PSL_VM)) { + if ((ISPL(frame->tf_cs) == SEL_UPL) || (frame->tf_eflags & PSL_VM)) { ss = frame->tf_ss & 0xffff; esp = frame->tf_esp; } else { @@ -893,7 +893,7 @@ syscall(frame) u_int code; sticks = p->p_sticks; - if (!CS_SECURE(frame.tf_cs)) + if (ISPL(frame.tf_cs) != SEL_UPL) panic("syscall"); p->p_md.md_regs = &frame; |
