summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormiod <miod@openbsd.org>2009-06-12 19:52:15 +0000
committermiod <miod@openbsd.org>2009-06-12 19:52:15 +0000
commit1318e7c94a36b6493fd87a12d250478556cbf19a (patch)
treea122fb128f8f2c6f304d47754215d57844e4db61
parentdocument that RECURSIVE_FETCH_LIST is set to No by default. (diff)
downloadwireguard-openbsd-1318e7c94a36b6493fd87a12d250478556cbf19a.tar.xz
wireguard-openbsd-1318e7c94a36b6493fd87a12d250478556cbf19a.zip
Make sure splsoftnet() masks softclock; fallout form switch to generic
soft interrupts.
-rw-r--r--sys/arch/sgi/include/intr.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/sys/arch/sgi/include/intr.h b/sys/arch/sgi/include/intr.h
index 3ce4385c50b..48a91f24e05 100644
--- a/sys/arch/sgi/include/intr.h
+++ b/sys/arch/sgi/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.25 2009/06/10 18:05:31 miod Exp $ */
+/* $OpenBSD: intr.h,v 1.26 2009/06/12 19:52:15 miod Exp $ */
/*
* Copyright (c) 2001-2004 Opsycon AB (www.opsycon.se / www.opsycon.com)
@@ -127,8 +127,11 @@ extern struct soft_intrhand *softnet_intrhand;
#define splaudio() splraise(imask[IPL_AUDIO])
#define splclock() splraise(imask[IPL_CLOCK])
#define splvm() splraise(imask[IPL_VM])
-#define splsoftclock() splraise(SINTMASK(SI_SOFTCLOCK))
-#define splsoftnet() splraise(SINTMASK(SI_SOFTNET))
+#define splsoftclock() splraise(SINTMASK(SI_SOFTCLOCK) | \
+ SINTMASK(SI_SOFT))
+#define splsoftnet() splraise(SINTMASK(SI_SOFTNET) | \
+ SINTMASK(SI_SOFTCLOCK) | \
+ SINTMASK(SI_SOFT))
#define splstatclock() splhigh()
#define splsched() splhigh()
#define splhigh() splraise(-1)