ARM: 8382/1: clocksource: make ARM_TIMER_SP804 depend on GENERIC_SCHED_CLOCK
authorSudeep Holla <sudeep.holla@arm.com>
Fri, 29 May 2015 11:27:46 +0000 (12:27 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 2 Jun 2015 08:58:19 +0000 (09:58 +0100)
Commit 5261ef2ea836 ("ARM: 8366/1: move Dual-Timer SP804 driver to
drivers/clocksource") moved SP804 to drivers/clocksource resulting in
it being selectable on platforms/architectures without the config
GENERIC_SCHED_CLOCK enabled. Due to that, it results in the following
build failure(e.g. x86_64 allmodconfig)

drivers/built-in.o: In function `__sp804_clocksource_and_sched_clock_init':
(.init.text+0x1a0e7): undefined reference to `sched_clock_register'

This patch fixes the build by making ARM_TIMER_SP804 depend on
GENERIC_SCHED_CLOCK

Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
drivers/clocksource/Kconfig

index 0f1c0e7f86daa745496e06ff2151e7e236e38c15..50534704486ae6e0b0494f1506a807ba2e029a7b 100644 (file)
@@ -134,6 +134,7 @@ config ARM_GLOBAL_TIMER
 
 config ARM_TIMER_SP804
        bool "Support for Dual Timer SP804 module"
+       depends on GENERIC_SCHED_CLOCK
        select CLKSRC_MMIO
        select CLKSRC_OF if OF