---

yaml --- r: 287219 b: refs/heads/master c: 0bf380b h: refs/heads/master i: 287217: 3de6f96 287215: 0a46735 v: v3
git-mirror · Feb 4, 2012 · 89d1eee · 89d1eee
1 parent 86ef9bc
commit 89d1eee
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3deaa7190a8da38453c4fabd9dec7f66d17fff67
+refs/heads/master: 0bf380bc70ecba68cb4d74dc656cc2fa8c4d801a
diff --git a/trunk/mm/compaction.c b/trunk/mm/compaction.c
@@ -313,6 +313,19 @@ static isolate_migrate_t isolate_migratepages(struct zone *zone,
 		} else if (!locked)
 			spin_lock_irq(&zone->lru_lock);
 
+		/*
+		 * migrate_pfn does not necessarily start aligned to a
+		 * pageblock. Ensure that pfn_valid is called when moving
+		 * into a new MAX_ORDER_NR_PAGES range in case of large
+		 * memory holes within the zone
+		 */
+		if ((low_pfn & (MAX_ORDER_NR_PAGES - 1)) == 0) {
+			if (!pfn_valid(low_pfn)) {
+				low_pfn += MAX_ORDER_NR_PAGES - 1;
+				continue;
+			}
+		}
+
 		if (!pfn_valid_within(low_pfn))
 			continue;
 		nr_scanned++;