Module Name: src
Committed By: skrll
Date: Wed Aug 12 10:03:30 UTC 2009
Modified Files:
src/sys/arch/hppa/hppa: pmap.c
Log Message:
Fix non-DEBUG builds.
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 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.51 src/sys/arch/hppa/hppa/pmap.c:1.52
--- src/sys/arch/hppa/hppa/pmap.c:1.51 Wed Aug 12 07:46:36 2009
+++ src/sys/arch/hppa/hppa/pmap.c Wed Aug 12 10:03:30 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.51 2009/08/12 07:46:36 skrll Exp $ */
+/* $NetBSD: pmap.c,v 1.52 2009/08/12 10:03:30 skrll Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.51 2009/08/12 07:46:36 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.52 2009/08/12 10:03:30 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1730,11 +1730,10 @@
void
pmap_zero_page(paddr_t pa)
{
- struct vm_page *pg = PHYS_TO_VM_PAGE(pa);
DPRINTF(PDB_FOLLOW|PDB_PHYS, ("%s(%x)\n", __func__, (int)pa));
- KASSERT(pg->mdpage.pvh_list == NULL);
+ KASSERT(PHYS_TO_VM_PAGE(pa)->mdpage.pvh_list == NULL);
memset((void *)pa, 0, PAGE_SIZE);
fdcache(HPPA_SID_KERNEL, pa, PAGE_SIZE);
@@ -1749,12 +1748,11 @@
pmap_copy_page(paddr_t spa, paddr_t dpa)
{
struct vm_page *srcpg = PHYS_TO_VM_PAGE(spa);
- struct vm_page *dstpg = PHYS_TO_VM_PAGE(dpa);
DPRINTF(PDB_FOLLOW|PDB_PHYS, ("%s(%x, %x)\n", __func__, (int)spa,
(int)dpa));
- KASSERT(dstpg->mdpage.pvh_list == NULL);
+ KASSERT(PHYS_TO_VM_PAGE(dpa)->mdpage.pvh_list == NULL);
pmap_flush_page(srcpg, false);
