[+cc linux-mips]
On Wed, Oct 15, 2014 at 11:06 AM, Bjorn Helgaas <[email protected]> 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 <[email protected]> > CC: [email protected] > --- > 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 [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
