[src/riastradh-drm2]: src/sys/external/bsd/drm2/dist/drm/i915 Use pmap_enter_...

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

details:   https://anonhg.NetBSD.org/src/rev/49ee6a352597
branches:  riastradh-drm2
changeset: 788529:49ee6a352597
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Sep 08 15:55:23 2013 +0000

description:
Use pmap_enter_default, not pmap_enter.

Seems to be a problem with modules referring to weak aliases?

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/i915_gem.c |  7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diffs (25 lines):

diff -r 54cedfd87144 -r 49ee6a352597 sys/external/bsd/drm2/dist/drm/i915/i915_gem.c
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c    Sun Sep 08 15:54:48 2013 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c    Sun Sep 08 15:55:23 2013 +0000
@@ -1555,7 +1555,12 @@
 
 /*
  * XXX i915_udv_fault is copypasta of udv_fault from uvm_device.c.
+ *
+ * XXX pmap_enter_default instead of pmap_enter because of a problem
+ * with using weak aliases in kernel modules or something.
  */
+int    pmap_enter_default(pmap_t, vaddr_t, paddr_t, vm_prot_t, unsigned);
+
 static int
 i915_udv_fault(struct uvm_faultinfo *ufi, vaddr_t vaddr, struct vm_page **pps,
     int npages, int centeridx, vm_prot_t access_type, int flags,
@@ -1615,7 +1620,7 @@
                UVMHIST_LOG(maphist,
                    "  MAPPING: device: pm=0x%x, va=0x%x, pa=0x%lx, at=%d",
                    ufi->orig_map->pmap, curr_va, paddr, mapprot);
-               if (pmap_enter(ufi->orig_map->pmap, curr_va, paddr, mapprot,
+               if (pmap_enter_default(ufi->orig_map->pmap, curr_va, paddr, mapprot,
                    PMAP_CANFAIL | mapprot | mmapflags) != 0) {
                        /*
                         * pmap_enter() didn't have the resource to