1 files changed, 9 insertions, 5 deletions

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 40954fb81598..3da85b81dabb 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -726,7 +726,7 @@ static void __drain_pages(unsigned int cpu)
         }
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_HIBERNATION
 
 void mark_free_pages(struct zone *zone)
 {
@@ -772,7 +772,7 @@ void drain_local_pages(void)
         __drain_pages(smp_processor_id());
         local_irq_restore(flags);       
 }
-#endif /* CONFIG_PM */
+#endif /* CONFIG_HIBERNATION */
 
 /*
  * Free a 0-order page
@@ -1350,6 +1350,10 @@ nofail_alloc:
                 if (page)
                         goto got_pg;
 
+                /* The OOM killer will not help higher order allocs so fail */
+                if (order > PAGE_ALLOC_COSTLY_ORDER)
+                        goto nopage;
+
                 out_of_memory(zonelist, gfp_mask, order);
                 goto restart;
         }
@@ -2775,11 +2779,11 @@ unsigned long __meminit __absent_pages_in_range(int nid,
         if (i == -1)
                 return 0;
 
+        prev_end_pfn = min(early_node_map[i].start_pfn, range_end_pfn);
+
         /* Account for ranges before physical memory on this node */
         if (early_node_map[i].start_pfn > range_start_pfn)
-                hole_pages = early_node_map[i].start_pfn - range_start_pfn;
-
-        prev_end_pfn = early_node_map[i].start_pfn;
+                hole_pages = prev_end_pfn - range_start_pfn;
 
         /* Find all holes for the zone within the node */
         for (; i != -1; i = next_active_region_index_in_nid(i, nid)) {