OSDN Git Service

ARM: 8744/1: don't discard memblock for kexec
authorArnd Bergmann <arnd@arndb.de>
Tue, 16 Jan 2018 13:48:14 +0000 (14:48 +0100)
committerRussell King <rmk+kernel@armlinux.org.uk>
Sun, 21 Jan 2018 15:36:50 +0000 (15:36 +0000)
commitec80eb467171b511635b9e3086fec357f79afe3b
tree65650e59f38f45a9534f7062c6bd6d7bc3ff18b4
parenta21b4c10c7bf5b58112afa20d6fa829e8d74e3e6
ARM: 8744/1: don't discard memblock for kexec

Discarding the memblock arrays usually works, but causes problems
with kexec, as pointed out by this kbuild warning:

WARNING: vmlinux.o(.text+0x7c60): Section mismatch in reference from the function machine_kexec_prepare() to the function .meminit.text:memblock_is_region_memory()

This lets us keep the memblock structures around whenever kexec
is enabled, but otherwise still drops them.

Fixes: cf1b09908a23 ("ARM: 8693/1: discard memblock arrays when possible")
Acked-by: Nicolas Pitre <nico@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
arch/arm/Kconfig