1 files changed, 5 insertions, 2 deletions

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index c02cff1ed56e..59661106da16 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -1144,7 +1144,9 @@ static __always_inline bool free_pages_prepare(struct page *page,
         }
         arch_free_page(page, order);
         kernel_poison_pages(page, 1 << order, 0);
-        kernel_map_pages(page, 1 << order, 0);
+        if (debug_pagealloc_enabled())
+                kernel_map_pages(page, 1 << order, 0);
+
         kasan_free_nondeferred_pages(page, order);
 
         return true;
@@ -2014,7 +2016,8 @@ inline void post_alloc_hook(struct page *page, unsigned int order,
         set_page_refcounted(page);
 
         arch_alloc_page(page, order);
-        kernel_map_pages(page, 1 << order, 1);
+        if (debug_pagealloc_enabled())
+                kernel_map_pages(page, 1 << order, 1);
         kasan_alloc_pages(page, order);
         kernel_poison_pages(page, 1 << order, 1);
         set_page_owner(page, order, gfp_flags);