From patchwork Tue Feb 16 16:03:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 8328921 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 5BDBE9F38B for ; Tue, 16 Feb 2016 16:08:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8B0DB2035B for ; Tue, 16 Feb 2016 16:08:48 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 58A0E20357 for ; Tue, 16 Feb 2016 16:08:45 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1aVi9Z-0007Jd-Sa; Tue, 16 Feb 2016 16:07:05 +0000 Received: from mout.kundenserver.de ([212.227.126.133]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aVi6z-0003Yi-6k for linux-arm-kernel@lists.infradead.org; Tue, 16 Feb 2016 16:04:27 +0000 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue004) with ESMTPA (Nemesis) id 0MbcQr-1aEsAr1npl-00J3og; Tue, 16 Feb 2016 17:03:56 +0100 From: Arnd Bergmann To: Russell King Subject: [PATCH 1/2] ARM: mm: DEBUG_RODATA makes no sense with XIP_KERNEL Date: Tue, 16 Feb 2016 17:03:26 +0100 Message-Id: <1455638631-3326518-1-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 X-Provags-ID: V03:K0:gieLxeGrCMpPXb1DbbZ25bFhLsDJmDKSW/N81Zv9l4cOn2Dnk0T W/HzDLjFP1P74/X68Nlv1KBIxMfMcYP25TmQH3eEwoistFnzzmWr12X+enzCIOxgN8V36pK s3CRdHjxbeJSei4mot94fHYFGRGbkzefFpUfGxyITg24PVpveJC0vC7km70VwzxEbwMOTGV +n1fZp/Z7En0+VDCollKQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:mPz4uUOUPmY=:xuc1c/Mwb7umxsPgh1DSnw mO2r5qsSL2FnhD0sUnxmsO5jDKfGFWJQ+WVXMxc3f5NxwufLvGfu8iEg3m5O8YBd4PjWhK0K1 okf5MmHIcmIrfdr0X36BsDav6eUSZK5Wniyy795NzTOTouyPV1HxFWApmhxt74CErqX0yQx+D p4A/As5FHGLr5TlOJ8XezYYCa/Ty1DvcubqR2+xqRpM7sS0fxyPbenD/Ju66UAcWqTkazR/p+ TM2ids1ApLENGAFkfE6zIT+znsiQmMrkMkubO/5wBtFl/UhRpqIJ6MT4uXVVChGEGKA0s/heS l3o+xE3u+a+7t/TglXSaaE9MPujl7CdcmTrLQMkuXiFvZbb0nCeDB4xeBKz5KIiW7PsiRdCCm J55MX3qi+G03EH4/0AqGTdNMhmGVDmH3EDg7eYmorI8FVIhB22csw10itucdMdz8MMGY7TUpC FX6IRDkim+cxVg3+5fmbJSLYv84FmM8Qt0IX8zdGWHzsicry11d+MieQl6cmLBHP9FvxHrBNB P+6O5LkSveoyqX3jHbJUDJxvS5/+2Y0DKMduTK+HvZCcK8BZ4q811Jsir18r5QT1tEGliOflg WO/6KmjKboeQqD5MkuUH3mpF7oy7H92PWtUkfEaf2Kq5nCFNKKsUZUo7ErKZEtJKXXciBKPIl oYqx43aEEpOhXoQKOfBt+RMFbk8bUoPZngXape+fZfJoNLyQMY5MIIQ1uqHY3fx3coCI= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160216_080425_814129_68673F3E X-CRM114-Status: GOOD ( 12.13 ) X-Spam-Score: -1.9 (-) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kees Cook , Arnd Bergmann , Ard Biesheuvel , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Laura Abbott MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When CONFIG_DEBUG_ALIGN_RODATA is set, we get a link error: arch/arm/mm/built-in.o:(.data+0x4bc): undefined reference to `__start_rodata_section_aligned' However, this combination is useless, as XIP_KERNEL implies that all the RODATA is already marked readonly, so both CONFIG_DEBUG_RODATA and CONFIG_DEBUG_ALIGN_RODATA (which depends on the other) are not needed with XIP_KERNEL, and this patches enforces that using a Kconfig dependency. Signed-off-by: Arnd Bergmann Fixes: 25362dc496ed ("ARM: 8501/1: mm: flip priority of CONFIG_DEBUG_RODATA") Acked-by: Ard Biesheuvel Acked-by: Kees Cook --- arch/arm/mm/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig index fbf2296388ce..8894045caba9 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig @@ -1039,7 +1039,7 @@ config ARCH_SUPPORTS_BIG_ENDIAN config DEBUG_RODATA bool "Make kernel text and rodata read-only" - depends on MMU + depends on MMU && !XIP_KERNEL default y if CPU_V7 help If this is set, kernel text and rodata memory will be made