]> git.baikalelectronics.ru Git - kernel.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)
committerBjorn Helgaas <bhelgaas@google.com>
Wed, 22 Oct 2014 22:14:03 +0000 (16:14 -0600)
commite90161fe4bed2462dfe0b7e25f879f8a571a7d0f
treeab1940941abb2e958ccb5c2e701904c1452107fa
parentc0089cadb06075e27f6ba86cea03a3992291768b
clocksource: Remove "weak" from clocksource_default_clock() declaration

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 abef42debb2e ("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: 37596baabff7 ("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>
include/linux/clocksource.h