summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlandry <landry@openbsd.org>2016-02-22 07:13:46 +0000
committerlandry <landry@openbsd.org>2016-02-22 07:13:46 +0000
commit0d69db5f46b08f8c5e851ad5945331e274673ed4 (patch)
treec1597b33ae2259bbb85c40c3b25c6b789f2ff1a3
parentFix skeyinit -E by hoisting argument parsing and the call to enable_db() (diff)
downloadwireguard-openbsd-0d69db5f46b08f8c5e851ad5945331e274673ed4.tar.xz
wireguard-openbsd-0d69db5f46b08f8c5e851ad5945331e274673ed4.zip
Move #include <sys/mutex.h> from pmap.c to pmap.h, like every other archs
using struct mutex in pmap.h do. Fixes net-snmp on alpha. ok deraadt@
-rw-r--r--sys/arch/alpha/alpha/pmap.c3
-rw-r--r--sys/arch/alpha/include/pmap.h3
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/arch/alpha/alpha/pmap.c b/sys/arch/alpha/alpha/pmap.c
index 03ba9aae523..7f4acfb9074 100644
--- a/sys/arch/alpha/alpha/pmap.c
+++ b/sys/arch/alpha/alpha/pmap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pmap.c,v 1.81 2015/12/04 06:21:52 jsg Exp $ */
+/* $OpenBSD: pmap.c,v 1.82 2016/02/22 07:13:46 landry Exp $ */
/* $NetBSD: pmap.c,v 1.154 2000/12/07 22:18:55 thorpej Exp $ */
/*-
@@ -140,7 +140,6 @@
#include <sys/pool.h>
#include <sys/user.h>
#include <sys/buf.h>
-#include <sys/mutex.h>
#include <sys/atomic.h>
#ifdef SYSVSHM
#include <sys/shm.h>
diff --git a/sys/arch/alpha/include/pmap.h b/sys/arch/alpha/include/pmap.h
index 5d1f7df6997..4b2c493960b 100644
--- a/sys/arch/alpha/include/pmap.h
+++ b/sys/arch/alpha/include/pmap.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pmap.h,v 1.37 2015/10/01 16:03:48 kettenis Exp $ */
+/* $OpenBSD: pmap.h,v 1.38 2016/02/22 07:13:47 landry Exp $ */
/* $NetBSD: pmap.h,v 1.37 2000/11/19 03:16:35 thorpej Exp $ */
/*-
@@ -71,6 +71,7 @@
#define _PMAP_MACHINE_
#include <machine/pte.h>
+#include <sys/mutex.h>
#ifdef _KERNEL