Merge tag 'topic/atomic-fixes-2014-12-17' of git://anongit.freedesktop.org/drm-intel...

[firefly-linux-kernel-4.4.55.git] / mm / debug-pagealloc.c

diff --git a/mm/debug-pagealloc.c b/mm/debug-pagealloc.c
index 0072f2c533313fe9e086788e74663f796eab163d..5bf5906ce13b7316ccb3ff3d101ff6cff00c6818 100644 (file)
--- a/mm/debug-pagealloc.c
+++ b/mm/debug-pagealloc.c
@@ -10,11 +10,17 @@ static bool page_poisoning_enabled __read_mostly;
 
 static bool need_page_poisoning(void)
 {
+       if (!debug_pagealloc_enabled())
+               return false;
+
        return true;
 }
 
 static void init_page_poisoning(void)
 {
+       if (!debug_pagealloc_enabled())
+               return;
+
        page_poisoning_enabled = true;
 }
 
@@ -119,7 +125,7 @@ static void unpoison_pages(struct page *page, int n)
                unpoison_page(page + i);
 }
 
-void kernel_map_pages(struct page *page, int numpages, int enable)
+void __kernel_map_pages(struct page *page, int numpages, int enable)
 {
        if (!page_poisoning_enabled)
                return;