Messages in this thread | | | Date | Wed, 15 Oct 2014 10:36:47 -0700 | Subject | Re: [PATCH v1 06/10] clocksource: Remove "weak" from clocksource_default_clock() declaration | From | John Stultz <> |
| |
On Wed, Oct 15, 2014 at 10:06 AM, Bjorn Helgaas <bhelgaas@google.com> 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@google.com> > CC: Daniel Lezcano <daniel.lezcano@linaro.org> > CC: Martin Schwidefsky <schwidefsky@de.ibm.com>
Acked-by: John Stultz <john.stultz@linaro.org>
| |