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: 123111 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp8803780qgn; Tue, 2 Jan 2018 02:33:50 -0800 (PST) X-Google-Smtp-Source: ACJfBoudr3hQhaSi8/ycFrCB1N4ut9JAFnOWWk4l8w6omAyq2wBnoCLlpAB+FuGfy+LwTgB+u3T+ X-Received: by 10.99.178.68 with SMTP id t4mr13963578pgo.330.1514889230061; Tue, 02 Jan 2018 02:33:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514889230; cv=none; d=google.com; s=arc-20160816; b=Ls9l662FC6C6/Fhd0xfZ5oEWWBpb2F1KIXcBdF+O5lNn5hWsDfm9YxSLNNZdDrWPuJ WCyWAcQmce165EKjwYMDdLKZdvTxIYCdjHBeJE+3LTuBQGg7Qpw0Yy+pCt+ex365N2Sw WpYxrrU31v7MRF9T68CIm62H3mWPLs3EzQSFfz6mSX6AxRhX370Drf1M4+N+REDoaYwt 2slOVU9NtI3KoQBeo73yBHyyZ0erOGCQAc9Z3yJSOd7ttUcm+nqXuVInn8S0g8FkjwgJ iNcGA2YbveqlRZ+rg/0hSpkipJsvtt4Z8ndAeXpOXEer5hLqLg/+f0zanvlX9WgbbZtj 4Qfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=C33GJXia0YWAwKWmuszXaHxU5OryVc26FWEyMVdhhew=; b=p9xdFb/FErueLGVIomglbLOk2PFwoPXWgrB4aNZO/iicQVIEvrvQtOeGt/Uhbis8/5 Qd0DwtT5BEi09+FXvaDWfWIJHEsUYREwX2mLeiyIkznnkNlGfpQ/DK8VmAm9qyBkT4bk cxPwncwCD1msFrrogKgZfZQVlX0DC0chwqNmCFjs+hizAuOqXgCeCEWnTLacjCSDYIuo 8B3e8uvi8/5suYuc1KGrakRL1VCA/c1LBNs8Bx4lykJETlb806hGV6lAwv1XC0Mw7nCC /3VuE1RfxdoSD1drbvcSwbNMqeaEdROX/W241OCDom8YOAPKZ8eXTYrGYm6nQmS5XggH qavA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i7si23003737pgn.621.2018.01.02.02.33.49; Tue, 02 Jan 2018 02:33:50 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752435AbeABKdp (ORCPT + 28 others); Tue, 2 Jan 2018 05:33:45 -0500 Received: from mout.kundenserver.de ([212.227.17.13]:65189 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751283AbeABKdo (ORCPT ); Tue, 2 Jan 2018 05:33:44 -0500 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 Cc: Arnd Bergmann , Vineet Gupta , Russell King , Jose Abreu , Sudip Mukherjee , linux-snps-arc@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org 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== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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(-) -- 2.9.0 Acked-by: Russell King 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) {