From owner-p4-projects@FreeBSD.ORG  Thu Jun 30 06:10:50 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 03D3416A420; Thu, 30 Jun 2005 06:10:50 +0000 (GMT)
X-Original-To: perforce@freebsd.org
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 BB45016A41C
	for <perforce@freebsd.org>; Thu, 30 Jun 2005 06:10:49 +0000 (GMT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A902D43D49
	for <perforce@freebsd.org>; Thu, 30 Jun 2005 06:10:49 +0000 (GMT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5U6An5W084621
	for <perforce@freebsd.org>; Thu, 30 Jun 2005 06:10:49 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5U6Anpv084618
	for perforce@freebsd.org; Thu, 30 Jun 2005 06:10:49 GMT
	(envelope-from peter@freebsd.org)
Date: Thu, 30 Jun 2005 06:10:49 GMT
Message-Id: <200506300610.j5U6Anpv084618@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>
Cc: 
Subject: PERFORCE change 79248 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Thu, 30 Jun 2005 06:10:50 -0000

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

Change 79248 by peter@peter_overcee on 2005/06/30 06:10:15

	Resync with cvs

Affected files ...

.. //depot/projects/hammer/sys/i386/i386/identcpu.c#24 edit

Differences ...

==== //depot/projects/hammer/sys/i386/i386/identcpu.c#24 (text+ko) ====

@@ -172,9 +172,10 @@
 		}
 	}
 
-	/* Detect AMD features (PTE no-execute bit, Long mode etc) */
-	if (strcmp(cpu_vendor, "GenuineIntel") == 0 ||
-	    strcmp(cpu_vendor, "AuthenticAMD") == 0) {
+	/* Detect AMD features (PTE no-execute bit, 3dnow, 64 bit mode etc) */
+	if (cpu_exthigh >= 0xx80000001 &&
+	    (strcmp(cpu_vendor, "GenuineIntel") == 0 ||
+	     strcmp(cpu_vendor, "AuthenticAMD") == 0)) {
 		do_cpuid(0x80000001, regs);
 		amd_feature = regs[3] & ~(cpu_feature & 0x0183f3ff);
 	}