svn commit: r256581 - head/sys/powerpc/aim

[Justin Hibbits]

Author: jhibbits
Date: Wed Oct 16 04:11:42 2013
New Revision: 256581
URL: http://svnweb.freebsd.org/changeset/base/256581

Log:
  Fix the Wii build, and remove an extraneous critical_enter().

Modified:
  head/sys/powerpc/aim/interrupt.c

Modified: head/sys/powerpc/aim/interrupt.c
==============================================================================
--- head/sys/powerpc/aim/interrupt.c	Wed Oct 16 04:10:28 2013	(r256580)
+++ head/sys/powerpc/aim/interrupt.c	Wed Oct 16 04:11:42 2013	(r256581)
@@ -101,17 +101,16 @@ powerpc_interrupt(struct trapframe *fram
 		atomic_subtract_int(&td->td_intr_nesting_level, 1);
 		critical_exit();
 		break;
+#ifdef HWPMC_HOOKS
 	case EXC_PERF:
 		critical_enter();
 		KASSERT(pmc_intr != NULL, ("Performance exception, but no handler!"));
 		(*pmc_intr)(PCPU_GET(cpuid), framep);
-		critical_enter();
-#ifdef HWPMC_HOOKS
 		if (pmc_hook && (PCPU_GET(curthread)->td_pflags & TDP_CALLCHAIN))
 			pmc_hook(PCPU_GET(curthread), PMC_FN_USER_CALLCHAIN, framep);
-#endif
 		critical_exit();
 		break;
+#endif
 
 	default:
 		/* Re-enable interrupts if applicable. */