More vm_offset_t removal I forgot to check in; spotted by deraadt@

2 files changed, 21 insertions, 20 deletions

diff --git a/sys/arch/mvme88k/dev/bussw.c b/sys/arch/mvme88k/dev/bussw.c
index 0f6c7184009..bb3fbe643ae 100644
--- a/sys/arch/mvme88k/dev/bussw.c
+++ b/sys/arch/mvme88k/dev/bussw.c
@@ -1,8 +1,8 @@
-/*	$OpenBSD: bussw.c,v 1.7 2003/06/02 07:06:56 deraadt Exp $ */
+/*	$OpenBSD: bussw.c,v 1.8 2003/10/06 06:31:26 miod Exp $ */
 
 /*
  * Copyright (c) 1999 Steve Murphree, Jr.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -53,10 +53,10 @@ struct bussw_softc {
 void    bussw_attach(struct device *, struct device *, void *);
 int     bussw_match(struct device *, void *, void *);
 
-struct cfattach bussw_ca = { 
+struct cfattach bussw_ca = {
 	sizeof(struct bussw_softc), bussw_match, bussw_attach
-}; 
- 
+};
+
 struct cfdriver bussw_cd = {
 	NULL, "bussw", DV_DULL, 0
 };
@@ -72,14 +72,15 @@ bussw_match(parent, vcf, args)
 {
 	struct confargs *ca = args;
 	struct bussw_reg *bussw;
+
 	/* Don't match if wrong cpu */
-	if (brdtyp != BRD_197) return (0);	/* The only one... */
-	
+	if (brdtyp != BRD_197)
+		return (0);
+
 	bussw = (struct bussw_reg *)(IIOV(ca->ca_paddr));
-	if (badvaddr((vm_offset_t)bussw, 4)) {
-	    printf("==> busswitch: failed address check.\n");
-	    return (0);
-	}
+	if (badvaddr((vaddr_t)bussw, 4))
+		return (0);
+
 	return (1);
 }
 
@@ -177,7 +178,7 @@ busswabort(eframe)
 
 	struct bussw_softc *sc = (struct bussw_softc *)bussw_cd.cd_devs[0];
         struct bussw_reg *bs  = sc->sc_bussw;
-	
+
 	if (bs->bs_intr1 & BS_INTR1_ABORT_INT) {
 		bs->bs_intr1 |= BS_INTR1_ABORT_ICLR;
 		nmihand(frame);
diff --git a/sys/arch/mvme88k/mvme88k/pmap.c b/sys/arch/mvme88k/mvme88k/pmap.c
index b6e710028e8..cd28a6004eb 100644
--- a/sys/arch/mvme88k/mvme88k/pmap.c
+++ b/sys/arch/mvme88k/mvme88k/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.80 2003/09/29 20:29:04 miod Exp $	*/
+/*	$OpenBSD: pmap.c,v 1.81 2003/10/06 06:31:28 miod Exp $	*/
 /*
  * Copyright (c) 2001, 2002, 2003 Miodrag Vallat
  * Copyright (c) 1998-2001 Steve Murphree, Jr.
@@ -115,7 +115,7 @@ int pmap_con_dbg = CD_NONE;
  * Alignment checks for pages (must lie on page boundaries).
  */
 
-#define PAGE_ALIGNED(ad)	(((vm_offset_t)(ad) & PAGE_MASK) == 0)
+#define PAGE_ALIGNED(ad)	(((vaddr_t)(ad) & PAGE_MASK) == 0)
 #define	CHECK_PAGE_ALIGN(ad,who) \
 	if (!PAGE_ALIGNED(ad)) \
 		printf("%s: addr  %x not page aligned.\n", who, ad)
@@ -788,15 +788,15 @@ pmap_bootstrap(vaddr_t load_start, paddr_t *phys_start, paddr_t *phys_end,
 
 	*phys_start += kernel_pmap_size;
 	*virt_start += kernel_pmap_size;
-	
+
 	/* make sure page tables are page aligned!! XXX smurph */
 	*phys_start = round_page(*phys_start);
 	*virt_start = round_page(*virt_start);
-	
+
 	/* save pointers to where page table entries start in physical memory */
 	kpdt_phys = *phys_start;
 	kpdt_virt = (kpdt_entry_t)*virt_start;
-	
+
 	/* might as well round up to a page - XXX smurph */
 	pdt_size = round_page(MAX_KERNEL_PDT_SIZE);
 	kernel_pmap_size += pdt_size;
@@ -958,7 +958,7 @@ pmap_bootstrap(vaddr_t load_start, paddr_t *phys_start, paddr_t *phys_end,
 	}
 #endif
 
-	for (; ptable->size != (size_t)(-1); ptable++){
+	for (; ptable->size != (vsize_t)(-1); ptable++){
 		if (ptable->size) {
 			pmap_map(ptable->virt_start, ptable->phys_start,
 			    ptable->phys_start + ptable->size,
@@ -1171,7 +1171,7 @@ pmap_create(void)
 	segdt = (sdt_entry_t *)uvm_km_zalloc(kernel_map, s);
 	if (segdt == NULL)
 		panic("pmap_create: kmem_alloc failure");
-	
+
 	/*
 	 * Initialize pointer to segment table both virtual and physical.
 	 */
@@ -2477,7 +2477,7 @@ pmap_deactivate(struct proc *p)
 {
 	pmap_t pmap = vm_map_pmap(&p->p_vmspace->vm_map);
 	int cpu = cpu_number();
-	
+
 	if (pmap != kernel_pmap) {
 		/*
 		 * we expect the spl is already raised to sched level.