summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/hp300/hp300/mem.c4
-rw-r--r--sys/arch/hp300/hp300/pmap_bootstrap.c8
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/arch/hp300/hp300/mem.c b/sys/arch/hp300/hp300/mem.c
index a2a51ed3740..6d9f0006bd3 100644
--- a/sys/arch/hp300/hp300/mem.c
+++ b/sys/arch/hp300/hp300/mem.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mem.c,v 1.22 2004/12/30 21:26:15 miod Exp $ */
+/* $OpenBSD: mem.c,v 1.23 2005/10/28 09:07:48 martin Exp $ */
/* $NetBSD: mem.c,v 1.25 1999/03/27 00:30:06 mycroft Exp $ */
/*
@@ -240,7 +240,7 @@ mmmmap(dev, off, prot)
*/
if ((u_int)off < lowram || (u_int)off >= 0xFFFFFFFC)
return (-1);
- return (m68k_btop((u_int)off));
+ return (atop(off));
}
int
diff --git a/sys/arch/hp300/hp300/pmap_bootstrap.c b/sys/arch/hp300/hp300/pmap_bootstrap.c
index 8fc41110e92..02b22567375 100644
--- a/sys/arch/hp300/hp300/pmap_bootstrap.c
+++ b/sys/arch/hp300/hp300/pmap_bootstrap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pmap_bootstrap.c,v 1.22 2005/01/15 21:13:08 miod Exp $ */
+/* $OpenBSD: pmap_bootstrap.c,v 1.23 2005/10/28 09:07:48 martin Exp $ */
/* $NetBSD: pmap_bootstrap.c,v 1.13 1997/06/10 18:56:50 veego Exp $ */
/*
@@ -89,8 +89,8 @@ do { \
#define PMAP_MD_MEMSIZE() \
do { \
- RELOC(avail_end, paddr_t) = m68k_ptob(RELOC(maxmem, int)) - \
- (round_page(MSGBUFSIZE) + m68k_ptob(1)); \
+ RELOC(avail_end, paddr_t) = ptoa(RELOC(maxmem, int)) - \
+ (round_page(MSGBUFSIZE) + ptoa(1)); \
} while (0)
/*
@@ -115,7 +115,7 @@ pmap_init_md()
*/
addr = (vaddr_t) intiobase;
if (uvm_map(kernel_map, &addr,
- m68k_ptob(IIOMAPSIZE + eiomapsize),
+ ptoa(IIOMAPSIZE + eiomapsize),
NULL, UVM_UNKNOWN_OFFSET, 0,
UVM_MAPFLAG(UVM_PROT_NONE, UVM_PROT_NONE,
UVM_INH_NONE, UVM_ADV_RANDOM,