Revert "init: only move down lockup_detector_init() when

hulk inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I4JUZZ

---------------------------

On ARM64, armv8_pmu_driver_init() is called in do_basic_setup(), it will
fail to create perf event if lockup_detector_init() is moved back. So
revert the patch firstly.

Fixes: 60565144 ("init: only move down lockup_detector_init() when sdei_watchdog is enabled")
Signed-off-by: NWei Li <liwei391@huawei.com>
Reviewed-by: NXiongfeng Wang <wangxiongfeng2@huawei.com>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>

arch/arm64/kernel/watchdog_sdei.c

@@ -21,7 +21,7 @@
 #define SDEI_NMI_WATCHDOG_HWIRQ		29
 
 static int sdei_watchdog_event_num;
-bool disable_sdei_nmi_watchdog;
+static bool disable_sdei_nmi_watchdog;
 static bool sdei_watchdog_registered;
 static DEFINE_PER_CPU(ktime_t, last_check_time);
 

include/linux/nmi.h

@@ -241,10 +241,8 @@ 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

init/main.c

@@ -1517,8 +1517,6 @@ 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();
@@ -1530,8 +1528,6 @@ static noinline void __init kernel_init_freeable(void)
 
 	do_basic_setup();
 
-	/* sdei_watchdog needs to be initialized after sdei_init */
-	if (!disable_sdei_nmi_watchdog)
 	lockup_detector_init();
 
 	kunit_run_all_tests();