Patch "arm64: Only select ARM64_MODULE_PLTS if MODULES=y" has been added to the 4.7-stable tree

Patch "arm64: Only select ARM64_MODULE_PLTS if MODULES=y" has been added to the 4.7-stable tree

[gregkh]

This is a note to let you know that I've just added the patch titled

    arm64: Only select ARM64_MODULE_PLTS if MODULES=y

to the 4.7-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     arm64-only-select-arm64_module_plts-if-modules-y.patch
and it can be found in the queue-4.7 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From b9c220b589daaf140f5b8ebe502c98745b94e65c Mon Sep 17 00:00:00 2001
From: Catalin Marinas <catalin.marinas@arm.com>
Date: Tue, 26 Jul 2016 10:16:55 -0700
Subject: arm64: Only select ARM64_MODULE_PLTS if MODULES=y
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

From: Catalin Marinas <catalin.marinas@arm.com>

commit b9c220b589daaf140f5b8ebe502c98745b94e65c upstream.

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")
Reported-by: Jeff Vander Stoep <jeffv@google.com>
Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 arch/arm64/Kconfig |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -872,7 +872,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


Patches currently in stable-queue which might be from catalin.marinas@arm.com are

queue-4.7/arm64-only-select-arm64_module_plts-if-modules-y.patch
queue-4.7/arm64-debug-unmask-pstate.d-earlier.patch
queue-4.7/arm64-fix-incorrect-per-cpu-usage-for-boot-cpu.patch
queue-4.7/arm64-honor-nosmp-kernel-command-line-option.patch