diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2010-10-24 15:39:19 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2010-10-24 15:39:19 +0000 |
| commit | 45a1c7c63149bd25222da561e7da3774e32cde02 (patch) | |
| tree | 9a8275b3f51fecaedb5e22a0e3ef0e3c5b89754d /sys/arch/mips64 | |
| parent | d0a2185b65c836b1ab6eab1a61803421490c3710 (diff) | |
Don't short-circuit userret() when returning from trap() in the rm7000
performance counter code path (which is not enabled at the moment).
Diffstat (limited to 'sys/arch/mips64')
| -rw-r--r-- | sys/arch/mips64/mips64/trap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/arch/mips64/mips64/trap.c b/sys/arch/mips64/mips64/trap.c index 911a563d2c2..44bae4b610e 100644 --- a/sys/arch/mips64/mips64/trap.c +++ b/sys/arch/mips64/mips64/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.69 2010/09/21 21:59:44 miod Exp $ */ +/* $OpenBSD: trap.c,v 1.70 2010/10/24 15:39:18 miod Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -684,7 +684,7 @@ printf("SIG-BUSB @%p pc %p, ra %p\n", trapframe->badvaddr, trapframe->pc, trapfr #ifdef RM7K_PERFCNTR if (rm7k_watchintr(trapframe)) { /* Return to user, don't add any more overhead */ - return; + goto out; } #endif i = SIGTRAP; @@ -718,7 +718,7 @@ printf("SIG-BUSB @%p pc %p, ra %p\n", trapframe->badvaddr, trapframe->pc, trapfr trapframe->a2, trapframe->a3); locr0->v0 = -result; /* Return to user, don't add any more overhead */ - return; + goto out; } else #endif /* |