Source-Changes-HG archive

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

[src/trunk]: src/sys/arch/mips/mips Can't KASSERT that a lock isn't held.



details:   https://anonhg.NetBSD.org/src/rev/5c340bca381a
branches:  trunk
changeset: 347355:5c340bca381a
user:      skrll <skrll%NetBSD.org@localhost>
date:      Mon Aug 22 11:34:06 2016 +0000

description:
Can't KASSERT that a lock isn't held.

diffstat:

 sys/arch/mips/mips/pmap_machdep.c |  6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diffs (34 lines):

diff -r aade8cb7598b -r 5c340bca381a sys/arch/mips/mips/pmap_machdep.c
--- a/sys/arch/mips/mips/pmap_machdep.c Mon Aug 22 10:36:20 2016 +0000
+++ b/sys/arch/mips/mips/pmap_machdep.c Mon Aug 22 11:34:06 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap_machdep.c,v 1.3 2016/08/19 10:05:35 skrll Exp $   */
+/*     $NetBSD: pmap_machdep.c,v 1.4 2016/08/22 11:34:06 skrll Exp $   */
 
 /*-
  * Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: pmap_machdep.c,v 1.3 2016/08/19 10:05:35 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_machdep.c,v 1.4 2016/08/22 11:34:06 skrll Exp $");
 
 /*
  *     Manages physical address maps.
@@ -177,7 +177,6 @@
        UVMHIST_LOG(pmaphist, "(pg=%p, prot=%d, ptep=%p)",
            pg, prot, old_pte_p, 0);
 
-       KASSERT(locked_p || !VM_PAGEMD_PVLIST_LOCKED_P(mdpg));
        KASSERT(!locked_p || VM_PAGEMD_PVLIST_LOCKED_P(mdpg));
 
        if (!MIPS_CACHE_VIRTUAL_ALIAS || !mips_cache_badalias(pv->pv_va, pa)) {
@@ -258,7 +257,6 @@
        UVMHIST_LOG(pmaphist, "(pg=%p, va=%#lx, pte=%#"PRIxPTE")",
            pg, va, pte_value(old_pte), 0);
 
-       KASSERT(locked_p || !VM_PAGEMD_PVLIST_LOCKED_P(mdpg));
        KASSERT(!locked_p || VM_PAGEMD_PVLIST_LOCKED_P(mdpg));
 
        if (MIPS_CACHE_VIRTUAL_ALIAS) {



Home | Main Index | Thread Index | Old Index