Module Name: src
Committed By: skrll
Date: Sat Apr 25 13:54:07 UTC 2009
Modified Files:
src/sys/arch/hppa/hppa [nick-hppapmap]: pmap.c
Log Message:
Put KASSERTs after DPRINTFs.
To generate a diff of this commit:
cvs rdiff -u -r1.43.8.46 -r1.43.8.47 src/sys/arch/hppa/hppa/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/hppa/hppa/pmap.c
diff -u src/sys/arch/hppa/hppa/pmap.c:1.43.8.46 src/sys/arch/hppa/hppa/pmap.c:1.43.8.47
--- src/sys/arch/hppa/hppa/pmap.c:1.43.8.46 Tue Apr 21 13:48:21 2009
+++ src/sys/arch/hppa/hppa/pmap.c Sat Apr 25 13:54:07 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.43.8.46 2009/04/21 13:48:21 skrll Exp $ */
+/* $NetBSD: pmap.c,v 1.43.8.47 2009/04/25 13:54:07 skrll Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.43.8.46 2009/04/21 13:48:21 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.43.8.47 2009/04/25 13:54:07 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -511,14 +511,14 @@
struct pv_entry *tpve;
u_int attrs;
- /* we should only be looking if we're not PVF_NC */
- KASSERT((pg->mdpage.pvh_attrs & PVF_NC) == 0);
- KASSERT(mutex_owned(&pg->mdpage.pvh_lock));
-
DPRINTF(PDB_FOLLOW|PDB_ALIAS,
("%s(%p, %p, 0x%x, %p)\n", __func__, pg, pve, (int)va,
ptep));
+ /* we should only be looking if we're not PVF_NC */
+ KASSERT((pg->mdpage.pvh_attrs & PVF_NC) == 0);
+ KASSERT(mutex_owned(&pg->mdpage.pvh_lock));
+
if (ptep) {
attrs = pmap_pvh_attrs(*ptep);
@@ -632,11 +632,11 @@
pmap_pv_enter(struct vm_page *pg, struct pv_entry *pve, pmap_t pm,
vaddr_t va, struct vm_page *pdep, pt_entry_t *ptep)
{
- KASSERT(mutex_owned(&pg->mdpage.pvh_lock));
-
DPRINTF(PDB_FOLLOW|PDB_PV, ("%s(%p, %p, %p, 0x%x, %p)\n", __func__,
pg, pve, pm, (int)va, pdep));
+ KASSERT(mutex_owned(&pg->mdpage.pvh_lock));
+
pve->pv_pmap = pm;
pve->pv_va = va;
pve->pv_ptp = pdep;
