[src/netbsd-1-4]: src/sys/uvm Pull up revision 1.17 (requested by ross):

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

details:   https://anonhg.NetBSD.org/src/rev/3dfdbdc7c71b
branches:  netbsd-1-4
changeset: 469642:3dfdbdc7c71b
user:      he <he%NetBSD.org@localhost>
date:      Tue Oct 26 20:22:53 1999 +0000

description:
Pull up revision 1.17 (requested by ross):
  Bugfix for device mmap fault handler, fixes serious performance
  problem with alpha X server.

diffstat:

 sys/uvm/uvm_device.c |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (33 lines):

diff -r 2191e08cf2bf -r 3dfdbdc7c71b sys/uvm/uvm_device.c
--- a/sys/uvm/uvm_device.c      Tue Oct 26 00:19:26 1999 +0000
+++ b/sys/uvm/uvm_device.c      Tue Oct 26 20:22:53 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_device.c,v 1.15 1999/03/26 21:58:39 mycroft Exp $  */
+/*     $NetBSD: uvm_device.c,v 1.15.2.1 1999/10/26 20:22:53 he Exp $   */
 
 /*
  *
@@ -415,6 +415,7 @@
        int lcv, retval, mdpgno;
        dev_t device;
        int (*mapfn) __P((dev_t, int, int));
+       vm_prot_t mapprot;
        UVMHIST_FUNC("udv_fault"); UVMHIST_CALLED(maphist);
        UVMHIST_LOG(maphist,"  flags=%d", flags,0,0,0);
 
@@ -473,11 +474,12 @@
                        break;
                }
                paddr = pmap_phys_address(mdpgno);
+               mapprot = ufi->entry->protection;
                UVMHIST_LOG(maphist,
                    "  MAPPING: device: pm=0x%x, va=0x%x, pa=0x%x, at=%d",
-                   ufi->orig_map->pmap, curr_va, (int)paddr, access_type);
-               pmap_enter(ufi->orig_map->pmap, curr_va, paddr, access_type, 0,
-                   access_type);
+                   ufi->orig_map->pmap, curr_va, (int)paddr, mapprot);
+               pmap_enter(ufi->orig_map->pmap, curr_va, paddr, mapprot, 0,
+                   mapprot);
 
        }