summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/arch/i386/i386/machdep.c27
-rw-r--r--sys/arch/i386/i386/vm_machdep.c8
2 files changed, 18 insertions, 17 deletions
diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c
index 9b5a28517d1..9ec0ac18e4e 100644
--- a/sys/arch/i386/i386/machdep.c
+++ b/sys/arch/i386/i386/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.187 2001/11/28 16:24:26 art Exp $ */
+/* $OpenBSD: machdep.c,v 1.188 2001/12/07 17:30:14 art Exp $ */
/* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */
/*-
@@ -345,18 +345,20 @@ cpu_startup()
unsigned i;
caddr_t v;
int sz;
- vm_offset_t minaddr, maxaddr, pa;
+ vaddr_t minaddr, maxaddr, va;
+ paddr_t pa;
/*
* Initialize error message buffer (at end of core).
* (space reserved in pmap_bootstrap)
*/
pa = avail_end;
- for (i = 0; i < btoc(MSGBUFSIZE); i++, pa += NBPG)
- pmap_enter(pmap_kernel(),
- (vm_offset_t)((caddr_t)msgbufp + i * NBPG), pa,
- VM_PROT_READ|VM_PROT_WRITE,
- VM_PROT_READ|VM_PROT_WRITE|PMAP_WIRED);
+ va = (vaddr_t)msgbufp;
+ for (i = 0; i < btoc(MSGBUFSIZE); i++) {
+ pmap_kenter_pa(va, pa, VM_PROT_READ|VM_PROT_WRITE);
+ va += PAGE_SIZE;
+ pa += PAGE_SIZE;
+ }
initmsgbuf((caddr_t)msgbufp, round_page(MSGBUFSIZE));
printf("%s", version);
@@ -598,7 +600,7 @@ setup_buffers(maxaddr)
if (!TAILQ_EMPTY(&saved_pgs))
FREE_PGS(saved_pgs);
- pg = pgs.tqh_first;
+ pg = TAILQ_FIRST(&pgs);
for (i = 0; i < nbuf; i++) {
/*
* First <residual> buffers get (base+1) physical pages
@@ -609,11 +611,10 @@ setup_buffers(maxaddr)
*/
addr = (vm_offset_t)buffers + i * MAXBSIZE;
for (size = PAGE_SIZE * (i < residual ? base + 1 : base);
- size > 0; size -= NBPG, addr += NBPG) {
- pmap_enter(pmap_kernel(), addr, pg->phys_addr,
- VM_PROT_READ|VM_PROT_WRITE,
- VM_PROT_READ|VM_PROT_WRITE|PMAP_WIRED);
- pg = pg->pageq.tqe_next;
+ size > 0; size -= PAGE_SIZE, addr += PAGE_SIZE) {
+ pmap_kenter_pa(addr, VM_PAGE_TO_PHYS(pg),
+ VM_PROT_READ|VM_PROT_WRITE);
+ pg = TAILQ_NEXT(pg, pageq);
}
}
}
diff --git a/sys/arch/i386/i386/vm_machdep.c b/sys/arch/i386/i386/vm_machdep.c
index d1c9dc219dc..4696e6f3921 100644
--- a/sys/arch/i386/i386/vm_machdep.c
+++ b/sys/arch/i386/i386/vm_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vm_machdep.c,v 1.34 2001/12/07 00:59:16 miod Exp $ */
+/* $OpenBSD: vm_machdep.c,v 1.35 2001/12/07 17:30:14 art Exp $ */
/* $NetBSD: vm_machdep.c,v 1.61 1996/05/03 19:42:35 christos Exp $ */
/*-
@@ -277,9 +277,9 @@ pagemove(from, to, size)
pmap_update_pg((vm_offset_t) from);
}
- from += NBPG;
- to += NBPG;
- size -= NBPG;
+ from += PAGE_SIZE;
+ to += PAGE_SIZE;
+ size -= PAGE_SIZE;
}
#if defined(I386_CPU)
if (cpu_class != CPUCLASS_386)