diff --git a/init/main.c b/init/main.c
index a9da7794333b4a82fd02ef47dc0787da8eb37170..cff7e6cd990c9642660df5394f86f3f8aae9cd44 100644
--- a/init/main.c
+++ b/init/main.c
@@ -1516,7 +1516,6 @@ static noinline void __init kernel_init_freeable(void)
 
 	rcu_init_tasks_generic();
 	do_pre_smp_initcalls();
-	lockup_detector_init();
 
 	smp_init();
 	sched_init_smp();
@@ -1528,6 +1527,8 @@ static noinline void __init kernel_init_freeable(void)
 
 	do_basic_setup();
 
+	lockup_detector_init();
+
 	kunit_run_all_tests();
 
 	console_on_rootfs();