Source-Changes-HG archive

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

[src/chs-ubc2]: src/sys/uvm Fix a merge error.



details:   https://anonhg.NetBSD.org/src/rev/a46872102e52
branches:  chs-ubc2
changeset: 471344:a46872102e52
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Mon Jun 21 15:53:55 1999 +0000

description:
Fix a merge error.

diffstat:

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

diffs (18 lines):

diff -r 53af227111e9 -r a46872102e52 sys/uvm/uvm_aobj.c
--- a/sys/uvm/uvm_aobj.c        Mon Jun 21 15:50:49 1999 +0000
+++ b/sys/uvm/uvm_aobj.c        Mon Jun 21 15:53:55 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_aobj.c,v 1.18.2.1.2.2 1999/06/21 01:47:19 thorpej Exp $    */
+/*     $NetBSD: uvm_aobj.c,v 1.18.2.1.2.3 1999/06/21 15:53:55 thorpej Exp $    */
 
 /*
  * Copyright (c) 1998 Chuck Silvers, Charles D. Cranor and
@@ -673,7 +673,7 @@
        /*
         * detaching from kernel_object is a noop.
         */
-       if (UVM_OBJ_IS_KERN_OBJECT(uobj))
+       if (UVM_OBJ_IS_KERN_OBJECT(uobj)) {
                simple_unlock(&uobj->vmobjlock);
                return;
        }



Home | Main Index | Thread Index | Old Index