diff options
Diffstat (limited to 'sys/uvm')
| -rw-r--r-- | sys/uvm/uvm.h | 19 | ||||
| -rw-r--r-- | sys/uvm/uvm_extern.h | 12 |
2 files changed, 11 insertions, 20 deletions
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. |