[src/uebayasi-xip]: src/sys/uvm Reduce more diffs from the original.

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

details:   https://anonhg.NetBSD.org/src/rev/a1f5f091325c
branches:  uebayasi-xip
changeset: 751742:a1f5f091325c
user:      uebayasi <uebayasi%NetBSD.org@localhost>
date:      Tue Jul 13 01:47:23 2010 +0000

description:
Reduce more diffs from the original.

diffstat:

 sys/uvm/uvm_bio.c   |  10 ++--------
 sys/uvm/uvm_fault.c |   8 +++-----
 2 files changed, 5 insertions(+), 13 deletions(-)

diffs (85 lines):

diff -r 7320a219eee8 -r a1f5f091325c sys/uvm/uvm_bio.c
--- a/sys/uvm/uvm_bio.c Mon Jul 12 06:25:14 2010 +0000
+++ b/sys/uvm/uvm_bio.c Tue Jul 13 01:47:23 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_bio.c,v 1.68.2.7 2010/07/12 06:25:14 uebayasi Exp $        */
+/*     $NetBSD: uvm_bio.c,v 1.68.2.8 2010/07/13 01:47:23 uebayasi Exp $        */
 
 /*
  * Copyright (c) 1998 Chuck Silvers.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_bio.c,v 1.68.2.7 2010/07/12 06:25:14 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_bio.c,v 1.68.2.8 2010/07/13 01:47:23 uebayasi Exp $");
 
 #include "opt_uvmhist.h"
 #include "opt_ubc.h"
@@ -338,7 +338,6 @@
 
                KASSERT(uobj == pg->uobject);
                mutex_enter(&uobj->vmobjlock);
-                       
                if (pg->flags & PG_WANTED) {
                        wakeup(pg);
                }
@@ -540,9 +539,6 @@
                for (i = 0; i < npages; i++) {
                        struct vm_page *pg = pgs[i];
 
-                       if (uvm_pageisdirect_p(pg))
-                               goto ubc_alloc_enter;
-
                        KASSERT(pg->uobject == uobj);
                        if (pg->loan_count != 0) {
                                mutex_enter(&uobj->vmobjlock);
@@ -561,8 +557,6 @@
                                }
                                pgs[i] = pg;
                        }
-
-ubc_alloc_enter:
                        pmap_kenter_pa(va + slot_offset + (i << PAGE_SHIFT),
                            VM_PAGE_TO_PHYS(pg),
                            VM_PROT_READ | VM_PROT_WRITE, 0);
diff -r 7320a219eee8 -r a1f5f091325c sys/uvm/uvm_fault.c
--- a/sys/uvm/uvm_fault.c       Mon Jul 12 06:25:14 2010 +0000
+++ b/sys/uvm/uvm_fault.c       Tue Jul 13 01:47:23 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_fault.c,v 1.166.2.16 2010/07/12 06:25:14 uebayasi Exp $    */
+/*     $NetBSD: uvm_fault.c,v 1.166.2.17 2010/07/13 01:47:23 uebayasi Exp $    */
 
 /*
  *
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_fault.c,v 1.166.2.16 2010/07/12 06:25:14 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_fault.c,v 1.166.2.17 2010/07/13 01:47:23 uebayasi Exp $");
 
 #include "opt_uvmhist.h"
 #include "opt_xip.h"
@@ -1785,7 +1785,6 @@
        KASSERT((pg->flags & PG_WANTED) == 0);
        KASSERT(!UVM_OBJ_IS_CLEAN(pg->uobject) ||
            (pg->flags & PG_CLEAN) != 0);
-
        pg->flags &= ~(PG_BUSY);
        UVM_PAGE_OWN(pg, NULL);
 
@@ -1959,12 +1958,11 @@
         * set "pg" to the page we want to map in (uobjpage, usually)
         */
 
-       pg = uobjpage;          /* map in the actual object */
        uvmexp.flt_obj++;
-
        if (UVM_ET_ISCOPYONWRITE(ufi->entry) ||
            UVM_OBJ_NEEDS_WRITEFAULT(uobjpage->uobject))
                flt->enter_prot &= ~VM_PROT_WRITE;
+       pg = uobjpage;          /* map in the actual object */
 
        KASSERT(uobjpage != PGO_DONTCARE);