lkml.org 
[lkml]   [2014]   [Oct]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH v1 06/10] clocksource: Remove "weak" from clocksource_default_clock() declaration
    From
    Date
    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>
    CC: Daniel Lezcano <daniel.lezcano@linaro.org>
    CC: Martin Schwidefsky <schwidefsky@de.ibm.com>
    ---
    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


    \
     
     \ /
      Last update: 2014-10-15 19:41    [W:3.096 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site