From df386e1ca35470f6c335307eaa3f84b708a66389 Mon Sep 17 00:00:00 2001
From: peter <peter@FreeBSD.org>
Date: Fri, 10 Oct 1997 12:42:54 +0000
Subject: Compensate for pcb.h tweaks.

(Bruce pointed out the nesting)
---
 sys/amd64/amd64/machdep.c     | 3 ++-
 sys/amd64/amd64/sys_machdep.c | 3 ++-
 sys/amd64/amd64/trap.c        | 7 ++++++-
 3 files changed, 10 insertions(+), 3 deletions(-)

(limited to 'sys/amd64/amd64')

diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
index 9a0d107..01600cf 100644
--- a/sys/amd64/amd64/machdep.c
+++ b/sys/amd64/amd64/machdep.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)machdep.c	7.4 (Berkeley) 6/3/91
- *	$Id: machdep.c,v 1.266 1997/09/25 15:49:37 davidg Exp $
+ *	$Id: machdep.c,v 1.267 1997/10/10 09:44:02 peter Exp $
  */
 
 #include "apm.h"
@@ -106,6 +106,7 @@
 #include <machine/cons.h>
 #include <machine/bootinfo.h>
 #include <machine/md_var.h>
+#include <machine/pcb_ext.h>		/* pcb.h included via sys/user.h */
 #ifdef SMP
 #include <machine/smp.h>
 #endif
diff --git a/sys/amd64/amd64/sys_machdep.c b/sys/amd64/amd64/sys_machdep.c
index 006f74c..e6daefd 100644
--- a/sys/amd64/amd64/sys_machdep.c
+++ b/sys/amd64/amd64/sys_machdep.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)sys_machdep.c	5.5 (Berkeley) 1/19/91
- *	$Id: sys_machdep.c,v 1.25 1997/09/01 01:12:51 bde Exp $
+ *	$Id: sys_machdep.c,v 1.26 1997/10/10 09:44:08 peter Exp $
  *
  */
 
@@ -52,6 +52,7 @@
 #include <sys/user.h>
 
 #include <machine/cpu.h>
+#include <machine/pcb_ext.h>	/* pcb.h included by sys/user.h */
 #include <machine/sysarch.h>
 
 #include <vm/vm_kern.h>		/* for kernel_map */
diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c
index 8260c8a..ec74808 100644
--- a/sys/amd64/amd64/trap.c
+++ b/sys/amd64/amd64/trap.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)trap.c	7.4 (Berkeley) 5/13/91
- *	$Id: trap.c,v 1.111 1997/09/21 21:38:05 gibbs Exp $
+ *	$Id: trap.c,v 1.112 1997/10/10 09:44:09 peter Exp $
  */
 
 /*
@@ -75,12 +75,17 @@
 #include <machine/psl.h>
 #include <machine/../isa/intr_machdep.h>
 #include <machine/smp.h>
+#include <machine/tss.h>
 
 #ifdef POWERFAIL_NMI
 #include <sys/syslog.h>
 #include <machine/clock.h>
 #endif
 
+#ifdef VM86
+#include <machine/vm86.h>
+#endif
+
 #include "isa.h"
 #include "npx.h"
 
-- 
cgit v1.1