From patchwork Tue Jan 2 10:31:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 10140255 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 CF8126034B for ; Tue, 2 Jan 2018 10:33:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ACEC028AA8 for ; Tue, 2 Jan 2018 10:33:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A076428ABB; Tue, 2 Jan 2018 10:33:47 +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.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2DD7C28AA8 for ; Tue, 2 Jan 2018 10:33:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=kprg2Y3dcmuBQsaKILueTvlbQAdRQfs/kR/INb2u6No=; b=MXA D38dhhya9Y9R+vM943U2p7ds2wlbg2+bIPFUQEekhd+zgUiOWAHBUHW+tqaDNEInPr/FD7A1w912Y OGvl/GUvjfN4vHRV/ZV7VVNQVf3uE7S9G1585IIbseg8QtJP1OG8IOVE+4AK8lCbc3DMkTzpCZ/ZZ iyJzV/8e5eGUU/TE5tByqHqyhh5iiq8vTtrbyyVPiy/JbQyH7CHdEV4CibhGMFAHnFu6LQKN3/3/Q tEt1atpXGwb1T8T2wWOsZUjJMuuZJP3342wzqeBH0uprc6C7gc51x3xDOJ68qjqG2eXCCfa8+ekys WId+/qFWG6Xlafhf2EtPSXjzBh4L2yw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1eWJtB-0005aW-EH; Tue, 02 Jan 2018 10:33:45 +0000 Received: from mout.kundenserver.de ([212.227.17.13]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eWJt6-0005YU-Pp; Tue, 02 Jan 2018 10:33:42 +0000 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue102 [212.227.15.145]) with ESMTPA (Nemesis) id 0MCZak-1eebL30XyM-009QbV; Tue, 02 Jan 2018 11:33:19 +0100 From: Arnd Bergmann To: Andrew Morton Subject: [PATCH] arch: drop duplicate exports of abort() Date: Tue, 2 Jan 2018 11:31:12 +0100 Message-Id: <20180102103311.706364-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:oFANxWIzeJJw/HZ0Q4s64XQQFF+iL+/oZimsBkMOsjeunJ5bu0a tTSb8s4dSqzByb6IQsW5QXcTXiRdPYJdUs1Y6VywHXwE9Bn0h3pC1g+ibrhNY5EnkC6LCjh nzl0/gKIyu2B1GAwjNRLNCImK0E8CU5nGvWIwTwJh/+u17nCa2SDiORIqMvmqDzFuI1j/no tFfdWfNqo+3SFsViBFVBQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:WSiHEpfgbQc=:ply/hAzHCtoPUrLS28furW 9bcVgjRiQiJQsvtlKZXo9qNPqIIIQxj1KvpJII7AujzSIaHtS7Rl6PVwlke+B5Z2joFilVT2u vgi4za40XReJuxKz/gMHx/5qjZyWnkXiU/lCRBlLKmrCE7i0hLm84s4muUh8oOxu3RQPOEeNw RDO/+SAZFYiRvM44B3+VMRvN6jK7IY/dsGLj+jHn8s5iiPMLOZmu8x/1gcVQfVoWeoxTJWbTL 8P+8ATfro75ZFTrETBg3GxaSlOyTLimNqLR9iWmWag+kjymSf+4Ps2MIfeppg07qpG3O3JSxv rvnlKDyBEer5u6gnYZGOzteUytFP4faPzuKgab4DoFOBvul9Bq9CVCRTlt42MRVJvv+rsEXWw Fr0HNRGnVU1Bkx/YTKJqBBONfO8TKjx3+d22TExRPCvFFtHypFIrEue6G3iO0f2KnoHu+QKkI /rXTTy6qPCGTc6cBYqQTz+ZbgJgJBX57kAnRKBXCUR9XGLShiNAOChCGx0heP/wkqYE8KXrRd a+7VmBx+wVUcYP/HUGxfH3mcch8AmF1wvdS31D4hb8nqx91llwfHQ9y9yvsZ4JrDJ9GnTY3KY xYiE1gInzCbS07XKuk2rQbMDUy0nQw4PltQsdr8o7gdElONDq2qzEp7pYUZgKKRNi9AyCZ4Go DtNWuVnjnuB5CKTsSgbzbW6ffMUyYpnS+j16l2v1fODuTOtpeXCFoTsC0yg7d991n8uc6eEQw Yg7gtzfKU+zMLANqktTxIMG3dOoEQrx0vlIYZA== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180102_023341_189944_3C31EA28 X-CRM114-Status: UNSURE ( 9.99 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jose Abreu , Arnd Bergmann , Vineet Gupta , Russell King , linux-kernel@vger.kernel.org, linux-snps-arc@lists.infradead.org, Sudip Mukherjee , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 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 We now have exports in both architecture code in in common code, which causes a link failure when symbol versioning is eanbled, on four architectures: kernel/exit.o: In function `__crc_abort': exit.c:(*ABS*+0xc0e2ec8b): multiple definition of `__crc_abort' This removes the four architecture specific exports and only leaves the export next to the __weak symbol. Fixes: mmotm ("kernel/exit.c: export abort() to modules") Signed-off-by: Arnd Bergmann Acked-by: Russell King --- Andrew, can you apply this to -mm on top of the other patch? --- arch/arc/kernel/traps.c | 1 - arch/arm/kernel/traps.c | 1 - arch/m32r/kernel/traps.c | 1 - arch/unicore32/kernel/traps.c | 1 - 4 files changed, 4 deletions(-) diff --git a/arch/arc/kernel/traps.c b/arch/arc/kernel/traps.c index 51a55b06cb2a..133a4dae41fe 100644 --- a/arch/arc/kernel/traps.c +++ b/arch/arc/kernel/traps.c @@ -169,4 +169,3 @@ void abort(void) { __asm__ __volatile__("trap_s 5\n"); } -EXPORT_SYMBOL(abort); diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c index e344bdd2e5ac..5e3633c24e63 100644 --- a/arch/arm/kernel/traps.c +++ b/arch/arm/kernel/traps.c @@ -793,7 +793,6 @@ void abort(void) /* if that doesn't kill us, halt */ panic("Oops failed to kill thread"); } -EXPORT_SYMBOL(abort); void __init trap_init(void) { diff --git a/arch/m32r/kernel/traps.c b/arch/m32r/kernel/traps.c index cb79fba79d43..b88a8dd14933 100644 --- a/arch/m32r/kernel/traps.c +++ b/arch/m32r/kernel/traps.c @@ -122,7 +122,6 @@ void abort(void) /* if that doesn't kill us, halt */ panic("Oops failed to kill thread"); } -EXPORT_SYMBOL(abort); void __init trap_init(void) { diff --git a/arch/unicore32/kernel/traps.c b/arch/unicore32/kernel/traps.c index 5f25b39f04d4..c4ac6043ebb0 100644 --- a/arch/unicore32/kernel/traps.c +++ b/arch/unicore32/kernel/traps.c @@ -298,7 +298,6 @@ void abort(void) /* if that doesn't kill us, halt */ panic("Oops failed to kill thread"); } -EXPORT_SYMBOL(abort); void __init trap_init(void) {