svn commit: r211424 - in head/sys: amd64/amd64 i386/i386

[Pietro Cerutti]

Author: gahr (ports committer)
Date: Tue Aug 17 12:17:24 2010
New Revision: 211424
URL: http://svn.freebsd.org/changeset/base/211424

Log:
  - The iMac9,1 needs the PAT workaround as well
  
  Approved by:	cognet

Modified:
  head/sys/amd64/amd64/pmap.c
  head/sys/i386/i386/pmap.c

Modified: head/sys/amd64/amd64/pmap.c
==============================================================================
--- head/sys/amd64/amd64/pmap.c	Tue Aug 17 12:16:06 2010	(r211423)
+++ head/sys/amd64/amd64/pmap.c	Tue Aug 17 12:17:24 2010	(r211424)
@@ -620,7 +620,8 @@ pmap_init_pat(void)
 		if (sysenv != NULL) {
 			if (strncmp(sysenv, "MacBook5,1", 10) == 0 ||
 			    strncmp(sysenv, "MacBookPro5,5", 13) == 0 ||
-			    strncmp(sysenv, "Macmini3,1", 10) == 0)
+			    strncmp(sysenv, "Macmini3,1", 10) == 0 ||
+			    strncmp(sysenv, "iMac9,1", 7) == 0)
 				pat_works = 0;
 			freeenv(sysenv);
 		}

Modified: head/sys/i386/i386/pmap.c
==============================================================================
--- head/sys/i386/i386/pmap.c	Tue Aug 17 12:16:06 2010	(r211423)
+++ head/sys/i386/i386/pmap.c	Tue Aug 17 12:17:24 2010	(r211424)
@@ -518,7 +518,8 @@ pmap_init_pat(void)
 			if (sysenv != NULL) {
 				if (strncmp(sysenv, "MacBook5,1", 10) == 0 ||
 				    strncmp(sysenv, "MacBookPro5,5", 13) == 0 ||
-				    strncmp(sysenv, "Macmini3,1", 10) == 0)
+				    strncmp(sysenv, "Macmini3,1", 10) == 0 ||
+				    strncmp(sysenv, "iMac9,1", 7) == 0)
 					pat_works = 0;
 				freeenv(sysenv);
 			}