Subject: [PATCH] clocksource: make ARM_TIMER_SP804 depend on GENERIC_SCHED_CLOCK

From: Sudeep Holla <[email-masked]>
Date: Fri, 29 May 2015 09:17:56 +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: Stephen Rothwell <[email-masked]>
Cc: Russell King <[email-masked]>
Cc: Daniel Lezcano <[email-masked]>
Cc: Thomas Gleixner <[email-masked]>
Signed-off-by: Sudeep Holla <[email-masked]>
---
 drivers/clocksource/Kconfig | 1 +
 1 file changed, 1 insertion(+)

Hi Russell,

If you are fine with this fix, I will put this into the patch tracker.

Regards,
Sudeep

diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
index 0f1c0e7f86da..50534704486a 100644
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@ -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

--
1.9.1