From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757285AbdJKNtg (ORCPT ); Wed, 11 Oct 2017 09:49:36 -0400 Received: from mout.kundenserver.de ([217.72.192.74]:64740 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752050AbdJKNtd (ORCPT ); Wed, 11 Oct 2017 09:49:33 -0400 From: Arnd Bergmann To: Russell King Cc: Arnd Bergmann , Nicolas Pitre , Ard Biesheuvel , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] ARM: don't discard memblock for kexec Date: Wed, 11 Oct 2017 15:48:55 +0200 Message-Id: <20171011134925.3251410-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:Zsk0LskhJJuXs1i3EM69vBJU+7jjTUPy9tf+iScHAUwAAAheMPC dt3x6ScD3Wuu23XM2qQpfAdWpBrAqLKj6leld5uxMcTHWYxVewYpTT+pTNn/TZfHV4G/h8s FL57fQrAnQvHncjWoB4crduXNp68KWA318VAYTGIcSKgmWoBqcUOPt9wPxA29St2Sb/m2c1 PPnSlWAlRJJTVN6tEfhDQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:9hYQxdCwa+0=:NUjkk1tg0gxeCxXLPZacGB 4DU0FMaAXdU/y/iy2JrTnHrqaparHBhbH9zMMnw8SDQeVNcThPAQv1ccn/BDbcbYj3/1nOlPj GSWw9jMCX31EMErXZcDLWhOIMlW/xoJQg8tatjEBdBFoufUj+Z0YSmLuI8ImSEPxw8m1ue0P9 OlmspESZMwVG7yz/8KiG8cGbtTfdlLVZCA+c86QsSkPuyxPEQp7yNI7Yy6ORHNlOC+w1sTdaX XSnIpW0I9o5zKlZ2FDB9Tw6P379NiakAodTkww6Yi9JKA5+2L5sBp0/yPSLzcH8oggV4p8fuM ci5CbsdVxzUPvdwG6Qz69V8mMD/dAEtMhGKHZ3b1ayRobzxfXBX/apr1YI7BPoYseWLgxKL7+ Dj+JRs2N5j6R0Zb4H5+avXL3BVUefz7OkB5MHykdP4xI3Ob929J0KM5X+tjyjGC+le8zkuXAh KcnKj43xwPyytDnkOGO+EiYuWuhENpK47aP2FbaLVWZLEFxgsQSyzwVvTJL+o3p6rdd7DyZM7 8VcFF0p07/DUE2Kl+4CLu15FVY+wk6cbRlHzwi/oPZv6K+aTCfgbmcP3CBN2Cu5KOSVuCX97E Cx8CHNccu8xrG/GVU4br4g47TdPw9HbGrTDiCK7L1xdHWY2nMQ8j+ohlUcw+KFR/cUOyf3D5C 0zuk/TnIiIFELoiDwRM+4VUxwflHPKH63tMisKWvmEMS4a3x75nkp5RKbT/OG0fqZtgxR130K pC4qoFSNBgFRY94HVhhpmWCtCO+LP8OPk+UnvA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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") Signed-off-by: Arnd Bergmann --- arch/arm/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 75b8c7e79ebc..90922a090501 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -2,7 +2,7 @@ config ARM bool default y 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 select ARCH_HAS_DEVMEM_IS_ALLOWED select ARCH_HAS_ELF_RANDOMIZE -- 2.9.0