[src/trunk]: src/sys/uvm uvm_mapent_trymerge: adjust object offset when neces...

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

details:   https://anonhg.NetBSD.org/src/rev/ea5f8dbfcc68
branches:  trunk
changeset: 580975:ea5f8dbfcc68
user:      yamt <yamt%NetBSD.org@localhost>
date:      Wed May 18 01:36:16 2005 +0000

description:
uvm_mapent_trymerge: adjust object offset when necessary.

diffstat:

 sys/uvm/uvm_map.c |  17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)

diffs (45 lines):

diff -r cedc2b59d549 -r ea5f8dbfcc68 sys/uvm/uvm_map.c
--- a/sys/uvm/uvm_map.c Wed May 18 01:34:53 2005 +0000
+++ b/sys/uvm/uvm_map.c Wed May 18 01:36:16 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_map.c,v 1.196 2005/05/18 01:34:53 yamt Exp $       */
+/*     $NetBSD: uvm_map.c,v 1.197 2005/05/18 01:36:16 yamt Exp $       */
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -71,7 +71,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_map.c,v 1.196 2005/05/18 01:34:53 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_map.c,v 1.197 2005/05/18 01:36:16 yamt Exp $");
 
 #include "opt_ddb.h"
 #include "opt_uvmhist.h"
@@ -4414,8 +4414,10 @@
                        error = 0;
                }
                if (error == 0) {
-                       if (uobj && uobj->pgops->pgo_detach) {
-                               uobj->pgops->pgo_detach(uobj);
+                       if (uobj) {
+                               if (uobj->pgops->pgo_detach) {
+                                       uobj->pgops->pgo_detach(uobj);
+                               }
                        }
 
                        entry->end = next->end;
@@ -4451,8 +4453,11 @@
                        error = 0;
                }
                if (error == 0) {
-                       if (uobj && uobj->pgops->pgo_detach) {
-                               uobj->pgops->pgo_detach(uobj);
+                       if (uobj) {
+                               if (uobj->pgops->pgo_detach) {
+                                       uobj->pgops->pgo_detach(uobj);
+                               }
+                               entry->offset = prev->offset;
                        }
 
                        entry->start = prev->start;