Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751443AbaJPHWp (ORCPT ); Thu, 16 Oct 2014 03:22:45 -0400 Received: from e06smtp16.uk.ibm.com ([195.75.94.112]:47760 "EHLO e06smtp16.uk.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750993AbaJPHWn (ORCPT ); Thu, 16 Oct 2014 03:22:43 -0400 Date: Thu, 16 Oct 2014 09:22:32 +0200 From: Martin Schwidefsky To: Bjorn Helgaas Cc: Jason Wessel , Ralf Baechle , Ingo Molnar , John Stultz , Eric Paris , "H. Peter Anvin" , Thomas Gleixner , Andrew Morton , "linux-kernel@vger.kernel.org" , Daniel Lezcano , "linux-s390@vger.kernel.org" Subject: Re: [PATCH v1 06/10] clocksource: Remove "weak" from clocksource_default_clock() declaration Message-ID: <20141016092232.570be048@mschwide> In-Reply-To: References: <20141015165957.4063.66741.stgit@bhelgaas-glaptop2.roam.corp.google.com> <20141015170624.4063.24678.stgit@bhelgaas-glaptop2.roam.corp.google.com> X-Mailer: Claws Mail 3.9.3 (GTK+ 2.24.23; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 14101607-0025-0000-0000-000001E868DB Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 15 Oct 2014 17:30:33 -0600 Bjorn Helgaas wrote: > [+cc Daniel, Martin, linux-s390; sorry, I botched my "stg mail" so you > weren't included the first time. s390 could see issues from this.] > > On Wed, Oct 15, 2014 at 11:06 AM, Bjorn Helgaas wrote: > > kernel/time/jiffies.c provides a default clocksource_default_clock() > > definition explicitly marked "weak". arch/s390 provides its own definition > > intended to override the default, but the "weak" attribute on the > > declaration applied to the s390 definition 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 clocksource_default_clock() > > declaration so we always prefer a non-weak definition over the weak one, > > independent of link order. > > > > Fixes: f1b82746c1e9 ("clocksource: Cleanup clocksource selection") > > Signed-off-by: Bjorn Helgaas > > CC: Daniel Lezcano > > CC: Martin Schwidefsky > > --- > > include/linux/clocksource.h | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h > > index 653f0e2b6ca9..abcafaa20b86 100644 > > --- a/include/linux/clocksource.h > > +++ b/include/linux/clocksource.h > > @@ -287,7 +287,7 @@ extern struct clocksource* clocksource_get_next(void); > > extern void clocksource_change_rating(struct clocksource *cs, int rating); > > extern void clocksource_suspend(void); > > extern void clocksource_resume(void); > > -extern struct clocksource * __init __weak clocksource_default_clock(void); > > +extern struct clocksource * __init clocksource_default_clock(void); > > extern void clocksource_mark_unstable(struct clocksource *cs); > > > > extern u64 > > s390 compiles and boots without the __weak for clocksource_default_clock. -- blue skies, Martin. "Reality continues to ruin my life." - Calvin. -- 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/