svn commit: r216262 - in stable/7/sys: amd64/amd64 i386/i386

[Jung-uk Kim]

Author: jkim
Date: Tue Dec  7 18:15:18 2010
New Revision: 216262
URL: http://svn.freebsd.org/changeset/base/216262

Log:
  MFC:	r216159
  
  Do not change CPU ticker frequency if TSC is P-state invariant.
  
  Approved by:	re (kib)

Modified:
  stable/7/sys/amd64/amd64/tsc.c
  stable/7/sys/i386/i386/tsc.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/amd64/amd64/tsc.c
==============================================================================
--- stable/7/sys/amd64/amd64/tsc.c	Tue Dec  7 18:14:38 2010	(r216261)
+++ stable/7/sys/amd64/amd64/tsc.c	Tue Dec  7 18:15:18 2010	(r216262)
@@ -151,6 +151,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: stable/7/sys/i386/i386/tsc.c
==============================================================================
--- stable/7/sys/i386/i386/tsc.c	Tue Dec  7 18:14:38 2010	(r216261)
+++ stable/7/sys/i386/i386/tsc.c	Tue Dec  7 18:15:18 2010	(r216262)
@@ -170,6 +170,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;