summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Gwynne <dlg@cvs.openbsd.org>2014-01-21 10:19:32 +0000
committerDavid Gwynne <dlg@cvs.openbsd.org>2014-01-21 10:19:32 +0000
commitcb45675595dec622231c4909689b56f0321b5414 (patch)
treebb155a7b4ef42b8c181e1ef61306984e652e1bee
parentafabf447e8168a34694f0eca272e80e7fc416c39 (diff)
use KERNEL_LOCK and KERNEL_UNLOCK instead of fumbling with kernel_lock
directly. ok kettenis@
-rw-r--r--sys/arch/sparc64/sparc64/intr.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/arch/sparc64/sparc64/intr.c b/sys/arch/sparc64/sparc64/intr.c
index 7c1e685117b..15e569106ca 100644
--- a/sys/arch/sparc64/sparc64/intr.c
+++ b/sys/arch/sparc64/sparc64/intr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.c,v 1.45 2013/05/13 17:46:42 kettenis Exp $ */
+/* $OpenBSD: intr.c,v 1.46 2014/01/21 10:19:31 dlg Exp $ */
/* $NetBSD: intr.c,v 1.39 2001/07/19 23:38:11 eeh Exp $ */
/*
@@ -129,12 +129,12 @@ intr_handler(struct trapframe64 *tf, struct intrhand *ih)
need_lock = tf->tf_pil < PIL_SCHED && tf->tf_pil != PIL_CLOCK;
if (need_lock)
- __mp_lock(&kernel_lock);
+ KERNEL_LOCK();
#endif
rc = (*ih->ih_fun)(ih->ih_arg ? ih->ih_arg : tf);
#ifdef MULTIPROCESSOR
if (need_lock)
- __mp_unlock(&kernel_lock);
+ KERNEL_UNLOCK();
#endif
return rc;
}