summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/dev/ic/ahci.c4
-rw-r--r--sys/dev/ic/sti.c4
-rw-r--r--sys/dev/isa/aha.c3
-rw-r--r--sys/dev/pci/ahci_pci.c4
-rw-r--r--sys/dev/pci/drm/ttm/ttm_page_alloc.c4
-rw-r--r--sys/dev/pci/vga_pci.c4
-rw-r--r--sys/dev/pci/viomb.c7
-rw-r--r--sys/dev/video.c6
-rw-r--r--sys/kern/dma_alloc.c6
-rw-r--r--sys/kern/exec_subr.c4
-rw-r--r--sys/kern/init_main.c4
-rw-r--r--sys/kern/kern_fork.c5
-rw-r--r--sys/kern/kern_malloc.c4
-rw-r--r--sys/kern/kern_malloc_debug.c4
-rw-r--r--sys/kern/subr_pool.c4
-rw-r--r--sys/kern/uipc_mbuf.c3
-rw-r--r--sys/kern/vfs_biomem.c4
-rw-r--r--sys/nfs/nfs_kq.c3
-rw-r--r--sys/sys/vnode.h4
-rw-r--r--sys/tmpfs/tmpfs_subr.c4
-rw-r--r--sys/tmpfs/tmpfs_vnops.c4
-rw-r--r--sys/uvm/uvm.h19
-rw-r--r--sys/uvm/uvm_extern.h12
23 files changed, 56 insertions, 64 deletions
diff --git a/sys/dev/ic/ahci.c b/sys/dev/ic/ahci.c
index 9f83a687092..8fc88dd3315 100644
--- a/sys/dev/ic/ahci.c
+++ b/sys/dev/ic/ahci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ahci.c,v 1.7 2014/02/13 23:48:30 pelikan Exp $ */
+/* $OpenBSD: ahci.c,v 1.8 2014/03/28 17:57:11 mpi Exp $ */
/*
* Copyright (c) 2006 David Gwynne <dlg@openbsd.org>
@@ -46,7 +46,7 @@ int ahcidebug = AHCI_D_VERBOSE;
#endif
#ifdef HIBERNATE
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
#include <sys/hibernate.h>
#include <sys/disk.h>
#include <sys/disklabel.h>
diff --git a/sys/dev/ic/sti.c b/sys/dev/ic/sti.c
index 4ed26f9ad5d..12eafb47ddf 100644
--- a/sys/dev/ic/sti.c
+++ b/sys/dev/ic/sti.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sti.c,v 1.70 2014/03/18 22:36:37 miod Exp $ */
+/* $OpenBSD: sti.c,v 1.71 2014/03/28 17:57:11 mpi Exp $ */
/*
* Copyright (c) 2000-2003 Michael Shalayeff
@@ -37,7 +37,7 @@
#include <sys/device.h>
#include <sys/malloc.h>
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
#include <machine/bus.h>
diff --git a/sys/dev/isa/aha.c b/sys/dev/isa/aha.c
index f447248c45c..9488aff583d 100644
--- a/sys/dev/isa/aha.c
+++ b/sys/dev/isa/aha.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: aha.c,v 1.75 2013/01/06 22:06:54 martynas Exp $ */
+/* $OpenBSD: aha.c,v 1.76 2014/03/28 17:57:11 mpi Exp $ */
/* $NetBSD: aha.c,v 1.11 1996/05/12 23:51:23 mycroft Exp $ */
#undef AHADIAG
@@ -59,7 +59,6 @@
#include <sys/proc.h>
#include <sys/timeout.h>
-#include <uvm/uvm.h>
#include <uvm/uvm_extern.h>
#include <machine/intr.h>
diff --git a/sys/dev/pci/ahci_pci.c b/sys/dev/pci/ahci_pci.c
index 0b9f4648951..d26cd0a69c8 100644
--- a/sys/dev/pci/ahci_pci.c
+++ b/sys/dev/pci/ahci_pci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ahci_pci.c,v 1.3 2014/01/02 08:00:35 gilles Exp $ */
+/* $OpenBSD: ahci_pci.c,v 1.4 2014/03/28 17:57:11 mpi Exp $ */
/*
* Copyright (c) 2006 David Gwynne <dlg@openbsd.org>
@@ -160,7 +160,7 @@ int ahci_pci_detach(struct device *, int);
int ahci_pci_activate(struct device *, int);
#ifdef HIBERNATE
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
#include <sys/hibernate.h>
#include <sys/disk.h>
#include <sys/disklabel.h>
diff --git a/sys/dev/pci/drm/ttm/ttm_page_alloc.c b/sys/dev/pci/drm/ttm/ttm_page_alloc.c
index 9da7fba7585..8345038b6e7 100644
--- a/sys/dev/pci/drm/ttm/ttm_page_alloc.c
+++ b/sys/dev/pci/drm/ttm/ttm_page_alloc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ttm_page_alloc.c,v 1.5 2014/03/25 17:44:39 mpi Exp $ */
+/* $OpenBSD: ttm_page_alloc.c,v 1.6 2014/03/28 17:57:11 mpi Exp $ */
/*
* Copyright (c) Red Hat Inc.
@@ -43,7 +43,7 @@
#include <dev/pci/agpvar.h>
#endif
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
#define NUM_PAGES_TO_ALLOC (PAGE_SIZE/sizeof(struct vm_page *))
#define SMALL_ALLOCATION 16
diff --git a/sys/dev/pci/vga_pci.c b/sys/dev/pci/vga_pci.c
index 580c0e39bcb..f0c49d041b6 100644
--- a/sys/dev/pci/vga_pci.c
+++ b/sys/dev/pci/vga_pci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vga_pci.c,v 1.76 2014/03/26 14:41:41 mpi Exp $ */
+/* $OpenBSD: vga_pci.c,v 1.77 2014/03/28 17:57:11 mpi Exp $ */
/* $NetBSD: vga_pci.c,v 1.3 1998/06/08 06:55:58 thorpej Exp $ */
/*
@@ -75,8 +75,6 @@
#include <sys/malloc.h>
#include <sys/rwlock.h>
-#include <uvm/uvm.h>
-
#include <machine/bus.h>
#include <dev/pci/pcireg.h>
diff --git a/sys/dev/pci/viomb.c b/sys/dev/pci/viomb.c
index 9f427a2dda8..b6d7c127143 100644
--- a/sys/dev/pci/viomb.c
+++ b/sys/dev/pci/viomb.c
@@ -1,5 +1,6 @@
-/* $OpenBSD: viomb.c,v 1.7 2013/10/31 01:54:43 dlg Exp $ */
+/* $OpenBSD: viomb.c,v 1.8 2014/03/28 17:57:11 mpi Exp $ */
/* $NetBSD: viomb.c,v 1.1 2011/10/30 12:12:21 hannken Exp $ */
+
/*
* Copyright (c) 2012 Talypov Dinar <dinar@i-nk.ru>
* Copyright (c) 2010 Minoura Makoto.
@@ -32,7 +33,9 @@
#include <sys/device.h>
#include <sys/task.h>
#include <sys/pool.h>
-#include <uvm/uvm.h>
+
+#include <uvm/uvm_extern.h>
+
#include <dev/pci/pcidevs.h>
#include <dev/pci/pcivar.h>
diff --git a/sys/dev/video.c b/sys/dev/video.c
index c733dc91e96..cb22de4efea 100644
--- a/sys/dev/video.c
+++ b/sys/dev/video.c
@@ -1,4 +1,5 @@
-/* $OpenBSD: video.c,v 1.28 2011/07/03 15:47:16 matthew Exp $ */
+/* $OpenBSD: video.c,v 1.29 2014/03/28 17:57:11 mpi Exp $ */
+
/*
* Copyright (c) 2008 Robert Nagy <robert@openbsd.org>
* Copyright (c) 2008 Marcus Glocker <mglocker@openbsd.org>
@@ -29,7 +30,8 @@
#include <sys/malloc.h>
#include <sys/conf.h>
#include <sys/videoio.h>
-#include <uvm/uvm.h>
+
+#include <uvm/uvm_extern.h>
#include <uvm/uvm_pmap.h>
#include <dev/video_if.h>
diff --git a/sys/kern/dma_alloc.c b/sys/kern/dma_alloc.c
index 504f75c7e26..599dc862f0c 100644
--- a/sys/kern/dma_alloc.c
+++ b/sys/kern/dma_alloc.c
@@ -1,4 +1,5 @@
-/* $OpenBSD: dma_alloc.c,v 1.9 2011/06/23 21:42:05 ariane Exp $ */
+/* $OpenBSD: dma_alloc.c,v 1.10 2014/03/28 17:57:11 mpi Exp $ */
+
/*
* Copyright (c) 2010 Theo de Raadt <deraadt@openbsd.org>
*
@@ -17,7 +18,8 @@
#include <sys/param.h>
#include <sys/pool.h>
-#include <uvm/uvm.h>
+
+#include <uvm/uvm_extern.h>
static __inline int dma_alloc_index(size_t size);
diff --git a/sys/kern/exec_subr.c b/sys/kern/exec_subr.c
index 35222abb803..489dbddcff7 100644
--- a/sys/kern/exec_subr.c
+++ b/sys/kern/exec_subr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: exec_subr.c,v 1.31 2013/10/15 05:30:53 deraadt Exp $ */
+/* $OpenBSD: exec_subr.c,v 1.32 2014/03/28 17:57:11 mpi Exp $ */
/* $NetBSD: exec_subr.c,v 1.9 1994/12/04 03:10:42 mycroft Exp $ */
/*
@@ -41,7 +41,7 @@
#include <sys/mman.h>
#include <sys/resourcevar.h>
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
#include <dev/rndvar.h>
#ifdef DEBUG
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index 724f6c49f81..afb0284a2b8 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: init_main.c,v 1.206 2014/03/26 05:23:42 guenther Exp $ */
+/* $OpenBSD: init_main.c,v 1.207 2014/03/28 17:57:11 mpi Exp $ */
/* $NetBSD: init_main.c,v 1.84.4.1 1996/06/02 09:08:06 mrg Exp $ */
/*
@@ -85,7 +85,7 @@
#include <ufs/ufs/quota.h>
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
#include <net/if.h>
#include <net/raw_cb.h>
diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c
index b9a7fb13d49..bea11e5f45b 100644
--- a/sys/kern/kern_fork.c
+++ b/sys/kern/kern_fork.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_fork.c,v 1.160 2014/03/26 05:23:42 guenther Exp $ */
+/* $OpenBSD: kern_fork.c,v 1.161 2014/03/28 17:57:11 mpi Exp $ */
/* $NetBSD: kern_fork.c,v 1.29 1996/02/09 18:59:34 christos Exp $ */
/*
@@ -62,8 +62,7 @@
#include "systrace.h"
#include <dev/systrace.h>
-#include <uvm/uvm_extern.h>
-#include <uvm/uvm_map.h>
+#include <uvm/uvm.h>
#ifdef __HAVE_MD_TCB
# include <machine/tcb.h>
diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c
index 5afe208f3b9..c583d69e9fc 100644
--- a/sys/kern/kern_malloc.c
+++ b/sys/kern/kern_malloc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_malloc.c,v 1.104 2014/01/21 01:48:44 tedu Exp $ */
+/* $OpenBSD: kern_malloc.c,v 1.105 2014/03/28 17:57:11 mpi Exp $ */
/* $NetBSD: kern_malloc.c,v 1.15.4.2 1996/06/13 17:10:56 cgd Exp $ */
/*
@@ -43,7 +43,7 @@
#include <dev/rndvar.h>
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
static __inline__ long BUCKETINDX(size_t sz)
{
diff --git a/sys/kern/kern_malloc_debug.c b/sys/kern/kern_malloc_debug.c
index 046af234b4f..2bce1883c18 100644
--- a/sys/kern/kern_malloc_debug.c
+++ b/sys/kern/kern_malloc_debug.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_malloc_debug.c,v 1.32 2013/08/08 23:25:06 syl Exp $ */
+/* $OpenBSD: kern_malloc_debug.c,v 1.33 2014/03/28 17:57:11 mpi Exp $ */
/*
* Copyright (c) 1999, 2000 Artur Grabowski <art@openbsd.org>
@@ -57,7 +57,7 @@
#include <sys/systm.h>
#include <sys/pool.h>
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
/*
* debug_malloc_type and debug_malloc_size define the type and size of
diff --git a/sys/kern/subr_pool.c b/sys/kern/subr_pool.c
index 0be2df00543..2fd1e897cfe 100644
--- a/sys/kern/subr_pool.c
+++ b/sys/kern/subr_pool.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: subr_pool.c,v 1.124 2013/11/05 03:28:45 dlg Exp $ */
+/* $OpenBSD: subr_pool.c,v 1.125 2014/03/28 17:57:11 mpi Exp $ */
/* $NetBSD: subr_pool.c,v 1.61 2001/09/26 07:14:56 chs Exp $ */
/*-
@@ -41,7 +41,7 @@
#include <sys/syslog.h>
#include <sys/sysctl.h>
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
#include <dev/rndvar.h>
/*
diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c
index 3e3a975c8f3..d6fb112110e 100644
--- a/sys/kern/uipc_mbuf.c
+++ b/sys/kern/uipc_mbuf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uipc_mbuf.c,v 1.179 2014/03/27 10:30:58 mpi Exp $ */
+/* $OpenBSD: uipc_mbuf.c,v 1.180 2014/03/28 17:57:11 mpi Exp $ */
/* $NetBSD: uipc_mbuf.c,v 1.15.4.1 1996/06/13 17:11:44 cgd Exp $ */
/*
@@ -88,7 +88,6 @@
#include <net/if.h>
-#include <uvm/uvm.h>
#include <uvm/uvm_extern.h>
#ifdef DDB
diff --git a/sys/kern/vfs_biomem.c b/sys/kern/vfs_biomem.c
index aa5838f0029..86044080305 100644
--- a/sys/kern/vfs_biomem.c
+++ b/sys/kern/vfs_biomem.c
@@ -1,4 +1,5 @@
-/* $OpenBSD: vfs_biomem.c,v 1.28 2013/07/09 15:37:43 beck Exp $ */
+/* $OpenBSD: vfs_biomem.c,v 1.29 2014/03/28 17:57:11 mpi Exp $ */
+
/*
* Copyright (c) 2007 Artur Grabowski <art@openbsd.org>
*
@@ -24,7 +25,6 @@
#include <sys/mount.h>
#include <uvm/uvm_extern.h>
-#include <uvm/uvm.h>
vaddr_t buf_kva_start, buf_kva_end;
int buf_needva;
diff --git a/sys/nfs/nfs_kq.c b/sys/nfs/nfs_kq.c
index 55e91de88ff..39c947f37c3 100644
--- a/sys/nfs/nfs_kq.c
+++ b/sys/nfs/nfs_kq.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nfs_kq.c,v 1.16 2012/12/05 23:20:23 deraadt Exp $ */
+/* $OpenBSD: nfs_kq.c,v 1.17 2014/03/28 17:57:11 mpi Exp $ */
/* $NetBSD: nfs_kq.c,v 1.7 2003/10/30 01:43:10 simonb Exp $ */
/*-
@@ -44,7 +44,6 @@
#include <sys/queue.h>
#include <uvm/uvm_extern.h>
-#include <uvm/uvm.h>
#include <nfs/rpcv2.h>
#include <nfs/nfsproto.h>
diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h
index 31740d4a778..a34f011109b 100644
--- a/sys/sys/vnode.h
+++ b/sys/sys/vnode.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: vnode.h,v 1.122 2013/11/01 17:17:25 deraadt Exp $ */
+/* $OpenBSD: vnode.h,v 1.123 2014/03/28 17:57:11 mpi Exp $ */
/* $NetBSD: vnode.h,v 1.38 1996/02/29 20:59:05 cgd Exp $ */
/*
@@ -41,7 +41,7 @@
#include <sys/selinfo.h>
#include <sys/tree.h>
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
#include <uvm/uvm_vnode.h>
/*
diff --git a/sys/tmpfs/tmpfs_subr.c b/sys/tmpfs/tmpfs_subr.c
index d72edbd2eab..88a4717a12b 100644
--- a/sys/tmpfs/tmpfs_subr.c
+++ b/sys/tmpfs/tmpfs_subr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmpfs_subr.c,v 1.5 2013/12/14 18:01:52 espie Exp $ */
+/* $OpenBSD: tmpfs_subr.c,v 1.6 2014/03/28 17:57:11 mpi Exp $ */
/* $NetBSD: tmpfs_subr.c,v 1.79 2012/03/13 18:40:50 elad Exp $ */
/*
@@ -91,7 +91,7 @@ __KERNEL_RCSID(0, "$NetBSD: tmpfs_subr.c,v 1.79 2012/03/13 18:40:50 elad Exp $")
#include <sys/systm.h>
#include <sys/vnode.h>
-#include <uvm/uvm.h>
+#include <uvm/uvm_aobj.h>
#include <dev/rndvar.h>
diff --git a/sys/tmpfs/tmpfs_vnops.c b/sys/tmpfs/tmpfs_vnops.c
index c33a2750f4b..8f9edf2f33a 100644
--- a/sys/tmpfs/tmpfs_vnops.c
+++ b/sys/tmpfs/tmpfs_vnops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmpfs_vnops.c,v 1.15 2014/02/28 15:59:38 espie Exp $ */
+/* $OpenBSD: tmpfs_vnops.c,v 1.16 2014/03/28 17:57:11 mpi Exp $ */
/* $NetBSD: tmpfs_vnops.c,v 1.100 2012/11/05 17:27:39 dholland Exp $ */
/*
@@ -55,7 +55,7 @@ __KERNEL_RCSID(0, "$NetBSD: tmpfs_vnops.c,v 1.100 2012/11/05 17:27:39 dholland E
#include <sys/poll.h>
#include <sys/file.h>
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
#include <miscfs/fifofs/fifo.h>
#include <tmpfs/tmpfs_vnops.h>
diff --git a/sys/uvm/uvm.h b/sys/uvm/uvm.h
index f68d5daa498..f5dde851952 100644
--- a/sys/uvm/uvm.h
+++ b/sys/uvm/uvm.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: uvm.h,v 1.52 2013/11/09 06:52:15 guenther Exp $ */
+/* $OpenBSD: uvm.h,v 1.53 2014/03/28 17:57:11 mpi Exp $ */
/* $NetBSD: uvm.h,v 1.24 2000/11/27 08:40:02 chs Exp $ */
/*
@@ -39,34 +39,17 @@
#define _UVM_UVM_H_
#include <uvm/uvm_extern.h>
-
-/*
- * pull in prototypes
- */
-
#include <uvm/uvm_amap.h>
#include <uvm/uvm_aobj.h>
#include <uvm/uvm_fault.h>
#include <uvm/uvm_glue.h>
#include <uvm/uvm_km.h>
-#include <uvm/uvm_map.h>
-#include <uvm/uvm_object.h>
-#include <uvm/uvm_page.h>
-#include <uvm/uvm_pager.h>
#include <uvm/uvm_swap.h>
#include <uvm/uvm_pmemrange.h>
#ifdef UVM_SWAP_ENCRYPT
#include <uvm/uvm_swap_encrypt.h>
#endif
-#include <machine/vmparam.h>
-
-/* Constraint ranges, set by MD code. */
-extern struct uvm_constraint_range isa_constraint;
-extern struct uvm_constraint_range dma_constraint;
-extern struct uvm_constraint_range no_constraint;
-extern struct uvm_constraint_range *uvm_md_constraints[];
-
/*
* uvm structure (vm global state: collected in one structure for ease
* of reference...)
diff --git a/sys/uvm/uvm_extern.h b/sys/uvm/uvm_extern.h
index 59aba87302c..9a49d2d3043 100644
--- a/sys/uvm/uvm_extern.h
+++ b/sys/uvm/uvm_extern.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: uvm_extern.h,v 1.110 2014/01/30 18:16:41 miod Exp $ */
+/* $OpenBSD: uvm_extern.h,v 1.111 2014/03/28 17:57:11 mpi Exp $ */
/* $NetBSD: uvm_extern.h,v 1.57 2001/03/09 01:02:12 chs Exp $ */
/*
@@ -397,15 +397,23 @@ extern struct uvmexp uvmexp;
#include <sys/vmmeter.h>
#include <sys/queue.h>
#include <sys/tree.h>
-#include <uvm/uvm_param.h>
#include <sys/lock.h>
#include <sys/mutex.h>
+
+#include <uvm/uvm_param.h>
#include <uvm/uvm_pmap.h>
+#include <uvm/uvm_object.h>
#include <uvm/uvm_page.h>
#include <uvm/uvm_map.h>
#include <uvm/uvm_fault.h>
#include <uvm/uvm_pager.h>
+/* Constraint ranges, set by MD code. */
+extern struct uvm_constraint_range isa_constraint;
+extern struct uvm_constraint_range dma_constraint;
+extern struct uvm_constraint_range no_constraint;
+extern struct uvm_constraint_range *uvm_md_constraints[];
+
/*
* Shareable process virtual address space.
* May eventually be merged with vm_map.
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-01 12:19:43 +0000