PERFORCE change 79248 for review

[Peter Wemm]

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

Change 79248 by peter at 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);
 	}