From 9097944fcdf0c8bfa82daca3fc1043c1fa25059f Mon Sep 17 00:00:00 2001
From: Matthew Dillon <dillon@dragonflybsd.org>
Date: Fri, 12 Jan 2007 06:07:29 +0000
Subject: [PATCH] Misc cleanups.

---
 sys/platform/vkernel/i386/db_trace.c |  5 ++++-
 sys/platform/vkernel/i386/trap.c     | 18 +++++-------------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/sys/platform/vkernel/i386/db_trace.c b/sys/platform/vkernel/i386/db_trace.c
index 52d5176d6a..d0438cb846 100644
--- a/sys/platform/vkernel/i386/db_trace.c
+++ b/sys/platform/vkernel/i386/db_trace.c
@@ -24,7 +24,7 @@
  * rights to redistribute these changes.
  *
  * $FreeBSD: src/sys/i386/i386/db_trace.c,v 1.35.2.3 2002/02/21 22:31:25 silby Exp $
- * $DragonFly: src/sys/platform/vkernel/i386/db_trace.c,v 1.4 2007/01/08 16:03:22 dillon Exp $
+ * $DragonFly: src/sys/platform/vkernel/i386/db_trace.c,v 1.5 2007/01/12 06:07:29 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -220,7 +220,10 @@ db_nextframe(struct i386_frame **fp, db_addr_t *ip)
 	 */
 	tf = (struct trapframe *) ((int)*fp + 8);
 
+#if 0
 	esp = (ISPL(tf->tf_cs) == SEL_UPL) ?  tf->tf_esp : (int)&tf->tf_esp;
+#endif
+	esp = (int)&tf->tf_esp;
 
 	switch (frame_type) {
 	case TRAP:
diff --git a/sys/platform/vkernel/i386/trap.c b/sys/platform/vkernel/i386/trap.c
index 260ccb4241..e3e995cd35 100644
--- a/sys/platform/vkernel/i386/trap.c
+++ b/sys/platform/vkernel/i386/trap.c
@@ -36,7 +36,7 @@
  *
  *	from: @(#)trap.c	7.4 (Berkeley) 5/13/91
  * $FreeBSD: src/sys/i386/i386/trap.c,v 1.147.2.11 2003/02/27 19:09:59 luoqi Exp $
- * $DragonFly: src/sys/platform/vkernel/i386/trap.c,v 1.9 2007/01/11 10:15:17 dillon Exp $
+ * $DragonFly: src/sys/platform/vkernel/i386/trap.c,v 1.10 2007/01/12 06:07:29 dillon Exp $
  */
 
 /*
@@ -925,11 +925,11 @@ trap_fatal(struct trapframe *frame, int usermode, vm_offset_t eva)
 	code = frame->tf_xflags;
 	type = frame->tf_trapno;
 
-	if (type <= MAX_TRAP_MSG)
+	if (type <= MAX_TRAP_MSG) {
 		kprintf("\n\nFatal trap %d: %s while in %s mode\n",
 			type, trap_msg[type],
-        		/*frame->tf_eflags & PSL_VM ? "vm86" :*/
-			ISPL(frame->tf_cs) == SEL_UPL ? "user" : "kernel");
+			(usermode ? "user" : "kernel"));
+	}
 #ifdef SMP
 	/* three separate prints in case of a trap on an unmapped page */
 	kprintf("mp_lock = %08x; ", mp_lock);
@@ -945,7 +945,7 @@ trap_fatal(struct trapframe *frame, int usermode, vm_offset_t eva)
 	}
 	kprintf("instruction pointer	= 0x%x:0x%x\n",
 	       frame->tf_cs & 0xffff, frame->tf_eip);
-        if ((ISPL(frame->tf_cs) == SEL_UPL) /*||(frame->tf_eflags&PSL_VM)*/) {
+	if (usermode) {
 		ss = frame->tf_ss & 0xffff;
 		esp = frame->tf_esp;
 	} else {
@@ -1115,14 +1115,6 @@ syscall2(struct trapframe *frame)
 	u_int code;
 	union sysunion args;
 
-#ifdef DIAGNOSTIC
-	if (ISPL(frame->tf_cs) != SEL_UPL) {
-		get_mplock();
-		panic("syscall");
-		/* NOT REACHED */
-	}
-#endif
-
 #ifdef SMP
 	KASSERT(td->td_mpcount == 0, ("badmpcount syscall2 from %p", (void *)frame->tf_eip));
 	if (syscall_mpsafe == 0)
-- 
2.41.0