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

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

details:   https://anonhg.NetBSD.org/src/rev/78903d80b56d
branches:  netbsd-6
changeset: 774468:78903d80b56d
user:      riz <riz%NetBSD.org@localhost>
date:      Sat Aug 18 22:03:24 2012 +0000

description:
Pull up following revision(s) (requested by chs in ticket #508):
        sys/uvm/uvm_map.c: revision 1.319
avoid leaking a uvm_object reference when merging a new map entry
with the entries on both sides.  fixes PR 46807.

diffstat:

 sys/uvm/uvm_map.c |  7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diffs (29 lines):

diff -r 7cc68396cca6 -r 78903d80b56d sys/uvm/uvm_map.c
--- a/sys/uvm/uvm_map.c Sat Aug 18 22:01:40 2012 +0000
+++ b/sys/uvm/uvm_map.c Sat Aug 18 22:03:24 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_map.c,v 1.313.2.2 2012/04/12 17:05:37 riz Exp $    */
+/*     $NetBSD: uvm_map.c,v 1.313.2.3 2012/08/18 22:03:24 riz Exp $    */
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -66,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_map.c,v 1.313.2.2 2012/04/12 17:05:37 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_map.c,v 1.313.2.3 2012/08/18 22:03:24 riz Exp $");
 
 #include "opt_ddb.h"
 #include "opt_uvmhist.h"
@@ -1466,9 +1466,8 @@
                /*
                 * drop our reference to uobj since we are extending a reference
                 * that we already have (the ref count can not drop to zero).
-                * (if merged, we've already detached)
                 */
-               if (uobj && uobj->pgops->pgo_detach && !merged)
+               if (uobj && uobj->pgops->pgo_detach)
                        uobj->pgops->pgo_detach(uobj);
 
                if (merged) {