Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965056AbcJXPHC (ORCPT ); Mon, 24 Oct 2016 11:07:02 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:61579 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S938729AbcJXPG6 (ORCPT ); Mon, 24 Oct 2016 11:06:58 -0400 From: Arnd Bergmann To: Nicholas Piggin Cc: Russell King - ARM Linux , Michal Marek , Adam Borowski , Omar Sandoval , Linus Torvalds , adobriyan@gmail.com, sfr@canb.auug.org.au, viro@zeniv.linux.org.uk, linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org Subject: [PATCH 2/2, variant B] ARM: move mmiocpy/mmioset exports to io.c Date: Mon, 24 Oct 2016 17:06:45 +0200 Message-ID: <14981419.nRUFpzhctm@wuerfel> User-Agent: KMail/5.1.3 (Linux/4.4.0-34-generic; KDE/5.18.0; x86_64; ; ) In-Reply-To: <3446653.W8FbGAKSeQ@wuerfel> References: <20161017065131.GA27863@angband.pl> <20161020150814.42951f61@roar.ozlabs.ibm.com> <3446653.W8FbGAKSeQ@wuerfel> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Provags-ID: V03:K0:bYAj8v+QUgaa66THsY33ggTF5qnWv9bTF1zbyfTiJEZxta36Myn sJQvLRFaJKYNMUSkz3xOf+ZPVzkiGMyUVkm3EePRb1bytbPxpmA1gXIKoz2qdtH4Nfkku5X r0AfrnQEr4rIVYCAmA77336joqLQIaE2viSPQJCbx1KB5tmZI6Zk8MSgNAsUuX9Sirm3bGN p4/7vuKR1ZGTFD7uvZXqg== X-UI-Out-Filterresults: notjunk:1;V01:K0:nuTyX5ALMe8=:wBSkyurtZvrTuQQny7pfN1 +KbzA14s3JTFkFYogn8ONdbbaenLttIJ2SaMAdEegPPx5GspcRk8nJA4BoDQpwTqxZgsqNUi0 t1SXbGaD5ns/mbCsF8IXH/VXQqxUQtFgPyc96UaxfQcyv5gKFyLLycJZRva3y/ZzeRao3JruG Oo6T6R5BNCJ6OICLRAZOeJ1O4ScNS3bNcrd+viI8TIvuIhOzQHxK8cPrUjulkj01oPzIdz6rQ dUYuaZ1AKpITeG42CDEG0E2KVhO0sk3fgSocYVG1TT/0wSzZ3Mq2DTtlktQPwgQ12WNy+umwi qiTz3U4y3xgC2cKaIRs5DwZZhHJC/PkDxnn+S/euaoPmquIH9q6X1YP4Qm/qS/Lth1HLlwR5g H5PC/1I4nUoSfXfoDNLySQ8TFKy8WrgPV7glB4K9c+0b6puYWTwb431FIJjfKMoS+nBnmyVrQ 5RKWOFZniIc1+PJqpM4bu7EfKgL9SxJZ2dsfwvpDAJfKQpMQRglA3mvCZsb7cX/Db6dQ8v5l7 lbnkmSCv/A1TDuwJf5/zC1Y7qWU+Mg0msrHYhaU/awk7nc0pv5hLDGW0pZK/h5+p5VHWCFNSR S+QsCv+pssjgCoaZl7D49aLmm5pFAX2r7HEjoWtXXrdNz63jWca56exjcKcnAO5yTsihlnIyX uVBCWeQIGu2M8zJIi2j2GhU1LKecqdG9hYSvmpFBEm9Awu/qRVyRkbjPZWd+6zAQGwWP/MOtz QXqdhP8btGdCtAsy Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1416 Lines: 43 The prototypes for mmioset/mmiocpy are intentionally hidden inside of inline functions, which breaks the EXPORT_SYMBOL statements when symbol versioning is enabled. This moves the two exports from the files that implement the code into the kernel/io.c file, adding another local declaration there. Signed-off-by: Arnd Bergmann diff --git a/arch/arm/kernel/io.c b/arch/arm/kernel/io.c index eedefe050022..c74746997626 100644 --- a/arch/arm/kernel/io.c +++ b/arch/arm/kernel/io.c @@ -82,3 +82,10 @@ void _memset_io(volatile void __iomem *dst, int c, size_t count) } } EXPORT_SYMBOL(_memset_io); + +/* can't export them from memcpy.S/memset.S because of hidden declaration */ +void mmioset(void __iomem *addr, unsigned int c, size_t n); +EXPORT_SYMBOL(mmioset); + +void mmiocpy(void *dest, const void __iomem *src, size_t n); +EXPORT_SYMBOL(mmiocpy); diff --git a/arch/arm/lib/memcpy.S b/arch/arm/lib/memcpy.S index 1be5b6ddf37c..1f822fc52400 100644 --- a/arch/arm/lib/memcpy.S +++ b/arch/arm/lib/memcpy.S @@ -70,4 +70,3 @@ ENTRY(memcpy) ENDPROC(memcpy) ENDPROC(mmiocpy) EXPORT_SYMBOL(memcpy) -EXPORT_SYMBOL(mmiocpy) diff --git a/arch/arm/lib/memset.S b/arch/arm/lib/memset.S index 7b72044cba62..6f075ca09abc 100644 --- a/arch/arm/lib/memset.S +++ b/arch/arm/lib/memset.S @@ -137,4 +137,3 @@ UNWIND( .fnend ) ENDPROC(memset) ENDPROC(mmioset) EXPORT_SYMBOL(memset) -EXPORT_SYMBOL(mmioset)