svn commit: r216159 - in head/sys: amd64/amd64 i386/i386

[Jung-uk Kim]

Author: jkim
Date: Fri Dec  3 21:06:30 2010
New Revision: 216159
URL: http://svn.freebsd.org/changeset/base/216159

Log:
  Do not change CPU ticker frequency if TSC is P-state invariant.  Note this
  change was meant to be committed with r184102 (and its subsequent MFCs) but
  it fell off somehow.
  
  Pointyhat to:	jkim
  MFC after:	3 days

Modified:
  head/sys/amd64/amd64/tsc.c
  head/sys/i386/i386/tsc.c

Modified: head/sys/amd64/amd64/tsc.c
==============================================================================
--- head/sys/amd64/amd64/tsc.c	Fri Dec  3 20:39:06 2010	(r216158)
+++ head/sys/amd64/amd64/tsc.c	Fri Dec  3 21:06:30 2010	(r216159)
@@ -146,6 +146,9 @@ tsc_levels_changed(void *arg, int unit)
 	int count, error;
 	uint64_t max_freq;
 
+	if (tsc_is_invariant)
+		return;
+
 	/* Only use values from the first CPU, assuming all are equal. */
 	if (unit != 0)
 		return;

Modified: head/sys/i386/i386/tsc.c
==============================================================================
--- head/sys/i386/i386/tsc.c	Fri Dec  3 20:39:06 2010	(r216158)
+++ head/sys/i386/i386/tsc.c	Fri Dec  3 21:06:30 2010	(r216159)
@@ -174,6 +174,9 @@ tsc_levels_changed(void *arg, int unit)
 	int count, error;
 	uint64_t max_freq;
 
+	if (tsc_is_invariant)
+		return;
+
 	/* Only use values from the first CPU, assuming all are equal. */
 	if (unit != 0)
 		return;