Fix the Wii build, and remove an extraneous critical_enter().
This commit is contained in:
parent
b45ca25f86
commit
6141b794bf
@ -101,17 +101,16 @@ powerpc_interrupt(struct trapframe *framep)
|
|||||||
atomic_subtract_int(&td->td_intr_nesting_level, 1);
|
atomic_subtract_int(&td->td_intr_nesting_level, 1);
|
||||||
critical_exit();
|
critical_exit();
|
||||||
break;
|
break;
|
||||||
|
#ifdef HWPMC_HOOKS
|
||||||
case EXC_PERF:
|
case EXC_PERF:
|
||||||
critical_enter();
|
critical_enter();
|
||||||
KASSERT(pmc_intr != NULL, ("Performance exception, but no handler!"));
|
KASSERT(pmc_intr != NULL, ("Performance exception, but no handler!"));
|
||||||
(*pmc_intr)(PCPU_GET(cpuid), framep);
|
(*pmc_intr)(PCPU_GET(cpuid), framep);
|
||||||
critical_enter();
|
|
||||||
#ifdef HWPMC_HOOKS
|
|
||||||
if (pmc_hook && (PCPU_GET(curthread)->td_pflags & TDP_CALLCHAIN))
|
if (pmc_hook && (PCPU_GET(curthread)->td_pflags & TDP_CALLCHAIN))
|
||||||
pmc_hook(PCPU_GET(curthread), PMC_FN_USER_CALLCHAIN, framep);
|
pmc_hook(PCPU_GET(curthread), PMC_FN_USER_CALLCHAIN, framep);
|
||||||
#endif
|
|
||||||
critical_exit();
|
critical_exit();
|
||||||
break;
|
break;
|
||||||
|
#endif
|
||||||
|
|
||||||
default:
|
default:
|
||||||
/* Re-enable interrupts if applicable. */
|
/* Re-enable interrupts if applicable. */
|
||||||
|
Loading…
x
Reference in New Issue
Block a user