From bc309929578385e948e4bc96249aa30de0f95c88 Mon Sep 17 00:00:00 2001
From: KATO Takenori <kato@FreeBSD.org>
Date: Tue, 25 Nov 1997 09:53:44 +0000
Subject: [PATCH] Sync with sys/i386/i386/trap.c revision 1.115.

---
 sys/pc98/i386/trap.c | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/sys/pc98/i386/trap.c b/sys/pc98/i386/trap.c
index 328b4d9ec6cb..2b06769a5cb1 100644
--- a/sys/pc98/i386/trap.c
+++ b/sys/pc98/i386/trap.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)trap.c	7.4 (Berkeley) 5/13/91
- *	$Id: trap.c,v 1.37 1997/10/12 11:57:23 kato Exp $
+ *	$Id: trap.c,v 1.38 1997/11/07 12:53:49 kato Exp $
  */
 
 /*
@@ -50,6 +50,8 @@
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/kernel.h>
+#include <sys/resourcevar.h>
+#include <sys/signalvar.h>
 #include <sys/syscall.h>
 #include <sys/sysent.h>
 #include <sys/vmmeter.h>
@@ -67,16 +69,17 @@
 #include <vm/vm_page.h>
 #include <vm/vm_extern.h>
 
-#include <sys/user.h>
-
 #include <machine/cpu.h>
 #include <machine/ipl.h>
 #include <machine/md_var.h>
-#include <machine/psl.h>
-#include <machine/../isa/intr_machdep.h>
+#include <machine/pcb.h>
+#ifdef SMP
 #include <machine/smp.h>
+#endif
 #include <machine/tss.h>
 
+#include <i386/isa/intr_machdep.h>
+
 #ifdef POWERFAIL_NMI
 #include <sys/syslog.h>
 #include <machine/clock.h>
@@ -957,10 +960,11 @@ syscall(frame)
 	int args[8];
 	u_int code;
 
-	sticks = p->p_sticks;
+#ifdef DIAGNOSTIC
 	if (ISPL(frame.tf_cs) != SEL_UPL)
 		panic("syscall");
-
+#endif
+	sticks = p->p_sticks;
 	p->p_md.md_regs = &frame;
 	params = (caddr_t)frame.tf_esp + sizeof(int);
 	code = frame.tf_eax;