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.

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