| Message ID | 245aede65d9834101efc9e470f50633b7052e1a8.1581362270.git.robin.murphy@arm.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 74a44bed8d93782affb707a33469bda7052b4207 |
| Headers | show |
| Series | arm64: Fix CONFIG_ARCH_RANDOM=n build | expand |
On Mon, Feb 10, 2020 at 07:21:01PM +0000, Robin Murphy wrote: > 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>
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>
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. Signed-off-by: Robin Murphy <robin.murphy@arm.com> --- arch/arm64/kernel/kaslr.c | 1 + 1 file changed, 1 insertion(+)