summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormpi <mpi@openbsd.org>2014-04-03 10:17:34 +0000
committermpi <mpi@openbsd.org>2014-04-03 10:17:34 +0000
commit1dc7ea453adce4c341d5048c332e97834a4c9a97 (patch)
treef827b4aa8e965c4db2ec22db37d183b907776c42
parentUse <uvm/uvm_extern.h> if it's enough. (diff)
downloadwireguard-openbsd-1dc7ea453adce4c341d5048c332e97834a4c9a97.tar.xz
wireguard-openbsd-1dc7ea453adce4c341d5048c332e97834a4c9a97.zip
More uvm_extern.h cleanup.
-rw-r--r--sys/arch/arm/arm/arm32_machdep.c5
-rw-r--r--sys/arch/arm/arm/cpufunc.c5
-rw-r--r--sys/arch/arm/arm/fiq.c4
-rw-r--r--sys/arch/arm/xscale/i80321_intr.c4
-rw-r--r--sys/arch/arm/xscale/pxa2x0_pcic.c7
-rw-r--r--sys/arch/zaurus/dev/scoop_pcic.c5
6 files changed, 16 insertions, 14 deletions
diff --git a/sys/arch/arm/arm/arm32_machdep.c b/sys/arch/arm/arm/arm32_machdep.c
index 42257595120..f5f398e3571 100644
--- a/sys/arch/arm/arm/arm32_machdep.c
+++ b/sys/arch/arm/arm/arm32_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: arm32_machdep.c,v 1.41 2013/09/12 11:42:22 patrick Exp $ */
+/* $OpenBSD: arm32_machdep.c,v 1.42 2014/04/03 10:17:34 mpi Exp $ */
/* $NetBSD: arm32_machdep.c,v 1.42 2003/12/30 12:33:15 pk Exp $ */
/*
@@ -54,9 +54,10 @@
#include <sys/msg.h>
#include <sys/msgbuf.h>
#include <sys/device.h>
-#include <uvm/uvm.h>
#include <sys/sysctl.h>
+#include <uvm/uvm_extern.h>
+
#include <dev/cons.h>
#include <arm/machdep.h>
diff --git a/sys/arch/arm/arm/cpufunc.c b/sys/arch/arm/arm/cpufunc.c
index 7a8a47135cf..521cbf04f8f 100644
--- a/sys/arch/arm/arm/cpufunc.c
+++ b/sys/arch/arm/arm/cpufunc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpufunc.c,v 1.25 2014/03/29 18:09:28 guenther Exp $ */
+/* $OpenBSD: cpufunc.c,v 1.26 2014/04/03 10:17:34 mpi Exp $ */
/* $NetBSD: cpufunc.c,v 1.65 2003/11/05 12:53:15 scw Exp $ */
/*
@@ -50,8 +50,9 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
+#include <machine/pmap.h>
#include <arm/cpuconf.h>
#include <arm/cpufunc.h>
diff --git a/sys/arch/arm/arm/fiq.c b/sys/arch/arm/arm/fiq.c
index 10c1a82f273..ac7af088409 100644
--- a/sys/arch/arm/arm/fiq.c
+++ b/sys/arch/arm/arm/fiq.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fiq.c,v 1.4 2013/05/10 10:18:46 patrick Exp $ */
+/* $OpenBSD: fiq.c,v 1.5 2014/04/03 10:17:34 mpi Exp $ */
/* $NetBSD: fiq.c,v 1.5 2002/04/03 23:33:27 thorpej Exp $ */
/*
@@ -42,8 +42,6 @@
#include <arm/cpufunc.h>
#include <arm/fiq.h>
-#include <uvm/uvm.h>
-
TAILQ_HEAD(, fiqhandler) fiqhandler_stack =
TAILQ_HEAD_INITIALIZER(fiqhandler_stack);
diff --git a/sys/arch/arm/xscale/i80321_intr.c b/sys/arch/arm/xscale/i80321_intr.c
index d5e4f1f6417..0f829563f6d 100644
--- a/sys/arch/arm/xscale/i80321_intr.c
+++ b/sys/arch/arm/xscale/i80321_intr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: i80321_intr.c,v 1.15 2014/03/29 18:09:28 guenther Exp $ */
+/* $OpenBSD: i80321_intr.c,v 1.16 2014/04/03 10:17:34 mpi Exp $ */
/*
* Copyright (c) 2006 Dale Rahn <drahn@openbsd.org>
@@ -21,7 +21,7 @@
#include <sys/malloc.h>
#include <sys/evcount.h>
-#include <uvm/uvm.h> /* uvmexp */
+#include <uvm/uvm_extern.h>
#include <machine/intr.h>
diff --git a/sys/arch/arm/xscale/pxa2x0_pcic.c b/sys/arch/arm/xscale/pxa2x0_pcic.c
index 741c77551b0..530720f0c45 100644
--- a/sys/arch/arm/xscale/pxa2x0_pcic.c
+++ b/sys/arch/arm/xscale/pxa2x0_pcic.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pxa2x0_pcic.c,v 1.19 2013/11/20 17:36:06 deraadt Exp $ */
+/* $OpenBSD: pxa2x0_pcic.c,v 1.20 2014/04/03 10:17:34 mpi Exp $ */
/*
* Copyright (c) 2005 Dale Rahn <drahn@openbsd.org>
@@ -22,11 +22,12 @@
#include <sys/kernel.h>
#include <sys/kthread.h>
#include <sys/malloc.h>
-#include <uvm/uvm.h>
+
+#include <uvm/uvm_extern.h>
#include <machine/bus.h>
#include <machine/intr.h>
-
+
#include <dev/pcmcia/pcmciareg.h>
#include <dev/pcmcia/pcmciavar.h>
#include <dev/pcmcia/pcmciachip.h>
diff --git a/sys/arch/zaurus/dev/scoop_pcic.c b/sys/arch/zaurus/dev/scoop_pcic.c
index af3d4e9afb3..aaa50bea02c 100644
--- a/sys/arch/zaurus/dev/scoop_pcic.c
+++ b/sys/arch/zaurus/dev/scoop_pcic.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scoop_pcic.c,v 1.3 2009/03/29 21:53:52 sthen Exp $ */
+/* $OpenBSD: scoop_pcic.c,v 1.4 2014/04/03 10:17:34 mpi Exp $ */
/*
* Copyright (c) 2005 Uwe Stuehler <uwe@bsdx.de>
@@ -18,7 +18,8 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <uvm/uvm.h>
+
+#include <uvm/uvm_extern.h>
#include <arch/arm/xscale/pxa2x0var.h>
#include <arch/arm/xscale/pxapcicvar.h>