lkml.org 
[lkml]   [2014]   [Nov]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.17 117/141] clocksource: Remove "weak" from clocksource_default_clock() declaration
    Date
    3.17-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Bjorn Helgaas <bhelgaas@google.com>

    commit 96a2adbc6f501996418da9f7afe39bf0e4d006a9 upstream.

    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 <bhelgaas@google.com>
    Acked-by: John Stultz <john.stultz@linaro.org>
    Acked-by: Ingo Molnar <mingo@kernel.org>
    CC: Daniel Lezcano <daniel.lezcano@linaro.org>
    CC: Martin Schwidefsky <schwidefsky@de.ibm.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    include/linux/clocksource.h | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/include/linux/clocksource.h
    +++ b/include/linux/clocksource.h
    @@ -287,7 +287,7 @@ extern struct clocksource* clocksource_g
    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



    \
     
     \ /
      Last update: 2014-11-19 22:21    [W:4.087 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site