Re: [PATCH] arm64: kaslr: Fix build failure with CONFIG_ARCH_RANDOM=n

From: Will Deacon
Date: Thu Feb 13 2020 - 04:17:31 EST


On Wed, Feb 12, 2020 at 10:24:57PM -0600, Samuel Holland wrote:
> Commit 2e8e1ea88cbc ("arm64: Use v8.5-RNG entropy for KASLR seed")
> introduced unconditional use of arm64-specific functions exported by
> asm/archrandom.h. With CONFIG_ARCH_RANDOM=y, this header is transitively
> included through linux/random.h. However, with CONFIG_ARCH_RANDOM=n,
> this header is not included, and the kernel fails to build.
>
> Explicitly include asm/archrandom.h so __early_cpu_has_rndr() and
> __arm64_rndr() are always available, even when they are just stubs.
>
> Fixes: 2e8e1ea88cbc ("arm64: Use v8.5-RNG entropy for KASLR seed")
> Signed-off-by: Samuel Holland <samuel@xxxxxxxxxxxx>
> ---
> arch/arm64/kernel/kaslr.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/arch/arm64/kernel/kaslr.c b/arch/arm64/kernel/kaslr.c
> index 53b8a4ee64ff..91a83104c6e8 100644
> --- a/arch/arm64/kernel/kaslr.c
> +++ b/arch/arm64/kernel/kaslr.c
> @@ -11,6 +11,7 @@
> #include <linux/sched.h>
> #include <linux/types.h>
>
> +#include <asm/archrandom.h>
> #include <asm/cacheflush.h>
> #include <asm/fixmap.h>
> #include <asm/kernel-pgtable.h>

Already queued up in arm64 for-next/fixes:

https://fixes.arm64.dev/

Will