From owner-svn-src-head@FreeBSD.ORG  Tue Feb  2 01:20:34 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 06AB51065693;
	Tue,  2 Feb 2010 01:20:34 +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 E94D88FC08;
	Tue,  2 Feb 2010 01:20:33 +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 o121KXJV029117;
	Tue, 2 Feb 2010 01:20:33 GMT (envelope-from rnoland@svn.freebsd.org)
Received: (from rnoland@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o121KXw2029115;
	Tue, 2 Feb 2010 01:20:33 GMT (envelope-from rnoland@svn.freebsd.org)
Message-Id: <201002020120.o121KXw2029115@svn.freebsd.org>
From: Robert Noland <rnoland@FreeBSD.org>
Date: Tue, 2 Feb 2010 01:20:33 +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: r203367 - head/sys/amd64/amd64
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Feb 2010 01:20:34 -0000

Author: rnoland
Date: Tue Feb  2 01:20:33 2010
New Revision: 203367
URL: http://svn.freebsd.org/changeset/base/203367

Log:
  Enable MTRR on all VIA CPUs that claim support (amd64).
  
  This is the amd64 part of r203289.
  
  Noticed by:	jhb
  MFC after:	2 weeks

Modified:
  head/sys/amd64/amd64/amd64_mem.c

Modified: head/sys/amd64/amd64/amd64_mem.c
==============================================================================
--- head/sys/amd64/amd64/amd64_mem.c	Tue Feb  2 00:32:15 2010	(r203366)
+++ head/sys/amd64/amd64/amd64_mem.c	Tue Feb  2 01:20:33 2010	(r203367)
@@ -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;
 	}