diff --git a/arch/arm64/kernel/watchdog_sdei.c b/arch/arm64/kernel/watchdog_sdei.c
index a499a14b23c16dfaee6bc1cc4df33481f3713a7c..75b8e034df3d2565892122c670420ab33510793b 100644
--- a/arch/arm64/kernel/watchdog_sdei.c
+++ b/arch/arm64/kernel/watchdog_sdei.c
@@ -21,7 +21,7 @@
 #define SDEI_NMI_WATCHDOG_HWIRQ		29
 
 static int sdei_watchdog_event_num;
-static bool disable_sdei_nmi_watchdog;
+bool disable_sdei_nmi_watchdog;
 static bool sdei_watchdog_registered;
 static DEFINE_PER_CPU(ktime_t, last_check_time);
 
diff --git a/include/linux/nmi.h b/include/linux/nmi.h
index d72ed0898f3833f76ca576542b039bdbcaba90d8..055fbe2760ec68de45fe4965fc42c331a7a7a7f6 100644
--- a/include/linux/nmi.h
+++ b/include/linux/nmi.h
@@ -224,8 +224,10 @@ int proc_watchdog_cpumask(struct ctl_table *, int, void *, size_t *, loff_t *);
 
 #ifdef CONFIG_SDEI_WATCHDOG
 void sdei_watchdog_clear_eoi(void);
+extern bool disable_sdei_nmi_watchdog;
 #else
 static inline void sdei_watchdog_clear_eoi(void) { }
+#define disable_sdei_nmi_watchdog 1
 #endif
 
 #endif
diff --git a/init/main.c b/init/main.c
index 10cea51597be5db47709e84c9d8b4e8cdeed403a..ffdee04ba553e86fed2151987d59ea6cdae2d908 100644
--- a/init/main.c
+++ b/init/main.c
@@ -1520,6 +1520,8 @@ static noinline void __init kernel_init_freeable(void)
 
 	rcu_init_tasks_generic();
 	do_pre_smp_initcalls();
+	if (disable_sdei_nmi_watchdog)
+		lockup_detector_init();
 
 	smp_init();
 	sched_init_smp();
@@ -1531,7 +1533,9 @@ static noinline void __init kernel_init_freeable(void)
 
 	do_basic_setup();
 
-	lockup_detector_init();
+	/* sdei_watchdog needs to be initialized after sdei_init */
+	if (!disable_sdei_nmi_watchdog)
+		lockup_detector_init();
 
 	kunit_run_all_tests();