summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2010-01-18 16:59:24 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2010-01-18 16:59:24 +0000
commitdf30a177444fe06be6762de755a15506697c2e68 (patch)
treedf4df005bc8cd5c2b5afb4b4c2136a8cc2fe6ebe /sys
parentf7e0d469569525dba8f4a4fc84f239920a48468a (diff)
Define IPL_SCHED as IPL_CLOCK, not IPL_HIGH.
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/mips64/include/cpu.h5
-rw-r--r--sys/arch/sgi/include/intr.h7
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/arch/mips64/include/cpu.h b/sys/arch/mips64/include/cpu.h
index 7d396182748..51e50b8383a 100644
--- a/sys/arch/mips64/include/cpu.h
+++ b/sys/arch/mips64/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.54 2010/01/09 23:43:41 miod Exp $ */
+/* $OpenBSD: cpu.h,v 1.55 2010/01/18 16:59:22 miod Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -360,9 +360,8 @@ extern vaddr_t uncached_base;
#include <sys/device.h>
#include <sys/lock.h>
-#include <sys/sched.h>
-
#include <machine/intr.h>
+#include <sys/sched.h>
struct cpu_hwinfo {
uint32_t c0prid;
diff --git a/sys/arch/sgi/include/intr.h b/sys/arch/sgi/include/intr.h
index b9048294b45..9b46c2bf5d1 100644
--- a/sys/arch/sgi/include/intr.h
+++ b/sys/arch/sgi/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.40 2009/12/28 06:55:27 syuu Exp $ */
+/* $OpenBSD: intr.h,v 1.41 2010/01/18 16:59:23 miod Exp $ */
/*
* Copyright (c) 2001-2004 Opsycon AB (www.opsycon.se / www.opsycon.com)
@@ -54,6 +54,7 @@
#define IPL_TTY 4 /* terminal */
#define IPL_VM 5 /* memory allocation */
#define IPL_CLOCK 6 /* clock */
+#define IPL_SCHED IPL_CLOCK
#define IPL_HIGH 7 /* everything */
#define IPL_IPI 8 /* interprocessor interrupt */
#define NIPLS 9 /* Number of levels */
@@ -116,15 +117,15 @@ extern struct soft_intrhand *softnet_intrhand;
#define splnet() splraise(IPL_NET)
#define spltty() splraise(IPL_TTY)
#define splaudio() splraise(IPL_AUDIO)
-#define splclock() splraise(IPL_CLOCK)
#define splvm() splraise(IPL_VM)
+#define splclock() splraise(IPL_CLOCK)
+#define splsched() splraise(IPL_SCHED)
#define splhigh() splraise(IPL_HIGH)
#define splsoftclock() splsoft()
#define splsoftnet() splsoft()
#define splstatclock() splhigh()
-#define splsched() splhigh()
#define spllock() splhigh()
#define spl0() spllower(0)