From 6b419d8add1b7de83e4bcef7efbd1c27e4c8a5a7 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 9 Jun 2026 11:47:05 +0100 Subject: [PATCH] Revert "random: do not use jump labels before they are initialized" This reverts commit 89a64d88e3c762d2666ec5b9bc115c94de764c2c. The commit this is reverting was part of a pre-release fix to an early 5.19 rc issue. It ended up being replaced by an identically named commit, but this fragment was unintentionally retained as a partial duplicate. Drop the duplicate. See: https://github.com/raspberrypi/linux/issues/7424 Signed-off-by: Phil Elwell --- drivers/char/random.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/drivers/char/random.c b/drivers/char/random.c index 80ed1d593f27e..f344f67c83f4e 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c @@ -859,14 +859,6 @@ void __init random_init_early(const char *command_line) unsigned long entropy[BLAKE2S_BLOCK_SIZE / sizeof(long)]; size_t i, longs, arch_bits; - /* - * If we were initialized by the bootloader before jump labels are - * initialized, then we should enable the static branch here, where - * it's guaranteed that jump labels have been initialized. - */ - if (!static_branch_likely(&crng_is_ready) && crng_init >= CRNG_READY) - crng_set_ready(NULL); - #if defined(LATENT_ENTROPY_PLUGIN) static const u8 compiletime_seed[BLAKE2S_BLOCK_SIZE] __initconst __latent_entropy; _mix_pool_bytes(compiletime_seed, sizeof(compiletime_seed));