From owner-svn-src-head@FreeBSD.ORG  Sat Nov 15 11:07:54 2008
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 EBA791065673;
	Sat, 15 Nov 2008 11:07:54 +0000 (UTC)
	(envelope-from jkoshy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D9B098FC18;
	Sat, 15 Nov 2008 11:07:54 +0000 (UTC)
	(envelope-from jkoshy@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mAFB7seg019170;
	Sat, 15 Nov 2008 11:07:54 GMT (envelope-from jkoshy@svn.freebsd.org)
Received: (from jkoshy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mAFB7sJB019169;
	Sat, 15 Nov 2008 11:07:54 GMT (envelope-from jkoshy@svn.freebsd.org)
Message-Id: <200811151107.mAFB7sJB019169@svn.freebsd.org>
From: Joseph Koshy <jkoshy@FreeBSD.org>
Date: Sat, 15 Nov 2008 11:07:54 +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: r184993 - head/sys/dev/hwpmc
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: Sat, 15 Nov 2008 11:07:55 -0000

Author: jkoshy
Date: Sat Nov 15 11:07:54 2008
New Revision: 184993
URL: http://svn.freebsd.org/changeset/base/184993

Log:
  Fix assertions.
  
  Reported by:	keramida

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

Modified: head/sys/dev/hwpmc/hwpmc_intel.c
==============================================================================
--- head/sys/dev/hwpmc/hwpmc_intel.c	Sat Nov 15 10:56:36 2008	(r184992)
+++ head/sys/dev/hwpmc/hwpmc_intel.c	Sat Nov 15 11:07:54 2008	(r184993)
@@ -151,8 +151,9 @@ pmc_intel_initialize(void)
 	case PMC_CPU_INTEL_PIV:
 		error = pmc_p4_initialize(pmc_mdep, ncpus);
 
-		KASSERT(md->pmd_npmc == TSC_NPMCS + P4_NPMCS, ("[intel,%d] "
-		    "incorrect npmc count %d", __LINE__, md->pmd_npmc));
+		KASSERT(pmc_mdep->pmd_npmc == TSC_NPMCS + P4_NPMCS,
+		    ("[intel,%d] incorrect npmc count %d", __LINE__,
+		    pmc_mdep->pmd_npmc));
 		break;
 #endif
 
@@ -168,8 +169,9 @@ pmc_intel_initialize(void)
 	case PMC_CPU_INTEL_PM:
 		error = pmc_p6_initialize(pmc_mdep, ncpus);
 
-		KASSERT(md->pmd_npmc == TSC_NPMCS + P6_NPMCS, ("[intel,%d] "
-		    "incorrect npmc count %d", __LINE__, md->pmd_npmc));
+		KASSERT(pmc_mdep->pmd_npmc == TSC_NPMCS + P6_NPMCS,
+		    ("[intel,%d] incorrect npmc count %d", __LINE__,
+		    pmc_mdep->pmd_npmc));
 		break;
 
 		/*
@@ -179,8 +181,9 @@ pmc_intel_initialize(void)
 	case PMC_CPU_INTEL_P5:
 		error = pmc_p5_initialize(pmc_mdep, ncpus);
 
-		KASSERT(md->pmd_npmc == TSC_NPMCS + PENTIUM_NPMCS, ("[intel,%d] "
-		    "incorrect npmc count %d", __LINE__, md->pmd_npmc));
+		KASSERT(pmc_mdep->pmd_npmc == TSC_NPMCS + PENTIUM_NPMCS,
+		    ("[intel,%d] incorrect npmc count %d", __LINE__,
+		    md->pmd_npmc));
 		break;
 #endif