---

yaml --- r: 276543 b: refs/heads/master c: d021563 h: refs/heads/master i: 276541: 53df1bf 276539: a9bd711 276535: 752692a 276527: 66cc7b1 276511: a156f5c 276479: fb4d3be v: v3
git-mirror · Dec 9, 2011 · c946ee4 · c946ee4
1 parent c8b6c2c
commit c946ee4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 09761333ed47e899cc1482c13090b95f3f711971
+refs/heads/master: d021563888312018ca65681096f62e36c20e63cc
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
@@ -3377,9 +3377,15 @@ static void setup_zone_migrate_reserve(struct zone *zone)
 	unsigned long block_migratetype;
 	int reserve;
 
-	/* Get the start pfn, end pfn and the number of blocks to reserve */
+	/*
+	 * Get the start pfn, end pfn and the number of blocks to reserve
+	 * We have to be careful to be aligned to pageblock_nr_pages to
+	 * make sure that we always check pfn_valid for the first page in
+	 * the block.
+	 */
 	start_pfn = zone->zone_start_pfn;
 	end_pfn = start_pfn + zone->spanned_pages;
+	start_pfn = roundup(start_pfn, pageblock_nr_pages);
 	reserve = roundup(min_wmark_pages(zone), pageblock_nr_pages) >>
 							pageblock_order;