Commit 27d8fa20 authored by Catalin Marinas's avatar Catalin Marinas

Revert "arm64: Initialize jump labels before setup_machine_fdt()"

This reverts commit 73e2d827.

The reverted patch was needed as a fix after commit f5bda35f
("random: use static branch for crng_ready()"). However, this was
already fixed by 60e5b288 ("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: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent b13baccc
...@@ -303,14 +303,13 @@ void __init __no_sanitize_address setup_arch(char **cmdline_p) ...@@ -303,14 +303,13 @@ void __init __no_sanitize_address setup_arch(char **cmdline_p)
early_fixmap_init(); early_fixmap_init();
early_ioremap_init(); early_ioremap_init();
setup_machine_fdt(__fdt_pointer);
/* /*
* Initialise the static keys early as they may be enabled by the * 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(); jump_label_init();
setup_machine_fdt(__fdt_pointer);
parse_early_param(); parse_early_param();
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment