2 files changed, 5 insertions, 3 deletions

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 82928f5ea049..8745ac7d1f75 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -414,7 +414,7 @@ config SLUB_STATS
 
 config DEBUG_KMEMLEAK
         bool "Kernel memory leak detector"
-        depends on DEBUG_KERNEL && EXPERIMENTAL && !MEMORY_HOTPLUG && \
+        depends on DEBUG_KERNEL && EXPERIMENTAL && \
                 (X86 || ARM || PPC || MIPS || S390 || SPARC64 || SUPERH || MICROBLAZE || TILE)
 
         select DEBUG_FS
diff --git a/mm/kmemleak.c b/mm/kmemleak.c
index 15c50302ff93..c833addd94d7 100644
--- a/mm/kmemleak.c
+++ b/mm/kmemleak.c
@@ -100,6 +100,7 @@
 
 #include <linux/kmemcheck.h>
 #include <linux/kmemleak.h>
+#include <linux/memory_hotplug.h>
 
 /*
  * Kmemleak configuration and common defines.
@@ -1292,9 +1293,9 @@ static void kmemleak_scan(void)
 #endif
 
         /*
-         * Struct page scanning for each node. The code below is not yet safe
-         * with MEMORY_HOTPLUG.
+         * Struct page scanning for each node.
          */
+        lock_memory_hotplug();
         for_each_online_node(i) {
                 pg_data_t *pgdat = NODE_DATA(i);
                 unsigned long start_pfn = pgdat->node_start_pfn;
@@ -1313,6 +1314,7 @@ static void kmemleak_scan(void)
                         scan_block(page, page + 1, NULL, 1);
                 }
         }
+        unlock_memory_hotplug();
 
         /*
          * Scanning the task stacks (may introduce false negatives).