* [RESEND PATCH] watchdog: orion: fix compile-test dependencies
@ 2017-03-13 16:40 Arnd Bergmann
2017-03-13 17:17 ` Guenter Roeck
0 siblings, 1 reply; 2+ messages in thread
From: Arnd Bergmann @ 2017-03-13 16:40 UTC (permalink / raw)
To: Guenter Roeck
Cc: Andrew Morton, Arnd Bergmann, Wim Van Sebroeck, linux-watchdog,
linux-kernel
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")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
---
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(-)
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 52a70ee6014f..8b9049dac094 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -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
--
2.9.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [RESEND PATCH] watchdog: orion: fix compile-test dependencies
2017-03-13 16:40 [RESEND PATCH] watchdog: orion: fix compile-test dependencies Arnd Bergmann
@ 2017-03-13 17:17 ` Guenter Roeck
0 siblings, 0 replies; 2+ messages in thread
From: Guenter Roeck @ 2017-03-13 17:17 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Andrew Morton, Wim Van Sebroeck, linux-watchdog, linux-kernel
On Mon, Mar 13, 2017 at 05:40:48PM +0100, Arnd Bergmann wrote:
> 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")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Reviewed-by: Guenter Roeck <linux@roeck-us.net>
I have it queued up in my patch list. Just need to sort out with Wim
how to send it upstream.
Guenter
> ---
> 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(-)
>
> diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
> index 52a70ee6014f..8b9049dac094 100644
> --- a/drivers/watchdog/Kconfig
> +++ b/drivers/watchdog/Kconfig
> @@ -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
> --
> 2.9.0
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-03-13 17:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-13 16:40 [RESEND PATCH] watchdog: orion: fix compile-test dependencies Arnd Bergmann
2017-03-13 17:17 ` Guenter Roeck
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.