From: Catalin Marinas Date: Wed, 15 Jun 2022 13:22:38 +0000 (+0100) Subject: Revert "arm64: Initialize jump labels before setup_machine_fdt()" X-Git-Tag: baikal/mips/sdk6.1~5471^2~5 X-Git-Url: https://git.baikalelectronics.ru/?a=commitdiff_plain;h=4c24bad43cd91901f92baacbd3948a900a84abb9;p=kernel.git Revert "arm64: Initialize jump labels before setup_machine_fdt()" This reverts commit ed3567c874b0691afa1c1df322b86b5a2464ad57. The reverted patch was needed as a fix after commit 8f20d58ba28b ("random: use static branch for crng_ready()"). However, this was already fixed by 2453a6eed43e ("random: do not use jump labels before they are initialized") and hence no longer necessary to initialise jump labels before setup_machine_fdt(). Signed-off-by: Catalin Marinas --- diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index cf3a759f10d4e..fea3223704b63 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -303,14 +303,13 @@ void __init __no_sanitize_address setup_arch(char **cmdline_p) early_fixmap_init(); early_ioremap_init(); + setup_machine_fdt(__fdt_pointer); + /* * Initialise the static keys early as they may be enabled by the - * cpufeature code, early parameters, and DT setup. + * cpufeature code and early parameters. */ jump_label_init(); - - setup_machine_fdt(__fdt_pointer); - parse_early_param(); /*