diff options
| author |   Lukas Bulwahn <lukas.bulwahn@gmail.com> | 2022-07-21 12:04:33 +0200 |
|---|---|---|
| committer |   Will Deacon <will@kernel.org> | 2022-08-17 14:52:50 +0100 |
| commit | ff5900092227ade3e31fe25f97faf406cde902e6 (patch) | |
| tree | cc0b03b1169d6b57a8681cac7f31afcf22a4ea4a /arch/arm64/kernel/pi/kaslr_early.c | |
| parent | arm64: Fix match_list for erratum 1286807 on Arm Cortex-A76 (diff) | |
| download | linux-dev-ff5900092227ade3e31fe25f97faf406cde902e6.tar.xz linux-dev-ff5900092227ade3e31fe25f97faf406cde902e6.zip | |
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>
Diffstat (limited to '')
| -rw-r--r-- | arch/arm64/kernel/pi/kaslr_early.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/arm64/kernel/pi/kaslr_early.c b/arch/arm64/kernel/pi/kaslr_early.c index 6c3855e69395..17bff6e399e4 100644 --- a/arch/arm64/kernel/pi/kaslr_early.c +++ b/arch/arm64/kernel/pi/kaslr_early.c @@ -94,11 +94,9 @@ 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; + if (!__early_cpu_has_rndr() || + !__arm64_rndr((unsigned long *)&seed)) + return 0; } /* |