[ Upstream commit a223770bfa7b6647f3a70983257bd89f9cafce46 ]
CONFIG_WATCHDOG_PRETIMEOUT_GOV build symbol adds watchdog_pretimeout.o
object to watchdog.o, the latter is compiled only if CONFIG_WATCHDOG_CORE
is selected, so it rightfully makes sense to add it as a dependency.
The change fixes the next compilation errors, if CONFIG_WATCHDOG_CORE=n
and CONFIG_WATCHDOG_PRETIMEOUT_GOV=y are selected:
drivers/watchdog/pretimeout_noop.o: In function `watchdog_gov_noop_register':
drivers/watchdog/pretimeout_noop.c:35: undefined reference to
`watchdog_register_governor'
drivers/watchdog/pretimeout_noop.o: In function
`watchdog_gov_noop_unregister':
drivers/watchdog/pretimeout_noop.c:40: undefined reference to
`watchdog_unregister_governor'
drivers/watchdog/pretimeout_panic.o: In function
`watchdog_gov_panic_register':
drivers/watchdog/pretimeout_panic.c:35: undefined reference to
`watchdog_register_governor'
drivers/watchdog/pretimeout_panic.o: In function
`watchdog_gov_panic_unregister':
drivers/watchdog/pretimeout_panic.c:40: undefined reference to
`watchdog_unregister_governor'
Reported-by: Kuo, Hsuan-Chi <hck...@illinois.edu>
Fixes: ff84136cb6a4 ("watchdog: add watchdog pretimeout governor framework")
Signed-off-by: Vladimir Zapolskiy <v...@mleia.com>
Reviewed-by: Guenter Roeck <li...@roeck-us.net>
Signed-off-by: Guenter Roeck <li...@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <w...@linux-watchdog.org>
Signed-off-by: Sasha Levin <sas...@kernel.org>
---
drivers/watchdog/Kconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 8c9ea3cd9c60..b7914eb6a04b 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -1967,6 +1967,7 @@ comment "Watchdog Pretimeout Governors"
config WATCHDOG_PRETIMEOUT_GOV
bool "Enable watchdog pretimeout governors"
+ depends on WATCHDOG_CORE
help
The option allows to select watchdog pretimeout governors.
--
2.20.1
