Source-Changes-HG archive

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

[src/trunk]: src/sys/uvm Remove duplicate asserts from when uvm_fault_lower1(...



details:   https://anonhg.NetBSD.org/src/rev/67f8848f70c7
branches:  trunk
changeset: 759721:67f8848f70c7
user:      pooka <pooka%NetBSD.org@localhost>
date:      Wed Dec 15 13:44:17 2010 +0000

description:
Remove duplicate asserts from when uvm_fault_lower1() was merged
into uvm_fault_lower() (the duplicates were there already before,
just in different functions).

reported by Alexander Nasonov on tech-kern

diffstat:

 sys/uvm/uvm_fault.c |  9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

diffs (30 lines):

diff -r 20581679aff9 -r 67f8848f70c7 sys/uvm/uvm_fault.c
--- a/sys/uvm/uvm_fault.c       Wed Dec 15 13:13:28 2010 +0000
+++ b/sys/uvm/uvm_fault.c       Wed Dec 15 13:44:17 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_fault.c,v 1.175 2010/06/22 18:34:50 rmind Exp $    */
+/*     $NetBSD: uvm_fault.c,v 1.176 2010/12/15 13:44:17 pooka Exp $    */
 
 /*
  *
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_fault.c,v 1.175 2010/06/22 18:34:50 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_fault.c,v 1.176 2010/12/15 13:44:17 pooka Exp $");
 
 #include "opt_uvmhist.h"
 
@@ -1588,11 +1588,6 @@
                uobjpage = pages[flt->centeridx];
        }
 
-       /* locked: maps(read), amap(if there), uobj(if !null), uobjpage(if !null) */
-       KASSERT(amap == NULL || mutex_owned(&amap->am_l));
-       KASSERT(uobj == NULL || mutex_owned(&uobj->vmobjlock));
-       KASSERT(uobjpage == NULL || (uobjpage->flags & PG_BUSY) != 0);
-
        /*
         * note that at this point we are done with any front or back pages.
         * we are now going to focus on the center page (i.e. the one we've



Home | Main Index | Thread Index | Old Index