---

yaml --- r: 283015 b: refs/heads/master c: 9571a98 h: refs/heads/master i: 283013: ea867eb 283011: 323feb7 283007: 848b852 v: v3
git-mirror · Jan 11, 2012 · e36f069 · e36f069
1 parent 56a94f7
commit e36f069
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 31b8384a555d94c78e2ea2284a323cb985441f60
+refs/heads/master: 9571a982903bf9dcbca2479fd3e7dafd2211ecf9
diff --git a/trunk/mm/bootmem.c b/trunk/mm/bootmem.c
@@ -56,7 +56,7 @@ early_param("bootmem_debug", bootmem_debug_setup);
 
 static unsigned long __init bootmap_bytes(unsigned long pages)
 {
-	unsigned long bytes = (pages + 7) / 8;
+	unsigned long bytes = DIV_ROUND_UP(pages, 8);
 
 	return ALIGN(bytes, sizeof(long));
 }
@@ -197,7 +197,7 @@ static unsigned long __init free_all_bootmem_core(bootmem_data_t *bdata)
 		idx = start - bdata->node_min_pfn;
 		vec = ~map[idx / BITS_PER_LONG];
 
-		if (aligned && vec == ~0UL && start + BITS_PER_LONG < end) {
+		if (aligned && vec == ~0UL && start + BITS_PER_LONG <= end) {
 			int order = ilog2(BITS_PER_LONG);
 
 			__free_pages_bootmem(pfn_to_page(start), order);