diff options
| author | jhibbits <jhibbits@FreeBSD.org> | 2013-10-16 04:11:42 +0000 |
|---|---|---|
| committer | jhibbits <jhibbits@FreeBSD.org> | 2013-10-16 04:11:42 +0000 |
| commit | 99ca70f3610c3ff6a85593d2cf949519b486f7e9 (patch) | |
| tree | 2b4792fc11060c3f3f2b21946eddf5a1814e2c50 /sys/powerpc/aim | |
| parent | 829cb050c1ac08b5a37227666bef265a9b6881c3 (diff) | |
| download | FreeBSD-src-99ca70f3610c3ff6a85593d2cf949519b486f7e9.zip FreeBSD-src-99ca70f3610c3ff6a85593d2cf949519b486f7e9.tar.gz | |
Fix the Wii build, and remove an extraneous critical_enter().
Diffstat (limited to 'sys/powerpc/aim')
| -rw-r--r-- | sys/powerpc/aim/interrupt.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/powerpc/aim/interrupt.c b/sys/powerpc/aim/interrupt.c index 4d1c22e..1db565c 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. */ |
