summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>2003-02-13 02:42:06 +0000
committerpeter <peter@FreeBSD.org>2003-02-13 02:42:06 +0000
commitdad13b35df531f1a6c8ab263d69c86a17e46a354 (patch)
tree22c2efa74eb3460dd6b8380b61dcc91216191568 /sys
parentcd0627ca28463482281255ffd580c4ed7af16f0c (diff)
downloadFreeBSD-src-dad13b35df531f1a6c8ab263d69c86a17e46a354.zip
FreeBSD-src-dad13b35df531f1a6c8ab263d69c86a17e46a354.tar.gz
Oops. I mis-remembered about the P4 problems. It was 5.0-DP2 that
was shipped with DISABLE_PG_G and DISABLE_PSE, not 5.0-REL. *blush* Disable the code - but still leave it there in case its still lurking.
Diffstat (limited to 'sys')
-rw-r--r--sys/amd64/amd64/pmap.c6
-rw-r--r--sys/i386/i386/pmap.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c
index e730ffc..6dd7684 100644
--- a/sys/amd64/amd64/pmap.c
+++ b/sys/amd64/amd64/pmap.c
@@ -259,7 +259,7 @@ pmap_kmem_choose(vm_offset_t addr)
{
vm_offset_t newaddr = addr;
-#ifdef I686_CPU
+#ifdef I686_CPU_not /* Problem seems to have gone away */
/* Deal with un-resolved Pentium4 issues */
if (cpu_class == CPUCLASS_686 &&
strcmp(cpu_vendor, "GenuineIntel") == 0 &&
@@ -377,7 +377,7 @@ pmap_bootstrap(firstaddr, loadaddr)
if (cpu_feature & CPUID_PGE)
pgeflag = PG_G;
#endif
-#ifdef I686_CPU
+#ifdef I686_CPU_not /* Problem seems to have gone away */
/* Deal with un-resolved Pentium4 issues */
if (cpu_class == CPUCLASS_686 &&
strcmp(cpu_vendor, "GenuineIntel") == 0 &&
@@ -401,7 +401,7 @@ pmap_bootstrap(firstaddr, loadaddr)
if (cpu_feature & CPUID_PSE)
pseflag = PG_PS;
#endif
-#ifdef I686_CPU
+#ifdef I686_CPU_not /* Problem seems to have gone away */
/* Deal with un-resolved Pentium4 issues */
if (cpu_class == CPUCLASS_686 &&
strcmp(cpu_vendor, "GenuineIntel") == 0 &&
diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c
index e730ffc..6dd7684 100644
--- a/sys/i386/i386/pmap.c
+++ b/sys/i386/i386/pmap.c
@@ -259,7 +259,7 @@ pmap_kmem_choose(vm_offset_t addr)
{
vm_offset_t newaddr = addr;
-#ifdef I686_CPU
+#ifdef I686_CPU_not /* Problem seems to have gone away */
/* Deal with un-resolved Pentium4 issues */
if (cpu_class == CPUCLASS_686 &&
strcmp(cpu_vendor, "GenuineIntel") == 0 &&
@@ -377,7 +377,7 @@ pmap_bootstrap(firstaddr, loadaddr)
if (cpu_feature & CPUID_PGE)
pgeflag = PG_G;
#endif
-#ifdef I686_CPU
+#ifdef I686_CPU_not /* Problem seems to have gone away */
/* Deal with un-resolved Pentium4 issues */
if (cpu_class == CPUCLASS_686 &&
strcmp(cpu_vendor, "GenuineIntel") == 0 &&
@@ -401,7 +401,7 @@ pmap_bootstrap(firstaddr, loadaddr)
if (cpu_feature & CPUID_PSE)
pseflag = PG_PS;
#endif
-#ifdef I686_CPU
+#ifdef I686_CPU_not /* Problem seems to have gone away */
/* Deal with un-resolved Pentium4 issues */
if (cpu_class == CPUCLASS_686 &&
strcmp(cpu_vendor, "GenuineIntel") == 0 &&
OpenPOWER on IntegriCloud