Skip to content

Commit 27d8fa2

Browse files
committed
Revert "arm64: Initialize jump labels before setup_machine_fdt()"
This reverts commit 73e2d82. The reverted patch was needed as a fix after commit f5bda35 ("random: use static branch for crng_ready()"). However, this was already fixed by 60e5b28 ("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 <[email protected]>
1 parent b13bacc commit 27d8fa2

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

arch/arm64/kernel/setup.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -303,14 +303,13 @@ void __init __no_sanitize_address setup_arch(char **cmdline_p)
303303
early_fixmap_init();
304304
early_ioremap_init();
305305

306+
setup_machine_fdt(__fdt_pointer);
307+
306308
/*
307309
* Initialise the static keys early as they may be enabled by the
308-
* cpufeature code, early parameters, and DT setup.
310+
* cpufeature code and early parameters.
309311
*/
310312
jump_label_init();
311-
312-
setup_machine_fdt(__fdt_pointer);
313-
314313
parse_early_param();
315314

316315
/*

0 commit comments

Comments
 (0)