summaryrefslogtreecommitdiff
path: root/sys/arch/i386
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2001-11-06 19:53:22 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2001-11-06 19:53:22 +0000
commit1a05584a00bbab0c5d169a8d3af7b22cafbfd92e (patch)
tree5ddd0ec6d94f69ad3960926e58a87b6d82166c7a /sys/arch/i386
parentef75d88ca83504eb18013af4622826ef9b5ff28d (diff)
Replace inclusion of <vm/foo.h> with the correct <uvm/bar.h> when necessary.
(Look ma, I might have broken the tree)
Diffstat (limited to 'sys/arch/i386')
-rw-r--r--sys/arch/i386/i386/bios.c3
-rw-r--r--sys/arch/i386/i386/db_interface.c4
-rw-r--r--sys/arch/i386/i386/db_memrw.c4
-rw-r--r--sys/arch/i386/i386/freebsd_machdep.c4
-rw-r--r--sys/arch/i386/i386/gdt.c3
-rw-r--r--sys/arch/i386/i386/genassym.cf4
-rw-r--r--sys/arch/i386/i386/kgdb_machdep.c4
-rw-r--r--sys/arch/i386/i386/mem.c4
-rw-r--r--sys/arch/i386/i386/sys_machdep.c3
-rw-r--r--sys/arch/i386/i386/vm_machdep.c3
-rw-r--r--sys/arch/i386/include/db_machdep.h4
-rw-r--r--sys/arch/i386/isa/isa_machdep.c4
-rw-r--r--sys/arch/i386/isa/npx.c3
-rw-r--r--sys/arch/i386/pci/pci_machdep.c4
-rw-r--r--sys/arch/i386/stand/installboot/installboot.c4
15 files changed, 23 insertions, 32 deletions
diff --git a/sys/arch/i386/i386/bios.c b/sys/arch/i386/i386/bios.c
index c95b80043a2..59516efacc8 100644
--- a/sys/arch/i386/i386/bios.c
+++ b/sys/arch/i386/i386/bios.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bios.c,v 1.46 2001/09/19 20:50:56 mickey Exp $ */
+/* $OpenBSD: bios.c,v 1.47 2001/11/06 19:53:14 miod Exp $ */
/*
* Copyright (c) 1997-2001 Michael Shalayeff
@@ -43,7 +43,6 @@
#include <sys/reboot.h>
#include <sys/extent.h>
-#include <vm/vm.h>
#include <uvm/uvm_extern.h>
#include <sys/sysctl.h>
diff --git a/sys/arch/i386/i386/db_interface.c b/sys/arch/i386/i386/db_interface.c
index 227d8e56454..1b648639bd2 100644
--- a/sys/arch/i386/i386/db_interface.c
+++ b/sys/arch/i386/i386/db_interface.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: db_interface.c,v 1.8 2000/07/05 14:26:34 hugh Exp $ */
+/* $OpenBSD: db_interface.c,v 1.9 2001/11/06 19:53:14 miod Exp $ */
/* $NetBSD: db_interface.c,v 1.22 1996/05/03 19:42:00 christos Exp $ */
/*
@@ -37,7 +37,7 @@
#include <sys/reboot.h>
#include <sys/systm.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
#include <dev/cons.h>
diff --git a/sys/arch/i386/i386/db_memrw.c b/sys/arch/i386/i386/db_memrw.c
index 6318d2edbce..9e17d2a2429 100644
--- a/sys/arch/i386/i386/db_memrw.c
+++ b/sys/arch/i386/i386/db_memrw.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: db_memrw.c,v 1.3 2001/05/05 23:25:35 art Exp $ */
+/* $OpenBSD: db_memrw.c,v 1.4 2001/11/06 19:53:14 miod Exp $ */
/* $NetBSD: db_memrw.c,v 1.6 1999/04/12 20:38:19 pk Exp $ */
/*
@@ -38,7 +38,7 @@
#include <sys/proc.h>
#include <sys/systm.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
#include <machine/db_machdep.h>
diff --git a/sys/arch/i386/i386/freebsd_machdep.c b/sys/arch/i386/i386/freebsd_machdep.c
index e885f47e3bd..ebc5c51fba1 100644
--- a/sys/arch/i386/i386/freebsd_machdep.c
+++ b/sys/arch/i386/i386/freebsd_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: freebsd_machdep.c,v 1.11 2001/02/03 02:46:28 mickey Exp $ */
+/* $OpenBSD: freebsd_machdep.c,v 1.12 2001/11/06 19:53:14 miod Exp $ */
/* $NetBSD: freebsd_machdep.c,v 1.10 1996/05/03 19:42:05 christos Exp $ */
/*-
@@ -49,7 +49,7 @@
#include <sys/exec.h>
#include <sys/mount.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
#include <machine/cpufunc.h>
#include <machine/npx.h>
diff --git a/sys/arch/i386/i386/gdt.c b/sys/arch/i386/i386/gdt.c
index d5c42fc8078..2950959304f 100644
--- a/sys/arch/i386/i386/gdt.c
+++ b/sys/arch/i386/i386/gdt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gdt.c,v 1.16 2001/09/19 20:50:56 mickey Exp $ */
+/* $OpenBSD: gdt.c,v 1.17 2001/11/06 19:53:14 miod Exp $ */
/* $NetBSD: gdt.c,v 1.8 1996/05/03 19:42:06 christos Exp $ */
/*-
@@ -42,7 +42,6 @@
#include <sys/proc.h>
#include <sys/user.h>
-#include <vm/vm.h>
#include <uvm/uvm_extern.h>
#include <machine/gdt.h>
diff --git a/sys/arch/i386/i386/genassym.cf b/sys/arch/i386/i386/genassym.cf
index 0df70c1582b..842f3d7dc95 100644
--- a/sys/arch/i386/i386/genassym.cf
+++ b/sys/arch/i386/i386/genassym.cf
@@ -1,4 +1,4 @@
-# $OpenBSD: genassym.cf,v 1.10 2001/09/16 14:28:04 miod Exp $
+# $OpenBSD: genassym.cf,v 1.11 2001/11/06 19:53:14 miod Exp $
#
# Copyright (c) 1982, 1990 The Regents of the University of California.
# All rights reserved.
@@ -43,8 +43,6 @@ ifdef INET
include <sys/mbuf.h>
endif
-include <vm/vm.h>
-
include <uvm/uvm_extern.h>
include <machine/trap.h>
diff --git a/sys/arch/i386/i386/kgdb_machdep.c b/sys/arch/i386/i386/kgdb_machdep.c
index 690c83a794e..fc74f997647 100644
--- a/sys/arch/i386/i386/kgdb_machdep.c
+++ b/sys/arch/i386/i386/kgdb_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kgdb_machdep.c,v 1.1 2001/01/24 09:37:58 hugh Exp $ */
+/* $OpenBSD: kgdb_machdep.c,v 1.2 2001/11/06 19:53:14 miod Exp $ */
/* $NetBSD: kgdb_machdep.c,v 1.6 1998/08/13 21:36:03 thorpej Exp $ */
/*-
@@ -82,7 +82,7 @@
#include <sys/kgdb.h>
#include <sys/systm.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
#include <machine/pte.h>
#include <machine/reg.h>
diff --git a/sys/arch/i386/i386/mem.c b/sys/arch/i386/i386/mem.c
index c3070705798..ae404ead9f9 100644
--- a/sys/arch/i386/i386/mem.c
+++ b/sys/arch/i386/i386/mem.c
@@ -1,5 +1,5 @@
/* $NetBSD: mem.c,v 1.31 1996/05/03 19:42:19 christos Exp $ */
-/* $OpenBSD: mem.c,v 1.20 2001/11/01 12:13:46 art Exp $ */
+/* $OpenBSD: mem.c,v 1.21 2001/11/06 19:53:14 miod Exp $ */
/*
* Copyright (c) 1988 University of Utah.
* Copyright (c) 1982, 1986, 1990, 1993
@@ -57,8 +57,6 @@
#include <machine/cpu.h>
#include <machine/conf.h>
-#include <vm/vm.h>
-
#include <uvm/uvm_extern.h>
#include "mtrr.h"
diff --git a/sys/arch/i386/i386/sys_machdep.c b/sys/arch/i386/i386/sys_machdep.c
index 693baee9456..508a4a26088 100644
--- a/sys/arch/i386/i386/sys_machdep.c
+++ b/sys/arch/i386/i386/sys_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sys_machdep.c,v 1.15 2001/09/19 20:50:56 mickey Exp $ */
+/* $OpenBSD: sys_machdep.c,v 1.16 2001/11/06 19:53:14 miod Exp $ */
/* $NetBSD: sys_machdep.c,v 1.28 1996/05/03 19:42:29 christos Exp $ */
/*-
@@ -57,7 +57,6 @@
#include <sys/mount.h>
#include <sys/syscallargs.h>
-#include <vm/vm.h>
#include <uvm/uvm_extern.h>
#include <machine/cpu.h>
diff --git a/sys/arch/i386/i386/vm_machdep.c b/sys/arch/i386/i386/vm_machdep.c
index 1f9bbce2f03..516dea6ebea 100644
--- a/sys/arch/i386/i386/vm_machdep.c
+++ b/sys/arch/i386/i386/vm_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vm_machdep.c,v 1.31 2001/11/06 18:41:09 art Exp $ */
+/* $OpenBSD: vm_machdep.c,v 1.32 2001/11/06 19:53:14 miod Exp $ */
/* $NetBSD: vm_machdep.c,v 1.61 1996/05/03 19:42:35 christos Exp $ */
/*-
@@ -58,7 +58,6 @@
#include <sys/exec.h>
#include <sys/ptrace.h>
-#include <vm/vm.h>
#include <uvm/uvm_extern.h>
#include <machine/cpu.h>
diff --git a/sys/arch/i386/include/db_machdep.h b/sys/arch/i386/include/db_machdep.h
index 277477aed04..ee32ef6556d 100644
--- a/sys/arch/i386/include/db_machdep.h
+++ b/sys/arch/i386/include/db_machdep.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: db_machdep.h,v 1.5 2001/01/24 09:38:01 hugh Exp $ */
+/* $OpenBSD: db_machdep.h,v 1.6 2001/11/06 19:53:14 miod Exp $ */
/* $NetBSD: db_machdep.h,v 1.9 1996/05/03 19:23:59 christos Exp $ */
/*
@@ -35,7 +35,7 @@
*/
#include <sys/param.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
#include <machine/trap.h>
typedef vaddr_t db_addr_t; /* address - unsigned */
diff --git a/sys/arch/i386/isa/isa_machdep.c b/sys/arch/i386/isa/isa_machdep.c
index 13cdd3ff3cb..bf93ba716a3 100644
--- a/sys/arch/i386/isa/isa_machdep.c
+++ b/sys/arch/i386/isa/isa_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: isa_machdep.c,v 1.39 2001/11/05 17:25:57 art Exp $ */
+/* $OpenBSD: isa_machdep.c,v 1.40 2001/11/06 19:53:14 miod Exp $ */
/* $NetBSD: isa_machdep.c,v 1.22 1997/06/12 23:57:32 thorpej Exp $ */
#define ISA_DMA_STATS
@@ -124,7 +124,7 @@
#include <sys/malloc.h>
#include <sys/proc.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
#define _I386_BUS_DMA_PRIVATE
#include <machine/bus.h>
diff --git a/sys/arch/i386/isa/npx.c b/sys/arch/i386/isa/npx.c
index 73f7833686f..a446ab4efc9 100644
--- a/sys/arch/i386/isa/npx.c
+++ b/sys/arch/i386/isa/npx.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: npx.c,v 1.19 2001/05/05 23:25:51 art Exp $ */
+/* $OpenBSD: npx.c,v 1.20 2001/11/06 19:53:14 miod Exp $ */
/* $NetBSD: npx.c,v 1.57 1996/05/12 23:12:24 mycroft Exp $ */
#if 0
@@ -54,7 +54,6 @@
#include <sys/ioctl.h>
#include <sys/device.h>
-#include <vm/vm.h>
#include <uvm/uvm_extern.h>
#include <machine/cpu.h>
diff --git a/sys/arch/i386/pci/pci_machdep.c b/sys/arch/i386/pci/pci_machdep.c
index 8f0804b225d..d0ea039a240 100644
--- a/sys/arch/i386/pci/pci_machdep.c
+++ b/sys/arch/i386/pci/pci_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_machdep.c,v 1.21 2001/09/11 20:05:24 miod Exp $ */
+/* $OpenBSD: pci_machdep.c,v 1.22 2001/11/06 19:53:14 miod Exp $ */
/* $NetBSD: pci_machdep.c,v 1.28 1997/06/06 23:29:17 thorpej Exp $ */
/*-
@@ -87,7 +87,7 @@
#include <sys/errno.h>
#include <sys/device.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
#define _I386_BUS_DMA_PRIVATE
#include <machine/bus.h>
diff --git a/sys/arch/i386/stand/installboot/installboot.c b/sys/arch/i386/stand/installboot/installboot.c
index 103f5d000dc..2add3ed9762 100644
--- a/sys/arch/i386/stand/installboot/installboot.c
+++ b/sys/arch/i386/stand/installboot/installboot.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: installboot.c,v 1.34 1999/05/23 17:19:22 aaron Exp $ */
+/* $OpenBSD: installboot.c,v 1.35 2001/11/06 19:53:14 miod Exp $ */
/* $NetBSD: installboot.c,v 1.5 1995/11/17 23:23:50 gwr Exp $ */
/*
@@ -44,7 +44,7 @@
#include <ufs/ffs/fs.h>
#include <sys/reboot.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
#include <sys/sysctl.h>
#include <machine/cpu.h>