clocksource: disallow drivers for ARCH_USES_GETTIMEOFFSET

PATCH New Arnd Bergmann 2 participants 2 messages Nov 16, 2015 – Nov 17, 2015 Clocksource, clockevent drivers

Share & tools

Arnd Bergmann

author

2015-11-16 16:51 UTC #0 lore raw

PATCH 1/1 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.

Signed-off-by Arnd Bergmann <[email protected]>

Fixes dfedaf105d60 ("clocksource: ti-32k: make it depend on GENERIC_CLOCKSOURCE")

drivers/clocksource/Kconfig +1 -0

index c479f815b99a..db240cb56da7 100644
@@ -1,4 +1,5 @@
 menu "Clock Source drivers"
+	depends on !ARCH_USES_GETTIMEOFFSET
 
 config CLKSRC_OF
 	bool

tip-bot for Arnd Bergmann

merge bot

2015-11-17 10:37 UTC #1 lore raw

[tip:timers/urgent] clocksource: Disallow drivers for ARCH_USES_GETTIMEOFFSET

clocksource: Disallow drivers for ARCH_USES_GETTIMEOFFSET

Commit-ID:  3da6d49e847128378c30292848125cc3e207e5f7
Gitweb:     http://git.kernel.org/tip/3da6d49e847128378c30292848125cc3e207e5f7
Author:     Arnd Bergmann <[email protected]>
AuthorDate: Mon, 16 Nov 2015 17:51:17 +0100
Committer:  Thomas Gleixner <[email protected]>
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'

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 <[email protected]>

Cc [email protected]

Cc Felipe Balbi <[email protected]>

Cc Tony Lindgren <[email protected]>

Cc Daniel Lezcano <[email protected]>

Link http://lkml.kernel.org/r/7579471.4N90fYPQOK@wuerfel open here

Signed-off-by Thomas Gleixner <[email protected]>

---
 drivers/clocksource/Kconfig | 1 +
 1 file changed, 1 insertion(+)

drivers/clocksource/Kconfig +1 -0

index 71cfdf7..2eb5f0e 100644
@@ -1,4 +1,5 @@
 menu "Clock Source drivers"
+	depends on !ARCH_USES_GETTIMEOFFSET
 
 config CLKSRC_OF
 	bool