svn commit: r318335 - in head/sys/powerpc: include powerpc

[Justin Hibbits]

Author: jhibbits
Date: Tue May 16 03:31:49 2017
New Revision: 318335
URL: https://svnweb.freebsd.org/changeset/base/318335

Log:
  Correct pa argument type for pmap_kenter_attr()
  
  Physical addresses are vm_paddr_t, not vm_offset_t.  This can make a difference
  when sizeof(vm_offset_t) != sizeof(vm_paddr_t).

Modified:
  head/sys/powerpc/include/pmap.h
  head/sys/powerpc/powerpc/bus_machdep.c
  head/sys/powerpc/powerpc/pmap_dispatch.c

Modified: head/sys/powerpc/include/pmap.h
==============================================================================
--- head/sys/powerpc/include/pmap.h	Tue May 16 03:12:51 2017	(r318334)
+++ head/sys/powerpc/include/pmap.h	Tue May 16 03:31:49 2017	(r318335)
@@ -251,7 +251,7 @@ extern	struct pmap kernel_pmap_store;
 
 void		pmap_bootstrap(vm_offset_t, vm_offset_t);
 void		pmap_kenter(vm_offset_t va, vm_paddr_t pa);
-void		pmap_kenter_attr(vm_offset_t va, vm_offset_t pa, vm_memattr_t);
+void		pmap_kenter_attr(vm_offset_t va, vm_paddr_t pa, vm_memattr_t);
 void		pmap_kremove(vm_offset_t);
 void		*pmap_mapdev(vm_paddr_t, vm_size_t);
 void		*pmap_mapdev_attr(vm_paddr_t, vm_size_t, vm_memattr_t);

Modified: head/sys/powerpc/powerpc/bus_machdep.c
==============================================================================
--- head/sys/powerpc/powerpc/bus_machdep.c	Tue May 16 03:12:51 2017	(r318334)
+++ head/sys/powerpc/powerpc/bus_machdep.c	Tue May 16 03:31:49 2017	(r318335)
@@ -105,8 +105,9 @@ bs_gen_map(bus_addr_t addr, bus_size_t s
 void
 bs_remap_earlyboot(void)
 {
+	vm_paddr_t pa, spa;
+	vm_offset_t va;
 	int i;
-	vm_offset_t pa, spa, va;
 	vm_memattr_t ma;
 
 	for (i = 0; i < earlyboot_map_idx; i++) {

Modified: head/sys/powerpc/powerpc/pmap_dispatch.c
==============================================================================
--- head/sys/powerpc/powerpc/pmap_dispatch.c	Tue May 16 03:12:51 2017	(r318334)
+++ head/sys/powerpc/powerpc/pmap_dispatch.c	Tue May 16 03:31:49 2017	(r318335)
@@ -495,7 +495,7 @@ pmap_kenter(vm_offset_t va, vm_paddr_t p
 }
 
 void
-pmap_kenter_attr(vm_offset_t va, vm_offset_t pa, vm_memattr_t ma)
+pmap_kenter_attr(vm_offset_t va, vm_paddr_t pa, vm_memattr_t ma)
 {
 
 	CTR4(KTR_PMAP, "%s(%#x, %#x, %#x)", __func__, va, pa, ma);