]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
clocksource: Remove "weak" from clocksource_default_clock() declaration
authorBjorn Helgaas <bhelgaas@google.com>
Tue, 14 Oct 2014 00:59:09 +0000 (18:59 -0600)
committerJiri Slaby <jslaby@suse.cz>
Wed, 19 Nov 2014 17:38:24 +0000 (18:38 +0100)
commit0f207b54545a7535e02e7ca11931655396e15846
tree531457f3ad68b9dd49f16be1a0cab918f5a6f5b6
parent33176fe6d29e0a689928532db6cf44de67c72921
clocksource: Remove "weak" from clocksource_default_clock() declaration

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: Jiri Slaby <jslaby@suse.cz>
include/linux/clocksource.h