From owner-svn-src-all@FreeBSD.ORG  Tue Dec  7 18:15:18 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 943671065674;
	Tue,  7 Dec 2010 18:15:18 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 835CA8FC18;
	Tue,  7 Dec 2010 18:15:18 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oB7IFIWQ076121;
	Tue, 7 Dec 2010 18:15:18 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oB7IFIaw076118;
	Tue, 7 Dec 2010 18:15:18 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201012071815.oB7IFIaw076118@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Tue, 7 Dec 2010 18:15:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r216262 - in stable/7/sys: amd64/amd64 i386/i386
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 07 Dec 2010 18:15:18 -0000

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;