Date: Sat, 15 Nov 2008 11:07:54 +0000 (UTC) From: Joseph Koshy <jkoshy@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r184993 - head/sys/dev/hwpmc Message-ID: <200811151107.mAFB7sJB019169@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200811151107.mAFB7sJB019169>