2 files changed, 5 insertions, 2 deletions

diff --git a/include/linux/decompress/mm.h b/include/linux/decompress/mm.h
index 12ff8c3f1d0..5032b9a31ae 100644
--- a/include/linux/decompress/mm.h
+++ b/include/linux/decompress/mm.h
@@ -25,7 +25,7 @@ static void *malloc(int size)
         void *p;
 
         if (size < 0)
-                error("Malloc error");
+                return NULL;
         if (!malloc_ptr)
                 malloc_ptr = free_mem_ptr;
 
@@ -35,7 +35,7 @@ static void *malloc(int size)
         malloc_ptr += size;
 
         if (free_mem_end_ptr && malloc_ptr >= free_mem_end_ptr)
-                error("Out of memory");
+                return NULL;
 
         malloc_count++;
         return p;
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 849b4a61bd8..2265f28eb47 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -1037,6 +1037,9 @@ extern void add_active_range(unsigned int nid, unsigned long start_pfn,
 extern void remove_active_range(unsigned int nid, unsigned long start_pfn,
                                         unsigned long end_pfn);
 extern void remove_all_active_ranges(void);
+void sort_node_map(void);
+unsigned long __absent_pages_in_range(int nid, unsigned long start_pfn,
+                                                unsigned long end_pfn);
 extern unsigned long absent_pages_in_range(unsigned long start_pfn,
                                                 unsigned long end_pfn);
 extern void get_pfn_range_for_nid(unsigned int nid,