1 files changed, 6 insertions, 4 deletions

diff --git a/mm/kmemleak.c b/mm/kmemleak.c
index 9c3d2dea0861..f9d9dc250428 100644
--- a/mm/kmemleak.c
+++ b/mm/kmemleak.c
@@ -1650,7 +1650,7 @@ static void kmemleak_scan(void)
  */
 static int kmemleak_scan_thread(void *arg)
 {
-        static int first_run = 1;
+        static int first_run = IS_ENABLED(CONFIG_DEBUG_KMEMLEAK_AUTO_SCAN);
 
         pr_info("Automatic memory scanning thread started\n");
         set_user_nice(current, 10);
@@ -2144,9 +2144,11 @@ static int __init kmemleak_late_init(void)
                 return -ENOMEM;
         }
 
-        mutex_lock(&scan_mutex);
-        start_scan_thread();
-        mutex_unlock(&scan_mutex);
+        if (IS_ENABLED(CONFIG_DEBUG_KMEMLEAK_AUTO_SCAN)) {
+                mutex_lock(&scan_mutex);
+                start_scan_thread();
+                mutex_unlock(&scan_mutex);
+        }
 
         pr_info("Kernel memory leak detector initialized\n");