Commit ff590009 authored by Lukas Bulwahn's avatar Lukas Bulwahn Committed by Will Deacon
Browse files

arm64: adjust KASLR relocation after ARCH_RANDOM removal 



Commit aacd149b ("arm64: head: avoid relocating the kernel twice for
KASLR") adds the new file arch/arm64/kernel/pi/kaslr_early.c with a small
code part guarded by '#ifdef CONFIG_ARCH_RANDOM'.

Concurrently, commit 9592eef7 ("random: remove CONFIG_ARCH_RANDOM")
removes the config CONFIG_ARCH_RANDOM and turns all '#ifdef
CONFIG_ARCH_RANDOM' code parts into unconditional code parts, which is
generally safe to do.

Remove a needless ifdef guard after the ARCH_RANDOM removal.

Signed-off-by: default avatarLukas Bulwahn <lukas.bulwahn@gmail.com>
Acked-by: default avatarArd Biesheuvel <ardb@kernel.org>
Link: https://lore.kernel.org/r/20220721100433.18286-1-lukas.bulwahn@gmail.com


Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent 5e1e0874

arch/arm64/kernel/pi/kaslr_early.c

+3 −5
Original line number Diff line number Diff line
@@ -94,10 +94,8 @@ asmlinkage u64 kaslr_early_init(void *fdt) 


	seed = get_kaslr_seed(fdt);

	if (!seed) {

#ifdef CONFIG_ARCH_RANDOM

		if (!__early_cpu_has_rndr() ||

		    !__arm64_rndr((unsigned long *)&seed))

#endif

			return 0;

	}