From owner-svn-src-all@FreeBSD.ORG  Sat Oct  6 18:59:23 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id BBA5C10657A7;
	Sat,  6 Oct 2012 18:59:23 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9AC098FC0C;
	Sat,  6 Oct 2012 18:59:23 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q96IxNR6020684;
	Sat, 6 Oct 2012 18:59:23 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q96IxNgH020682;
	Sat, 6 Oct 2012 18:59:23 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201210061859.q96IxNgH020682@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Sat, 6 Oct 2012 18:59:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r241273 - stable/8/sys/dev/hwpmc
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, 06 Oct 2012 18:59:23 -0000

Author: avg
Date: Sat Oct  6 18:59:23 2012
New Revision: 241273
URL: http://svn.freebsd.org/changeset/base/241273

Log:
  MFC r240650: hwpmc amd_pcpu_fini: fix a bug in code locked under DEBUG

Modified:
  stable/8/sys/dev/hwpmc/hwpmc_amd.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/dev/   (props changed)
  stable/8/sys/dev/hwpmc/   (props changed)

Modified: stable/8/sys/dev/hwpmc/hwpmc_amd.c
==============================================================================
--- stable/8/sys/dev/hwpmc/hwpmc_amd.c	Sat Oct  6 18:59:12 2012	(r241272)
+++ stable/8/sys/dev/hwpmc/hwpmc_amd.c	Sat Oct  6 18:59:23 2012	(r241273)
@@ -838,7 +838,7 @@ amd_pcpu_fini(struct pmc_mdep *md, int c
 	for (i = 0; i < AMD_NPMCS; i++) {
 		KASSERT(pac->pc_amdpmcs[i].phw_pmc == NULL,
 		    ("[amd,%d] CPU%d/PMC%d in use", __LINE__, cpu, i));
-		KASSERT(AMD_PMC_IS_STOPPED(AMD_PMC_EVSEL_0 + (i-1)),
+		KASSERT(AMD_PMC_IS_STOPPED(AMD_PMC_EVSEL_0 + i),
 		    ("[amd,%d] CPU%d/PMC%d not stopped", __LINE__, cpu, i));
 	}
 #endif