Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/uvm in uvm_mmap_dev(), use the passed-in offset instead ...



details:   https://anonhg.NetBSD.org/src/rev/2a147b41ded4
branches:  trunk
changeset: 805651:2a147b41ded4
user:      chs <chs%NetBSD.org@localhost>
date:      Sat Jan 10 23:35:02 2015 +0000

description:
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 f3ac7a5a843f -r 2a147b41ded4 sys/uvm/uvm_mmap.c
--- a/sys/uvm/uvm_mmap.c        Sat Jan 10 23:34:49 2015 +0000
+++ b/sys/uvm/uvm_mmap.c        Sat Jan 10 23:35:02 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_mmap.c,v 1.150 2014/12/14 23:48:58 chs Exp $       */
+/*     $NetBSD: uvm_mmap.c,v 1.151 2015/01/10 23:35:02 chs 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.150 2014/12/14 23:48:58 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_mmap.c,v 1.151 2015/01/10 23:35:02 chs 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;
 }
 



Home | Main Index | Thread Index | Old Index