Bjorn Helgaas 96a2adbc6f 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 10629d711e ("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: f1b82746c1 ("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>		2014-10-22 16:14:03 -06:00
..
acpi	ACPICA: Introduce acpi_enable_all_wakeup_gpes()	2014-09-30 21:04:47 +02:00
asm-generic	Merge git://git.infradead.org/users/eparis/audit	2014-10-19 16:25:56 -07:00
clocksource
crypto	crypto: LLVMLinux: Add macro to remove use of VLAIS in crypto code	2014-10-14 10:51:22 +02:00
drm	drm/mst: rework payload table allocation to conform better.	2014-10-13 14:40:53 +10:00
dt-bindings	The clk tree changes for 3.18 are dominated by clock drivers. Mostly	2014-10-15 07:05:03 +02:00
keys	KEYS: Restore partial ID matching functionality for asymmetric keys	2014-10-06 15:21:05 +01:00
kvm	arm/arm64: KVM: Fix BE accesses to GICv2 EISR and ELRSR regs	2014-10-16 10:57:41 +02:00
linux	clocksource: Remove "weak" from clocksource_default_clock() declaration	2014-10-22 16:14:03 -06:00
math-emu
media	Merge branch 'patchwork' into v4l_for_linus	2014-10-09 14:00:54 -03:00
memory
misc	cxl: Add new header for call backs and structs	2014-10-08 20:15:43 +11:00
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-10-19 11:41:57 -07:00
pcmcia
ras
rdma	IB/mlx5, iser, isert: Add Signature API additions	2014-10-09 00:10:53 -07:00
rxrpc
scsi	Merge branch 'for-3.18/core' of git://git.kernel.dk/linux-block	2014-10-18 11:53:51 -07:00
soc/tegra
sound	Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma	2014-10-18 18:11:04 -07:00
target
trace	Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2014-10-13 15:44:12 +02:00
uapi	Merge git://git.infradead.org/users/eparis/audit	2014-10-19 16:25:56 -07:00
video	fbdev changes for 3.18	2014-10-18 18:03:02 -07:00
xen	xen: remove DEFINE_XENBUS_DRIVER() macro	2014-10-06 10:27:57 +01:00
Kbuild