diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2009-10-22 20:10:47 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2009-10-22 20:10:47 +0000 |
| commit | 367f13c7e4fb8a960568c1aec8792e5aa394acf0 (patch) | |
| tree | 9c46f53a504830549f0989412cb0f0bba6cce3be /sys/arch/mips64 | |
| parent | a81feba34f8a90600807b2131fe19f958f163e15 (diff) | |
unifdef -DIMASK_EXTERNAL to the mips code. Support for interrupt masking at
coprocessor 0 sr level might come back in the future if hardware support
requires it, but at the moment it's getting in the way of larger changes.
``In the Attic, noone can hear you scream''
Diffstat (limited to 'sys/arch/mips64')
| -rw-r--r-- | sys/arch/mips64/mips64/interrupt.c | 4 | ||||
| -rw-r--r-- | sys/arch/mips64/mips64/trap.c | 8 |
2 files changed, 2 insertions, 10 deletions
diff --git a/sys/arch/mips64/mips64/interrupt.c b/sys/arch/mips64/mips64/interrupt.c index 2326f3c29fa..09711c8cacd 100644 --- a/sys/arch/mips64/mips64/interrupt.c +++ b/sys/arch/mips64/mips64/interrupt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: interrupt.c,v 1.45 2009/10/22 20:05:27 miod Exp $ */ +/* $OpenBSD: interrupt.c,v 1.46 2009/10/22 20:10:44 miod Exp $ */ /* * Copyright (c) 2001-2004 Opsycon AB (www.opsycon.se / www.opsycon.com) @@ -293,9 +293,7 @@ splx(int newcpl) __asm__ (" .set noreorder\n"); ci->ci_cpl = newcpl; __asm__ (" sync\n .set reorder\n"); -#ifdef IMASK_EXTERNAL hw_setintrmask(newcpl); -#endif } } diff --git a/sys/arch/mips64/mips64/trap.c b/sys/arch/mips64/mips64/trap.c index 54a37bd7c23..46ce38d202e 100644 --- a/sys/arch/mips64/mips64/trap.c +++ b/sys/arch/mips64/mips64/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.45 2009/10/22 18:31:51 miod Exp $ */ +/* $OpenBSD: trap.c,v 1.46 2009/10/22 20:10:44 miod Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -210,9 +210,6 @@ trap(trapframe) */ if (trapframe->sr & SR_INT_ENAB) { if (type != T_BREAK) { -#ifndef IMASK_EXTERNAL - updateimask(trapframe->cpl); -#endif enableintr(); } } @@ -604,9 +601,6 @@ printf("SIG-BUSB @%p pc %p, ra %p\n", trapframe->badvaddr, trapframe->pc, trapfr #endif /* Reenable interrupts if necessary */ if (trapframe->sr & SR_INT_ENAB) { -#ifndef IMASK_EXTERNAL - updateimask(trapframe->cpl); -#endif enableintr(); } return; |