Module Name: src
Committed By: pooka
Date: Wed Dec 15 13:44:17 UTC 2010
Modified Files:
src/sys/uvm: uvm_fault.c
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.175 -r1.176 src/sys/uvm/uvm_fault.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_fault.c
diff -u src/sys/uvm/uvm_fault.c:1.175 src/sys/uvm/uvm_fault.c:1.176
--- src/sys/uvm/uvm_fault.c:1.175 Tue Jun 22 18:34:50 2010
+++ src/sys/uvm/uvm_fault.c Wed Dec 15 13:44:17 2010
@@ -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
