svn commit: r261656 - in head/sys/arm: arm include

[Ian Lepore]

Author: ian
Date: Sun Feb  9 14:35:44 2014
New Revision: 261656
URL: http://svnweb.freebsd.org/changeset/base/261656

Log:
  Use vm_paddr_t, not vm_offset_t, when dealing with physical addresses.
  
  Pointed out by:	alc

Modified:
  head/sys/arm/arm/physmem.c
  head/sys/arm/include/physmem.h

Modified: head/sys/arm/arm/physmem.c
==============================================================================
--- head/sys/arm/arm/physmem.c	Sun Feb  9 14:28:47 2014	(r261655)
+++ head/sys/arm/arm/physmem.c	Sun Feb  9 14:35:44 2014	(r261656)
@@ -49,7 +49,7 @@ __FBSDID("$FreeBSD$");
 #define	MAX_EXCNT	10
 
 struct region {
-	vm_offset_t	addr;
+	vm_paddr_t	addr;
 	vm_size_t	size;
 	uint32_t	flags;
 };
@@ -90,7 +90,7 @@ vm_paddr_t dump_avail[MAX_AVAIL_ENTRIES 
 long realmem;
 
 /* The address at which the kernel was loaded.  Set early in initarm(). */
-vm_offset_t arm_physmem_kernaddr;
+vm_paddr_t arm_physmem_kernaddr;
 
 /*
  * Print the contents of the physical and excluded region tables using the
@@ -227,7 +227,7 @@ regions_to_avail(vm_paddr_t *avail, uint
  * Insertion-sort a new entry into a regions list; sorted by start address.
  */
 static void
-insert_region(struct region *regions, size_t rcnt, vm_offset_t addr,
+insert_region(struct region *regions, size_t rcnt, vm_paddr_t addr,
     vm_size_t size, uint32_t flags)
 {
 	size_t i;
@@ -249,7 +249,7 @@ insert_region(struct region *regions, si
  * Add a hardware memory region.
  */
 void
-arm_physmem_hardware_region(vm_offset_t pa, vm_size_t sz)
+arm_physmem_hardware_region(vm_paddr_t pa, vm_size_t sz)
 {
 	vm_offset_t adj;
 
@@ -277,7 +277,7 @@ arm_physmem_hardware_region(vm_offset_t 
 /*
  * Add an exclusion region.
  */
-void arm_physmem_exclude_region(vm_offset_t pa, vm_size_t sz, uint32_t exflags)
+void arm_physmem_exclude_region(vm_paddr_t pa, vm_size_t sz, uint32_t exflags)
 {
 	vm_offset_t adj;
 

Modified: head/sys/arm/include/physmem.h
==============================================================================
--- head/sys/arm/include/physmem.h	Sun Feb  9 14:28:47 2014	(r261655)
+++ head/sys/arm/include/physmem.h	Sun Feb  9 14:35:44 2014	(r261656)
@@ -32,7 +32,7 @@
 /*
  * The physical address at which the kernel was loaded.
  */
-extern vm_offset_t arm_physmem_kernaddr;
+extern vm_paddr_t arm_physmem_kernaddr;
 
 /*
  * Routines to help configure physical ram.
@@ -52,8 +52,8 @@ extern vm_offset_t arm_physmem_kernaddr;
 #define	EXFLAG_NODUMP	0x01
 #define	EXFLAG_NOALLOC	0x02
 
-void arm_physmem_hardware_region(vm_offset_t pa, vm_size_t sz);
-void arm_physmem_exclude_region(vm_offset_t pa, vm_size_t sz, uint32_t flags);
+void arm_physmem_hardware_region(vm_paddr_t pa, vm_size_t sz);
+void arm_physmem_exclude_region(vm_paddr_t pa, vm_size_t sz, uint32_t flags);
 void arm_physmem_init_kernel_globals(void);
 void arm_physmem_print_tables(void);