From owner-svn-src-head@FreeBSD.ORG Mon Dec 26 06:23:50 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx2.freebsd.org (mx2.freebsd.org [IPv6:2001:4f8:fff6::35]) by hub.freebsd.org (Postfix) with ESMTP id 28409106564A; Mon, 26 Dec 2011 06:23:50 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from 172-17-198-245.globalsuite.net (hub.freebsd.org [IPv6:2001:4f8:fff6::36]) by mx2.freebsd.org (Postfix) with ESMTP id A6A4414F00B; Mon, 26 Dec 2011 06:23:48 +0000 (UTC) Message-ID: <4EF812F4.9010902@FreeBSD.org> Date: Sun, 25 Dec 2011 22:23:48 -0800 From: Doug Barton Organization: http://SupersetSolutions.com/ User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:9.0) Gecko/20111222 Thunderbird/9.0 MIME-Version: 1.0 To: "Bjoern A. Zeeb" References: <201112251429.pBPETawV062695@svn.freebsd.org> In-Reply-To: <201112251429.pBPETawV062695@svn.freebsd.org> X-Enigmail-Version: undefined OpenPGP: id=1A1ABC84 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r228874 - 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Dec 2011 06:23:50 -0000 On 12/25/2011 06:29, Bjoern A. Zeeb wrote: > 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]. Shouldn't "Why it's Ok to remove the assert" be part of this commit log? > 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); > > -- [^L] Breadth of IT experience, and depth of knowledge in the DNS. Yours for the right price. :) http://SupersetSolutions.com/