From a89f142f6f444991ef10915d896da5ff69a01205 Mon Sep 17 00:00:00 2001
From: bde <bde@FreeBSD.org>
Date: Tue, 25 Jun 1996 20:31:01 +0000
Subject: [PATCH] Added #include of <machine/md_var.h>.  This will be needed
 when some declarations are moved from <machine/cpufunc.h> to better places.

---
 sys/amd64/amd64/fpu.c            | 3 ++-
 sys/amd64/isa/isa.c              | 3 ++-
 sys/amd64/isa/npx.c              | 3 ++-
 sys/dev/ar/if_ar.c               | 3 ++-
 sys/dev/ar/if_ar_isa.c           | 3 ++-
 sys/dev/ed/if_ed.c               | 3 ++-
 sys/dev/ie/if_ie.c               | 3 ++-
 sys/dev/lnc/if_lnc.c             | 2 ++
 sys/dev/syscons/syscons.c        | 3 ++-
 sys/gnu/i386/fpemul/load_store.c | 3 ++-
 sys/gnu/i386/fpemul/reg_ld_str.c | 3 ++-
 sys/i386/isa/ctx.c               | 3 ++-
 sys/i386/isa/if_ar.c             | 3 ++-
 sys/i386/isa/if_ed.c             | 3 ++-
 sys/i386/isa/if_ie.c             | 3 ++-
 sys/i386/isa/if_ix.c             | 3 ++-
 sys/i386/isa/if_lnc.c            | 2 ++
 sys/i386/isa/if_ze.c             | 3 ++-
 sys/i386/isa/if_zp.c             | 3 ++-
 sys/i386/isa/isa.c               | 3 ++-
 sys/i386/isa/npx.c               | 3 ++-
 sys/i386/isa/spigot.c            | 1 +
 sys/i386/isa/syscons.c           | 3 ++-
 sys/isa/syscons.c                | 3 ++-
 sys/pccard/pccard.c              | 1 +
 25 files changed, 48 insertions(+), 21 deletions(-)

diff --git a/sys/amd64/amd64/fpu.c b/sys/amd64/amd64/fpu.c
index fbeb8244bdd3..ad03e2ac29b6 100644
--- a/sys/amd64/amd64/fpu.c
+++ b/sys/amd64/amd64/fpu.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)npx.c	7.2 (Berkeley) 5/12/91
- *	$Id: npx.c,v 1.28 1996/01/04 19:51:14 wollman Exp $
+ *	$Id: npx.c,v 1.29 1996/01/06 23:10:52 peter Exp $
  */
 
 #include "npx.h"
@@ -54,6 +54,7 @@
 
 #include <machine/cpu.h>
 #include <machine/pcb.h>
+#include <machine/md_var.h>
 #include <machine/trap.h>
 #include <machine/clock.h>
 #include <machine/specialreg.h>
diff --git a/sys/amd64/isa/isa.c b/sys/amd64/isa/isa.c
index 02fa63d2609e..e944509daf7b 100644
--- a/sys/amd64/isa/isa.c
+++ b/sys/amd64/isa/isa.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.c	7.2 (Berkeley) 5/13/91
- *	$Id: isa.c,v 1.69 1996/04/20 21:22:32 gibbs Exp $
+ *	$Id: isa.c,v 1.70 1996/05/02 10:43:09 phk Exp $
  */
 
 /*
@@ -55,6 +55,7 @@
 #include <sys/buf.h>
 #include <sys/syslog.h>
 #include <sys/malloc.h>
+#include <machine/md_var.h>
 #include <machine/segments.h>
 #include <vm/vm.h>
 #include <vm/vm_param.h>
diff --git a/sys/amd64/isa/npx.c b/sys/amd64/isa/npx.c
index fbeb8244bdd3..ad03e2ac29b6 100644
--- a/sys/amd64/isa/npx.c
+++ b/sys/amd64/isa/npx.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)npx.c	7.2 (Berkeley) 5/12/91
- *	$Id: npx.c,v 1.28 1996/01/04 19:51:14 wollman Exp $
+ *	$Id: npx.c,v 1.29 1996/01/06 23:10:52 peter Exp $
  */
 
 #include "npx.h"
@@ -54,6 +54,7 @@
 
 #include <machine/cpu.h>
 #include <machine/pcb.h>
+#include <machine/md_var.h>
 #include <machine/trap.h>
 #include <machine/clock.h>
 #include <machine/specialreg.h>
diff --git a/sys/dev/ar/if_ar.c b/sys/dev/ar/if_ar.c
index f52a0ca3ce51..7758bcb8e5d4 100644
--- a/sys/dev/ar/if_ar.c
+++ b/sys/dev/ar/if_ar.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_ar.c,v 1.7 1996/03/17 00:29:32 peter Exp $
+ * $Id: if_ar.c,v 1.8 1996/04/12 19:57:44 jhay Exp $
  */
 
 /*
@@ -73,6 +73,7 @@
 
 #include <sys/devconf.h>
 #include <machine/clock.h>
+#include <machine/md_var.h>
 
 #include <i386/isa/if_arregs.h>
 #include <i386/isa/ic/hd64570.h>
diff --git a/sys/dev/ar/if_ar_isa.c b/sys/dev/ar/if_ar_isa.c
index f52a0ca3ce51..7758bcb8e5d4 100644
--- a/sys/dev/ar/if_ar_isa.c
+++ b/sys/dev/ar/if_ar_isa.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_ar.c,v 1.7 1996/03/17 00:29:32 peter Exp $
+ * $Id: if_ar.c,v 1.8 1996/04/12 19:57:44 jhay Exp $
  */
 
 /*
@@ -73,6 +73,7 @@
 
 #include <sys/devconf.h>
 #include <machine/clock.h>
+#include <machine/md_var.h>
 
 #include <i386/isa/if_arregs.h>
 #include <i386/isa/ic/hd64570.h>
diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c
index 40734bdd5e1d..0dab0954323c 100644
--- a/sys/dev/ed/if_ed.c
+++ b/sys/dev/ed/if_ed.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ed.c,v 1.99 1996/05/27 22:32:23 gpalmer Exp $
+ *	$Id: if_ed.c,v 1.100 1996/06/18 01:22:18 bde Exp $
  */
 
 /*
@@ -78,6 +78,7 @@
 #endif
 
 #include <machine/clock.h>
+#include <machine/md_var.h>
 
 #include <i386/isa/isa_device.h>
 #include <i386/isa/icu.h>
diff --git a/sys/dev/ie/if_ie.c b/sys/dev/ie/if_ie.c
index dc45440ded5b..24e3829ab612 100644
--- a/sys/dev/ie/if_ie.c
+++ b/sys/dev/ie/if_ie.c
@@ -43,7 +43,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ie.c,v 1.33 1996/02/06 18:50:45 wollman Exp $
+ *	$Id: if_ie.c,v 1.34 1996/06/18 01:22:22 bde Exp $
  */
 
 /*
@@ -145,6 +145,7 @@ iomem, and to make 16-pointers, we subtract iomem and and with 0xffff.
 #endif
 
 #include <machine/clock.h>
+#include <machine/md_var.h>
 
 #include <i386/isa/isa_device.h>
 #include <i386/isa/ic/i82586.h>
diff --git a/sys/dev/lnc/if_lnc.c b/sys/dev/lnc/if_lnc.c
index 46afc70409e8..ebd2eba001dd 100644
--- a/sys/dev/lnc/if_lnc.c
+++ b/sys/dev/lnc/if_lnc.c
@@ -99,6 +99,8 @@
 #include <net/bpfdesc.h>
 #endif
 
+#include <machine/md_var.h>
+
 #include <i386/isa/isa_device.h>
 #include <i386/isa/if_lnc.h>
 
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c
index 6e8c7974969e..46b46d3cfa90 100644
--- a/sys/dev/syscons/syscons.c
+++ b/sys/dev/syscons/syscons.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: syscons.c,v 1.154 1996/06/23 17:12:05 bde Exp $
+ *  $Id: syscons.c,v 1.155 1996/06/25 08:54:45 sos Exp $
  */
 
 #include "sc.h"
@@ -54,6 +54,7 @@
 #include <machine/clock.h>
 #include <machine/cons.h>
 #include <machine/console.h>
+#include <machine/md_var.h>
 #include <machine/psl.h>
 #include <machine/frame.h>
 #include <machine/pc/display.h>
diff --git a/sys/gnu/i386/fpemul/load_store.c b/sys/gnu/i386/fpemul/load_store.c
index e45b67ecefd8..94f61b6e8274 100644
--- a/sys/gnu/i386/fpemul/load_store.c
+++ b/sys/gnu/i386/fpemul/load_store.c
@@ -57,7 +57,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *    $Id: load_store.c,v 1.3 1994/06/10 07:44:30 rich Exp $
+ *    $Id: load_store.c,v 1.4 1994/09/21 22:22:46 bde Exp $
  *
  */
 
@@ -72,6 +72,7 @@
 #include "proc.h"
 #include "systm.h"
 #include "machine/cpu.h"
+#include "machine/md_var.h"
 #include "machine/pcb.h"
 
 #include "fpu_emu.h"
diff --git a/sys/gnu/i386/fpemul/reg_ld_str.c b/sys/gnu/i386/fpemul/reg_ld_str.c
index 8fde12fd18d4..f087b33a5105 100644
--- a/sys/gnu/i386/fpemul/reg_ld_str.c
+++ b/sys/gnu/i386/fpemul/reg_ld_str.c
@@ -56,7 +56,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *     $Id: reg_ld_str.c,v 1.4 1994/08/31 04:45:24 davidg Exp $
+ *     $Id: reg_ld_str.c,v 1.5 1994/09/21 22:22:48 bde Exp $
  *
  */
 
@@ -71,6 +71,7 @@
 #include "proc.h"
 #include "systm.h"
 #include "machine/cpu.h"
+#include "machine/md_var.h"
 #include "machine/pcb.h"
 
 #include "fpu_emu.h"
diff --git a/sys/i386/isa/ctx.c b/sys/i386/isa/ctx.c
index 296b896f72d6..53aec146ce0b 100644
--- a/sys/i386/isa/ctx.c
+++ b/sys/i386/isa/ctx.c
@@ -8,7 +8,7 @@
  *	of this software, nor does the author assume any responsibility
  *	for damages incurred with its use.
  *
- *	$Id: ctx.c,v 1.17 1996/03/28 14:28:37 scrappy Exp $
+ *	$Id: ctx.c,v 1.18 1996/06/18 01:22:15 bde Exp $
  */
 
 /*
@@ -128,6 +128,7 @@
 #include <i386/isa/isa_device.h>
 #include <i386/isa/ctxreg.h>
 #include <machine/ioctl_ctx.h>
+#include <machine/md_var.h>
 
 static int     waitvb(short);
 
diff --git a/sys/i386/isa/if_ar.c b/sys/i386/isa/if_ar.c
index f52a0ca3ce51..7758bcb8e5d4 100644
--- a/sys/i386/isa/if_ar.c
+++ b/sys/i386/isa/if_ar.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_ar.c,v 1.7 1996/03/17 00:29:32 peter Exp $
+ * $Id: if_ar.c,v 1.8 1996/04/12 19:57:44 jhay Exp $
  */
 
 /*
@@ -73,6 +73,7 @@
 
 #include <sys/devconf.h>
 #include <machine/clock.h>
+#include <machine/md_var.h>
 
 #include <i386/isa/if_arregs.h>
 #include <i386/isa/ic/hd64570.h>
diff --git a/sys/i386/isa/if_ed.c b/sys/i386/isa/if_ed.c
index 40734bdd5e1d..0dab0954323c 100644
--- a/sys/i386/isa/if_ed.c
+++ b/sys/i386/isa/if_ed.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ed.c,v 1.99 1996/05/27 22:32:23 gpalmer Exp $
+ *	$Id: if_ed.c,v 1.100 1996/06/18 01:22:18 bde Exp $
  */
 
 /*
@@ -78,6 +78,7 @@
 #endif
 
 #include <machine/clock.h>
+#include <machine/md_var.h>
 
 #include <i386/isa/isa_device.h>
 #include <i386/isa/icu.h>
diff --git a/sys/i386/isa/if_ie.c b/sys/i386/isa/if_ie.c
index dc45440ded5b..24e3829ab612 100644
--- a/sys/i386/isa/if_ie.c
+++ b/sys/i386/isa/if_ie.c
@@ -43,7 +43,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ie.c,v 1.33 1996/02/06 18:50:45 wollman Exp $
+ *	$Id: if_ie.c,v 1.34 1996/06/18 01:22:22 bde Exp $
  */
 
 /*
@@ -145,6 +145,7 @@ iomem, and to make 16-pointers, we subtract iomem and and with 0xffff.
 #endif
 
 #include <machine/clock.h>
+#include <machine/md_var.h>
 
 #include <i386/isa/isa_device.h>
 #include <i386/isa/ic/i82586.h>
diff --git a/sys/i386/isa/if_ix.c b/sys/i386/isa/if_ix.c
index 9a33ebd96db6..b392fffc37d9 100644
--- a/sys/i386/isa/if_ix.c
+++ b/sys/i386/isa/if_ix.c
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_ix.c,v 1.19 1996/02/06 18:50:46 wollman Exp $
+ *	$Id: if_ix.c,v 1.20 1996/06/12 05:03:41 gpalmer Exp $
  */
 
 #include "ix.h"
@@ -44,6 +44,7 @@
 #include <sys/devconf.h>
 
 #include <machine/clock.h>
+#include <machine/md_var.h>
 
 #include <net/if.h>
 #include <net/if_types.h>
diff --git a/sys/i386/isa/if_lnc.c b/sys/i386/isa/if_lnc.c
index 46afc70409e8..ebd2eba001dd 100644
--- a/sys/i386/isa/if_lnc.c
+++ b/sys/i386/isa/if_lnc.c
@@ -99,6 +99,8 @@
 #include <net/bpfdesc.h>
 #endif
 
+#include <machine/md_var.h>
+
 #include <i386/isa/isa_device.h>
 #include <i386/isa/if_lnc.h>
 
diff --git a/sys/i386/isa/if_ze.c b/sys/i386/isa/if_ze.c
index 45d631521467..655516b31521 100644
--- a/sys/i386/isa/if_ze.c
+++ b/sys/i386/isa/if_ze.c
@@ -47,7 +47,7 @@
  */
 
 /*
- * $Id: if_ze.c,v 1.29 1996/02/06 18:50:50 wollman Exp $
+ * $Id: if_ze.c,v 1.30 1996/06/12 05:03:45 gpalmer Exp $
  */
 
 #include "ze.h"
@@ -92,6 +92,7 @@
 #endif
 
 #include <machine/clock.h>
+#include <machine/md_var.h>
 
 #include <i386/isa/isa.h>
 #include <i386/isa/isa_device.h>
diff --git a/sys/i386/isa/if_zp.c b/sys/i386/isa/if_zp.c
index 1f151c88165f..ae53e23fa085 100644
--- a/sys/i386/isa/if_zp.c
+++ b/sys/i386/isa/if_zp.c
@@ -34,7 +34,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	From: if_ep.c,v 1.9 1994/01/25 10:46:29 deraadt Exp $
- *	$Id: if_zp.c,v 1.20 1996/06/12 05:03:46 gpalmer Exp $
+ *	$Id: if_zp.c,v 1.21 1996/06/18 01:22:24 bde Exp $
  */
 /*-
  * TODO:
@@ -144,6 +144,7 @@
 #endif
 
 #include <machine/clock.h>
+#include <machine/md_var.h>
 
 #include <i386/isa/isa_device.h>
 #include <i386/isa/if_zpreg.h>
diff --git a/sys/i386/isa/isa.c b/sys/i386/isa/isa.c
index 02fa63d2609e..e944509daf7b 100644
--- a/sys/i386/isa/isa.c
+++ b/sys/i386/isa/isa.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.c	7.2 (Berkeley) 5/13/91
- *	$Id: isa.c,v 1.69 1996/04/20 21:22:32 gibbs Exp $
+ *	$Id: isa.c,v 1.70 1996/05/02 10:43:09 phk Exp $
  */
 
 /*
@@ -55,6 +55,7 @@
 #include <sys/buf.h>
 #include <sys/syslog.h>
 #include <sys/malloc.h>
+#include <machine/md_var.h>
 #include <machine/segments.h>
 #include <vm/vm.h>
 #include <vm/vm_param.h>
diff --git a/sys/i386/isa/npx.c b/sys/i386/isa/npx.c
index fbeb8244bdd3..ad03e2ac29b6 100644
--- a/sys/i386/isa/npx.c
+++ b/sys/i386/isa/npx.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)npx.c	7.2 (Berkeley) 5/12/91
- *	$Id: npx.c,v 1.28 1996/01/04 19:51:14 wollman Exp $
+ *	$Id: npx.c,v 1.29 1996/01/06 23:10:52 peter Exp $
  */
 
 #include "npx.h"
@@ -54,6 +54,7 @@
 
 #include <machine/cpu.h>
 #include <machine/pcb.h>
+#include <machine/md_var.h>
 #include <machine/trap.h>
 #include <machine/clock.h>
 #include <machine/specialreg.h>
diff --git a/sys/i386/isa/spigot.c b/sys/i386/isa/spigot.c
index 00b6d6ef858a..fd8197a0db92 100644
--- a/sys/i386/isa/spigot.c
+++ b/sys/i386/isa/spigot.c
@@ -69,6 +69,7 @@ error "Can only have 1 spigot configured."
 #endif /* DEVFS */
 
 #include	<machine/frame.h>
+#include	<machine/md_var.h>
 #include	<machine/spigot.h>
 #include	<machine/psl.h>
 
diff --git a/sys/i386/isa/syscons.c b/sys/i386/isa/syscons.c
index 6e8c7974969e..46b46d3cfa90 100644
--- a/sys/i386/isa/syscons.c
+++ b/sys/i386/isa/syscons.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: syscons.c,v 1.154 1996/06/23 17:12:05 bde Exp $
+ *  $Id: syscons.c,v 1.155 1996/06/25 08:54:45 sos Exp $
  */
 
 #include "sc.h"
@@ -54,6 +54,7 @@
 #include <machine/clock.h>
 #include <machine/cons.h>
 #include <machine/console.h>
+#include <machine/md_var.h>
 #include <machine/psl.h>
 #include <machine/frame.h>
 #include <machine/pc/display.h>
diff --git a/sys/isa/syscons.c b/sys/isa/syscons.c
index 6e8c7974969e..46b46d3cfa90 100644
--- a/sys/isa/syscons.c
+++ b/sys/isa/syscons.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: syscons.c,v 1.154 1996/06/23 17:12:05 bde Exp $
+ *  $Id: syscons.c,v 1.155 1996/06/25 08:54:45 sos Exp $
  */
 
 #include "sc.h"
@@ -54,6 +54,7 @@
 #include <machine/clock.h>
 #include <machine/cons.h>
 #include <machine/console.h>
+#include <machine/md_var.h>
 #include <machine/psl.h>
 #include <machine/frame.h>
 #include <machine/pc/display.h>
diff --git a/sys/pccard/pccard.c b/sys/pccard/pccard.c
index b0098c84e750..9f3a7c5898c3 100644
--- a/sys/pccard/pccard.c
+++ b/sys/pccard/pccard.c
@@ -68,6 +68,7 @@
 
 #include <machine/clock.h>
 #include <machine/laptops.h>
+#include <machine/md_var.h>
 
 extern struct kern_devconf kdc_cpu0;