]> git.baikalelectronics.ru Git - kernel.git/commit
arm64: adjust KASLR relocation after ARCH_RANDOM removal
authorLukas Bulwahn <lukas.bulwahn@gmail.com>
Thu, 21 Jul 2022 10:04:33 +0000 (12:04 +0200)
committerWill Deacon <will@kernel.org>
Wed, 17 Aug 2022 13:52:50 +0000 (14:52 +0100)
commitff5900092227ade3e31fe25f97faf406cde902e6
treecc0b03b1169d6b57a8681cac7f31afcf22a4ea4a
parent5e1e087457c94ad7fafbe1cf6f774c6999ee29d4
arm64: adjust KASLR relocation after ARCH_RANDOM removal

Commit aacd149b6238 ("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 9592eef7c16e ("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: Lukas Bulwahn <lukas.bulwahn@gmail.com>
Acked-by: Ard Biesheuvel <ardb@kernel.org>
Link: https://lore.kernel.org/r/20220721100433.18286-1-lukas.bulwahn@gmail.com
Signed-off-by: Will Deacon <will@kernel.org>
arch/arm64/kernel/pi/kaslr_early.c