From 40e148b5880cffcf43f44d4ffe50d8c0158d1f2c Mon Sep 17 00:00:00 2001
From: mpi <mpi@openbsd.org>
Date: Mon, 14 Apr 2014 07:36:12 +0000
Subject: Fewer <uvm/uvm.h>

---
 sys/arch/alpha/pci/pci_6600.c      | 4 +---
 sys/arch/alpha/pci/pci_eb164.c     | 4 +---
 sys/arch/landisk/landisk/machdep.c | 5 +++--
 sys/arch/sh/sh/locore_c.c          | 4 ++--
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/sys/arch/alpha/pci/pci_6600.c b/sys/arch/alpha/pci/pci_6600.c
index a857ac28ac1..6bfceef3c15 100644
--- a/sys/arch/alpha/pci/pci_6600.c
+++ b/sys/arch/alpha/pci/pci_6600.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_6600.c,v 1.19 2009/09/30 20:16:30 miod Exp $ */
+/* $OpenBSD: pci_6600.c,v 1.20 2014/04/14 07:36:12 mpi Exp $ */
 /* $NetBSD: pci_6600.c,v 1.5 2000/06/06 00:50:15 thorpej Exp $ */
 
 /*-
@@ -38,8 +38,6 @@
 #include <sys/device.h>
 #include <sys/malloc.h>
 
-#include <uvm/uvm.h>
-
 #include <machine/autoconf.h>
 #define _ALPHA_BUS_DMA_PRIVATE
 #include <machine/bus.h>
diff --git a/sys/arch/alpha/pci/pci_eb164.c b/sys/arch/alpha/pci/pci_eb164.c
index e2728a6461b..2bf45a66a42 100644
--- a/sys/arch/alpha/pci/pci_eb164.c
+++ b/sys/arch/alpha/pci/pci_eb164.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_eb164.c,v 1.25 2009/09/30 20:18:06 miod Exp $ */
+/* $OpenBSD: pci_eb164.c,v 1.26 2014/04/14 07:36:12 mpi Exp $ */
 /* $NetBSD: pci_eb164.c,v 1.27 2000/06/06 00:50:15 thorpej Exp $ */
 
 /*-
@@ -67,8 +67,6 @@
 #include <sys/device.h>
 #include <sys/syslog.h>
 
-#include <uvm/uvm.h>
-
 #include <machine/autoconf.h>
 #include <machine/rpb.h>
 
diff --git a/sys/arch/landisk/landisk/machdep.c b/sys/arch/landisk/landisk/machdep.c
index 1c609da4726..4639ddb0124 100644
--- a/sys/arch/landisk/landisk/machdep.c
+++ b/sys/arch/landisk/landisk/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.30 2014/03/13 03:52:55 dlg Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.31 2014/04/14 07:36:12 mpi Exp $	*/
 /*	$NetBSD: machdep.c,v 1.1 2006/09/01 21:26:18 uwe Exp $	*/
 
 /*-
@@ -79,7 +79,8 @@
 #include <sys/kcore.h>
 
 #include <net/if.h>
-#include <uvm/uvm.h>
+
+#include <uvm/uvm_extern.h>
 
 #include <dev/cons.h>
 
diff --git a/sys/arch/sh/sh/locore_c.c b/sys/arch/sh/sh/locore_c.c
index 153589be8b2..41f1de60dbb 100644
--- a/sys/arch/sh/sh/locore_c.c
+++ b/sys/arch/sh/sh/locore_c.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: locore_c.c,v 1.10 2010/06/27 12:41:23 miod Exp $	*/
+/*	$OpenBSD: locore_c.c,v 1.11 2014/04/14 07:36:12 mpi Exp $	*/
 /*	$NetBSD: locore_c.c,v 1.13 2006/03/04 01:13:35 uwe Exp $	*/
 
 /*-
@@ -110,7 +110,7 @@
 #include <sys/sched.h>
 #include <sys/proc.h>
 
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
 
 #include <sh/locore.h>
 #include <sh/cpu.h>
-- 
cgit v1.2.3-59-g8ed1b