[src/netbsd-7]: src/sys/uvm Pull up following revision(s) (requested by chs i...

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

details:   https://anonhg.NetBSD.org/src/rev/91b137ee18f1
branches:  netbsd-7
changeset: 798816:91b137ee18f1
user:      snj <snj%NetBSD.org@localhost>
date:      Sun Jan 11 06:27:40 2015 +0000

description:
Pull up following revision(s) (requested by chs in ticket #403):
        sys/uvm/uvm_mmap.c: revision 1.151
in uvm_mmap_dev(), use the passed-in offset instead of 0.
from Onno van der Linden in PR 49536.

diffstat:

 sys/uvm/uvm_mmap.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (34 lines):

diff -r d776515cad4d -r 91b137ee18f1 sys/uvm/uvm_mmap.c
--- a/sys/uvm/uvm_mmap.c        Sun Jan 11 06:25:31 2015 +0000
+++ b/sys/uvm/uvm_mmap.c        Sun Jan 11 06:27:40 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_mmap.c,v 1.148.4.1 2014/12/31 06:44:01 snj Exp $   */
+/*     $NetBSD: uvm_mmap.c,v 1.148.4.2 2015/01/11 06:27:40 snj Exp $   */
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -46,7 +46,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_mmap.c,v 1.148.4.1 2014/12/31 06:44:01 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_mmap.c,v 1.148.4.2 2015/01/11 06:27:40 snj Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_pax.h"
@@ -1084,13 +1084,13 @@
                *addrp = (void *)p->p_emul->e_vm_default_addr(p,
                    (vaddr_t)p->p_vmspace->vm_daddr, len);
 
-       uobj = udv_attach(dev, prot, 0, len);
+       uobj = udv_attach(dev, prot, off, len);
        if (uobj == NULL)
                return EINVAL;
 
        error = uvm_mmap(&p->p_vmspace->vm_map, (vaddr_t *)addrp,
                         (vsize_t)len, prot, prot, flags, UVM_ADV_RANDOM,
-                        uobj, 0, p->p_rlimit[RLIMIT_MEMLOCK].rlim_cur);
+                        uobj, off, p->p_rlimit[RLIMIT_MEMLOCK].rlim_cur);
        return error;
 }