diff --git a/[refs] b/[refs]
index 385a16cce79e..50751a2449be 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 04c5decdc0aecde43bf44860484f26ee0691335f
+refs/heads/master: 60177d31d215bc2b4c5a7aa6f742800e04fa0a92
diff --git a/trunk/mm/compaction.c b/trunk/mm/compaction.c
index 9eef55838fca..694eaabaaebd 100644
--- a/trunk/mm/compaction.c
+++ b/trunk/mm/compaction.c
@@ -713,7 +713,15 @@ static void isolate_freepages(struct zone *zone,
 
 		/* Found a block suitable for isolating free pages from */
 		isolated = 0;
-		end_pfn = min(pfn + pageblock_nr_pages, zone_end_pfn);
+
+		/*
+		 * As pfn may not start aligned, pfn+pageblock_nr_page
+		 * may cross a MAX_ORDER_NR_PAGES boundary and miss
+		 * a pfn_valid check. Ensure isolate_freepages_block()
+		 * only scans within a pageblock
+		 */
+		end_pfn = ALIGN(pfn + 1, pageblock_nr_pages);
+		end_pfn = min(end_pfn, zone_end_pfn);
 		isolated = isolate_freepages_block(cc, pfn, end_pfn,
 						   freelist, false);
 		nr_freepages += isolated;