From patchwork Sun Nov 20 17:03:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Pitre X-Patchwork-Id: 9438543 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5E8A260235 for ; Sun, 20 Nov 2016 17:05:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4663828516 for ; Sun, 20 Nov 2016 17:05:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 36CB82896F; Sun, 20 Nov 2016 17:05:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=unavailable version=3.3.1 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.wl.linuxfoundation.org (Postfix) with ESMTPS id CCCE128516 for ; Sun, 20 Nov 2016 17:05:43 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1c8VXP-0006xt-IA; Sun, 20 Nov 2016 17:04:19 +0000 Received: from mail-qk0-x230.google.com ([2607:f8b0:400d:c09::230]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1c8VXK-0006Or-Ks for linux-arm-kernel@lists.infradead.org; Sun, 20 Nov 2016 17:04:16 +0000 Received: by mail-qk0-x230.google.com with SMTP id q130so324199071qke.1 for ; Sun, 20 Nov 2016 09:03:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:in-reply-to:message-id:references :user-agent:mime-version; bh=W/1QVKX0ygKZpLA5YyyYEhnuwm6uSMa7wq+012GJyMs=; b=RHfXGGYFpJOCju/ccUTeOd63o2aGr8AOHUocDWqSfYSbogijnA4pB0H5Cdhaiwfvpf W3TLKv037zkb6zFi6XWGlh1i4iOQwFOUczPteRtf+Fyl+fXaza58pXKeV8J8HWkcZxGs KfbOp4i8IdRI01qjXqx9UpzCTUtZKwt//fyw4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:cc:subject:in-reply-to:message-id :references:user-agent:mime-version; bh=W/1QVKX0ygKZpLA5YyyYEhnuwm6uSMa7wq+012GJyMs=; b=Yyvuh8G+neIZb+5sGIKV4wMnuqTJhQUdNmQosZ77/owUJvBSv7nxSj4BNl5PUtd/Up 3kM6+jY2RFO5e6SuoopjJjR6nmEo93uxEoHAGRxMGP/tKgCl97TyDsF6LxzzGjNJiks4 A4KXQ4nBkI+d/G5W0ftNi3tQFHFon6c9huMFFWlrWuLlKILs+laEkgULkm2rURG0K7vU ZyzkA6J6XVapV+BH43jibKzwRNowu1mq0aXlEwdnFIR0vFbaHQPjuMeeQaoL/tOwnHBg 4fpqIh/eJQwkgQcHlxK2DKRF2msMuL/RubugRV+ZfxcsIzdtHKShSVk/eAovz9lb3Xy8 /aFg== X-Gm-Message-State: AKaTC02o2g2GJz0SabBEqzxazku9IjeBT7/PLB+JIVQzKIUu5L2oOZizT0uOh7iuOzMTgmWk X-Received: by 10.55.140.132 with SMTP id o126mr12902876qkd.227.1479661432074; Sun, 20 Nov 2016 09:03:52 -0800 (PST) Received: from xanadu.home ([2607:fa48:6e39:d410:feaa:14ff:fea7:ed77]) by smtp.gmail.com with ESMTPSA id n188sm9112505qkc.30.2016.11.20.09.03.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 20 Nov 2016 09:03:51 -0800 (PST) Date: Sun, 20 Nov 2016 12:03:50 -0500 (EST) From: Nicolas Pitre To: Russell King - ARM Linux Subject: Re: commit 4dd1837d7589f468ed109556513f476e7a7f9121 breaks build In-Reply-To: <20161120132502.GV1041@n2100.armlinux.org.uk> Message-ID: References: <58310EC6.4020402@math.uni-bielefeld.de> <20161120113007.GS1041@n2100.armlinux.org.uk> <58318C6A.50104@math.uni-bielefeld.de> <20161120123422.GT1041@n2100.armlinux.org.uk> <58319D70.7030106@math.uni-bielefeld.de> <20161120132502.GV1041@n2100.armlinux.org.uk> User-Agent: Alpine 2.20 (LFD 67 2015-01-07) MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161120_090414_865140_EA501D7A X-CRM114-Status: GOOD ( 20.99 ) 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: Tobias Jakobi , linux-samsung-soc , viro@zeniv.linux.org.uk, "linux-arm-kernel@lists.infradead.org" , "linux-kernel@vger.kernel.org" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP On Sun, 20 Nov 2016, Russell King - ARM Linux wrote: > On Sun, Nov 20, 2016 at 01:56:16PM +0100, Tobias Jakobi wrote: > > Hey Russell, > > > > thanks for the quick reply and looking into this! > > > > Added Nicolas Pitre to Cc since the ksym trim stuff came from him. > > Arnd's patch "kbuild: provide include/asm/asm-prototypes.h for ARM" fixes > it, but I think it's a mixture of fixes, and partially dependent on some > other patches. I don't know what the status of his patch is, but my > feeling is that it consists of more than a single fix, and needs > splitting. Certainly the asm-prototypes.h is not relevant to this > problem, but the rest of it seems to be. Well... the problem for the current breakage was identified a while ago: https://lkml.org/lkml/2016/2/10/686 I'm surprised that Al didn't fold my patch into his. Now that this has hit mainline, CONFIG_TRIM_UNUSED_KSYMS is now broken on ARM. And I don't see how the asm-prototypes.h is going to fix it either (if anything, at the moment it looks like it might be another source of breakage). So I think the folowing patch should go into mainline: ----- >8 From 3225f625c116a350c54f361df491bf3e1c6d32b3 Mon Sep 17 00:00:00 2001 From: Nicolas Pitre Date: Wed, 10 Feb 2016 17:40:04 -0500 Subject: [PATCH] ARM: don't use assembler macro arguments with EXPORT_SYMBOL() Committ 4dd1837d75 ("arm: move exports to definitions") added EXPORT_SYMBOL(\name) to bitops.h. Here \name is an assembler macro argument which is not subject to preprocessor substitutions. And the assembler doesn't handle preprocessor macros either. That has the effect of breaking CONFIG_TRIM_UNUSED_KSYMS=y. Signed-off-by: Nicolas Pitre diff --git a/arch/arm/lib/bitops.h b/arch/arm/lib/bitops.h index df06638b32..7d807cfd8e 100644 --- a/arch/arm/lib/bitops.h +++ b/arch/arm/lib/bitops.h @@ -1,6 +1,5 @@ #include #include -#include #if __LINUX_ARM_ARCH__ >= 6 .macro bitop, name, instr @@ -26,7 +25,6 @@ UNWIND( .fnstart ) bx lr UNWIND( .fnend ) ENDPROC(\name ) -EXPORT_SYMBOL(\name ) .endm .macro testop, name, instr, store @@ -57,7 +55,6 @@ UNWIND( .fnstart ) 2: bx lr UNWIND( .fnend ) ENDPROC(\name ) -EXPORT_SYMBOL(\name ) .endm #else .macro bitop, name, instr @@ -77,7 +74,6 @@ UNWIND( .fnstart ) ret lr UNWIND( .fnend ) ENDPROC(\name ) -EXPORT_SYMBOL(\name ) .endm /** @@ -106,6 +102,5 @@ UNWIND( .fnstart ) ret lr UNWIND( .fnend ) ENDPROC(\name ) -EXPORT_SYMBOL(\name ) .endm #endif diff --git a/arch/arm/lib/changebit.S b/arch/arm/lib/changebit.S index f402786217..1cfdb138d2 100644 --- a/arch/arm/lib/changebit.S +++ b/arch/arm/lib/changebit.S @@ -9,7 +9,10 @@ */ #include #include +#include #include "bitops.h" .text bitop _change_bit, eor + +EXPORT_SYMBOL(_change_bit) diff --git a/arch/arm/lib/clearbit.S b/arch/arm/lib/clearbit.S index f6b75fb64d..e901ca5af0 100644 --- a/arch/arm/lib/clearbit.S +++ b/arch/arm/lib/clearbit.S @@ -9,7 +9,10 @@ */ #include #include +#include #include "bitops.h" .text bitop _clear_bit, bic + +EXPORT_SYMBOL(_clear_bit) diff --git a/arch/arm/lib/setbit.S b/arch/arm/lib/setbit.S index 618fedae4b..3c8b11240f 100644 --- a/arch/arm/lib/setbit.S +++ b/arch/arm/lib/setbit.S @@ -9,7 +9,10 @@ */ #include #include +#include #include "bitops.h" .text bitop _set_bit, orr + +EXPORT_SYMBOL(_set_bit) diff --git a/arch/arm/lib/testchangebit.S b/arch/arm/lib/testchangebit.S index 4becdc3a59..e3d19b87fb 100644 --- a/arch/arm/lib/testchangebit.S +++ b/arch/arm/lib/testchangebit.S @@ -9,7 +9,10 @@ */ #include #include +#include #include "bitops.h" .text testop _test_and_change_bit, eor, str + +EXPORT_SYMBOL(_test_and_change_bit) diff --git a/arch/arm/lib/testclearbit.S b/arch/arm/lib/testclearbit.S index 918841dcce..d247e6f70f 100644 --- a/arch/arm/lib/testclearbit.S +++ b/arch/arm/lib/testclearbit.S @@ -9,7 +9,10 @@ */ #include #include +#include #include "bitops.h" .text testop _test_and_clear_bit, bicne, strne + +EXPORT_SYMBOL(_test_and_clear_bit) diff --git a/arch/arm/lib/testsetbit.S b/arch/arm/lib/testsetbit.S index 8d1b2fe9e4..76800ff601 100644 --- a/arch/arm/lib/testsetbit.S +++ b/arch/arm/lib/testsetbit.S @@ -9,7 +9,10 @@ */ #include #include +#include #include "bitops.h" .text testop _test_and_set_bit, orreq, streq + +EXPORT_SYMBOL(_test_and_set_bit)