svn commit: r228874 - head/sys/dev/hwpmc

Bjoern A. Zeeb bz at FreeBSD.org
Sun Dec 25 14:29:37 UTC 2011


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);
 


More information about the svn-src-all mailing list