From patchwork Wed Oct 11 13:48:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 115552 Delivered-To: patch@linaro.org Received: by 10.80.163.170 with SMTP id s39csp648604edb; Wed, 11 Oct 2017 06:49:38 -0700 (PDT) X-Google-Smtp-Source: AOwi7QDR/3hK0oa25xPFJE4mENfKRjDSX05FASHsFy6OZczYADHLunh9WxjfdNRDPEZspb8r1HdM X-Received: by 10.98.192.18 with SMTP id x18mr14183434pff.280.1507729778303; Wed, 11 Oct 2017 06:49:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507729778; cv=none; d=google.com; s=arc-20160816; b=Vnhlwmd0q6ASmbrBhPvHJE8tLRu68tAqSsCB3iPR55wGCh3sXNh9CP+cQ13Fxco04G OPZdELgPooMJaGMw9135sZ3eLZCVE2vyF48aJg8iflyXyeKv+Y0qUcCwU4tnsGI17aSV aDmpXZXdDW855CgdPw8gYgzpJJjy2p0Kf3IGhhphFPLNhiUEy29ejiE5n6O0/FwGPpyB vz6mpiD9vqOZK1QKZCsRYfwtdOP9jOrTongzxXuOjGKUw7t7dwfb8UQWgrClQtu1Xz+A RC1jNiKX/m/wCnqiFSqbFOZzIS4e1csu3dvTRaHETISRszx96/5APZaqvwmZMrFoSu7Q sVgw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=1fB4ZtMVjXf7vXqlTzchlWVNv1308cjXIiEdu+prGbY=; b=ybfUGR6VSzyrf37Ml4SaXfI5D0B2706i5xFINImdTazrqE59wRFdsSvbSC15LMEaSH 9SzQV+l2saq3nbL8weTe3F2zVU+DD27Kq6e090gjfCL1Iuh3SEzPTq/ySe1k0oNI0JKe 72QTok9+qapS8B8uNrwPbURYgjOzEzuy7dzELN9d+pqCpmNS9z6rsGyYfSl2ke9JvKuD Yv2Qgecj41dreEGOZ42fmGm/zm7m9QU2BkvbN/1M6w1kxq3n9ZxxPybQeeFnAqKuv84I b+Y1DPCTXvEecplg9e0Ht1ovj5t6xOsuL0UlbZBsuQEk3nBAwYdBeYFL1M/Tk4a7hvLI yzWw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m3si9015943pld.489.2017.10.11.06.49.38; Wed, 11 Oct 2017 06:49:38 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757296AbdJKNtg (ORCPT + 26 others); 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 Received: from wuerfel.lan ([95.208.190.237]) by mrelayeu.kundenserver.de (mreue101 [212.227.15.145]) with ESMTPA (Nemesis) id 0Lk8aY-1dQTrP4BlS-00c8fM; Wed, 11 Oct 2017 15:49:30 +0200 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 Precedence: bulk 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(-) -- 2.9.0 Acked-by: Nicolas Pitre 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