Module Name: src
Committed By: riz
Date: Sat Aug 18 22:03:24 UTC 2012
Modified Files:
src/sys/uvm [netbsd-6]: uvm_map.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.313.2.2 -r1.313.2.3 src/sys/uvm/uvm_map.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/uvm/uvm_map.c
diff -u src/sys/uvm/uvm_map.c:1.313.2.2 src/sys/uvm/uvm_map.c:1.313.2.3
--- src/sys/uvm/uvm_map.c:1.313.2.2 Thu Apr 12 17:05:37 2012
+++ src/sys/uvm/uvm_map.c Sat Aug 18 22:03:24 2012
@@ -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 @@ forwardmerge:
/*
* 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) {
