From 46af5ebd9e7964483c88442b62909401ad1be3be Mon Sep 17 00:00:00 2001
From: Takuya ASADA <syuu@cvs.openbsd.org>
Date: Sun, 22 Nov 2009 22:15:26 +0000
Subject: removing unnecessary locks. ok jsing@

---
 sys/arch/mips64/mips64/clock.c    | 10 +---------
 sys/arch/mips64/mips64/softintr.c |  4 +---
 2 files changed, 2 insertions(+), 12 deletions(-)

(limited to 'sys/arch')

diff --git a/sys/arch/mips64/mips64/clock.c b/sys/arch/mips64/mips64/clock.c
index f4677a2db3b..91c405be630 100644
--- a/sys/arch/mips64/mips64/clock.c
+++ b/sys/arch/mips64/mips64/clock.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: clock.c,v 1.28 2009/11/22 18:33:48 syuu Exp $ */
+/*	$OpenBSD: clock.c,v 1.29 2009/11/22 22:15:25 syuu Exp $ */
 
 /*
  * Copyright (c) 2001-2004 Opsycon AB  (www.opsycon.se / www.opsycon.com)
@@ -158,19 +158,11 @@ clock_int5(uint32_t mask, struct trap_frame *tf)
 	 * Process clock interrupt unless it is currently masked.
 	 */
 	if (tf->ipl < IPL_CLOCK) {
-#ifdef MULTIPROCESSOR
-		if (ci->ci_ipl < IPL_SCHED)
-			__mp_lock(&kernel_lock);
-#endif
 		while (ci->ci_pendingticks) {
 			clk_count.ec_count++;
 			hardclock(tf);
 			ci->ci_pendingticks--;
 		}
-#ifdef MULTIPROCESSOR
-		if (ci->ci_ipl < IPL_SCHED)
-			__mp_unlock(&kernel_lock);
-#endif
 	}
 
 	return CR_INT_5;	/* Clock is always on 5 */
diff --git a/sys/arch/mips64/mips64/softintr.c b/sys/arch/mips64/mips64/softintr.c
index d3401c4e219..c9244cf76e8 100644
--- a/sys/arch/mips64/mips64/softintr.c
+++ b/sys/arch/mips64/mips64/softintr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: softintr.c,v 1.6 2009/11/21 23:28:14 syuu Exp $	*/
+/*	$OpenBSD: softintr.c,v 1.7 2009/11/22 22:15:25 syuu Exp $	*/
 /*	$NetBSD: softintr.c,v 1.2 2003/07/15 00:24:39 lukem Exp $	*/
 
 /*
@@ -100,9 +100,7 @@ softintr_dispatch(int si)
 
 		mtx_leave(&siq->siq_mtx);
 
-		KERNEL_LOCK();
 		(*sih->sih_func)(sih->sih_arg);
-		KERNEL_UNLOCK();
 	}
 }
 
-- 
cgit v1.2.3