summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@cvs.openbsd.org>2013-05-17 19:38:53 +0000
committerMark Kettenis <kettenis@cvs.openbsd.org>2013-05-17 19:38:53 +0000
commit23aa67d94df599971e63a34d1b596d5c2dcd7204 (patch)
tree27e040172442ddb70716a9160536fd2e77f23985 /sys/arch
parente4cd83a56a360f734e9ba7092609e5b077e403e6 (diff)
Add a dummy IPL_MPSAFE definition.
ok miod@, mikeb@
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/alpha/include/intr.h4
-rw-r--r--sys/arch/armish/include/intr.h6
-rw-r--r--sys/arch/beagle/include/intr.h6
-rw-r--r--sys/arch/hp300/include/intr.h4
-rw-r--r--sys/arch/hppa/include/intr.h4
-rw-r--r--sys/arch/hppa64/include/intr.h2
-rw-r--r--sys/arch/landisk/include/intr.h4
-rw-r--r--sys/arch/loongson/include/intr.h5
-rw-r--r--sys/arch/octeon/include/intr.h5
-rw-r--r--sys/arch/powerpc/include/intr.h4
-rw-r--r--sys/arch/sgi/include/intr.h5
-rw-r--r--sys/arch/sparc/include/psl.h4
-rw-r--r--sys/arch/vax/include/intr.h4
-rw-r--r--sys/arch/zaurus/include/intr.h6
14 files changed, 47 insertions, 16 deletions
diff --git a/sys/arch/alpha/include/intr.h b/sys/arch/alpha/include/intr.h
index 03af2a9e156..ad34ba1f2da 100644
--- a/sys/arch/alpha/include/intr.h
+++ b/sys/arch/alpha/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.39 2011/04/15 20:40:05 deraadt Exp $ */
+/* $OpenBSD: intr.h,v 1.40 2013/05/17 19:38:51 kettenis Exp $ */
/* $NetBSD: intr.h,v 1.26 2000/06/03 20:47:41 thorpej Exp $ */
/*-
@@ -125,6 +125,8 @@ struct scbvec {
#define IPL_SOFTNET 2 /* network software interrupts */
#define IPL_SOFT 3 /* other software interrupts */
+#define IPL_MPSAFE 0 /* no "mpsafe" interrupts */
+
#define IST_UNUSABLE -1 /* interrupt cannot be used */
#define IST_NONE 0 /* none (dummy) */
#define IST_PULSE 1 /* pulsed */
diff --git a/sys/arch/armish/include/intr.h b/sys/arch/armish/include/intr.h
index c892c264473..e2336516766 100644
--- a/sys/arch/armish/include/intr.h
+++ b/sys/arch/armish/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.7 2011/03/23 16:54:34 pirofti Exp $ */
+/* $OpenBSD: intr.h,v 1.8 2013/05/17 19:38:51 kettenis Exp $ */
/* $NetBSD: intr.h,v 1.12 2003/06/16 20:00:59 thorpej Exp $ */
/*
@@ -41,7 +41,6 @@
#ifdef _KERNEL
-
/* Interrupt priority "levels". */
#define IPL_NONE 0 /* nothing */
#define IPL_SOFT 1 /* generic software interrupts */
@@ -60,6 +59,9 @@
#define NIPL 13
+/* Interrupt priority "flags". */
+#define IPL_MPSAFE 0 /* no "mpsafe" interrupts */
+
/* Interrupt sharing types. */
#define IST_NONE 0 /* none */
#define IST_PULSE 1 /* pulsed */
diff --git a/sys/arch/beagle/include/intr.h b/sys/arch/beagle/include/intr.h
index bffd21347ba..bedeccd60c5 100644
--- a/sys/arch/beagle/include/intr.h
+++ b/sys/arch/beagle/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.7 2013/05/09 13:35:44 patrick Exp $ */
+/* $OpenBSD: intr.h,v 1.8 2013/05/17 19:38:51 kettenis Exp $ */
/* $NetBSD: intr.h,v 1.12 2003/06/16 20:00:59 thorpej Exp $ */
/*
@@ -41,7 +41,6 @@
#ifdef _KERNEL
-
/* Interrupt priority "levels". */
#define IPL_NONE 0 /* nothing */
#define IPL_SOFT 1 /* generic software interrupts */
@@ -60,6 +59,9 @@
#define NIPL 13
+/* Interrupt priority "flags". */
+#define IPL_MPSAFE 0 /* no "mpsafe" interrupts */
+
/* Interrupt sharing types. */
#define IST_NONE 0 /* none */
#define IST_PULSE 1 /* pulsed */
diff --git a/sys/arch/hp300/include/intr.h b/sys/arch/hp300/include/intr.h
index f605d2ff84b..2d5d61e0e7f 100644
--- a/sys/arch/hp300/include/intr.h
+++ b/sys/arch/hp300/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.29 2011/12/21 22:39:11 miod Exp $ */
+/* $OpenBSD: intr.h,v 1.30 2013/05/17 19:38:51 kettenis Exp $ */
/* $NetBSD: intr.h,v 1.2 1997/07/24 05:43:08 scottr Exp $ */
/*-
@@ -69,6 +69,8 @@ struct isr {
#define IPL_SCHED 7
#define IPL_HIGH 7
+#define IPL_MPSAFE 0 /* no "mpsafe" interrupts */
+
/*
* This array contains the appropriate PSL_S|PSL_IPL? values
* to raise interrupt priority to the requested level.
diff --git a/sys/arch/hppa/include/intr.h b/sys/arch/hppa/include/intr.h
index c721bea2d12..caf1c1181b2 100644
--- a/sys/arch/hppa/include/intr.h
+++ b/sys/arch/hppa/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.37 2011/01/14 13:20:06 jsing Exp $ */
+/* $OpenBSD: intr.h,v 1.38 2013/05/17 19:38:51 kettenis Exp $ */
/*
* Copyright (c) 2002-2004 Michael Shalayeff
@@ -50,6 +50,8 @@
#define IPL_IPI 11
#define IPL_NESTED 12 /* pseudo-level for sub-tables */
+#define IPL_MPSAFE 0 /* no "mpsafe" interrupts */
+
#define IST_NONE 0
#define IST_PULSE 1
#define IST_EDGE 2
diff --git a/sys/arch/hppa64/include/intr.h b/sys/arch/hppa64/include/intr.h
index f4007111df5..61fcb4b27fa 100644
--- a/sys/arch/hppa64/include/intr.h
+++ b/sys/arch/hppa64/include/intr.h
@@ -35,6 +35,8 @@
#define IPL_HIGH 10
#define IPL_IPI 11
+#define IPL_MPSAFE 0 /* no "mpsafe" interrupts */
+
#define IST_NONE 0
#define IST_PULSE 1
#define IST_EDGE 2
diff --git a/sys/arch/landisk/include/intr.h b/sys/arch/landisk/include/intr.h
index 68c00e358e4..f148edc4dc6 100644
--- a/sys/arch/landisk/include/intr.h
+++ b/sys/arch/landisk/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.10 2011/03/23 16:54:35 pirofti Exp $ */
+/* $OpenBSD: intr.h,v 1.11 2013/05/17 19:38:52 kettenis Exp $ */
/* $NetBSD: intr.h,v 1.1 2006/09/01 21:26:18 uwe Exp $ */
/*-
@@ -45,6 +45,8 @@
#define IPL_SCHED 14 /* scheduling */
#define IPL_HIGH 15 /* everything */
+#define IPL_MPSAFE 0 /* no "mpsafe" interrupts */
+
#define splsoftclock() _cpu_intr_raise(IPL_SOFTCLOCK << 4)
#define splsoftnet() _cpu_intr_raise(IPL_SOFTNET << 4)
#define splsoftserial() _cpu_intr_raise(IPL_SOFTSERIAL << 4)
diff --git a/sys/arch/loongson/include/intr.h b/sys/arch/loongson/include/intr.h
index 5f806e1afc9..1169eba3a80 100644
--- a/sys/arch/loongson/include/intr.h
+++ b/sys/arch/loongson/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.4 2013/01/15 23:30:36 pirofti Exp $ */
+/* $OpenBSD: intr.h,v 1.5 2013/05/17 19:38:52 kettenis Exp $ */
/*
* Copyright (c) 2001-2004 Opsycon AB (www.opsycon.se / www.opsycon.com)
@@ -59,6 +59,9 @@
#define IPL_HIGH 7 /* everything */
#define NIPLS 8 /* Number of levels */
+/* Interrupt priority 'flags'. */
+#define IPL_MPSAFE 0 /* no "mpsafe" interrupts */
+
/* Interrupt sharing types. */
#define IST_NONE 0 /* none */
#define IST_PULSE 1 /* pulsed */
diff --git a/sys/arch/octeon/include/intr.h b/sys/arch/octeon/include/intr.h
index d79c1b7d167..b90dbfad563 100644
--- a/sys/arch/octeon/include/intr.h
+++ b/sys/arch/octeon/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.2 2011/05/08 13:24:55 syuu Exp $ */
+/* $OpenBSD: intr.h,v 1.3 2013/05/17 19:38:52 kettenis Exp $ */
/*
* Copyright (c) 2001-2004 Opsycon AB (www.opsycon.se / www.opsycon.com)
@@ -59,6 +59,9 @@
#define IPL_IPI 8 /* interprocessor interrupt */
#define NIPLS 9 /* Number of levels */
+/* Interrupt priority 'flags'. */
+#define IPL_MPSAFE 0 /* no "mpsafe" interrupts */
+
/* Interrupt sharing types. */
#define IST_NONE 0 /* none */
#define IST_PULSE 1 /* pulsed */
diff --git a/sys/arch/powerpc/include/intr.h b/sys/arch/powerpc/include/intr.h
index 2220b8aac71..ce2d4142d43 100644
--- a/sys/arch/powerpc/include/intr.h
+++ b/sys/arch/powerpc/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.48 2012/08/21 09:24:52 kettenis Exp $ */
+/* $OpenBSD: intr.h,v 1.49 2013/05/17 19:38:52 kettenis Exp $ */
/*
* Copyright (c) 1997 Per Fogelstrom, Opsycon AB and RTMX Inc, USA.
@@ -50,6 +50,8 @@
#define IPL_HIGH 11
#define IPL_NUM 12
+#define IPL_MPSAFE 0 /* no "mpsafe" interrupts */
+
#define IST_NONE 0
#define IST_PULSE 1
#define IST_EDGE 2
diff --git a/sys/arch/sgi/include/intr.h b/sys/arch/sgi/include/intr.h
index d7cc3dc7c6e..9fb7c95651e 100644
--- a/sys/arch/sgi/include/intr.h
+++ b/sys/arch/sgi/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.42 2010/12/21 14:56:24 claudio Exp $ */
+/* $OpenBSD: intr.h,v 1.43 2013/05/17 19:38:52 kettenis Exp $ */
/*
* Copyright (c) 2001-2004 Opsycon AB (www.opsycon.se / www.opsycon.com)
@@ -59,6 +59,9 @@
#define IPL_IPI 8 /* interprocessor interrupt */
#define NIPLS 9 /* Number of levels */
+/* Interrupt priority 'flags'. */
+#define IPL_MPSAFE 0 /* no "mpsafe" interrupts */
+
/* Interrupt sharing types. */
#define IST_NONE 0 /* none */
#define IST_PULSE 1 /* pulsed */
diff --git a/sys/arch/sparc/include/psl.h b/sys/arch/sparc/include/psl.h
index 4d9fba8a1df..80cee8efffc 100644
--- a/sys/arch/sparc/include/psl.h
+++ b/sys/arch/sparc/include/psl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: psl.h,v 1.26 2013/05/16 06:38:13 ratchov Exp $ */
+/* $OpenBSD: psl.h,v 1.27 2013/05/17 19:38:52 kettenis Exp $ */
/* $NetBSD: psl.h,v 1.12 1997/03/10 21:49:11 pk Exp $ */
/*
@@ -100,6 +100,8 @@
#define IPL_SCHED IPL_STATCLOCK
#define IPL_HIGH 15 /* splhigh() */
+#define IPL_MPSAFE 0 /* no "mpsafe" interrupts */
+
#if defined(_KERNEL) && !defined(_LOCORE)
static __inline int getpsr(void);
diff --git a/sys/arch/vax/include/intr.h b/sys/arch/vax/include/intr.h
index ef22af85f06..38eea015f52 100644
--- a/sys/arch/vax/include/intr.h
+++ b/sys/arch/vax/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.15 2011/09/03 20:41:31 miod Exp $ */
+/* $OpenBSD: intr.h,v 1.16 2013/05/17 19:38:52 kettenis Exp $ */
/* $NetBSD: intr.h,v 1.1 1998/08/18 23:55:00 matt Exp $ */
/*
@@ -52,6 +52,8 @@
#define IPL_SCHED 0x1f
#define IPL_HIGH 0x1f
+#define IPL_MPSAFE 0 /* no "mpsafe" interrupts */
+
#define IST_UNUSABLE -1 /* interrupt cannot be used */
#define IST_NONE 0 /* none (dummy) */
#define IST_PULSE 1 /* pulsed */
diff --git a/sys/arch/zaurus/include/intr.h b/sys/arch/zaurus/include/intr.h
index a2c69799f6d..e8045fa39c6 100644
--- a/sys/arch/zaurus/include/intr.h
+++ b/sys/arch/zaurus/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.10 2011/03/23 16:54:37 pirofti Exp $ */
+/* $OpenBSD: intr.h,v 1.11 2013/05/17 19:38:52 kettenis Exp $ */
/* $NetBSD: intr.h,v 1.12 2003/06/16 20:00:59 thorpej Exp $ */
/*
@@ -41,7 +41,6 @@
#ifdef _KERNEL
-
/* Interrupt priority "levels". */
#define IPL_NONE 0 /* nothing */
#define IPL_SOFT 1 /* generic software interrupts */
@@ -60,6 +59,9 @@
#define NIPL 13
+/* Interrupt priority "flags". */
+#define IPL_MPSAFE 0 /* no "mpsafe" interrupts */
+
/* Interrupt sharing types. */
#define IST_NONE 0 /* none */
#define IST_PULSE 1 /* pulsed */