Messages in this thread Patch in this message | | | Date | Tue, 17 Nov 2015 02:37:05 -0800 | From | tip-bot for Arnd Bergmann <> | Subject | [tip:timers/urgent] clocksource: Disallow drivers for ARCH_USES_GETTIMEOFFSET |
| |
Commit-ID: 3da6d49e847128378c30292848125cc3e207e5f7 Gitweb: http://git.kernel.org/tip/3da6d49e847128378c30292848125cc3e207e5f7 Author: Arnd Bergmann <arnd@arndb.de> AuthorDate: Mon, 16 Nov 2015 17:51:17 +0100 Committer: Thomas Gleixner <tglx@linutronix.de> CommitDate: Mon, 16 Nov 2015 19:07:08 +0100
clocksource: Disallow drivers for ARCH_USES_GETTIMEOFFSET
We can now select clocksource drivers like ti-32k and CONFIG_OF on ancient machines that still use gettimeoffset, and the combination results in a link error.
arch/arm/kernel/built-in.o: In function `time_init': (.init.text+0xc28): undefined reference to `clocksource_probe'
The reason for this is that the Makefile is hidden behind CONFIG_ARCH_USES_GETTIMEOFFSET, but the Kconfig file is not, and it has shown up just now because the ti-32k driver was added and can be selected using COMPILE_TEST on all platforms.
This patch hides the Kconfig menu in CONFIG_ARCH_USES_GETTIMEOFFSET as well.
Fixes: dfedaf105d60 "clocksource: ti-32k: make it depend on GENERIC_CLOCKSOURCE" Signed-off-by: Arnd Bergmann <arnd@arndb.de> Cc: linux-arm-kernel@lists.infradead.org Cc: Felipe Balbi <balbi@ti.com> Cc: Tony Lindgren <tony@atomide.com> Cc: Daniel Lezcano <daniel.lezcano@linaro.org> Link: http://lkml.kernel.org/r/7579471.4N90fYPQOK@wuerfel Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
--- drivers/clocksource/Kconfig | 1 + 1 file changed, 1 insertion(+)
diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig index 71cfdf7..2eb5f0e 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig @@ -1,4 +1,5 @@ menu "Clock Source drivers" + depends on !ARCH_USES_GETTIMEOFFSET config CLKSRC_OF bool
| |