summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authormiod <miod@openbsd.org>2007-11-30 08:19:40 +0000
committermiod <miod@openbsd.org>2007-11-30 08:19:40 +0000
commit73bb9e10714217339c3e52c4732b2a8bba4c801c (patch)
treec4a4236b2d538f41f229b2547b6fd1670af88155 /sys
parentSkip the sanity test introduced in r1.50 on TI devices, as it gets triggered (diff)
downloadwireguard-openbsd-73bb9e10714217339c3e52c4732b2a8bba4c801c.tar.xz
wireguard-openbsd-73bb9e10714217339c3e52c4732b2a8bba4c801c.zip
Define IPL_VM on platforms which lack it.
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/landisk/include/intr.h7
-rw-r--r--sys/arch/mac68k/include/intr.h4
2 files changed, 7 insertions, 4 deletions
diff --git a/sys/arch/landisk/include/intr.h b/sys/arch/landisk/include/intr.h
index 1fa915f3994..30874757d7d 100644
--- a/sys/arch/landisk/include/intr.h
+++ b/sys/arch/landisk/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.6 2007/05/16 19:38:21 thib Exp $ */
+/* $OpenBSD: intr.h,v 1.7 2007/11/30 08:19:40 miod Exp $ */
/* $NetBSD: intr.h,v 1.1 2006/09/01 21:26:18 uwe Exp $ */
/*-
@@ -44,9 +44,10 @@
/* Interrupt priority levels */
#define IPL_BIO 10 /* block I/O */
+#define IPL_AUDIO IPL_BIO
#define IPL_NET 11 /* network */
#define IPL_TTY 12 /* terminal */
-#define IPL_AUDIO 13 /* serial */
+#define IPL_VM 12
#define IPL_CLOCK 14 /* clock */
#define IPL_SCHED 14 /* scheduling */
#define IPL_HIGH 15 /* everything */
@@ -57,7 +58,7 @@
#define splbio() _cpu_intr_raise(IPL_BIO << 4)
#define splnet() _cpu_intr_raise(IPL_NET << 4)
#define spltty() _cpu_intr_raise(IPL_TTY << 4)
-#define splvm() spltty()
+#define splvm() _cpu_intr_raise(IPL_VM << 4)
#define splaudio() _cpu_intr_raise(IPL_AUDIO << 4)
#define splclock() _cpu_intr_raise(IPL_CLOCK << 4)
#define splstatclock() splclock()
diff --git a/sys/arch/mac68k/include/intr.h b/sys/arch/mac68k/include/intr.h
index 558610bec3c..b29ee66d211 100644
--- a/sys/arch/mac68k/include/intr.h
+++ b/sys/arch/mac68k/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.17 2007/07/29 21:24:05 miod Exp $ */
+/* $OpenBSD: intr.h,v 1.18 2007/11/30 08:19:43 miod Exp $ */
/* $NetBSD: intr.h,v 1.9 1998/08/12 06:58:42 scottr Exp $ */
/*
@@ -58,8 +58,10 @@ extern u_short mac68k_statclockipl;
#define IPL_SOFTNET 1
#define IPL_SOFTCLOCK 1
#define IPL_BIO 2
+#define IPL_AUDIO PSLTOIPL(mac68k_audioipl)
#define IPL_NET PSLTOIPL(mac68k_netipl)
#define IPL_TTY PSLTOIPL(mac68k_ttyipl)
+#define IPL_VM PSLTOIPL(mac68k_vmipl)
#define IPL_CLOCK PSLTOIPL(mac68k_clockipl)
#define IPL_STATCLOCK PSLTOIPL(mac68k_statclockipl)
#define IPL_HIGH 7