From owner-svn-src-all@FreeBSD.ORG  Sun Dec 25 14:29:37 2011
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 2DBAE1065670;
	Sun, 25 Dec 2011 14:29:37 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 176BA8FC0A;
	Sun, 25 Dec 2011 14:29:37 +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 pBPETa6P062698;
	Sun, 25 Dec 2011 14:29:36 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pBPETawV062695;
	Sun, 25 Dec 2011 14:29:36 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <201112251429.pBPETawV062695@svn.freebsd.org>
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Sun, 25 Dec 2011 14:29:36 +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: r228874 - head/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: Sun, 25 Dec 2011 14:29:37 -0000

Author: bz
Date: Sun Dec 25 14:29:36 2011
New Revision: 228874
URL: http://svn.freebsd.org/changeset/base/228874

Log:
  Quite the tinderbox for the holidays.  Remove the assert[1].
  
  Suggested by:	jhibbits [1]
  MFC after:	3 days

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

Modified: head/sys/dev/hwpmc/hwpmc_powerpc.c
==============================================================================
--- head/sys/dev/hwpmc/hwpmc_powerpc.c	Sun Dec 25 13:24:48 2011	(r228873)
+++ head/sys/dev/hwpmc/hwpmc_powerpc.c	Sun Dec 25 14:29:36 2011	(r228874)
@@ -686,11 +686,6 @@ powerpc_intr(int cpu, struct trapframe *
 		v       = pm->pm_sc.pm_reloadcount;
 		config  = mfspr(SPR_MMCR0);
 
-		KASSERT((config & ~AMD_PMC_ENABLE) ==
-		    (pm->pm_md.pm_amd.pm_amd_evsel & ~AMD_PMC_ENABLE),
-		    ("[powerpc,%d] config mismatch reg=0x%x pm=0x%x", __LINE__,
-			config, pm->pm_md.pm_amd.pm_amd_evsel));
-
 		mtspr(SPR_MMCR0, config | SPR_MMCR0_FC);
 		powerpc_pmcn_write(i, v);