summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Murphy <robin.murphy@arm.com>2020-02-10 20:21:01 +0100
committerWill Deacon <will@kernel.org>2020-02-11 10:47:01 +0100
commit74a44bed8d93782affb707a33469bda7052b4207 (patch)
tree03d9a92f1441c0c9083929a0bb1865007c967ff4
parentperf/smmuv3: Use platform_get_irq_optional() for wired interrupt (diff)
downloadlinux-74a44bed8d93782affb707a33469bda7052b4207.tar.xz
linux-74a44bed8d93782affb707a33469bda7052b4207.zip
arm64: Fix CONFIG_ARCH_RANDOM=n build
The entire asm/archrandom.h header is generically included via linux/archrandom.h only when CONFIG_ARCH_RANDOM is already set, so the stub definitions of __arm64_rndr() and __early_cpu_has_rndr() are only visible to KASLR if it explicitly includes the arch-internal header. Acked-by: Mark Brown <broonie@kernel.org> Signed-off-by: Robin Murphy <robin.murphy@arm.com> Signed-off-by: Will Deacon <will@kernel.org>
-rw-r--r--arch/arm64/kernel/kaslr.c1
1 files changed, 1 insertions, 0 deletions
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>