Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933220AbaJUUE4 (ORCPT ); Tue, 21 Oct 2014 16:04:56 -0400 Received: from mail-qc0-f172.google.com ([209.85.216.172]:39699 "EHLO mail-qc0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932842AbaJUUEy (ORCPT ); Tue, 21 Oct 2014 16:04:54 -0400 MIME-Version: 1.0 In-Reply-To: References: <20141015165957.4063.66741.stgit@bhelgaas-glaptop2.roam.corp.google.com> <20141015170609.4063.10668.stgit@bhelgaas-glaptop2.roam.corp.google.com> From: Bjorn Helgaas Date: Tue, 21 Oct 2014 14:04:31 -0600 Message-ID: Subject: Re: [PATCH v1 04/10] MIPS: Remove "weak" from platform_maar_init() declaration To: Jason Wessel , Ralf Baechle , Ingo Molnar , John Stultz , Eric Paris , "H. Peter Anvin" , Thomas Gleixner , Andrew Morton Cc: "linux-kernel@vger.kernel.org" , "linux-mips@linux-mips.org" Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Oct 15, 2014 at 5:27 PM, Bjorn Helgaas wrote: > [+cc linux-mips] > > On Wed, Oct 15, 2014 at 11:06 AM, Bjorn Helgaas wrote: >> arch/mips/mm/init.c provides a default platform_maar_init() definition >> explicitly marked "weak". arch/mips/mti-malta/malta-memory.c provides its >> own definition intended to override the default, but the "weak" attribute >> on the declaration applied to this as well, so the linker chose one based >> on link order (see 10629d711ed7 ("PCI: Remove __weak annotation from >> pcibios_get_phb_of_node decl")). >> >> Remove the "weak" attribute from the declaration so we always prefer a >> non-weak definition over the weak one, independent of link order. >> >> Signed-off-by: Bjorn Helgaas >> CC: linux-mips@linux-mips.org Dropping this because no MIPS folks responded. >> --- >> arch/mips/include/asm/maar.h | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/arch/mips/include/asm/maar.h b/arch/mips/include/asm/maar.h >> index 6c62b0f899c0..b02891f9caaf 100644 >> --- a/arch/mips/include/asm/maar.h >> +++ b/arch/mips/include/asm/maar.h >> @@ -26,7 +26,7 @@ >> * >> * Return: The number of MAAR pairs configured. >> */ >> -unsigned __weak platform_maar_init(unsigned num_pairs); >> +unsigned platform_maar_init(unsigned num_pairs); >> >> /** >> * write_maar_pair() - write to a pair of MAARs >> -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/