s/amiga_round_page/m68k_round_page/ s/amiga_btop/m68k_btop/

s/amiga_trunc_seg/m68k_trunc_seg/ s/amiga_round_seg/m68k_round_seg/
s/amiga_ptob/m68k_ptob/
This commit is contained in:
veego 1997-06-10 18:26:41 +00:00
parent d35d17a7c0
commit 7097d0f71e
1 changed files with 8 additions and 8 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: pmap.c,v 1.38 1996/10/13 03:06:38 christos Exp $ */
/* $NetBSD: pmap.c,v 1.39 1997/06/10 18:26:41 veego Exp $ */
/*
* Copyright (c) 1991 Regents of the University of California.
@ -313,7 +313,7 @@ pmap_bootstrap(firstaddr, loadaddr)
avail_end = maxmem << PGSHIFT;
/* XXX: allow for msgbuf */
avail_end -= amiga_round_page(sizeof(struct msgbuf));
avail_end -= m68k_round_page(sizeof(struct msgbuf));
#ifdef MACHINE_NONCONTIG
/*
* first segment of memory is always the one loadbsd found
@ -681,7 +681,7 @@ pmap_page_index(pa)
while (sep->start) {
if (pa >= sep->start && pa < sep->end)
return (amiga_btop(pa - sep->start) + sep->first_page);
return (m68k_btop(pa - sep->start) + sep->first_page);
++sep;
}
return -1;
@ -1023,9 +1023,9 @@ pmap_remove(pmap, sva, eva)
*/
if (!pmap_ste_v(pmap, va)) {
/* XXX: avoid address wrap around */
if (va >= amiga_trunc_seg((vm_offset_t)-1))
if (va >= m68k_trunc_seg((vm_offset_t)-1))
break;
va = amiga_round_seg(va + PAGE_SIZE) - PAGE_SIZE;
va = m68k_round_seg(va + PAGE_SIZE) - PAGE_SIZE;
continue;
}
pte = pmap_pte(pmap, va);
@ -1325,9 +1325,9 @@ pmap_protect(pmap, sva, eva, prot)
*/
if (!pmap_ste_v(pmap, va)) {
/* XXX: avoid address wrap around */
if (va >= amiga_trunc_seg((vm_offset_t)-1))
if (va >= m68k_trunc_seg((vm_offset_t)-1))
break;
va = amiga_round_seg(va + PAGE_SIZE) - PAGE_SIZE;
va = m68k_round_seg(va + PAGE_SIZE) - PAGE_SIZE;
pte = pmap_pte(pmap, va);
pte++;
continue;
@ -2075,7 +2075,7 @@ vm_offset_t
pmap_phys_address(ppn)
int ppn;
{
return(amiga_ptob(ppn));
return(m68k_ptob(ppn));
}
/*