From 38cc2d931696447b8599493cbb26414258d3763f Mon Sep 17 00:00:00 2001
From: Eivind Eklund <eivind@FreeBSD.org>
Date: Tue, 24 Nov 1998 20:25:52 +0000
Subject: [PATCH] Move the declaration of PPro_vmtrr from the header file to
 pmap.c, replacing the one in the header file with a definition.  This makes
 it easier to work with tools that grok ANSI C only.

---
 sys/amd64/amd64/pmap.c   | 7 ++++++-
 sys/amd64/include/pmap.h | 7 ++++---
 sys/i386/i386/pmap.c     | 7 ++++++-
 sys/i386/include/pmap.h  | 7 ++++---
 4 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c
index 7dbd604659d3..7b684bd2e11c 100644
--- a/sys/amd64/amd64/pmap.c
+++ b/sys/amd64/amd64/pmap.c
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)pmap.c	7.7 (Berkeley)	5/12/91
- *	$Id: pmap.c,v 1.211 1998/10/28 13:36:57 dg Exp $
+ *	$Id: pmap.c,v 1.212 1998/11/08 02:26:14 msmith Exp $
  */
 
 /*
@@ -184,6 +184,11 @@ static caddr_t CADDR2;
 static pt_entry_t *msgbufmap;
 struct msgbuf *msgbufp=0;
 
+/*
+ *  PPro_vmtrr
+ */
+struct ppro_vmtrr PPro_vmtrr[NPPROVMTRR];
+
 #ifdef SMP
 extern char prv_CPAGE1[], prv_CPAGE2[], prv_CPAGE3[];
 extern pt_entry_t *prv_CMAP1, *prv_CMAP2, *prv_CMAP3;
diff --git a/sys/amd64/include/pmap.h b/sys/amd64/include/pmap.h
index 25bfc624c8eb..5251be3890c7 100644
--- a/sys/amd64/include/pmap.h
+++ b/sys/amd64/include/pmap.h
@@ -42,7 +42,7 @@
  *
  *	from: hp300: @(#)pmap.h	7.2 (Berkeley) 12/16/90
  *	from: @(#)pmap.h	7.4 (Berkeley) 5/12/91
- * 	$Id: pmap.h,v 1.55 1998/05/11 01:05:59 dyson Exp $
+ * 	$Id: pmap.h,v 1.56 1998/06/21 14:08:27 mckay Exp $
  */
 
 #ifndef _MACHINE_PMAP_H_
@@ -237,9 +237,10 @@ typedef struct pv_entry {
 #define NPPROVMTRR		8
 #define PPRO_VMTRRphysBase0	0x200
 #define PPRO_VMTRRphysMask0	0x201
-struct {
+struct ppro_vmtrr {
 	u_int64_t base, mask;
-} PPro_vmtrr[NPPROVMTRR];
+};
+extern struct ppro_vmtrr PPro_vmtrr[NPPROVMTRR];
 
 extern caddr_t	CADDR1;
 extern pt_entry_t *CMAP1;
diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c
index 7dbd604659d3..7b684bd2e11c 100644
--- a/sys/i386/i386/pmap.c
+++ b/sys/i386/i386/pmap.c
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)pmap.c	7.7 (Berkeley)	5/12/91
- *	$Id: pmap.c,v 1.211 1998/10/28 13:36:57 dg Exp $
+ *	$Id: pmap.c,v 1.212 1998/11/08 02:26:14 msmith Exp $
  */
 
 /*
@@ -184,6 +184,11 @@ static caddr_t CADDR2;
 static pt_entry_t *msgbufmap;
 struct msgbuf *msgbufp=0;
 
+/*
+ *  PPro_vmtrr
+ */
+struct ppro_vmtrr PPro_vmtrr[NPPROVMTRR];
+
 #ifdef SMP
 extern char prv_CPAGE1[], prv_CPAGE2[], prv_CPAGE3[];
 extern pt_entry_t *prv_CMAP1, *prv_CMAP2, *prv_CMAP3;
diff --git a/sys/i386/include/pmap.h b/sys/i386/include/pmap.h
index 25bfc624c8eb..5251be3890c7 100644
--- a/sys/i386/include/pmap.h
+++ b/sys/i386/include/pmap.h
@@ -42,7 +42,7 @@
  *
  *	from: hp300: @(#)pmap.h	7.2 (Berkeley) 12/16/90
  *	from: @(#)pmap.h	7.4 (Berkeley) 5/12/91
- * 	$Id: pmap.h,v 1.55 1998/05/11 01:05:59 dyson Exp $
+ * 	$Id: pmap.h,v 1.56 1998/06/21 14:08:27 mckay Exp $
  */
 
 #ifndef _MACHINE_PMAP_H_
@@ -237,9 +237,10 @@ typedef struct pv_entry {
 #define NPPROVMTRR		8
 #define PPRO_VMTRRphysBase0	0x200
 #define PPRO_VMTRRphysMask0	0x201
-struct {
+struct ppro_vmtrr {
 	u_int64_t base, mask;
-} PPro_vmtrr[NPPROVMTRR];
+};
+extern struct ppro_vmtrr PPro_vmtrr[NPPROVMTRR];
 
 extern caddr_t	CADDR1;
 extern pt_entry_t *CMAP1;