summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2016-01-15 18:53:27 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2016-01-15 18:53:27 +0000
commit86272315d546b7eecea4ed3ce3d2280c412016fb (patch)
treebbc5cc11f5b9a2062eb1ef3596e0e144f1697ac8
parent5a1609ab2d33b2da40d2c5e05f74c046f80c557e (diff)
intr_barrier for sh/landisk; tobiasu noticed the need as well
-rw-r--r--sys/arch/sh/include/intr.h4
-rw-r--r--sys/arch/sh/sh/interrupt.c7
2 files changed, 9 insertions, 2 deletions
diff --git a/sys/arch/sh/include/intr.h b/sys/arch/sh/include/intr.h
index 41f83944ec1..0c179fa789d 100644
--- a/sys/arch/sh/include/intr.h
+++ b/sys/arch/sh/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.9 2015/02/11 07:05:39 dlg Exp $ */
+/* $OpenBSD: intr.h,v 1.10 2016/01/15 18:53:26 deraadt Exp $ */
/* $NetBSD: intr.h,v 1.22 2006/01/24 23:51:42 uwe Exp $ */
/*-
@@ -72,6 +72,8 @@ struct intc_intrhand {
const char *ih_name;
};
+void intr_barrier(void *);
+
/* from 0x200 by 0x20 -> from 0 by 1 */
#define EVTCODE_TO_MAP_INDEX(x) (((x) >> 5) - 0x10)
#define EVTCODE_TO_IH_INDEX(x) \
diff --git a/sys/arch/sh/sh/interrupt.c b/sys/arch/sh/sh/interrupt.c
index 5747c9f9e16..839bd78541f 100644
--- a/sys/arch/sh/sh/interrupt.c
+++ b/sys/arch/sh/sh/interrupt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: interrupt.c,v 1.15 2015/09/01 05:47:14 deraadt Exp $ */
+/* $OpenBSD: interrupt.c,v 1.16 2016/01/15 18:53:26 deraadt Exp $ */
/* $NetBSD: interrupt.c,v 1.18 2006/01/25 00:02:57 uwe Exp $ */
/*-
@@ -640,6 +640,11 @@ softintr_establish(int ipl, void (*func)(void *), void *arg)
return (sih);
}
+void
+intr_barrier(void *cookie)
+{
+}
+
/* Unregister a software interrupt handler. */
void
softintr_disestablish(void *arg)