Commit f627ac0e authored by Guenter Roeck's avatar Guenter Roeck Committed by Wim Van Sebroeck
Browse files

watchdog: Use depends instead of select for pretimeout governors 



Watchdog pretimeout governors were enabled from the default governor
selection using "select". As a result, the default governor was always
built into the kernel, even if no watchdog driver was loaded. By using
"depends on" instead of "select", we are in better control, and the
governors can all be built as modules. At the same time, set the default
configuration option for pretimeout governors to match WATCHDOG_CORE
(meaning all pretimeout governors are by default enabled if pretimeout
support is enabled).

The practical impact of this change is minimal. Previously, selecting
a default governor automatically enabled that governor. Now, a default
governor can only be selected if that governor has been enabled.
Consequently, the order of governor selection is now reversed: The
governor selection is now first, followed by default governor selection.

Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarWim Van Sebroeck <wim@linux-watchdog.org>
parent 0b468829

drivers/watchdog/Kconfig

+16 −14
Original line number Diff line number Diff line
@@ -2062,6 +2062,20 @@ config WATCHDOG_PRETIMEOUT_GOV 


if WATCHDOG_PRETIMEOUT_GOV



config WATCHDOG_PRETIMEOUT_GOV_NOOP

	tristate "Noop watchdog pretimeout governor"

	default WATCHDOG_CORE

	help

	  Noop watchdog pretimeout governor, only an informational

	  message is added to kernel log buffer.



config WATCHDOG_PRETIMEOUT_GOV_PANIC

	tristate "Panic watchdog pretimeout governor"

	default WATCHDOG_CORE

	help

	  Panic watchdog pretimeout governor, on watchdog pretimeout

	  event put the kernel into panic.



choice

	prompt "Default Watchdog Pretimeout Governor"

	default WATCHDOG_PRETIMEOUT_DEFAULT_GOV_PANIC
@@ -2072,7 +2086,7 @@ choice 


config WATCHDOG_PRETIMEOUT_DEFAULT_GOV_NOOP

	bool "noop"

	select WATCHDOG_PRETIMEOUT_GOV_NOOP

	depends on WATCHDOG_PRETIMEOUT_GOV_NOOP

	help

	  Use noop watchdog pretimeout governor by default. If noop

	  governor is selected by a user, write a short message to
@@ -2080,7 +2094,7 @@ config WATCHDOG_PRETIMEOUT_DEFAULT_GOV_NOOP 


config WATCHDOG_PRETIMEOUT_DEFAULT_GOV_PANIC

	bool "panic"

	select WATCHDOG_PRETIMEOUT_GOV_PANIC

	depends on WATCHDOG_PRETIMEOUT_GOV_PANIC

	help

	  Use panic watchdog pretimeout governor by default, if

	  a watchdog pretimeout event happens, consider that
@@ -2088,18 +2102,6 @@ config WATCHDOG_PRETIMEOUT_DEFAULT_GOV_PANIC 


endchoice



config WATCHDOG_PRETIMEOUT_GOV_NOOP

	tristate "Noop watchdog pretimeout governor"

	help

	  Noop watchdog pretimeout governor, only an informational

	  message is added to kernel log buffer.



config WATCHDOG_PRETIMEOUT_GOV_PANIC

	tristate "Panic watchdog pretimeout governor"

	help

	  Panic watchdog pretimeout governor, on watchdog pretimeout

	  event put the kernel into panic.



endif # WATCHDOG_PRETIMEOUT_GOV



endif # WATCHDOG

CRA Git | Maintained and supported by SUSTech CRA and CCSE