From bfda1e3ff71283b7afb0a344b2612c0aed333cc6 Mon Sep 17 00:00:00 2001
From: Peter Wemm <peter@FreeBSD.org>
Date: Wed, 7 Apr 1999 17:08:40 +0000
Subject: [PATCH] Disable the mtrr copy calls, it doesn't work with the
 i686_mem.c stuff. This should make it compile/link again.

---
 sys/amd64/amd64/mp_machdep.c | 8 +++++++-
 sys/amd64/amd64/mptable.c    | 8 +++++++-
 sys/amd64/include/mptable.h  | 8 +++++++-
 sys/i386/i386/mp_machdep.c   | 8 +++++++-
 sys/i386/i386/mptable.c      | 8 +++++++-
 sys/i386/include/mptable.h   | 8 +++++++-
 sys/kern/subr_smp.c          | 8 +++++++-
 7 files changed, 49 insertions(+), 7 deletions(-)

diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c
index 2267f5a6a97..cde98a7b66e 100644
--- a/sys/amd64/amd64/mp_machdep.c
+++ b/sys/amd64/amd64/mp_machdep.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.92 1999/02/26 03:42:50 tegge Exp $
+ *	$Id: mp_machdep.c,v 1.93 1999/03/05 16:38:10 bde Exp $
  */
 
 #include "opt_smp.h"
@@ -496,8 +496,10 @@ init_secondary(void)
 	PTD[0] = 0;
 	pmap_set_opt((unsigned *)PTD);
 
+#if 0
 	putmtrr();
 	pmap_setvidram();
+#endif
 
 	invltlb();
 }
@@ -556,8 +558,10 @@ mp_enable(u_int boot_addr)
 	u_int   ux;
 #endif	/* APIC_IO */
 
+#if 0
 	getmtrr();
 	pmap_setvidram();
+#endif
 
 	POSTCODE(MP_ENABLE_POST);
 
@@ -2243,7 +2247,9 @@ ap_init()
 		panic("cpuid mismatch! boom!!");
 	}
 
+#if 0
 	getmtrr();
+#endif
 
 	/* Init local apic for irq's */
 	apic_initialize();
diff --git a/sys/amd64/amd64/mptable.c b/sys/amd64/amd64/mptable.c
index 2267f5a6a97..cde98a7b66e 100644
--- a/sys/amd64/amd64/mptable.c
+++ b/sys/amd64/amd64/mptable.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.92 1999/02/26 03:42:50 tegge Exp $
+ *	$Id: mp_machdep.c,v 1.93 1999/03/05 16:38:10 bde Exp $
  */
 
 #include "opt_smp.h"
@@ -496,8 +496,10 @@ init_secondary(void)
 	PTD[0] = 0;
 	pmap_set_opt((unsigned *)PTD);
 
+#if 0
 	putmtrr();
 	pmap_setvidram();
+#endif
 
 	invltlb();
 }
@@ -556,8 +558,10 @@ mp_enable(u_int boot_addr)
 	u_int   ux;
 #endif	/* APIC_IO */
 
+#if 0
 	getmtrr();
 	pmap_setvidram();
+#endif
 
 	POSTCODE(MP_ENABLE_POST);
 
@@ -2243,7 +2247,9 @@ ap_init()
 		panic("cpuid mismatch! boom!!");
 	}
 
+#if 0
 	getmtrr();
+#endif
 
 	/* Init local apic for irq's */
 	apic_initialize();
diff --git a/sys/amd64/include/mptable.h b/sys/amd64/include/mptable.h
index 2267f5a6a97..cde98a7b66e 100644
--- a/sys/amd64/include/mptable.h
+++ b/sys/amd64/include/mptable.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.92 1999/02/26 03:42:50 tegge Exp $
+ *	$Id: mp_machdep.c,v 1.93 1999/03/05 16:38:10 bde Exp $
  */
 
 #include "opt_smp.h"
@@ -496,8 +496,10 @@ init_secondary(void)
 	PTD[0] = 0;
 	pmap_set_opt((unsigned *)PTD);
 
+#if 0
 	putmtrr();
 	pmap_setvidram();
+#endif
 
 	invltlb();
 }
@@ -556,8 +558,10 @@ mp_enable(u_int boot_addr)
 	u_int   ux;
 #endif	/* APIC_IO */
 
+#if 0
 	getmtrr();
 	pmap_setvidram();
+#endif
 
 	POSTCODE(MP_ENABLE_POST);
 
@@ -2243,7 +2247,9 @@ ap_init()
 		panic("cpuid mismatch! boom!!");
 	}
 
+#if 0
 	getmtrr();
+#endif
 
 	/* Init local apic for irq's */
 	apic_initialize();
diff --git a/sys/i386/i386/mp_machdep.c b/sys/i386/i386/mp_machdep.c
index 2267f5a6a97..cde98a7b66e 100644
--- a/sys/i386/i386/mp_machdep.c
+++ b/sys/i386/i386/mp_machdep.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.92 1999/02/26 03:42:50 tegge Exp $
+ *	$Id: mp_machdep.c,v 1.93 1999/03/05 16:38:10 bde Exp $
  */
 
 #include "opt_smp.h"
@@ -496,8 +496,10 @@ init_secondary(void)
 	PTD[0] = 0;
 	pmap_set_opt((unsigned *)PTD);
 
+#if 0
 	putmtrr();
 	pmap_setvidram();
+#endif
 
 	invltlb();
 }
@@ -556,8 +558,10 @@ mp_enable(u_int boot_addr)
 	u_int   ux;
 #endif	/* APIC_IO */
 
+#if 0
 	getmtrr();
 	pmap_setvidram();
+#endif
 
 	POSTCODE(MP_ENABLE_POST);
 
@@ -2243,7 +2247,9 @@ ap_init()
 		panic("cpuid mismatch! boom!!");
 	}
 
+#if 0
 	getmtrr();
+#endif
 
 	/* Init local apic for irq's */
 	apic_initialize();
diff --git a/sys/i386/i386/mptable.c b/sys/i386/i386/mptable.c
index 2267f5a6a97..cde98a7b66e 100644
--- a/sys/i386/i386/mptable.c
+++ b/sys/i386/i386/mptable.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.92 1999/02/26 03:42:50 tegge Exp $
+ *	$Id: mp_machdep.c,v 1.93 1999/03/05 16:38:10 bde Exp $
  */
 
 #include "opt_smp.h"
@@ -496,8 +496,10 @@ init_secondary(void)
 	PTD[0] = 0;
 	pmap_set_opt((unsigned *)PTD);
 
+#if 0
 	putmtrr();
 	pmap_setvidram();
+#endif
 
 	invltlb();
 }
@@ -556,8 +558,10 @@ mp_enable(u_int boot_addr)
 	u_int   ux;
 #endif	/* APIC_IO */
 
+#if 0
 	getmtrr();
 	pmap_setvidram();
+#endif
 
 	POSTCODE(MP_ENABLE_POST);
 
@@ -2243,7 +2247,9 @@ ap_init()
 		panic("cpuid mismatch! boom!!");
 	}
 
+#if 0
 	getmtrr();
+#endif
 
 	/* Init local apic for irq's */
 	apic_initialize();
diff --git a/sys/i386/include/mptable.h b/sys/i386/include/mptable.h
index 2267f5a6a97..cde98a7b66e 100644
--- a/sys/i386/include/mptable.h
+++ b/sys/i386/include/mptable.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.92 1999/02/26 03:42:50 tegge Exp $
+ *	$Id: mp_machdep.c,v 1.93 1999/03/05 16:38:10 bde Exp $
  */
 
 #include "opt_smp.h"
@@ -496,8 +496,10 @@ init_secondary(void)
 	PTD[0] = 0;
 	pmap_set_opt((unsigned *)PTD);
 
+#if 0
 	putmtrr();
 	pmap_setvidram();
+#endif
 
 	invltlb();
 }
@@ -556,8 +558,10 @@ mp_enable(u_int boot_addr)
 	u_int   ux;
 #endif	/* APIC_IO */
 
+#if 0
 	getmtrr();
 	pmap_setvidram();
+#endif
 
 	POSTCODE(MP_ENABLE_POST);
 
@@ -2243,7 +2247,9 @@ ap_init()
 		panic("cpuid mismatch! boom!!");
 	}
 
+#if 0
 	getmtrr();
+#endif
 
 	/* Init local apic for irq's */
 	apic_initialize();
diff --git a/sys/kern/subr_smp.c b/sys/kern/subr_smp.c
index 2267f5a6a97..cde98a7b66e 100644
--- a/sys/kern/subr_smp.c
+++ b/sys/kern/subr_smp.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.92 1999/02/26 03:42:50 tegge Exp $
+ *	$Id: mp_machdep.c,v 1.93 1999/03/05 16:38:10 bde Exp $
  */
 
 #include "opt_smp.h"
@@ -496,8 +496,10 @@ init_secondary(void)
 	PTD[0] = 0;
 	pmap_set_opt((unsigned *)PTD);
 
+#if 0
 	putmtrr();
 	pmap_setvidram();
+#endif
 
 	invltlb();
 }
@@ -556,8 +558,10 @@ mp_enable(u_int boot_addr)
 	u_int   ux;
 #endif	/* APIC_IO */
 
+#if 0
 	getmtrr();
 	pmap_setvidram();
+#endif
 
 	POSTCODE(MP_ENABLE_POST);
 
@@ -2243,7 +2247,9 @@ ap_init()
 		panic("cpuid mismatch! boom!!");
 	}
 
+#if 0
 	getmtrr();
+#endif
 
 	/* Init local apic for irq's */
 	apic_initialize();