summaryrefslogtreecommitdiffstats
path: root/sys/pc98/i386
diff options
context:
space:
mode:
authorkato <kato@FreeBSD.org>1997-07-21 13:04:54 +0000
committerkato <kato@FreeBSD.org>1997-07-21 13:04:54 +0000
commit2c550ff39218bff8f14f9689f171f96881ad4b9a (patch)
tree902fba4844b33cd5db3a8c8266687343fdd93877 /sys/pc98/i386
parent8df0f01f5826daffbe0697534d72179b3716380e (diff)
downloadFreeBSD-src-2c550ff39218bff8f14f9689f171f96881ad4b9a.zip
FreeBSD-src-2c550ff39218bff8f14f9689f171f96881ad4b9a.tar.gz
Synchronize with sys/i386/i386/machdep.c and trap.c revisions 1.253
and 1.101, respectively.
Diffstat (limited to 'sys/pc98/i386')
-rw-r--r--sys/pc98/i386/machdep.c8
-rw-r--r--sys/pc98/i386/trap.c6
2 files changed, 2 insertions, 12 deletions
diff --git a/sys/pc98/i386/machdep.c b/sys/pc98/i386/machdep.c
index 4732917..aff37a0 100644
--- a/sys/pc98/i386/machdep.c
+++ b/sys/pc98/i386/machdep.c
@@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* from: @(#)machdep.c 7.4 (Berkeley) 6/3/91
- * $Id: machdep.c,v 1.46 1997/06/23 09:35:36 kato Exp $
+ * $Id: machdep.c,v 1.47 1997/06/30 09:58:39 kato Exp $
*/
#include "apm.h"
@@ -57,14 +57,11 @@
#include <sys/buf.h>
#include <sys/reboot.h>
#include <sys/conf.h>
-#include <sys/file.h>
#include <sys/callout.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
-#include <sys/mount.h>
#include <sys/msgbuf.h>
#include <sys/sysent.h>
-#include <sys/tty.h>
#include <sys/sysctl.h>
#include <sys/vmmeter.h>
@@ -93,7 +90,6 @@
#include <sys/user.h>
#include <sys/exec.h>
-#include <sys/vnode.h>
#include <ddb/ddb.h>
@@ -103,12 +99,10 @@
#include <machine/apm_bios.h>
#endif
#include <machine/cpu.h>
-#include <machine/npx.h>
#include <machine/reg.h>
#include <machine/psl.h>
#include <machine/clock.h>
#include <machine/specialreg.h>
-#include <machine/sysarch.h>
#include <machine/cons.h>
#include <machine/bootinfo.h>
#include <machine/md_var.h>
diff --git a/sys/pc98/i386/trap.c b/sys/pc98/i386/trap.c
index 8843174..cb46fd4 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.24 1997/06/09 13:38:21 kato Exp $
+ * $Id: trap.c,v 1.25 1997/06/23 09:35:38 kato Exp $
*/
/*
@@ -48,11 +48,9 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/proc.h>
-#include <sys/acct.h>
#include <sys/kernel.h>
#include <sys/syscall.h>
#include <sys/sysent.h>
-#include <sys/queue.h>
#include <sys/vmmeter.h>
#ifdef KTRACE
#include <sys/ktrace.h>
@@ -74,8 +72,6 @@
#include <machine/ipl.h>
#include <machine/md_var.h>
#include <machine/psl.h>
-#include <machine/reg.h>
-#include <machine/trap.h>
#include <machine/../isa/intr_machdep.h>
#include <machine/smp.h>
OpenPOWER on IntegriCloud