From owner-svn-src-head@FreeBSD.ORG  Fri Dec  3 21:06:31 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0C6B21065693;
	Fri,  3 Dec 2010 21:06:31 +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 EF1A68FC15;
	Fri,  3 Dec 2010 21:06:30 +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 oB3L6U5r025892;
	Fri, 3 Dec 2010 21:06:30 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oB3L6Uwd025889;
	Fri, 3 Dec 2010 21:06:30 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201012032106.oB3L6Uwd025889@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Fri, 3 Dec 2010 21:06:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r216159 - in head/sys: amd64/amd64 i386/i386
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 03 Dec 2010 21:06:31 -0000

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;