PERFORCE change 28186 for review

[Peter Wemm]

http://perforce.freebsd.org/chv.cgi?CH=28186

Change 28186 by peter at peter_overcee on 2003/04/04 22:36:29

	nuke opt_pmap.h
	remove I686 workarounds

Affected files ...

.. //depot/projects/hammer/sys/x86_64/x86_64/pmap.c#12 edit

Differences ...

==== //depot/projects/hammer/sys/x86_64/x86_64/pmap.c#12 (text+ko) ====

@@ -99,7 +99,6 @@
  *	and to when physical maps must be made correct.
  */
 
-#include "opt_pmap.h"
 #include "opt_msgbuf.h"
 #include "opt_kstack_pages.h"
 
@@ -261,13 +260,6 @@
 {
 	vm_offset_t newaddr = addr;
 
-#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 &&
-	    (cpu_id & 0xf00) == 0xf00)
-		return newaddr;
-#endif
 #ifndef DISABLE_PSE
 	if (cpu_feature & CPUID_PSE)
 		newaddr = (addr + (NBPDR - 1)) & ~(NBPDR - 1);
@@ -384,15 +376,6 @@
 	if (cpu_feature & CPUID_PGE)
 		pgeflag = PG_G;
 #endif
-#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 &&
-	    (cpu_id & 0xf00) == 0xf00) {
-		printf("Warning: Pentium 4 cpu: PG_G disabled (global flag)\n");
-		pgeflag = 0;
-	}
-#endif
 	
 /*
  * Initialize the 4MB page size flag
@@ -408,15 +391,6 @@
 	if (cpu_feature & CPUID_PSE)
 		pseflag = PG_PS;
 #endif
-#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 &&
-	    (cpu_id & 0xf00) == 0xf00) {
-		printf("Warning: Pentium 4 cpu: PG_PS disabled (4MB pages)\n");
-		pseflag = 0;
-	}
-#endif
 #ifndef DISABLE_PSE
 	if (pseflag) {
 		pd_entry_t ptditmp;