diff options
| author |   kettenis <kettenis@openbsd.org> | 2015-04-28 18:39:13 +0000 |
|---|---|---|
| committer | kettenis <kettenis@openbsd.org> | 2015-04-28 18:39:13 +0000 |
| commit | aed4e36e1b78fd49143677f9b77bf45f3b73c8c3 (patch) | |
| tree | eb39fef329b0bf9bbb66dad77ae0abf38fd36f2a | |
| parent | Make sure to overwrite sdl_type after calling ether_ifattach(). (diff) | |
| download | wireguard-openbsd-aed4e36e1b78fd49143677f9b77bf45f3b73c8c3.tar.xz wireguard-openbsd-aed4e36e1b78fd49143677f9b77bf45f3b73c8c3.zip | |
Don't grab the kernel lock for clock interrupts. The way we use mutexes
these days is incompatible with that practice and leads to deadlocks.
ok jsing@
| -rw-r--r-- | sys/arch/hppa/hppa/intr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/arch/hppa/hppa/intr.c b/sys/arch/hppa/hppa/intr.c index 109c2a0067c..5c0ee090d52 100644 --- a/sys/arch/hppa/hppa/intr.c +++ b/sys/arch/hppa/hppa/intr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.c,v 1.46 2015/02/11 01:55:40 dlg Exp $ */ +/* $OpenBSD: intr.c,v 1.47 2015/04/28 18:39:13 kettenis Exp $ */ /* * Copyright (c) 2002-2004 Michael Shalayeff @@ -274,7 +274,7 @@ cpu_intr(void *v) mtctl(frame->tf_eiem, CR_EIEM); #ifdef MULTIPROCESSOR - if (pri < IPL_IPI && s < IPL_SCHED) + if (pri < IPL_CLOCK) __mp_lock(&kernel_lock); #endif @@ -296,7 +296,7 @@ cpu_intr(void *v) #endif #ifdef MULTIPROCESSOR - if (pri < IPL_IPI && s < IPL_SCHED) + if (pri < IPL_CLOCK) __mp_unlock(&kernel_lock); #endif mtctl(0, CR_EIEM); |