From 697268c82aaa1fec511c0924da791c79b5bba3d9 Mon Sep 17 00:00:00 2001
From: Martin Pieuchot <mpi@cvs.openbsd.org>
Date: Thu, 3 Apr 2014 08:07:17 +0000
Subject: Moar <uvm/uvm.h> -> <uvm/uvm_extern.h> love.

---
 sys/arch/loongson/loongson/machdep.c    | 5 +++--
 sys/arch/mips64/mips64/genassym.cf      | 4 +---
 sys/arch/mips64/mips64/mips64_machdep.c | 4 ++--
 sys/arch/mips64/mips64/r4000_errata.c   | 4 ++--
 sys/arch/mips64/mips64/sys_machdep.c    | 4 ++--
 sys/arch/octeon/octeon/machdep.c        | 4 ++--
 sys/arch/sgi/pci/macepcibridge.c        | 3 +--
 sys/arch/sgi/sgi/bus_dma.c              | 4 ++--
 sys/arch/sgi/sgi/ip22_machdep.c         | 4 ++--
 sys/arch/sgi/sgi/ip27_machdep.c         | 4 ++--
 sys/arch/sgi/sgi/ip30_machdep.c         | 4 ++--
 sys/arch/sgi/sgi/machdep.c              | 5 +++--
 sys/arch/sgi/xbow/xbridge.c             | 4 ++--
 13 files changed, 26 insertions(+), 27 deletions(-)

(limited to 'sys')

diff --git a/sys/arch/loongson/loongson/machdep.c b/sys/arch/loongson/loongson/machdep.c
index 29aa8a462a3..79ba9231c36 100644
--- a/sys/arch/loongson/loongson/machdep.c
+++ b/sys/arch/loongson/loongson/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.46 2014/03/29 23:59:49 miod Exp $ */
+/*	$OpenBSD: machdep.c,v 1.47 2014/04/03 08:07:16 mpi Exp $ */
 
 /*
  * Copyright (c) 2009, 2010, 2014 Miodrag Vallat.
@@ -65,7 +65,8 @@
 #include <sys/kcore.h>
 
 #include <net/if.h>
-#include <uvm/uvm.h>
+
+#include <uvm/uvm_extern.h>
 
 #include <machine/db_machdep.h>
 #include <ddb/db_interface.h>
diff --git a/sys/arch/mips64/mips64/genassym.cf b/sys/arch/mips64/mips64/genassym.cf
index 9de943a6ceb..ff3ee2cd166 100644
--- a/sys/arch/mips64/mips64/genassym.cf
+++ b/sys/arch/mips64/mips64/genassym.cf
@@ -1,4 +1,4 @@
-#	$OpenBSD: genassym.cf,v 1.10 2014/03/22 00:01:04 miod Exp $
+#	$OpenBSD: genassym.cf,v 1.11 2014/04/03 08:07:16 mpi Exp $
 #
 # Copyright (c) 1997 Per Fogelstrom / Opsycon AB
 #
@@ -32,8 +32,6 @@ include <sys/mbuf.h>
 include <sys/user.h>
 include <sys/siginfo.h>
 
-include <uvm/uvm.h>
-
 include <machine/cpu.h>
 
 export	SONPROC
diff --git a/sys/arch/mips64/mips64/mips64_machdep.c b/sys/arch/mips64/mips64/mips64_machdep.c
index cefac71775a..5c14041b4de 100644
--- a/sys/arch/mips64/mips64/mips64_machdep.c
+++ b/sys/arch/mips64/mips64/mips64_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mips64_machdep.c,v 1.14 2014/03/21 23:05:41 miod Exp $ */
+/*	$OpenBSD: mips64_machdep.c,v 1.15 2014/04/03 08:07:16 mpi Exp $ */
 
 /*
  * Copyright (c) 2009, 2010, 2012 Miodrag Vallat.
@@ -54,7 +54,7 @@
 #include <mips64/mips_cpu.h>
 #include <mips64/mips_opcode.h>
 
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
 
 #include <mips64/dev/clockvar.h>
 
diff --git a/sys/arch/mips64/mips64/r4000_errata.c b/sys/arch/mips64/mips64/r4000_errata.c
index 969934a4af8..9811e1d841c 100644
--- a/sys/arch/mips64/mips64/r4000_errata.c
+++ b/sys/arch/mips64/mips64/r4000_errata.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: r4000_errata.c,v 1.2 2014/03/24 17:12:52 miod Exp $	*/
+/*	$OpenBSD: r4000_errata.c,v 1.3 2014/04/03 08:07:16 mpi Exp $	*/
 
 /*
  * Copyright (c) 2014 Miodrag Vallat.
@@ -83,7 +83,7 @@
 
 #include <machine/cpu.h>
 
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
 
 int	r4000_errata;
 
diff --git a/sys/arch/mips64/mips64/sys_machdep.c b/sys/arch/mips64/mips64/sys_machdep.c
index 5773eda01c4..591e1ee3ee4 100644
--- a/sys/arch/mips64/mips64/sys_machdep.c
+++ b/sys/arch/mips64/mips64/sys_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sys_machdep.c,v 1.7 2012/04/21 12:20:30 miod Exp $	*/
+/*	$OpenBSD: sys_machdep.c,v 1.8 2014/04/03 08:07:16 mpi Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -50,7 +50,7 @@
 #include <sys/mount.h>
 #include <sys/syscallargs.h>
 
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
 
 #include <mips64/cache.h>
 #include <mips64/sysarch.h>
diff --git a/sys/arch/octeon/octeon/machdep.c b/sys/arch/octeon/octeon/machdep.c
index b8550bc970e..1e50572e8cc 100644
--- a/sys/arch/octeon/octeon/machdep.c
+++ b/sys/arch/octeon/octeon/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.43 2014/03/13 03:52:55 dlg Exp $ */
+/*	$OpenBSD: machdep.c,v 1.44 2014/04/03 08:07:16 mpi Exp $ */
 
 /*
  * Copyright (c) 2009, 2010 Miodrag Vallat.
@@ -64,7 +64,7 @@
 #endif
 
 #include <net/if.h>
-#include <uvm/uvm.h>
+
 #include <uvm/uvm_extern.h>
 
 #include <machine/db_machdep.h>
diff --git a/sys/arch/sgi/pci/macepcibridge.c b/sys/arch/sgi/pci/macepcibridge.c
index 85bf32a9b34..91b622263d1 100644
--- a/sys/arch/sgi/pci/macepcibridge.c
+++ b/sys/arch/sgi/pci/macepcibridge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: macepcibridge.c,v 1.45 2012/09/29 18:54:39 miod Exp $ */
+/*	$OpenBSD: macepcibridge.c,v 1.46 2014/04/03 08:07:16 mpi Exp $ */
 
 /*
  * Copyright (c) 2009 Miodrag Vallat.
@@ -53,7 +53,6 @@
 #include <sys/proc.h>
 #include <sys/ioctl.h>
 #include <sys/extent.h>
-#include <uvm/uvm.h>
 
 #include <machine/autoconf.h>
 #include <machine/cpu.h>
diff --git a/sys/arch/sgi/sgi/bus_dma.c b/sys/arch/sgi/sgi/bus_dma.c
index e66a451bcf6..63e27d095f1 100644
--- a/sys/arch/sgi/sgi/bus_dma.c
+++ b/sys/arch/sgi/sgi/bus_dma.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bus_dma.c,v 1.32 2014/03/21 21:49:45 miod Exp $ */
+/*	$OpenBSD: bus_dma.c,v 1.33 2014/04/03 08:07:16 mpi Exp $ */
 
 /*
  * Copyright (c) 2003-2004 Opsycon AB  (www.opsycon.se / www.opsycon.com)
@@ -61,7 +61,7 @@
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
 
 #include <mips64/cache.h>
 #include <machine/cpu.h>
diff --git a/sys/arch/sgi/sgi/ip22_machdep.c b/sys/arch/sgi/sgi/ip22_machdep.c
index 07553206867..42c066dda38 100644
--- a/sys/arch/sgi/sgi/ip22_machdep.c
+++ b/sys/arch/sgi/sgi/ip22_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip22_machdep.c,v 1.16 2014/03/23 00:00:32 miod Exp $	*/
+/*	$OpenBSD: ip22_machdep.c,v 1.17 2014/04/03 08:07:16 mpi Exp $	*/
 
 /*
  * Copyright (c) 2012 Miodrag Vallat.
@@ -27,7 +27,7 @@
 #include <sys/buf.h>
 #include <sys/mount.h>
 
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
 
 #include <machine/autoconf.h>
 #include <machine/bus.h>
diff --git a/sys/arch/sgi/sgi/ip27_machdep.c b/sys/arch/sgi/sgi/ip27_machdep.c
index 395b76c25e2..49aa71688ad 100644
--- a/sys/arch/sgi/sgi/ip27_machdep.c
+++ b/sys/arch/sgi/sgi/ip27_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip27_machdep.c,v 1.57 2012/10/03 11:18:23 miod Exp $	*/
+/*	$OpenBSD: ip27_machdep.c,v 1.58 2014/04/03 08:07:16 mpi Exp $	*/
 
 /*
  * Copyright (c) 2008, 2009 Miodrag Vallat.
@@ -40,7 +40,7 @@
 #include <machine/mnode.h>
 #include <machine/atomic.h>
 
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
 
 #include <sgi/sgi/ip27.h>
 #include <sgi/sgi/l1.h>
diff --git a/sys/arch/sgi/sgi/ip30_machdep.c b/sys/arch/sgi/sgi/ip30_machdep.c
index 0ab4b9f6297..36d11090b08 100644
--- a/sys/arch/sgi/sgi/ip30_machdep.c
+++ b/sys/arch/sgi/sgi/ip30_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip30_machdep.c,v 1.59 2014/03/09 10:12:17 miod Exp $	*/
+/*	$OpenBSD: ip30_machdep.c,v 1.60 2014/04/03 08:07:16 mpi Exp $	*/
 
 /*
  * Copyright (c) 2008, 2009 Miodrag Vallat.
@@ -36,7 +36,7 @@
 #include <mips64/mips_cpu.h>
 #include <machine/memconf.h>
 
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
 
 #include <sgi/sgi/ip30.h>
 #include <sgi/xbow/widget.h>
diff --git a/sys/arch/sgi/sgi/machdep.c b/sys/arch/sgi/sgi/machdep.c
index a4e1c1c4f3e..ffc926c6d17 100644
--- a/sys/arch/sgi/sgi/machdep.c
+++ b/sys/arch/sgi/sgi/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.136 2014/03/22 00:01:04 miod Exp $ */
+/*	$OpenBSD: machdep.c,v 1.137 2014/04/03 08:07:16 mpi Exp $ */
 
 /*
  * Copyright (c) 2003-2004 Opsycon AB  (www.opsycon.se / www.opsycon.com)
@@ -48,7 +48,8 @@
 #endif
 
 #include <net/if.h>
-#include <uvm/uvm.h>
+
+#include <uvm/uvm_extern.h>
 
 #include <machine/db_machdep.h>
 #include <ddb/db_interface.h>
diff --git a/sys/arch/sgi/xbow/xbridge.c b/sys/arch/sgi/xbow/xbridge.c
index 0020ed0c835..82aee65a558 100644
--- a/sys/arch/sgi/xbow/xbridge.c
+++ b/sys/arch/sgi/xbow/xbridge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: xbridge.c,v 1.87 2014/01/22 00:03:06 jsg Exp $	*/
+/*	$OpenBSD: xbridge.c,v 1.88 2014/04/03 08:07:16 mpi Exp $	*/
 
 /*
  * Copyright (c) 2008, 2009, 2011  Miodrag Vallat.
@@ -45,7 +45,7 @@
 #include <machine/intr.h>
 #include <machine/mnode.h>
 
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
 
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
-- 
cgit v1.2.3