---

yaml
---
r: 286595
b: refs/heads/master
c: 656a070
h: refs/heads/master
i:
  286593: fcd5a19
  286591: 76420a9
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 687875fb7de4a95223af20ee024282fa9099f860
+refs/heads/master: 656a070629adfe23c12768e35ddf91feab469ff7

trunk/mm/page_alloc.c

@@ -5413,15 +5413,22 @@ __count_immobile_pages(struct zone *zone, struct page *page, int count)
 
 bool is_pageblock_removable_nolock(struct page *page)
 {
-	struct zone *zone = page_zone(page);
-	unsigned long pfn = page_to_pfn(page);
+	struct zone *zone;
+	unsigned long pfn;
 
 	/*
 	 * We have to be careful here because we are iterating over memory
 	 * sections which are not zone aware so we might end up outside of
 	 * the zone but still within the section.
+	 * We have to take care about the node as well. If the node is offline
+	 * its NODE_DATA will be NULL - see page_zone.
 	 */
-	if (!zone || zone->zone_start_pfn > pfn ||
+	if (!node_online(page_to_nid(page)))
+		return false;
+
+	zone = page_zone(page);
+	pfn = page_to_pfn(page);
+	if (zone->zone_start_pfn > pfn ||
 			zone->zone_start_pfn + zone->spanned_pages <= pfn)
 		return false;