Remove the superfluous typedef uvm_flag_t (unsigned int). Also, fix an

associated mistake in the uvm manpage.

Suggested by and ok tedu@

4 files changed, 14 insertions, 14 deletions

diff --git a/share/man/man9/uvm.9 b/share/man/man9/uvm.9
index df774335b0b..89c15554f60 100644
--- a/share/man/man9/uvm.9
+++ b/share/man/man9/uvm.9
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: uvm.9,v 1.61 2015/10/30 04:21:42 mmcc Exp $
+.\"	$OpenBSD: uvm.9,v 1.62 2015/11/11 15:59:33 mmcc Exp $
 .\"	$NetBSD: uvm.9,v 1.14 2000/06/29 06:08:44 mrg Exp $
 .\"
 .\" Copyright (c) 1998 Matthew R. Green
@@ -30,7 +30,7 @@
 .\" XXX this manual sets nS to 1 or 0 in the description, to obtain
 .\" synopsis-like function prototypes.  any better way?
 .\"
-.Dd $Mdocdate: October 30 2015 $
+.Dd $Mdocdate: November 11 2015 $
 .Dt UVM 9
 .Os
 .Sh NAME
@@ -122,7 +122,7 @@ function initialises the swap subsystem.
 .Sh VIRTUAL ADDRESS SPACE MANAGEMENT
 .nr nS 1
 .Ft int
-.Fn uvm_map "vm_map_t map" "vaddr_t *startp" "vsize_t size" "struct uvm_object *uobj" "voff_t uoffset" "vsize_t alignment" "uvm_flag_t flags"
+.Fn uvm_map "vm_map_t map" "vaddr_t *startp" "vsize_t size" "struct uvm_object *uobj" "voff_t uoffset" "vsize_t alignment" "unsigned int flags"
 .Ft int
 .Fn uvm_map_pageable "vm_map_t map" "vaddr_t start" "vaddr_t end" "boolean_t new_pageable" "int lockflags"
 .Ft int
@@ -147,7 +147,7 @@ function initialises the swap subsystem.
 .Fn uvm_uarea_alloc "void"
 .Ft void
 .Fn uvm_uarea_free "struct proc *p"
-.Ft int
+.Ft unsigned int
 .Fn UVM_MAPFLAG "vm_prot_t prot" "vm_prot_t maxprot" "vm_inherit_t inh" "int advice" "int flags"
 .nr nS 0
 .Pp
diff --git a/sys/uvm/uvm_extern.h b/sys/uvm/uvm_extern.h
index 6257fab9a09..509e49f9cfd 100644
--- a/sys/uvm/uvm_extern.h
+++ b/sys/uvm/uvm_extern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm_extern.h,v 1.135 2015/09/28 18:33:42 tedu Exp $	*/
+/*	$OpenBSD: uvm_extern.h,v 1.136 2015/11/11 15:59:33 mmcc Exp $	*/
 /*	$NetBSD: uvm_extern.h,v 1.57 2001/03/09 01:02:12 chs Exp $	*/
 
 /*
@@ -60,7 +60,6 @@
 #ifndef _UVM_UVM_EXTERN_H_
 #define _UVM_UVM_EXTERN_H_
 
-typedef unsigned int  uvm_flag_t;
 typedef int vm_fault_t;
 
 typedef int vm_inherit_t;	/* XXX: inheritance codes */
@@ -413,8 +412,8 @@ void			*km_alloc(size_t, const struct kmem_va_mode *,
 void			km_free(void *, size_t, const struct kmem_va_mode *,
 			    const struct kmem_pa_mode *);
 int			uvm_map(vm_map_t, vaddr_t *, vsize_t,
-			    struct uvm_object *, voff_t, vsize_t, uvm_flag_t);
-int			uvm_mapanon(vm_map_t, vaddr_t *, vsize_t, vsize_t, uvm_flag_t);
+			    struct uvm_object *, voff_t, vsize_t, unsigned int);
+int			uvm_mapanon(vm_map_t, vaddr_t *, vsize_t, vsize_t, unsigned int);
 int			uvm_map_pageable(vm_map_t, vaddr_t, 
 			    vaddr_t, boolean_t, int);
 int			uvm_map_pageable_all(vm_map_t, int, vsize_t);
diff --git a/sys/uvm/uvm_map.c b/sys/uvm/uvm_map.c
index cc0f914dcf1..ec462419442 100644
--- a/sys/uvm/uvm_map.c
+++ b/sys/uvm/uvm_map.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm_map.c,v 1.202 2015/10/01 20:27:51 kettenis Exp $	*/
+/*	$OpenBSD: uvm_map.c,v 1.203 2015/11/11 15:59:33 mmcc Exp $	*/
 /*	$NetBSD: uvm_map.c,v 1.86 2000/11/27 08:40:03 chs Exp $	*/
 
 /*
@@ -940,7 +940,7 @@ uvm_map_addr_augment(struct vm_map_entry *entry)
  */
 int
 uvm_mapanon(struct vm_map *map, vaddr_t *addr, vsize_t sz,
-    vsize_t align, uvm_flag_t flags)
+    vsize_t align, unsigned int flags)
 {
 	struct vm_map_entry	*first, *last, *entry, *new;
 	struct uvm_map_deadq	 dead;
@@ -1128,7 +1128,8 @@ out:
  */
 int
 uvm_map(struct vm_map *map, vaddr_t *addr, vsize_t sz,
-    struct uvm_object *uobj, voff_t uoffset, vsize_t align, uvm_flag_t flags)
+    struct uvm_object *uobj, voff_t uoffset,
+    vsize_t align, unsigned int flags)
 {
 	struct vm_map_entry	*first, *last, *entry, *new;
 	struct uvm_map_deadq	 dead;
diff --git a/sys/uvm/uvm_mmap.c b/sys/uvm/uvm_mmap.c
index 7ebc6e42145..5429923b550 100644
--- a/sys/uvm/uvm_mmap.c
+++ b/sys/uvm/uvm_mmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm_mmap.c,v 1.121 2015/11/01 19:03:33 semarie Exp $	*/
+/*	$OpenBSD: uvm_mmap.c,v 1.122 2015/11/11 15:59:33 mmcc Exp $	*/
 /*	$NetBSD: uvm_mmap.c,v 1.49 2001/02/18 21:19:08 chs Exp $	*/
 
 /*
@@ -982,7 +982,7 @@ uvm_mmapanon(vm_map_t map, vaddr_t *addr, vsize_t size, vm_prot_t prot,
 {
 	int error;
 	int advice = MADV_NORMAL;
-	uvm_flag_t uvmflag = 0;
+	unsigned int uvmflag = 0;
 	vsize_t align = 0;	/* userland page size */
 
 	/*
@@ -1035,7 +1035,7 @@ uvm_mmapfile(vm_map_t map, vaddr_t *addr, vsize_t size, vm_prot_t prot,
 	struct uvm_object *uobj;
 	int error;
 	int advice = MADV_NORMAL;
-	uvm_flag_t uvmflag = 0;
+	unsigned int uvmflag = 0;
 	vsize_t align = 0;	/* userland page size */
 
 	/*