 @@ -1,14 +1,14 @@
-/*	$NetBSD: sysv_shm.c,v 1.117 2009/10/05 23:47:04 rmind Exp $	*/
+/*	$NetBSD: sysv_shm.c,v 1.117.4.1 2010/04/23 21:18:00 rmind Exp $	*/
 /*-
  * Copyright (c) 1999, 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center, and by Mindaugas Rasiukevicius.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -51,27 +51,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysv_shm.c,v 1.117 2009/10/05 23:47:04 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysv_shm.c,v 1.117.4.1 2010/04/23 21:18:00 rmind Exp $");
 #define SYSVSHM
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/shm.h>
 #include <sys/mutex.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <sys/sysctl.h>
 #include <sys/mount.h>		/* XXX for <sys/syscallargs.h> */
 #include <sys/syscallargs.h>
 @@ -258,43 +258,45 @@ shm_memlock(struct lwp *l, struct shmid_
 	KASSERT(mutex_owned(&shm_lock));
 	shmmap_s = shmmap_getprivate(p);
 	/* Find our shared memory address by shmid */
 	SLIST_FOREACH(shmmap_se, &shmmap_s->entries, next) {
 		if (shmmap_se->shmid != shmid)
 			continue;
 		size = (shmseg->shm_segsz + PGOFSET) & ~PGOFSET;
 		if (cmd == SHM_LOCK &&
 		    (shmseg->shm_perm.mode & SHMSEG_WIRED) == 0) {
 			/* Wire the object and map, then tag it */
-			error = uobj_wirepages(shmseg->_shm_internal, 0, size);
+			error = uvm_obj_wirepages(shmseg->_shm_internal,
 , size);
 			if (error)
 				return EIO;
 			error = uvm_map_pageable(&p->p_vmspace->vm_map,
 			    shmmap_se->va, shmmap_se->va + size, false, 0);
 			if (error) {
-				uobj_unwirepages(shmseg->_shm_internal, 0, size);
+				uvm_obj_unwirepages(shmseg->_shm_internal,
 , size);
 				if (error == EFAULT)
 					error = ENOMEM;
 				return error;
+			}
 			shmseg->shm_perm.mode |= SHMSEG_WIRED;
 		} else if (cmd == SHM_UNLOCK &&
 		    (shmseg->shm_perm.mode & SHMSEG_WIRED) != 0) {
 			/* Unwire the object and map, then untag it */
-			uobj_unwirepages(shmseg->_shm_internal, 0, size);
+			uvm_obj_unwirepages(shmseg->_shm_internal, 0, size);
 			error = uvm_map_pageable(&p->p_vmspace->vm_map,
 			    shmmap_se->va, shmmap_se->va + size, true, 0);
 			if (error)
 				return EIO;
 			shmseg->shm_perm.mode &= ~SHMSEG_WIRED;
+		}
+	}
 	return 0;
+}
 /*
  * Unmap shared memory.
 @@ -720,27 +722,27 @@ sys_shmget(struct lwp *l, const struct s
 	 */
 	shmseg = &shmsegs[segnum];
 	shmseg->shm_perm.mode = SHMSEG_ALLOCATED | SHMSEG_REMOVED;
 	shm_committed += btoc(size);
 	shm_nused++;
 	lockmem = shm_use_phys;
 	shm_realloc_disable++;
 	mutex_exit(&shm_lock);
 	/* Allocate the memory object and lock it if needed */
 	shmseg->_shm_internal = uao_create(size, 0);
 	if (lockmem) {
 		/* Wire the pages and tag it */
-		error = uobj_wirepages(shmseg->_shm_internal, 0, size);
+		error = uvm_obj_wirepages(shmseg->_shm_internal, 0, size);
 		if (error) {
 			uao_detach(shmseg->_shm_internal);
 			mutex_enter(&shm_lock);
 			shm_free_segment(segnum);
 			shm_realloc_disable--;
 			mutex_exit(&shm_lock);
 			return error;
+		}
+	}
 	/*
 	 * Please note, while segment is marked, there are no need to hold the
 	 * lock, while setting it (except shm_perm.mode).

 @@ -1,14 +1,14 @@
-/*	$NetBSD: uvm_extern.h,v 1.162.2.2 2010/03/18 04:36:54 rmind Exp $	*/
+/*	$NetBSD: uvm_extern.h,v 1.162.2.3 2010/04/23 21:18:00 rmind Exp $	*/
 /*
+ *
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -614,27 +614,27 @@ int		uvm_fault_internal(struct vm_map *,
 #if defined(KGDB)
 void			uvm_chgkprot(void *, size_t, int);
 #endif
 void			uvm_proc_fork(struct proc *, struct proc *, bool);
 void			uvm_lwp_fork(struct lwp *, struct lwp *,
 			    void *, size_t, void (*)(void *), void *);
 int			uvm_coredump_walkmap(struct proc *,
 			    void *,
 			    int (*)(struct proc *, void *,
 				    struct uvm_coredump_state *), void *);
 void			uvm_proc_exit(struct proc *);
 void			uvm_lwp_exit(struct lwp *);
 void			uvm_init_limits(struct proc *);
-bool			uvm_kernacc(void *, vm_prot_t);
+bool			uvm_kernacc(void *, size_t, vm_prot_t);
 __dead void		uvm_scheduler(void);
 vaddr_t			uvm_uarea_alloc(void);
 void			uvm_uarea_free(vaddr_t);
 vaddr_t			uvm_lwp_getuarea(lwp_t *);
 void			uvm_lwp_setuarea(lwp_t *, vaddr_t);
 int			uvm_vslock(struct vmspace *, void *, size_t, vm_prot_t);
 void			uvm_vsunlock(struct vmspace *, void *, size_t);
 void			uvm_cpu_attach(struct cpu_info *);
 /* uvm_init.c */
 void			uvm_init(void);
 @@ -697,30 +697,28 @@ int			uvm_mmap(struct vm_map *, vaddr_t
 			    vm_prot_t, vm_prot_t, int,
 			    void *, voff_t, vsize_t);
 vaddr_t			uvm_default_mapaddr(struct proc *, vaddr_t, vsize_t);
 /* uvm_mremap.c */
 int			uvm_mremap(struct vm_map *, vaddr_t, vsize_t,
 			    struct vm_map *, vaddr_t *, vsize_t,
 			    struct proc *, int);
 /* uvm_object.c */
 void			uvm_obj_init(struct uvm_object *,
 			    const struct uvm_pagerops *, kmutex_t *, u_int);
 void			uvm_obj_destroy(struct uvm_object *, kmutex_t *);
-int			uobj_wirepages(struct uvm_object *uobj, off_t start,
+int			uvm_obj_wirepages(struct uvm_object *, off_t, off_t);
-			    off_t end);
+void			uvm_obj_unwirepages(struct uvm_object *, off_t, off_t);
 void			uobj_unwirepages(struct uvm_object *uobj, off_t start,
 			    off_t end);
 /* uvm_page.c */
 struct vm_page		*uvm_pagealloc_strat(struct uvm_object *,
 			    voff_t, struct vm_anon *, int, int, int);
 #define	uvm_pagealloc(obj, off, anon, flags) \
 	    uvm_pagealloc_strat((obj), (off), (anon), (flags), \
 				UVM_PGA_STRAT_NORMAL, 0)
 void			uvm_pagereplace(struct vm_page *,
 			    struct vm_page *);
 void			uvm_pagerealloc(struct vm_page *,
 			    struct uvm_object *, voff_t);
 /* Actually, uvm_page_physload takes PF#s which need their own type */
 void			uvm_page_physload(paddr_t, paddr_t, paddr_t,

 @@ -1,14 +1,14 @@
-/*	$NetBSD: uvm_object.c,v 1.7.4.1 2010/03/16 15:38:18 rmind Exp $	*/
+/*	$NetBSD: uvm_object.c,v 1.7.4.2 2010/04/23 21:18:00 rmind Exp $	*/
 /*
  * Copyright (c) 2006 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Mindaugas Rasiukevicius.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -27,27 +27,27 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * uvm_object.c: operate with memory objects
+ *
  * TODO:
  *  1. Support PG_RELEASED-using objects
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_object.c,v 1.7.4.1 2010/03/16 15:38:18 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_object.c,v 1.7.4.2 2010/04/23 21:18:00 rmind Exp $");
 #include "opt_ddb.h"
 #include <sys/param.h>
 #include <sys/mutex.h>
 #include <sys/queue.h>
 #include <sys/rb.h>
 #include <uvm/uvm.h>
 #include <uvm/uvm_ddb.h>
 /* We will fetch this page count per step */
 #define	FETCH_PAGECOUNT	16
 @@ -90,27 +90,27 @@ uvm_obj_destroy(struct uvm_object *uo, k
 		mutex_obj_free(uo->vmobjlock);
+	}
+}
 /*
  * uobj_wirepages: wire the pages of entire uobj
+ *
  * => NOTE: this function should only be used for types of objects
  *  where PG_RELEASED flag is never set (aobj objects)
  * => caller must pass page-aligned start and end values
  */
 int
-uobj_wirepages(struct uvm_object *uobj, off_t start, off_t end)
+uvm_obj_wirepages(struct uvm_object *uobj, off_t start, off_t end)
+{
 	int i, npages, error;
 	struct vm_page *pgs[FETCH_PAGECOUNT], *pg = NULL;
 	off_t offset = start, left;
 	left = (end - start) >> PAGE_SHIFT;
 	mutex_enter(uobj->vmobjlock);
 	while (left) {
 		npages = MIN(FETCH_PAGECOUNT, left);
 		/* Get the pages */
 @@ -173,27 +173,27 @@ error:
 	return error;
+}
 /*
  * uobj_unwirepages: unwire the pages of entire uobj
+ *
  * => NOTE: this function should only be used for types of objects
  *  where PG_RELEASED flag is never set
  * => caller must pass page-aligned start and end values
  */
 void
-uobj_unwirepages(struct uvm_object *uobj, off_t start, off_t end)
+uvm_obj_unwirepages(struct uvm_object *uobj, off_t start, off_t end)
+{
 	struct vm_page *pg;
 	off_t offset;
 	mutex_enter(uobj->vmobjlock);
 	mutex_enter(&uvm_pageqlock);
 	for (offset = start; offset < end; offset += PAGE_SIZE) {
 		pg = uvm_pagelookup(uobj, offset);
 		KASSERT(pg != NULL);
 		KASSERT(!(pg->flags & PG_RELEASED));
 		uvm_pageunwire(pg);