Module Name: src Committed By: rmind Date: Wed Jun 15 19:46:11 UTC 2011
Modified Files: src/sys/uvm: uvm_page.c Log Message: uvm_pagealloc_strat: fix diagnostic assert. Reported by drochner@. To generate a diff of this commit: cvs rdiff -u -r1.174 -r1.175 src/sys/uvm/uvm_page.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_page.c diff -u src/sys/uvm/uvm_page.c:1.174 src/sys/uvm/uvm_page.c:1.175 --- src/sys/uvm/uvm_page.c:1.174 Sun Jun 12 03:36:03 2011 +++ src/sys/uvm/uvm_page.c Wed Jun 15 19:46:11 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: uvm_page.c,v 1.174 2011/06/12 03:36:03 rmind Exp $ */ +/* $NetBSD: uvm_page.c,v 1.175 2011/06/15 19:46:11 rmind Exp $ */ /* * Copyright (c) 1997 Charles D. Cranor and Washington University. @@ -66,7 +66,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uvm_page.c,v 1.174 2011/06/12 03:36:03 rmind Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uvm_page.c,v 1.175 2011/06/15 19:46:11 rmind Exp $"); #include "opt_ddb.h" #include "opt_uvmhist.h" @@ -1192,7 +1192,8 @@ KASSERT(anon == NULL || (flags & UVM_FLAG_COLORMATCH) || off == 0); KASSERT(off == trunc_page(off)); KASSERT(obj == NULL || mutex_owned(obj->vmobjlock)); - KASSERT(anon == NULL || mutex_owned(anon->an_lock)); + KASSERT(anon == NULL || anon->an_lock == NULL || + mutex_owned(anon->an_lock)); mutex_spin_enter(&uvm_fpageqlock);