- 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)

3 files changed, 3 insertions, 3 deletions

diff --git a/sys/dev/fb/fb.c b/sys/dev/fb/fb.c
index 073ffd8..8dd9da8 100644
--- a/sys/dev/fb/fb.c
+++ b/sys/dev/fb/fb.c
@@ -498,7 +498,7 @@ fbioctl(dev_t dev, u_long cmd, caddr_t arg, int flag, struct thread *td)
 }
 
 static int
-fbmmap(dev_t dev, vm_offset_t offset, vm_offset_t *paddr, int nprot)
+fbmmap(dev_t dev, vm_offset_t offset, vm_paddr_t *paddr, int nprot)
 {
 	int unit;
 
diff --git a/sys/dev/fb/fbreg.h b/sys/dev/fb/fbreg.h
index ce9869e..c607337 100644
--- a/sys/dev/fb/fbreg.h
+++ b/sys/dev/fb/fbreg.h
@@ -82,7 +82,7 @@ typedef int vi_blank_display_t(video_adapter_t *adp, int mode);
 #define V_DISPLAY_SUSPEND	3
 */
 typedef int vi_mmap_t(video_adapter_t *adp, vm_offset_t offset,
-		      vm_offset_t *paddr, int prot);
+		      vm_paddr_t *paddr, int prot);
 typedef int vi_ioctl_t(video_adapter_t *adp, u_long cmd, caddr_t data);
 typedef int vi_clear_t(video_adapter_t *adp);
 typedef int vi_fill_rect_t(video_adapter_t *adp, int val, int x, int y,
diff --git a/sys/dev/fb/vga.c b/sys/dev/fb/vga.c
index 358bc32..410b1f5 100644
--- a/sys/dev/fb/vga.c
+++ b/sys/dev/fb/vga.c
@@ -2449,7 +2449,7 @@ vga_blank_display(video_adapter_t *adp, int mode)
  * all adapters
  */
 static int
-vga_mmap_buf(video_adapter_t *adp, vm_offset_t offset, vm_offset_t *paddr,
+vga_mmap_buf(video_adapter_t *adp, vm_offset_t offset, vm_paddr_t *paddr,
    	     int prot)
 {
     if (adp->va_info.vi_flags & V_INFO_LINEAR)