Skip to content

Commit

Permalink
Revert "arm64: Initialize jump labels before setup_machine_fdt()"
Browse files Browse the repository at this point in the history
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 <catalin.marinas@arm.com>
  • Loading branch information
Catalin Marinas committed Jun 15, 2022
1 parent b13bacc commit 27d8fa2
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions arch/arm64/kernel/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();

/*
Expand Down

0 comments on commit 27d8fa2

Please sign in to comment.