Skip to contentSkip to conversation

watchdog: orion: fix compile-test dependencies

PATCH RESEND In review Arnd Bergmann 2 participants 2 messages Mar 13, 2017 Watchdog device drivers

lore
Share & tools
lore
#0 lore raw

PATCH RESEND 1/1 watchdog: orion: fix compile-test dependencies

I ran into one corner case with the orion watchdog using the atomic_io_modify interface:

drivers/watchdog/orion_wdt.o: In function `orion_stop':
orion_wdt.c:(.text.orion_stop+0x28): undefined reference to atomic_io_modify' drivers/watchdog/orion_wdt.o: In function armada375_stop':
orion_wdt.c:(.text.armada375_stop+0x28): undefined reference to `atomic_io_modify'

This function is available on all 32-bit ARM builds except for ebsa110, so we have to specifically exclude that from compile-testing.

Fixes da2a68b3eb47 ("watchdog: Enable COMPILE_TEST where possible")

---
Originally submitted on March 2, still needed to address the one remaining kernelci.org build failure in v4.11-rc2:

https://kernelci.org/build/id/58c5dbdc59b514108e645533/

---
 drivers/watchdog/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/watchdog/Kconfig +1 -1
index 52a70ee6014f..8b9049dac094 100644
@@ -452,7 +452,7 @@ config DAVINCI_WATCHDOG
 
 config ORION_WATCHDOG
 	tristate "Orion watchdog"
-	depends on ARCH_ORION5X || ARCH_DOVE || MACH_DOVE || ARCH_MVEBU || COMPILE_TEST
+	depends on ARCH_ORION5X || ARCH_DOVE || MACH_DOVE || ARCH_MVEBU || (COMPILE_TEST && !ARCH_EBSA110)
 	depends on ARM
 	select WATCHDOG_CORE
 	help
Signature · 1 line
2.9.0
maintainer
#1 lore raw
Quoted 8 lines · Arnd Bergmann

I ran into one corner case with the orion watchdog using the atomic_io_modify interface:

drivers/watchdog/orion_wdt.o: In function `orion_stop':
orion_wdt.c:(.text.orion_stop+0x28): undefined reference to atomic_io_modify' drivers/watchdog/orion_wdt.o: In function armada375_stop':
orion_wdt.c:(.text.armada375_stop+0x28): undefined reference to `atomic_io_modify'

Quoted 6 lines

This function is available on all 32-bit ARM builds except for ebsa110, so we have to specifically exclude that from compile-testing.

Fixes da2a68b3eb47 ("watchdog: Enable COMPILE_TEST where possible")

I have it queued up in my patch list. Just need to sort out with Wim how to send it upstream.

Guenter

Quoted 25 lines

---
Originally submitted on March 2, still needed to address the one remaining kernelci.org build failure in v4.11-rc2:

https://kernelci.org/build/id/58c5dbdc59b514108e645533/

---
 drivers/watchdog/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/watchdog/Kconfig +1 -1
index 52a70ee6014f..8b9049dac094 100644
@@ -452,7 +452,7 @@ config DAVINCI_WATCHDOG
 
 config ORION_WATCHDOG
 	tristate "Orion watchdog"
-	depends on ARCH_ORION5X || ARCH_DOVE || MACH_DOVE || ARCH_MVEBU || COMPILE_TEST
+	depends on ARCH_ORION5X || ARCH_DOVE || MACH_DOVE || ARCH_MVEBU || (COMPILE_TEST && !ARCH_EBSA110)
 	depends on ARM
 	select WATCHDOG_CORE
 	help
Signature · 1 line
2.9.0