diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2001-06-08 13:32:56 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2001-06-08 13:32:56 +0000 |
| commit | cbdda62400f648563c81cfe2a9c8eddef741ca1c (patch) | |
| tree | 149bdb8ff080459e141a13c7c4053cfae03708c7 /sys/arch/hp300 | |
| parent | 480e90eb415f3003ae457dbb3109fa26702cf357 (diff) | |
Fix the XXX #debug bits in vm_machdep().
Makes the pmap_extract() accept a NULL argument for pap; from NetBSD
Diffstat (limited to 'sys/arch/hp300')
| -rw-r--r-- | sys/arch/hp300/hp300/pmap.c | 5 | ||||
| -rw-r--r-- | sys/arch/hp300/hp300/vm_machdep.c | 10 |
2 files changed, 8 insertions, 7 deletions
diff --git a/sys/arch/hp300/hp300/pmap.c b/sys/arch/hp300/hp300/pmap.c index d1c384ffaa6..33f15e5b853 100644 --- a/sys/arch/hp300/hp300/pmap.c +++ b/sys/arch/hp300/hp300/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.23 2001/06/08 08:08:43 art Exp $ */ +/* $OpenBSD: pmap.c,v 1.24 2001/06/08 13:32:54 millert Exp $ */ /* $NetBSD: pmap.c,v 1.80 1999/09/16 14:52:06 chs Exp $ */ /*- @@ -1675,7 +1675,8 @@ pmap_extract(pmap, va, pap) PMAP_DPRINTF(PDB_FOLLOW, ("%lx\n", pa)); - *pap = pa; + if (pap) + *pap = pa; return (TRUE); } diff --git a/sys/arch/hp300/hp300/vm_machdep.c b/sys/arch/hp300/hp300/vm_machdep.c index 4173cc45a88..3593b163c1d 100644 --- a/sys/arch/hp300/hp300/vm_machdep.c +++ b/sys/arch/hp300/hp300/vm_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vm_machdep.c,v 1.24 2001/06/08 08:08:46 art Exp $ */ +/* $OpenBSD: vm_machdep.c,v 1.25 2001/06/08 13:32:55 millert Exp $ */ /* $NetBSD: vm_machdep.c,v 1.47 1999/03/26 23:41:29 mycroft Exp $ */ /* @@ -230,18 +230,18 @@ pagemove(from, to, size) size_t size; { paddr_t pa; + boolean_t rv; #ifdef DEBUG if ((size & PAGE_MASK) != 0) panic("pagemove"); #endif while (size > 0) { - pmap_extract(pmap_kernel(), (vaddr_t)from, &pa); + rv = pmap_extract(pmap_kernel(), (vaddr_t)from, &pa); #ifdef DEBUG -#if 0 - if (pa == 0) + if (rv == FALSE) panic("pagemove 2"); - if (pmap_extract(pmap_kernel(), (vaddr_t)to, XXX) != FALSE) + if (pmap_extract(pmap_kernel(), (vaddr_t)to, NULL) == TRUE) panic("pagemove 3"); #endif #endif |