svn commit: r277987 - head/sys/powerpc/ofw

[Nathan Whitehorn]

Author: nwhitehorn
Date: Sat Jan 31 18:39:32 2015
New Revision: 277987
URL: https://svnweb.freebsd.org/changeset/base/277987

Log:
  Correctness improvements for removing FDT excluded memory areas.

Modified:
  head/sys/powerpc/ofw/ofw_machdep.c

Modified: head/sys/powerpc/ofw/ofw_machdep.c
==============================================================================
--- head/sys/powerpc/ofw/ofw_machdep.c	Sat Jan 31 17:45:48 2015	(r277986)
+++ head/sys/powerpc/ofw/ofw_machdep.c	Sat Jan 31 18:39:32 2015	(r277987)
@@ -259,16 +259,14 @@ excise_fdt_reserved(struct mem_region *a
 				if (fdtmap[j].address + fdtmap[j].size < 
 				    avail[i].mr_start + avail[i].mr_size) {
 					avail[asz].mr_start =
-					    roundup2(fdtmap[j].address +
-					    fdtmap[j].size, PAGE_SIZE);
+					    fdtmap[j].address + fdtmap[j].size;
 					avail[asz].mr_size = avail[i].mr_start +
 					     avail[i].mr_size -
 					     avail[asz].mr_start;
 					asz++;
 				}
 
-				avail[i].mr_size =
-				    rounddown2(fdtmap[j].address, PAGE_MASK) -
+				avail[i].mr_size = fdtmap[j].address -
 				    avail[i].mr_start;
 			}
 
@@ -282,8 +280,10 @@ excise_fdt_reserved(struct mem_region *a
 			    avail[i].mr_start && fdtmap[j].address +
 			    fdtmap[j].size < avail[i].mr_start +
 			    avail[i].mr_size) {
+				avail[i].mr_size += avail[i].mr_start;
 				avail[i].mr_start =
-				    roundup2(fdtmap[j].address + fdtmap[j].size,				    PAGE_MASK);
+				    fdtmap[j].address + fdtmap[j].size;
+				avail[i].mr_size -= avail[i].mr_start;
 			}
 		}
 	}