From owner-svn-src-user@FreeBSD.ORG Wed Oct 26 03:47:39 2011 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BDBFE106564A; Wed, 26 Oct 2011 03:47:39 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 94F618FC16; Wed, 26 Oct 2011 03:47:39 +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 p9Q3ldAT030652; Wed, 26 Oct 2011 03:47:39 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9Q3ldU1030649; Wed, 26 Oct 2011 03:47:39 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201110260347.p9Q3ldU1030649@svn.freebsd.org> From: Adrian Chadd Date: Wed, 26 Oct 2011 03:47:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226781 - in user/adrian/if_ath_tx/sys: dev/hwpmc sys X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Oct 2011 03:47:39 -0000 Author: adrian Date: Wed Oct 26 03:47:39 2011 New Revision: 226781 URL: http://svn.freebsd.org/changeset/base/226781 Log: More missing DEBUG -> HWPMC_DEBUG stuff. Modified: user/adrian/if_ath_tx/sys/dev/hwpmc/hwpmc_amd.c user/adrian/if_ath_tx/sys/sys/pmc.h Modified: user/adrian/if_ath_tx/sys/dev/hwpmc/hwpmc_amd.c ============================================================================== --- user/adrian/if_ath_tx/sys/dev/hwpmc/hwpmc_amd.c Wed Oct 26 03:25:25 2011 (r226780) +++ user/adrian/if_ath_tx/sys/dev/hwpmc/hwpmc_amd.c Wed Oct 26 03:47:39 2011 (r226781) @@ -47,7 +47,7 @@ __FBSDID("$FreeBSD$"); #include #include -#ifdef DEBUG +#ifdef HWPMC_DEBUG enum pmc_class amd_pmc_class; #endif @@ -284,7 +284,7 @@ amd_read_pmc(int cpu, int ri, pmc_value_ PMCDBG(MDP,REA,1,"amd-read id=%d class=%d", ri, pd->pm_descr.pd_class); -#ifdef DEBUG +#ifdef HWPMC_DEBUG KASSERT(pd->pm_descr.pd_class == amd_pmc_class, ("[amd,%d] unknown PMC class (%d)", __LINE__, pd->pm_descr.pd_class)); @@ -329,7 +329,7 @@ amd_write_pmc(int cpu, int ri, pmc_value mode = PMC_TO_MODE(pm); -#ifdef DEBUG +#ifdef HWPMC_DEBUG KASSERT(pd->pm_descr.pd_class == amd_pmc_class, ("[amd,%d] unknown PMC class (%d)", __LINE__, pd->pm_descr.pd_class)); @@ -515,7 +515,7 @@ amd_allocate_pmc(int cpu, int ri, struct static int amd_release_pmc(int cpu, int ri, struct pmc *pmc) { -#ifdef DEBUG +#ifdef HWPMC_DEBUG const struct amd_descr *pd; #endif struct pmc_hw *phw; @@ -532,7 +532,7 @@ amd_release_pmc(int cpu, int ri, struct KASSERT(phw->phw_pmc == NULL, ("[amd,%d] PHW pmc %p non-NULL", __LINE__, phw->phw_pmc)); -#ifdef DEBUG +#ifdef HWPMC_DEBUG pd = &amd_pmcdesc[ri]; if (pd->pm_descr.pd_class == amd_pmc_class) KASSERT(AMD_PMC_IS_STOPPED(pd->pm_evsel), @@ -834,7 +834,7 @@ amd_pcpu_fini(struct pmc_mdep *md, int c amd_pcpu[cpu] = NULL; -#ifdef DEBUG +#ifdef HWPMC_DEBUG 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)); @@ -913,7 +913,7 @@ pmc_amd_initialize(void) return NULL; } -#ifdef DEBUG +#ifdef HWPMC_DEBUG amd_pmc_class = class; #endif Modified: user/adrian/if_ath_tx/sys/sys/pmc.h ============================================================================== --- user/adrian/if_ath_tx/sys/sys/pmc.h Wed Oct 26 03:25:25 2011 (r226780) +++ user/adrian/if_ath_tx/sys/sys/pmc.h Wed Oct 26 03:47:39 2011 (r226781) @@ -952,7 +952,7 @@ extern struct pmc_cpu **pmc_pcpu; /* driver statistics */ extern struct pmc_op_getdriverstats pmc_stats; -#if defined(DEBUG) && DEBUG +#if defined(HWPMC_DEBUG) /* debug flags, major flag groups */ struct pmc_debugflags {