- Add vm_paddr_t, a physical address type. This is required for systems

  where physical addresses larger than virtual addresses, such as i386s
  with PAE.
- Use this to represent physical addresses in the MI vm system and in the
  i386 pmap code.  This also changes the paddr parameter to d_mmap_t.
- Fix printf formats to handle physical addresses >4G in the i386 memory
  detection code, and due to kvtop returning vm_paddr_t instead of u_long.

Note that this is a name change only; vm_paddr_t is still the same as
vm_offset_t on all currently supported platforms.

Sponsored by:	DARPA, Network Associates Laboratories
Discussed with:	re, phk (cdevsw change)

2 files changed, 6 insertions, 6 deletions

diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c
index 8d1c849..c84daf3 100644
--- a/sys/dev/ed/if_ed.c
+++ b/sys/dev/ed/if_ed.c
@@ -568,7 +568,7 @@ ed_probe_WD80x3_generic(dev, flags, intr_vals)
 
 	for (i = 0; i < memsize; ++i) {
 		if (sc->mem_start[i]) {
-			device_printf(dev, "failed to clear shared memory at %lx - check configuration\n",
+			device_printf(dev, "failed to clear shared memory at %x - check configuration\n",
 				      kvtop(sc->mem_start + i));
 
 			/*
@@ -903,7 +903,7 @@ ed_probe_3Com(dev, port_rid, flags)
 
 	for (i = 0; i < memsize; ++i)
 		if (sc->mem_start[i]) {
-			device_printf(dev, "failed to clear shared memory at %lx - check configuration\n",
+			device_printf(dev, "failed to clear shared memory at %x - check configuration\n",
 				      kvtop(sc->mem_start + i));
 			return (ENXIO);
 		}
diff --git a/sys/dev/ed/if_ed_cbus.c b/sys/dev/ed/if_ed_cbus.c
index b3be8d5..624c2da 100644
--- a/sys/dev/ed/if_ed_cbus.c
+++ b/sys/dev/ed/if_ed_cbus.c
@@ -939,7 +939,7 @@ ed_probe_SIC98(dev, port_rid, flags)
 	for (i = 0; i < sc->mem_size; i++) {
 		if (sc->mem_start[i]) {
 			device_printf(dev, "failed to clear shared memory "
-				"at %lx - check configuration\n",
+				"at %x - check configuration\n",
 				kvtop(sc->mem_start + i));
 
 			return (ENXIO);
@@ -1112,7 +1112,7 @@ ed_probe_CNET98(dev, port_rid, flags)
 	/* Check window area address */
 	tmp_s = kvtop(sc->mem_start) >> 12;
 	if (tmp_s < 0x80) {
-		device_printf(dev, "Please change window address(0x%lx)\n",
+		device_printf(dev, "Please change window address(0x%x)\n",
 			kvtop(sc->mem_start));
 		return (ENXIO);
 	}
@@ -1121,7 +1121,7 @@ ed_probe_CNET98(dev, port_rid, flags)
 	tmp    = rman_get_start(sc->port_res) >> 12;
 	if ((tmp_s <= tmp) && (tmp < (tmp_s + 4))) {
 		device_printf(dev, "Please change iobase address(0x%lx) "
-			"or window address(0x%lx)\n",
+			"or window address(0x%x)\n",
 	   		rman_get_start(sc->port_res), kvtop(sc->mem_start));
 		return (ENXIO);
 	}
@@ -1173,7 +1173,7 @@ ed_probe_CNET98(dev, port_rid, flags)
 	for (i = 0; i < sc->mem_size; i++) {
 		if (sc->mem_start[i]) {
 			device_printf(dev, "failed to clear shared memory "
-				"at %lx - check configuration\n",
+				"at %x - check configuration\n",
 				kvtop(sc->mem_start + i));
 
 			return (ENXIO);