diff options
author | peter <peter@FreeBSD.org> | 1999-04-07 17:08:40 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 1999-04-07 17:08:40 +0000 |
commit | 2680ced1707f3ed798cf6c3a77a5fda48f62cdde (patch) | |
tree | f900fd6afced6fe38daccbe761e374b848967ae2 /sys/i386 | |
parent | b25dcdb8cd2b44ba56f17a2206e85cc932b69ad9 (diff) | |
download | FreeBSD-src-2680ced1707f3ed798cf6c3a77a5fda48f62cdde.zip FreeBSD-src-2680ced1707f3ed798cf6c3a77a5fda48f62cdde.tar.gz |
Disable the mtrr copy calls, it doesn't work with the i686_mem.c stuff.
This should make it compile/link again.
Diffstat (limited to 'sys/i386')
-rw-r--r-- | sys/i386/i386/mp_machdep.c | 8 | ||||
-rw-r--r-- | sys/i386/i386/mptable.c | 8 | ||||
-rw-r--r-- | sys/i386/include/mptable.h | 8 |
3 files changed, 21 insertions, 3 deletions
diff --git a/sys/i386/i386/mp_machdep.c b/sys/i386/i386/mp_machdep.c index 2267f5a..cde98a7 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 2267f5a..cde98a7 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 2267f5a..cde98a7 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(); |