svn commit: r266178 - stable/10/sys/arm/arm

[Ian Lepore]

Author: ian
Date: Thu May 15 19:28:52 2014
New Revision: 266178
URL: http://svnweb.freebsd.org/changeset/base/266178

Log:
  MFC r256672
  
  If we avoid to use the page at addr 0, we should adjust the size to reflect it.

Modified:
  stable/10/sys/arm/arm/machdep.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/arm/arm/machdep.c
==============================================================================
--- stable/10/sys/arm/arm/machdep.c	Thu May 15 19:26:20 2014	(r266177)
+++ stable/10/sys/arm/arm/machdep.c	Thu May 15 19:28:52 2014	(r266178)
@@ -1169,11 +1169,15 @@ physmap_init(struct mem_region *availmem
 		 */
 		if (availmem_regions[i].mr_start > 0 ||
 		    availmem_regions[i].mr_size > PAGE_SIZE) {
+			vm_size_t size;
 			phys_avail[j] = availmem_regions[i].mr_start;
-			if (phys_avail[j] == 0)
+
+			size = availmem_regions[i].mr_size;
+			if (phys_avail[j] == 0) {
 				phys_avail[j] += PAGE_SIZE;
-			phys_avail[j + 1] = availmem_regions[i].mr_start +
-			    availmem_regions[i].mr_size;
+				size -= PAGE_SIZE;
+			}
+			phys_avail[j + 1] = availmem_regions[i].mr_start + size;
 		} else
 			j -= 2;
 	}