From 367f13c7e4fb8a960568c1aec8792e5aa394acf0 Mon Sep 17 00:00:00 2001
From: Miod Vallat <miod@cvs.openbsd.org>
Date: Thu, 22 Oct 2009 20:10:47 +0000
Subject: 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''

---
 sys/arch/mips64/mips64/interrupt.c | 4 +---
 sys/arch/mips64/mips64/trap.c      | 8 +-------
 2 files changed, 2 insertions(+), 10 deletions(-)

(limited to 'sys/arch/mips64')

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;
-- 
cgit v1.2.3