aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 e730ffc3208d..6dd76840136b 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 e730ffc3208d..6dd76840136b 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 &&