From aee026da84c598299ad2c7fe63cdde19a90aea60 Mon Sep 17 00:00:00 2001 From: Xiongfeng Wang Date: Mon, 28 Jan 2019 15:36:49 +0800 Subject: [PATCH 2792/2944] openeuler: lockup_detector: init lockup detector after all the init_calls commit 141482cb4b018134cc0e949430f936a22b339fca openEuler-1.0. 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 Reviewed-by: Kefeng Wang Signed-off-by: Yang Yingliang Signed-off-by: Xin Hao Reviewed-by: Baolin Wang --- init/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/init/main.c b/init/main.c index 38a603f..70b5973 100644 --- a/init/main.c +++ b/init/main.c @@ -1132,7 +1132,6 @@ static noinline void __init kernel_init_freeable(void) init_mm_internals(); do_pre_smp_initcalls(); - lockup_detector_init(); smp_init(); sched_init_smp(); @@ -1143,6 +1142,8 @@ static noinline void __init kernel_init_freeable(void) do_basic_setup(); + lockup_detector_init(); + /* Open the /dev/console on the rootfs, this should never fail */ if (ksys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0) pr_err("Warning: unable to open an initial console.\n"); -- 1.8.3.1