summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkettenis <kettenis@openbsd.org>2015-09-13 14:06:40 +0000
committerkettenis <kettenis@openbsd.org>2015-09-13 14:06:40 +0000
commit11078ddadc0f4b7a5bcc8ad8681f17d0d0dfa2a7 (patch)
tree2a012903dcc0c59a539a3b1619b2787e636b64f0
parentGet the default loopback interface pointer just after doing a route (diff)
downloadwireguard-openbsd-11078ddadc0f4b7a5bcc8ad8681f17d0d0dfa2a7.tar.xz
wireguard-openbsd-11078ddadc0f4b7a5bcc8ad8681f17d0d0dfa2a7.zip
intr_barrier(9) for macppc and socppc.
-rw-r--r--sys/arch/powerpc/include/intr.h5
-rw-r--r--sys/arch/powerpc/powerpc/intr.c8
2 files changed, 10 insertions, 3 deletions
diff --git a/sys/arch/powerpc/include/intr.h b/sys/arch/powerpc/include/intr.h
index fdb0e951fb9..7ddcfafda04 100644
--- a/sys/arch/powerpc/include/intr.h
+++ b/sys/arch/powerpc/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.51 2015/06/24 11:58:06 mpi Exp $ */
+/* $OpenBSD: intr.h,v 1.52 2015/09/13 14:06:40 kettenis Exp $ */
/*
* Copyright (c) 1997 Per Fogelstrom, Opsycon AB and RTMX Inc, USA.
@@ -147,7 +147,6 @@ struct soft_intrq {
struct mutex siq_mtx;
};
-
void softintr_disestablish(void *);
void softintr_dispatch(int);
void *softintr_establish(int, void (*)(void *), void *);
@@ -189,6 +188,8 @@ extern int ppc_configed_intr_cnt;
#define MAX_PRECONF_INTR 16
extern struct intrhand ppc_configed_intr[MAX_PRECONF_INTR];
+void intr_barrier(void *);
+
#define PPC_IPI_NOP 0
#define PPC_IPI_DDB 1
diff --git a/sys/arch/powerpc/powerpc/intr.c b/sys/arch/powerpc/powerpc/intr.c
index 35b62911893..84718250ad6 100644
--- a/sys/arch/powerpc/powerpc/intr.c
+++ b/sys/arch/powerpc/powerpc/intr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.c,v 1.8 2015/01/04 13:01:42 mpi Exp $ */
+/* $OpenBSD: intr.c,v 1.9 2015/09/13 14:06:40 kettenis Exp $ */
/*
* Copyright (c) 1997 Per Fogelstrom, Opsycon AB and RTMX Inc, USA.
@@ -148,6 +148,12 @@ ppc_intr_typename(int type)
}
}
+void
+intr_barrier(void *ih)
+{
+ sched_barrier(NULL);
+}
+
#ifdef DIAGNOSTIC
void
splassert_check(int wantipl, const char *func)