From owner-svn-src-all@FreeBSD.ORG  Tue Aug 17 12:17:24 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BA23210656A7;
	Tue, 17 Aug 2010 12:17:24 +0000 (UTC)
	(envelope-from gahr@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 954E68FC18;
	Tue, 17 Aug 2010 12:17:24 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o7HCHOu3032256;
	Tue, 17 Aug 2010 12:17:24 GMT (envelope-from gahr@svn.freebsd.org)
Received: (from gahr@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7HCHOTp032253;
	Tue, 17 Aug 2010 12:17:24 GMT (envelope-from gahr@svn.freebsd.org)
Message-Id: <201008171217.o7HCHOTp032253@svn.freebsd.org>
From: Pietro Cerutti <gahr@FreeBSD.org>
Date: Tue, 17 Aug 2010 12:17:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r211424 - in head/sys: amd64/amd64 i386/i386
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Aug 2010 12:17:24 -0000

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);
 			}