summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormaja <maja@openbsd.org>2008-12-06 20:05:08 +0000
committermaja <maja@openbsd.org>2008-12-06 20:05:08 +0000
commit2da6de254ba3a37b3f2e4702d6fd74bd512c7e07 (patch)
tree7792757965460943deb7f09ca61b54542f5ab58e
parentrevert all changes related to the mpsafe intr handler. i screwed up the commit (diff)
downloadwireguard-openbsd-2da6de254ba3a37b3f2e4702d6fd74bd512c7e07.tar.xz
wireguard-openbsd-2da6de254ba3a37b3f2e4702d6fd74bd512c7e07.zip
Revert this to, due to the ppc intr backout. -moj ok @kettenis
-rw-r--r--sys/arch/socppc/socppc/clock.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/arch/socppc/socppc/clock.c b/sys/arch/socppc/socppc/clock.c
index 4b97347ecbb..e78e9dd2815 100644
--- a/sys/arch/socppc/socppc/clock.c
+++ b/sys/arch/socppc/socppc/clock.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clock.c,v 1.2 2008/10/12 11:51:08 kettenis Exp $ */
+/* $OpenBSD: clock.c,v 1.3 2008/12/06 20:05:08 maja Exp $ */
/* $NetBSD: clock.c,v 1.1 1996/09/30 16:34:40 ws Exp $ */
/*
@@ -202,7 +202,7 @@ decr_intr(struct clockframe *frame)
*/
ppc_mtdec(nextevent - tb);
- if (ci->ci_cpl >= IPL_CLOCK) {
+ if (curcpu()->ci_cpl & SPL_CLOCK) {
ci->ci_statspending += nstats;
} else {
KERNEL_LOCK();