From 7b19b93698461b7fb667b34af70802c42c320d40 Mon Sep 17 00:00:00 2001
From: Jonathan Gray <jsg@cvs.openbsd.org>
Date: Sat, 19 Sep 2015 02:13:06 +0000
Subject: intr_barrier(9) for arm ok kettenis@

---
 sys/arch/arm/arm/cpu.c         | 10 +++++++++-
 sys/arch/armish/include/intr.h |  4 +++-
 sys/arch/armv7/include/intr.h  |  4 +++-
 sys/arch/zaurus/include/intr.h |  4 +++-
 4 files changed, 18 insertions(+), 4 deletions(-)

(limited to 'sys/arch')

diff --git a/sys/arch/arm/arm/cpu.c b/sys/arch/arm/arm/cpu.c
index 9bc13a03c56..bc96e79393f 100644
--- a/sys/arch/arm/arm/cpu.c
+++ b/sys/arch/arm/arm/cpu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.c,v 1.21 2015/05/29 05:48:07 jsg Exp $	*/
+/*	$OpenBSD: cpu.c,v 1.22 2015/09/19 02:13:05 jsg Exp $	*/
 /*	$NetBSD: cpu.c,v 1.56 2004/04/14 04:01:49 bsh Exp $	*/
 
 
@@ -50,8 +50,10 @@
 #include <sys/device.h>
 #include <sys/proc.h>
 #include <sys/conf.h>
+#include <sys/sched.h>
 #include <uvm/uvm_extern.h>
 #include <machine/cpu.h>
+#include <machine/intr.h>
 
 #include <arm/cpuconf.h>
 #include <arm/undefined.h>
@@ -580,4 +582,10 @@ cpu_alloc_idlepcb(struct cpu_info *ci)
 }
 #endif /* MULTIPROCESSOR */
 
+void
+intr_barrier(void *ih)
+{
+	sched_barrier(NULL);
+}
+
 /* End of cpu.c */
diff --git a/sys/arch/armish/include/intr.h b/sys/arch/armish/include/intr.h
index e2336516766..a8ecdd0956d 100644
--- a/sys/arch/armish/include/intr.h
+++ b/sys/arch/armish/include/intr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.h,v 1.8 2013/05/17 19:38:51 kettenis Exp $	*/
+/*	$OpenBSD: intr.h,v 1.9 2015/09/19 02:13:05 jsg Exp $	*/
 /*	$NetBSD: intr.h,v 1.12 2003/06/16 20:00:59 thorpej Exp $	*/
 
 /*
@@ -96,6 +96,8 @@
 #define	splsched()	splhigh()
 #define	spllock()	splhigh()
 
+void	intr_barrier(void *);
+
 #endif /* ! _LOCORE */
 
 #include <machine/armish_intr.h>
diff --git a/sys/arch/armv7/include/intr.h b/sys/arch/armv7/include/intr.h
index d5206fa1d8c..4d8b42ea449 100644
--- a/sys/arch/armv7/include/intr.h
+++ b/sys/arch/armv7/include/intr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.h,v 1.1 2013/09/04 14:38:27 patrick Exp $	*/
+/*	$OpenBSD: intr.h,v 1.2 2015/09/19 02:13:05 jsg Exp $	*/
 /*	$NetBSD: intr.h,v 1.12 2003/06/16 20:00:59 thorpej Exp $	*/
 
 /*
@@ -126,6 +126,8 @@ extern struct arm_intr_func arm_intr_func;
 #define	splsched()	splhigh()
 #define	spllock()	splhigh()
 
+void	intr_barrier(void *);
+
 void arm_init_smask(void); /* XXX */
 extern uint32_t arm_smask[NIPL];
 void arm_setsoftintr(int si);
diff --git a/sys/arch/zaurus/include/intr.h b/sys/arch/zaurus/include/intr.h
index e8045fa39c6..ba3253da140 100644
--- a/sys/arch/zaurus/include/intr.h
+++ b/sys/arch/zaurus/include/intr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.h,v 1.11 2013/05/17 19:38:52 kettenis Exp $	*/
+/*	$OpenBSD: intr.h,v 1.12 2015/09/19 02:13:05 jsg Exp $	*/
 /*	$NetBSD: intr.h,v 1.12 2003/06/16 20:00:59 thorpej Exp $	*/
 
 /*
@@ -97,6 +97,8 @@
 #define	splsched()	splhigh()
 #define	spllock()	splhigh()
 
+void	intr_barrier(void *);
+
 #endif /* ! _LOCORE */
 
 #include <arm/xscale/pxa2x0_intr.h>
-- 
cgit v1.2.3