From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933043AbcBPQEw (ORCPT ); Tue, 16 Feb 2016 11:04:52 -0500 Received: from mout.kundenserver.de ([212.227.126.187]:49822 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932143AbcBPQEv (ORCPT ); Tue, 16 Feb 2016 11:04:51 -0500 From: Arnd Bergmann To: Russell King Cc: linux-arm-kernel@lists.infradead.org, Arnd Bergmann , Kees Cook , Laura Abbott , Ard Biesheuvel , Chris Brandt , linux-kernel@vger.kernel.org Subject: [PATCH 2/2] ARM: mm: hide __start_rodata_section_aligned for non-debug builds Date: Tue, 16 Feb 2016 17:03:27 +0100 Message-Id: <1455638631-3326518-2-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1455638631-3326518-1-git-send-email-arnd@arndb.de> References: <1455638631-3326518-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:/N6tiBuwX2pBWTTIQQFZBS6ZNJV+T0ZJOnKTFP/PIaQi/O6llhD xiy9T2ENjWoDLNawwuE+UrFiLYTSDdEZAz6L/dI7iTsZWKyzzFLc7QtbxFJBYqdA3rjWuQo 3xEY23bFek0y4gsEUyhRRBtRCUnSwhyFk2sLfrovLkEA8s7VdSFFjCtZo6xSP0wnuXmdC3o eJmf662fEjh/UnLQeTrYQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:VYdbG5QsPSA=:8kISkxxQH5M3JLG9Kr7EcY 0qUKTkoQMJWcILJS6qPdtoAJ3TiuYUN0XzYdT9K07aB20E4DKd+nZc0DNfsmFtFuOGrARTQCq K11b/D7JBSf5xbwOnVwnqtaACSqN960Wd1+QJSj+hEweizx1mbjwUPhQoHC7xTPFvbEcxPMYn BA46xYIbVxfZvXCnH9OD/0q77SfZU++tRip9tAxXQGJJKqmHAv+aSDPNwWZiO/4CjpZDTUkDJ rcFSScW5MciYISxZPqFne5NMhf/wpWtrY4K0/jy95SbgVCd2A/wpSJ3NWe/fqZ+3C0+2NsHah A72Jb6NHwqHEO1KaNZ39UvxrNOZZnldtuapc+VDQF325AXi2kwKmx7sNx9g0lS4jpfpTad4co ThJecVNIjJE2f5mqIFcHGKbymplWCHie1htiEsUQd7FIo33tUy/30EODEhPf61OgANqfUsf9v swN3Gr6ctagfGhwF/qhjC/s22CaBtNWzYD/4Xf+E5ma7eLXM0mwz/Hmw/wbwqg+vCC8+ywWo0 HqG7T04TKP2dAzKHsC0Nf2T2TiuCQnOf5719Keg5EwFdwqeU85F3j3prUT4yRZhoufeEYbkxy m985ypyWQtyJOv1PZZwYko7sgNkweS5oQExf5/LzhaufXYuagvOxkY8SMona1b/THRB4cVwSd z25KYh+UQaViR6bPyg32L2EyEDBcChUYhE8v+B0AfYiU4r9ivA61iI2ANYbcrPV+yh/U= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The __start_rodata_section_aligned is only referenced by the DEBUG_RODATA code, which is only used when the MMU is enabled, but the definition fails on !MMU builds: arch/arm/kernel/vmlinux.lds:702: undefined symbol `SECTION_SHIFT' referenced in expression This hides the symbol whenever DEBUG_RODATA is disabled. Signed-off-by: Arnd Bergmann Fixes: 64ac2e74f0b2 ("ARM: 8502/1: mm: mark section-aligned portion of rodata NX") --- arch/arm/kernel/vmlinux.lds.S | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S index 2d7085ae1c2f..bb12933aee22 100644 --- a/arch/arm/kernel/vmlinux.lds.S +++ b/arch/arm/kernel/vmlinux.lds.S @@ -322,12 +322,14 @@ SECTIONS STABS_DEBUG } +#ifdef CONFIG_DEBUG_RODATA /* * Without CONFIG_DEBUG_ALIGN_RODATA, __start_rodata_section_aligned will * be the first section-aligned location after __start_rodata. Otherwise, * it will be equal to __start_rodata. */ __start_rodata_section_aligned = ALIGN(__start_rodata, 1 << SECTION_SHIFT); +#endif /* * These must never be empty -- 2.7.0