[src/rmind-uvmplock]: src/sys Use consistent naming - uvm_obj_*().

[rmind <rmind%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a76618c6b1c9
branches:  rmind-uvmplock
changeset: 753046:a76618c6b1c9
user:      rmind <rmind%NetBSD.org@localhost>
date:      Fri Apr 23 21:18:00 2010 +0000

description:
Use consistent naming - uvm_obj_*().

diffstat:

 sys/kern/sysv_shm.c  |  14 ++++++++------
 sys/uvm/uvm_extern.h |  10 ++++------
 sys/uvm/uvm_object.c |   8 ++++----
 3 files changed, 16 insertions(+), 16 deletions(-)

diffs (121 lines):

diff -r 9924de0cb260 -r a76618c6b1c9 sys/kern/sysv_shm.c
--- a/sys/kern/sysv_shm.c       Wed Mar 24 06:02:48 2010 +0000
+++ b/sys/kern/sysv_shm.c       Fri Apr 23 21:18:00 2010 +0000
@@ -1,4 +1,4 @@
-/*     $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.
@@ -61,7 +61,7 @@
  */
 
 #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
 
@@ -268,13 +268,15 @@
                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,
+                           0, 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,
+                                   0, size);
                                if (error == EFAULT)
                                        error = ENOMEM;
                                return error;
@@ -284,7 +286,7 @@
                } 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)
@@ -730,7 +732,7 @@
        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);
diff -r 9924de0cb260 -r a76618c6b1c9 sys/uvm/uvm_extern.h
--- a/sys/uvm/uvm_extern.h      Wed Mar 24 06:02:48 2010 +0000
+++ b/sys/uvm/uvm_extern.h      Fri Apr 23 21:18:00 2010 +0000
@@ -1,4 +1,4 @@
-/*     $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 $       */
 
 /*
  *
@@ -624,7 +624,7 @@
 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);
@@ -707,10 +707,8 @@
 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,
-                           off_t end);
-void                   uobj_unwirepages(struct uvm_object *uobj, off_t start,
-                           off_t end);
+int                    uvm_obj_wirepages(struct uvm_object *, off_t, off_t);
+void                   uvm_obj_unwirepages(struct uvm_object *, off_t, off_t);
 
 /* uvm_page.c */
 struct vm_page         *uvm_pagealloc_strat(struct uvm_object *,
diff -r 9924de0cb260 -r a76618c6b1c9 sys/uvm/uvm_object.c
--- a/sys/uvm/uvm_object.c      Wed Mar 24 06:02:48 2010 +0000
+++ b/sys/uvm/uvm_object.c      Fri Apr 23 21:18:00 2010 +0000
@@ -1,4 +1,4 @@
-/*     $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.
@@ -37,7 +37,7 @@
  */
 
 #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"
 
@@ -100,7 +100,7 @@
  */
 
 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;
@@ -183,7 +183,7 @@
  */
 
 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;