diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-03-01 16:51:19 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-03-01 16:51:19 -0800 |
| commit | d74e026ae5c4d4289c2ca0a9c404eed4f4bb235e (patch) | |
| tree | a718106dac2c21534cf1faa039dadfc8695b58fa /drivers/watchdog/Kconfig | |
| parent | 449a97d07a8d4ed4e8e3981ce6ae42c25e381b24 (diff) | |
| parent | 7c0ae5be821c1b6a700c5506de9b62e95f60df3c (diff) | |
| download | linux-d74e026ae5c4d4289c2ca0a9c404eed4f4bb235e.tar.bz2 | |
Merge tag 'lkdtm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into char-misc-testing
Kees writes:
Become maintainer, add hardening tests for use-after-free and atomic wrapping.
Diffstat (limited to 'drivers/watchdog/Kconfig')
| -rw-r--r-- | drivers/watchdog/Kconfig | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 86c2392bd968..9289da313d98 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -1584,6 +1584,17 @@ config WATCHDOG_RIO machines. The watchdog timeout period is normally one minute but can be changed with a boot-time parameter. +config WATCHDOG_SUN4V + tristate "Sun4v Watchdog support" + select WATCHDOG_CORE + depends on SPARC64 + help + Say Y here to support the hypervisor watchdog capability embedded + in the SPARC sun4v architecture. + + To compile this driver as a module, choose M here. The module will + be called sun4v_wdt. + # XTENSA Architecture # Xen Architecture |