From 6141b794bfffae90d9bd0169a78d60a63cdac224 Mon Sep 17 00:00:00 2001 From: Justin Hibbits Date: Wed, 16 Oct 2013 04:11:42 +0000 Subject: [PATCH] Fix the Wii build, and remove an extraneous critical_enter(). --- sys/powerpc/aim/interrupt.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/powerpc/aim/interrupt.c b/sys/powerpc/aim/interrupt.c index 4d1c22e26dd3..1db565ca520c 100644 --- a/sys/powerpc/aim/interrupt.c +++ b/sys/powerpc/aim/interrupt.c @@ -101,17 +101,16 @@ powerpc_interrupt(struct trapframe *framep) 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. */