From owner-p4-projects@FreeBSD.ORG  Fri Apr  4 22:36:39 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7B2BF37B404; Fri,  4 Apr 2003 22:36:38 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 16A1E37B401
	for <perforce@freebsd.org>; Fri,  4 Apr 2003 22:36:38 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B0A8043FA3
	for <perforce@freebsd.org>; Fri,  4 Apr 2003 22:36:37 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h356ab0U020982
	for <perforce@freebsd.org>; Fri, 4 Apr 2003 22:36:37 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h356abZg020979
	for perforce@freebsd.org; Fri, 4 Apr 2003 22:36:37 -0800 (PST)
Date: Fri, 4 Apr 2003 22:36:37 -0800 (PST)
Message-Id: <200304050636.h356abZg020979@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 28186 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 05 Apr 2003 06:36:39 -0000

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

Change 28186 by peter@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;