Module Name: src
Committed By: yamt
Date: Tue Jul 5 14:07:12 UTC 2011
Modified Files:
src/sys/arch/x86/x86: pmap.c
Log Message:
unrelax an assertion
To generate a diff of this commit:
cvs rdiff -u -r1.126 -r1.127 src/sys/arch/x86/x86/pmap.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/arch/x86/x86/pmap.c
diff -u src/sys/arch/x86/x86/pmap.c:1.126 src/sys/arch/x86/x86/pmap.c:1.127
--- src/sys/arch/x86/x86/pmap.c:1.126 Fri Jun 24 01:39:41 2011
+++ src/sys/arch/x86/x86/pmap.c Tue Jul 5 14:07:12 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.126 2011/06/24 01:39:41 yamt Exp $ */
+/* $NetBSD: pmap.c,v 1.127 2011/07/05 14:07:12 yamt Exp $ */
/*-
* Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
@@ -171,7 +171,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.126 2011/06/24 01:39:41 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.127 2011/07/05 14:07:12 yamt Exp $");
#include "opt_user_ldt.h"
#include "opt_lockdebug.h"
@@ -3212,7 +3212,7 @@
"PG_PVLIST, va = %#" PRIxVADDR ", pa = %#" PRIxPADDR,
va, (paddr_t)pmap_pte2pa(opte)));
- KASSERT(pmap == pmap_kernel() || uvm_page_locked_p(pg));
+ KASSERT(uvm_page_locked_p(pg));
/* Sync R/M bits. */
pp = VM_PAGE_TO_PP(pg);
