Home Explore Help
Sign In
GfA
/
linux_kernel
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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>
Arnd Bergmann 7 years ago
parent
a21b4c10c7
commit
ec80eb4671
1 changed files with 1 additions and 1 deletions
Unified View Show Diff Stats
  1. 1 1
      arch/arm/Kconfig

+ 1 - 1
arch/arm/Kconfig
View File 

@@ -3,7 +3,7 @@ config ARM
 
 	bool
 
 	bool
 
 	default y
 
 	default y
 
 	select ARCH_CLOCKSOURCE_DATA
 
 	select ARCH_CLOCKSOURCE_DATA
 
-	select ARCH_DISCARD_MEMBLOCK if !HAVE_ARCH_PFN_VALID
 
+	select ARCH_DISCARD_MEMBLOCK if !HAVE_ARCH_PFN_VALID && !KEXEC
 
 	select ARCH_HAS_DEBUG_VIRTUAL if MMU
 
 	select ARCH_HAS_DEBUG_VIRTUAL if MMU
 
 	select ARCH_HAS_DEVMEM_IS_ALLOWED
 
 	select ARCH_HAS_DEVMEM_IS_ALLOWED
 
 	select ARCH_HAS_ELF_RANDOMIZE
 
 	select ARCH_HAS_ELF_RANDOMIZE