Commit bef7d8e1 authored Feb 20, 2021 by Xiongfeng Wang Committed by Zheng Zengkai Apr 08, 2021

lockup_detector: init lockup detector after all the init_calls



hulk inclusion
category: feature
bugzilla: 48046
CVE: NA

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

We call 'sdei_init' as 'subsys_initcall_sync'. lockup detector need to
be initialised after sdei_init. The influence of this patch is that we
can not detect the hard lockup in init_calls.

Signed-off-by: Xiongfeng Wang <wangxiongfeng2@huawei.com>
Reviewed-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>

 Conflicts:
	init/main.c
Signed-off-by: Xiongfeng Wang <wangxiongfeng2@huawei.com>
Reviewed-by: Hanjun Guo <guohanjun@huawei.com>
Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com>

parent cfaccce9

init/main.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -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();