From owner-svn-src-all@FreeBSD.ORG  Sat Jun 12 13:10:04 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 864CA1065672;
	Sat, 12 Jun 2010 13:10:04 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 75C0D8FC16;
	Sat, 12 Jun 2010 13:10:04 +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 o5CDA4QT007853;
	Sat, 12 Jun 2010 13:10:04 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5CDA4Lg007851;
	Sat, 12 Jun 2010 13:10:04 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201006121310.o5CDA4Lg007851@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Sat, 12 Jun 2010 13:10:04 +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: r209103 - head/sys/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: Sat, 12 Jun 2010 13:10:04 -0000

Author: mav
Date: Sat Jun 12 13:10:03 2010
New Revision: 209103
URL: http://svn.freebsd.org/changeset/base/209103

Log:
  Check general TSC presence before doing more specific checks and printfs.

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

Modified: head/sys/i386/i386/tsc.c
==============================================================================
--- head/sys/i386/i386/tsc.c	Sat Jun 12 12:19:08 2010	(r209102)
+++ head/sys/i386/i386/tsc.c	Sat Jun 12 13:10:03 2010	(r209103)
@@ -123,6 +123,10 @@ init_TSC(void)
 void
 init_TSC_tc(void)
 {
+
+	if (!tsc_present) 
+		return;
+
 	/*
 	 * We can not use the TSC if we support APM.  Precise timekeeping
 	 * on an APM'ed machine is at best a fools pursuit, since 
@@ -152,7 +156,7 @@ init_TSC_tc(void)
 		tsc_timecounter.tc_quality = -100;
 #endif
 
-	if (tsc_present && tsc_freq != 0 && !tsc_is_broken) {
+	if (tsc_freq != 0 && !tsc_is_broken) {
 		tsc_timecounter.tc_frequency = tsc_freq;
 		tc_init(&tsc_timecounter);
 	}