Re: [PATCH v1 06/10] clocksource: Remove "weak" from clocksource_default_clock() declaration

From: John Stultz
Date: Wed Oct 15 2014 - 13:36:52 EST

On Wed, Oct 15, 2014 at 10:06 AM, Bjorn Helgaas <bhelgaas@xxxxxxxxxx> 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 <bhelgaas@xxxxxxxxxx>
> CC: Daniel Lezcano <daniel.lezcano@xxxxxxxxxx>
> CC: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

Acked-by: John Stultz <john.stultz@xxxxxxxxxx>
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at
Please read the FAQ at