diff options
| author |   Catalin Marinas <catalin.marinas@arm.com> | 2022-06-15 14:22:38 +0100 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2022-06-15 16:14:32 +0100 |
| commit | 27d8fa207835fa5c7cd6f969c6cc94d1123951ee (patch) | |
| tree | f984da20128bdcc24228ff5a555b6212f7d9367b /arch/arm64/kernel/setup.c | |
| parent | Linux 5.19-rc2 (diff) | |
| download | linux-dev-27d8fa207835fa5c7cd6f969c6cc94d1123951ee.tar.xz linux-dev-27d8fa207835fa5c7cd6f969c6cc94d1123951ee.zip | |
Revert "arm64: Initialize jump labels before setup_machine_fdt()"
This reverts commit 73e2d827a501d48dceeb5b9b267a4cd283d6b1ae.
The reverted patch was needed as a fix after commit f5bda35fba61
("random: use static branch for crng_ready()"). However, this was
already fixed by 60e5b2886b92 ("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 <catalin.marinas@arm.com>
Diffstat (limited to '')
| -rw-r--r-- | arch/arm64/kernel/setup.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index cf3a759f10d4..fea3223704b6 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(); /* |