From owner-svn-src-stable-8@FreeBSD.ORG  Sun Apr  4 15:42:53 2010
Return-Path: <owner-svn-src-stable-8@FreeBSD.ORG>
Delivered-To: svn-src-stable-8@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 05E85106566B;
	Sun,  4 Apr 2010 15:42:53 +0000 (UTC)
	(envelope-from rnoland@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E7B0F8FC08;
	Sun,  4 Apr 2010 15:42:52 +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 o34FgqPR053371;
	Sun, 4 Apr 2010 15:42:52 GMT (envelope-from rnoland@svn.freebsd.org)
Received: (from rnoland@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o34Fgqvm053368;
	Sun, 4 Apr 2010 15:42:52 GMT (envelope-from rnoland@svn.freebsd.org)
Message-Id: <201004041542.o34Fgqvm053368@svn.freebsd.org>
From: Robert Noland <rnoland@FreeBSD.org>
Date: Sun, 4 Apr 2010 15:42:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r206165 - in stable/8/sys: amd64/amd64 i386/i386
X-BeenThere: svn-src-stable-8@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 8-stable src tree
	<svn-src-stable-8.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-8>
List-Post: <mailto:svn-src-stable-8@freebsd.org>
List-Help: <mailto:svn-src-stable-8-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 04 Apr 2010 15:42:53 -0000

Author: rnoland
Date: Sun Apr  4 15:42:52 2010
New Revision: 206165
URL: http://svn.freebsd.org/changeset/base/206165

Log:
  MFC r203289,r203367
  
  Enable MTRR on all VIA CPUs that claim support

Modified:
  stable/8/sys/amd64/amd64/amd64_mem.c
  stable/8/sys/i386/i386/i686_mem.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/amd64/amd64/amd64_mem.c
==============================================================================
--- stable/8/sys/amd64/amd64/amd64_mem.c	Sun Apr  4 15:37:47 2010	(r206164)
+++ stable/8/sys/amd64/amd64/amd64_mem.c	Sun Apr  4 15:42:52 2010	(r206165)
@@ -707,11 +707,8 @@ amd64_mem_drvinit(void *unused)
 	switch (cpu_vendor_id) {
 	case CPU_VENDOR_INTEL:
 	case CPU_VENDOR_AMD:
-		break;
 	case CPU_VENDOR_CENTAUR:
-		if (cpu_exthigh >= 0x80000008)
-			break;
-		/* FALLTHROUGH */
+		break;
 	default:
 		return;
 	}

Modified: stable/8/sys/i386/i386/i686_mem.c
==============================================================================
--- stable/8/sys/i386/i386/i686_mem.c	Sun Apr  4 15:37:47 2010	(r206164)
+++ stable/8/sys/i386/i386/i686_mem.c	Sun Apr  4 15:42:52 2010	(r206165)
@@ -707,11 +707,8 @@ i686_mem_drvinit(void *unused)
 	switch (cpu_vendor_id) {
 	case CPU_VENDOR_INTEL:
 	case CPU_VENDOR_AMD:
-		break;
 	case CPU_VENDOR_CENTAUR:
-		if (cpu_exthigh >= 0x80000008)
-			break;
-		/* FALLTHROUGH */
+		break;
 	default:
 		return;
 	}