Use vm_paddr_t for physical addresses.

2 files changed, 5 insertions, 4 deletions

diff --git a/sys/sparc64/pci/psycho.c b/sys/sparc64/pci/psycho.c
index 9fd83e2..75767ee 100644
--- a/sys/sparc64/pci/psycho.c
+++ b/sys/sparc64/pci/psycho.c
@@ -340,9 +340,10 @@ psycho_attach(device_t dev)
 	struct upa_regs *reg;
 	struct ofw_pci_bdesc obd;
 	struct psycho_desc *desc;
+	vm_paddr_t pcictl_offs;
 	phandle_t node;
 	u_int64_t csr;
-	u_long pcictl_offs, mlen;
+	u_long mlen;
 	int psycho_br[2];
 	int n, i, nreg, rid;
 #if defined(PSYCHO_DEBUG) || defined(PSYCHO_STRAY)
@@ -375,13 +376,13 @@ psycho_attach(device_t dev)
 	if (sc->sc_mode == PSYCHO_MODE_PSYCHO) {
 		if (nreg <= 2)
 			panic("psycho_attach: %d not enough registers", nreg);
-		sc->sc_basepaddr = (vm_offset_t)UPA_REG_PHYS(&reg[2]);
+		sc->sc_basepaddr = (vm_paddr_t)UPA_REG_PHYS(&reg[2]);
 		mlen = UPA_REG_SIZE(&reg[2]);
 		pcictl_offs = UPA_REG_PHYS(&reg[0]);
 	} else {
 		if (nreg <= 0)
 			panic("psycho_attach: %d not enough registers", nreg);
-		sc->sc_basepaddr = (vm_offset_t)UPA_REG_PHYS(&reg[0]);
+		sc->sc_basepaddr = (vm_paddr_t)UPA_REG_PHYS(&reg[0]);
 		mlen = UPA_REG_SIZE(reg);
 		pcictl_offs = sc->sc_basepaddr + PSR_PCICTL0;
 	}
diff --git a/sys/sparc64/pci/psychovar.h b/sys/sparc64/pci/psychovar.h
index d4e69da..3b8fa73 100644
--- a/sys/sparc64/pci/psychovar.h
+++ b/sys/sparc64/pci/psychovar.h
@@ -43,7 +43,7 @@ struct psycho_softc {
 	 * PSYCHO register.  we record the base physical address of these
 	 * also as it is the base of the entire PSYCHO
 	 */
-	vm_offset_t			sc_basepaddr;
+	vm_paddr_t			sc_basepaddr;
 
 	/* Interrupt Group Number for this device */
 	int				sc_ign;