summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2010-04-23 03:50:23 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2010-04-23 03:50:23 +0000
commit5e0ee3d236585b8d1a8a5cc9b6f75428cc37bdff (patch)
tree85c617df54c21c9df1eec49b6e2d85bb06adce32 /sys
parentfddeb59e503ffbfbaac591d18ef04618a5e19903 (diff)
Make sure IPL_SCHED is always defined by MD headers, instead of having a MI
fallback definition in <sys/sched.h>, so that there is no hidden include ordering requirement between <machine/intr.h> and <sys/sched.h>. ok deraadt@ tedu@
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/alpha/include/intr.h3
-rw-r--r--sys/arch/armish/include/intr.h3
-rw-r--r--sys/arch/beagle/include/intr.h3
-rw-r--r--sys/arch/gumstix/include/intr.h3
-rw-r--r--sys/arch/hp300/include/intr.h3
-rw-r--r--sys/arch/hppa/include/intr.h3
-rw-r--r--sys/arch/loongson/include/intr.h3
-rw-r--r--sys/arch/mac68k/include/intr.h3
-rw-r--r--sys/arch/moko/include/intr.h3
-rw-r--r--sys/arch/mvme68k/include/intr.h3
-rw-r--r--sys/arch/palm/include/intr.h3
-rw-r--r--sys/arch/powerpc/include/intr.h3
-rw-r--r--sys/arch/vax/include/intr.h3
-rw-r--r--sys/arch/zaurus/include/intr.h3
-rw-r--r--sys/sys/sched.h6
15 files changed, 29 insertions, 19 deletions
diff --git a/sys/arch/alpha/include/intr.h b/sys/arch/alpha/include/intr.h
index 6e8cb65725d..f9dd2fb2e41 100644
--- a/sys/arch/alpha/include/intr.h
+++ b/sys/arch/alpha/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.34 2009/09/30 20:16:29 miod Exp $ */
+/* $OpenBSD: intr.h,v 1.35 2010/04/23 03:50:20 miod Exp $ */
/* $NetBSD: intr.h,v 1.26 2000/06/03 20:47:41 thorpej Exp $ */
/*-
@@ -117,6 +117,7 @@ struct scbvec {
#define IPL_AUDIO ALPHA_PSL_IPL_IO
#define IPL_VM ALPHA_PSL_IPL_IO
#define IPL_CLOCK ALPHA_PSL_IPL_CLOCK
+#define IPL_SCHED ALPHA_PSL_IPL_HIGH
#define IPL_HIGH ALPHA_PSL_IPL_HIGH
#define IPL_SOFTSERIAL 0 /* serial software interrupts */
diff --git a/sys/arch/armish/include/intr.h b/sys/arch/armish/include/intr.h
index 70b7aa7b182..21ea4659704 100644
--- a/sys/arch/armish/include/intr.h
+++ b/sys/arch/armish/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.5 2009/04/08 21:19:31 kettenis Exp $ */
+/* $OpenBSD: intr.h,v 1.6 2010/04/23 03:50:22 miod Exp $ */
/* $NetBSD: intr.h,v 1.12 2003/06/16 20:00:59 thorpej Exp $ */
/*
@@ -55,6 +55,7 @@
#define IPL_AUDIO 9 /* audio device */
#define IPL_CLOCK 10 /* clock interrupt */
#define IPL_STATCLOCK 11 /* statistics clock interrupt */
+#define IPL_SCHED 12 /* everything */
#define IPL_HIGH 12 /* everything */
#define NIPL 13
diff --git a/sys/arch/beagle/include/intr.h b/sys/arch/beagle/include/intr.h
index d21d190f868..355fe332f1e 100644
--- a/sys/arch/beagle/include/intr.h
+++ b/sys/arch/beagle/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.1 2009/05/08 03:13:26 drahn Exp $ */
+/* $OpenBSD: intr.h,v 1.2 2010/04/23 03:50:22 miod Exp $ */
/* $NetBSD: intr.h,v 1.12 2003/06/16 20:00:59 thorpej Exp $ */
/*
@@ -55,6 +55,7 @@
#define IPL_AUDIO 9 /* audio device */
#define IPL_CLOCK 10 /* clock interrupt */
#define IPL_STATCLOCK 11 /* statistics clock interrupt */
+#define IPL_SCHED 12 /* everything */
#define IPL_HIGH 12 /* everything */
#define NIPL 13
diff --git a/sys/arch/gumstix/include/intr.h b/sys/arch/gumstix/include/intr.h
index 63067cfe29a..6c6ac884b01 100644
--- a/sys/arch/gumstix/include/intr.h
+++ b/sys/arch/gumstix/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.3 2010/02/01 23:53:58 drahn Exp $ */
+/* $OpenBSD: intr.h,v 1.4 2010/04/23 03:50:22 miod Exp $ */
/* $NetBSD: intr.h,v 1.12 2003/06/16 20:00:59 thorpej Exp $ */
/*
@@ -55,6 +55,7 @@
#define IPL_AUDIO 9 /* audio device */
#define IPL_CLOCK 10 /* clock interrupt */
#define IPL_STATCLOCK 11 /* statistics clock interrupt */
+#define IPL_SCHED 12 /* everything */
#define IPL_HIGH 12 /* everything */
#define NIPL 13
diff --git a/sys/arch/hp300/include/intr.h b/sys/arch/hp300/include/intr.h
index f96d5bd42dc..5af424eb28c 100644
--- a/sys/arch/hp300/include/intr.h
+++ b/sys/arch/hp300/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.26 2009/09/18 19:32:39 miod Exp $ */
+/* $OpenBSD: intr.h,v 1.27 2010/04/23 03:50:22 miod Exp $ */
/* $NetBSD: intr.h,v 1.2 1997/07/24 05:43:08 scottr Exp $ */
/*-
@@ -65,6 +65,7 @@ struct isr {
#define IPL_VM 5
#define IPL_CLOCK 6
#define IPL_STATCLOCK 6
+#define IPL_SCHED 7
#define IPL_HIGH 7
/*
diff --git a/sys/arch/hppa/include/intr.h b/sys/arch/hppa/include/intr.h
index aaa8b23b471..97efc5faecb 100644
--- a/sys/arch/hppa/include/intr.h
+++ b/sys/arch/hppa/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.29 2010/04/19 16:32:53 jsing Exp $ */
+/* $OpenBSD: intr.h,v 1.30 2010/04/23 03:50:22 miod Exp $ */
/*
* Copyright (c) 2002-2004 Michael Shalayeff
@@ -45,6 +45,7 @@
#define IPL_AUDIO 8
#define IPL_CLOCK 9
#define IPL_STATCLOCK 10
+#define IPL_SCHED 10
#define IPL_HIGH 10
#define IPL_NESTED 11 /* pseudo-level for sub-tables */
diff --git a/sys/arch/loongson/include/intr.h b/sys/arch/loongson/include/intr.h
index 6059fbc7338..31b07c61af7 100644
--- a/sys/arch/loongson/include/intr.h
+++ b/sys/arch/loongson/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.1 2009/11/24 11:20:50 miod Exp $ */
+/* $OpenBSD: intr.h,v 1.2 2010/04/23 03:50:22 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 7 /* everything */
#define IPL_HIGH 7 /* everything */
#define NIPLS 8 /* Number of levels */
diff --git a/sys/arch/mac68k/include/intr.h b/sys/arch/mac68k/include/intr.h
index 7441ec32c99..5acce0eb251 100644
--- a/sys/arch/mac68k/include/intr.h
+++ b/sys/arch/mac68k/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.20 2009/09/18 19:32:41 miod Exp $ */
+/* $OpenBSD: intr.h,v 1.21 2010/04/23 03:50:22 miod Exp $ */
/* $NetBSD: intr.h,v 1.9 1998/08/12 06:58:42 scottr Exp $ */
/*
@@ -63,6 +63,7 @@ extern u_short mac68k_statclockipl;
#define IPL_VM PSLTOIPL(mac68k_vmipl)
#define IPL_CLOCK PSLTOIPL(mac68k_clockipl)
#define IPL_STATCLOCK PSLTOIPL(mac68k_statclockipl)
+#define IPL_SCHED 7
#define IPL_HIGH 7
#define MD_IPLTOPSL(ipl) IPLTOPSL(ipl)
diff --git a/sys/arch/moko/include/intr.h b/sys/arch/moko/include/intr.h
index d3b35124ea5..d2232a72882 100644
--- a/sys/arch/moko/include/intr.h
+++ b/sys/arch/moko/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.4 2010/02/01 23:53:58 drahn Exp $ */
+/* $OpenBSD: intr.h,v 1.5 2010/04/23 03:50:22 miod Exp $ */
/* $NetBSD: intr.h,v 1.12 2003/06/16 20:00:59 thorpej Exp $ */
/*
@@ -55,6 +55,7 @@
#define IPL_AUDIO 9 /* audio device */
#define IPL_CLOCK 10 /* clock interrupt */
#define IPL_STATCLOCK 11 /* statistics clock interrupt */
+#define IPL_SCHED 12 /* everything */
#define IPL_HIGH 12 /* everything */
#define NIPL 13
diff --git a/sys/arch/mvme68k/include/intr.h b/sys/arch/mvme68k/include/intr.h
index c16e2386226..636df352576 100644
--- a/sys/arch/mvme68k/include/intr.h
+++ b/sys/arch/mvme68k/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.19 2009/09/18 19:32:41 miod Exp $ */
+/* $OpenBSD: intr.h,v 1.20 2010/04/23 03:50:22 miod Exp $ */
/*
* Copyright (C) 2000 Steve Murphree, Jr.
* All rights reserved.
@@ -49,6 +49,7 @@
#define IPL_VM 5
#define IPL_CLOCK 5
#define IPL_STATCLOCK 5
+#define IPL_SCHED 7
#define IPL_HIGH 7
#define MD_IPLTOPSL(ipl) IPLTOPSL(ipl)
diff --git a/sys/arch/palm/include/intr.h b/sys/arch/palm/include/intr.h
index c341f9ea7f0..8cdb0868853 100644
--- a/sys/arch/palm/include/intr.h
+++ b/sys/arch/palm/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.1 2009/09/05 01:22:11 marex Exp $ */
+/* $OpenBSD: intr.h,v 1.2 2010/04/23 03:50:22 miod Exp $ */
/* $NetBSD: intr.h,v 1.12 2003/06/16 20:00:59 thorpej Exp $ */
/*
@@ -55,6 +55,7 @@
#define IPL_AUDIO 9 /* audio device */
#define IPL_CLOCK 10 /* clock interrupt */
#define IPL_STATCLOCK 11 /* statistics clock interrupt */
+#define IPL_SCHED 12 /* everything */
#define IPL_HIGH 12 /* everything */
#define NIPL 13
diff --git a/sys/arch/powerpc/include/intr.h b/sys/arch/powerpc/include/intr.h
index 937c3f5f26e..6cbf762efba 100644
--- a/sys/arch/powerpc/include/intr.h
+++ b/sys/arch/powerpc/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.43 2009/10/01 20:19:19 kettenis Exp $ */
+/* $OpenBSD: intr.h,v 1.44 2010/04/23 03:50:22 miod Exp $ */
/*
* Copyright (c) 1997 Per Fogelstrom, Opsycon AB and RTMX Inc, USA.
@@ -42,6 +42,7 @@
#define IPL_TTY 3
#define IPL_VM 4
#define IPL_CLOCK 5
+#define IPL_SCHED 6
#define IPL_HIGH 6
#define IPL_NUM 7
diff --git a/sys/arch/vax/include/intr.h b/sys/arch/vax/include/intr.h
index a567d59f773..4a6e3c5ee42 100644
--- a/sys/arch/vax/include/intr.h
+++ b/sys/arch/vax/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.11 2009/03/20 18:39:30 miod Exp $ */
+/* $OpenBSD: intr.h,v 1.12 2010/04/23 03:50:22 miod Exp $ */
/* $NetBSD: intr.h,v 1.1 1998/08/18 23:55:00 matt Exp $ */
/*
@@ -49,6 +49,7 @@
#define IPL_AUDIO 0x15 /* audio */
#define IPL_CLOCK 0x18 /* clock */
#define IPL_STATCLOCK 0x18 /* statclock */
+#define IPL_SCHED 0x1f
#define IPL_HIGH 0x1f
#define IST_UNUSABLE -1 /* interrupt cannot be used */
diff --git a/sys/arch/zaurus/include/intr.h b/sys/arch/zaurus/include/intr.h
index 2545a62309b..b1e0feb0442 100644
--- a/sys/arch/zaurus/include/intr.h
+++ b/sys/arch/zaurus/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.8 2009/04/08 21:19:31 kettenis Exp $ */
+/* $OpenBSD: intr.h,v 1.9 2010/04/23 03:50:22 miod Exp $ */
/* $NetBSD: intr.h,v 1.12 2003/06/16 20:00:59 thorpej Exp $ */
/*
@@ -55,6 +55,7 @@
#define IPL_AUDIO 9 /* audio device */
#define IPL_CLOCK 10 /* clock interrupt */
#define IPL_STATCLOCK 11 /* statistics clock interrupt */
+#define IPL_SCHED 12 /* everything */
#define IPL_HIGH 12 /* everything */
#define NIPL 13
diff --git a/sys/sys/sched.h b/sys/sys/sched.h
index 9f2a9d3e1be..9f4f5329781 100644
--- a/sys/sys/sched.h
+++ b/sys/sys/sched.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sched.h,v 1.26 2010/04/06 20:33:28 kettenis Exp $ */
+/* $OpenBSD: sched.h,v 1.27 2010/04/23 03:50:22 miod Exp $ */
/* $NetBSD: sched.h,v 1.2 1999/02/28 18:14:58 ross Exp $ */
/*-
@@ -171,10 +171,6 @@ void remrunqueue(struct proc *);
(parent)->p_estcpu = ESTCPULIM((parent)->p_estcpu + (child)->p_estcpu);\
} while (0)
-#ifndef IPL_SCHED
-#define IPL_SCHED IPL_HIGH
-#endif
-
#if defined(MULTIPROCESSOR) || defined(LOCKDEBUG)
#include <sys/lock.h>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-02 22:43:46 +0000