From: Catalin Marinas Date: Tue, 26 Jul 2016 17:16:55 +0000 (-0700) Subject: UPSTREAM: arm64: Only select ARM64_MODULE_PLTS if MODULES=y X-Git-Tag: firefly_0821_release~176^2~160 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e54f34381d3ddb1947d17d937e9cf1b1515452c2;p=firefly-linux-kernel-4.4.55.git UPSTREAM: arm64: Only select ARM64_MODULE_PLTS if MODULES=y Selecting CONFIG_RANDOMIZE_BASE=y and CONFIG_MODULES=n fails to build the module PLTs support: CC arch/arm64/kernel/module-plts.o /work/Linux/linux-2.6-aarch64/arch/arm64/kernel/module-plts.c: In function ‘module_emit_plt_entry’: /work/Linux/linux-2.6-aarch64/arch/arm64/kernel/module-plts.c:32:49: error: dereferencing pointer to incomplete type ‘struct module’ This patch selects ARM64_MODULE_PLTS conditionally only if MODULES is enabled. Fixes: f80fb3a3d508 ("arm64: add support for kernel ASLR") Cc: # 4.6+ Reported-by: Jeff Vander Stoep Acked-by: Ard Biesheuvel Acked-by: Mark Rutland Signed-off-by: Catalin Marinas Bug: 30369029 Patchset: kaslr-arm64-4.4 (cherry picked from commit b9c220b589daaf140f5b8ebe502c98745b94e65c) Signed-off-by: Jeff Vander Stoep Change-Id: I446cb3aa78f1c64b5aa1e2e90fda13f7d46cac33 --- diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 5cca6d7d803e..a5019f2afa9c 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -804,7 +804,7 @@ config RELOCATABLE config RANDOMIZE_BASE bool "Randomize the address of the kernel image" - select ARM64_MODULE_PLTS + select ARM64_MODULE_PLTS if MODULES select RELOCATABLE help Randomizes the virtual address at which the kernel image is