From owner-svn-src-all@FreeBSD.ORG  Tue Apr 30 14:56:42 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id F2413B47;
 Tue, 30 Apr 2013 14:56:41 +0000 (UTC)
 (envelope-from davide@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id E3DF8177C;
 Tue, 30 Apr 2013 14:56:41 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3UEufDo072226;
 Tue, 30 Apr 2013 14:56:41 GMT (envelope-from davide@svn.freebsd.org)
Received: (from davide@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3UEufcC072225;
 Tue, 30 Apr 2013 14:56:41 GMT (envelope-from davide@svn.freebsd.org)
Message-Id: <201304301456.r3UEufcC072225@svn.freebsd.org>
From: Davide Italiano <davide@FreeBSD.org>
Date: Tue, 30 Apr 2013 14:56:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r250101 - head/sys/dev/hwpmc
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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, 30 Apr 2013 14:56:42 -0000

Author: davide
Date: Tue Apr 30 14:56:41 2013
New Revision: 250101
URL: http://svnweb.freebsd.org/changeset/base/250101

Log:
  Complete r250097:
  Do not change the initialization order in pmc_intel_initialize().

Modified:
  head/sys/dev/hwpmc/hwpmc_intel.c

Modified: head/sys/dev/hwpmc/hwpmc_intel.c
==============================================================================
--- head/sys/dev/hwpmc/hwpmc_intel.c	Tue Apr 30 13:20:11 2013	(r250100)
+++ head/sys/dev/hwpmc/hwpmc_intel.c	Tue Apr 30 14:56:41 2013	(r250101)
@@ -191,7 +191,9 @@ pmc_intel_initialize(void)
 	pmc_mdep->pmd_switch_out = intel_switch_out;
 
 	ncpus = pmc_cpu_max();
-
+	error = pmc_tsc_initialize(pmc_mdep, ncpus);
+	if (error)
+		goto error;
 	switch (cputype) {
 #if	defined(__i386__) || defined(__amd64__)
 		/*
@@ -246,8 +248,10 @@ pmc_intel_initialize(void)
 		KASSERT(0, ("[intel,%d] Unknown CPU type", __LINE__));
 	}
 
-	if (error)
+	if (error) {
+		pmc_tsc_finalize(pmc_mdep);
 		goto error;
+	}
 
 	/*
 	 * Init the uncore class.
@@ -267,7 +271,6 @@ pmc_intel_initialize(void)
 		break;
 	}
 #endif
-	error = pmc_tsc_initialize(pmc_mdep, ncpus);
   error:
 	if (error) {
 		pmc_mdep_free(pmc_mdep);