Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752755AbeABLRM (ORCPT + 1 other); Tue, 2 Jan 2018 06:17:12 -0500 Received: from pandora.armlinux.org.uk ([78.32.30.218]:52680 "EHLO pandora.armlinux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752157AbeABLRL (ORCPT ); Tue, 2 Jan 2018 06:17:11 -0500 Date: Tue, 2 Jan 2018 11:16:50 +0000 From: Russell King - ARM Linux To: Arnd Bergmann Cc: Andrew Morton , Vineet Gupta , Jose Abreu , Sudip Mukherjee , linux-snps-arc@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH] arch: drop duplicate exports of abort() Message-ID: <20180102111650.GC28752@n2100.armlinux.org.uk> References: <20180102103311.706364-1-arnd@arndb.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20180102103311.706364-1-arnd@arndb.de> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: On Tue, Jan 02, 2018 at 11:31:12AM +0100, Arnd Bergmann wrote: > 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 For arm: 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) > { > -- > 2.9.0 > -- RMK's Patch system: http://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line in suburbia: sync at 8.8Mbps down 630kbps up According to speedtest.net: 8.21Mbps down 510kbps up