svn commit: r195198 - in stable/7/sys: . amd64/amd64 contrib/pf
Andriy Gapon
avg at FreeBSD.org
Tue Jun 30 17:19:12 UTC 2009
Author: avg
Date: Tue Jun 30 17:19:11 2009
New Revision: 195198
URL: http://svn.freebsd.org/changeset/base/195198
Log:
MFC 185460 (mav): improve invariant TSC detection for Intel CPUs
Nod from: mav
Modified:
stable/7/sys/ (props changed)
stable/7/sys/amd64/amd64/identcpu.c
stable/7/sys/contrib/pf/ (props changed)
Modified: stable/7/sys/amd64/amd64/identcpu.c
==============================================================================
--- stable/7/sys/amd64/amd64/identcpu.c Tue Jun 30 17:10:08 2009 (r195197)
+++ stable/7/sys/amd64/amd64/identcpu.c Tue Jun 30 17:19:11 2009 (r195198)
@@ -361,7 +361,11 @@ printcpuinfo(void)
tsc_is_invariant = 1;
break;
case CPU_VENDOR_INTEL:
- if (amd_pminfo & AMDPM_TSC_INVARIANT)
+ if ((amd_pminfo & AMDPM_TSC_INVARIANT) ||
+ (AMD64_CPU_FAMILY(cpu_id) == 0x6 &&
+ AMD64_CPU_MODEL(cpu_id) >= 0xe) ||
+ (AMD64_CPU_FAMILY(cpu_id) == 0xf &&
+ AMD64_CPU_MODEL(cpu_id) >= 0x3))
tsc_is_invariant = 1;
break;
}
More information about the svn-src-stable-7
mailing list