[PATCH v4 3/5] watchdog: split up config options

[Nicholas Piggin]

On Fri, 16 Jun 2017 16:57:13 +1000
Nicholas Piggin <npiggin at gmail.com> wrote:

> Split SOFTLOCKUP_DETECTOR from LOCKUP_DETECTOR, and split
> HARDLOCKUP_DETECTOR_PERF from HARDLOCKUP_DETECTOR.
> 
> LOCKUP_DETECTOR implies the general boot, sysctl, and programming
> interfaces for the lockup detectors.
> 
> An architecture that wants to use a hard lockup detector must define
> HAVE_HARDLOCKUP_DETECTOR_PERF or HAVE_HARDLOCKUP_DETECTOR_ARCH.
> 
> Alternatively an arch can define HAVE_NMI_WATCHDOG, which provides
> the minimum arch_touch_nmi_watchdog, and it otherwise does its own
> thing and does not implement the LOCKUP_DETECTOR interfaces.
> 
> sparc is unusual in that it has started to implement some of the
> interfaces, but not fully yet. It should probably be converted to
> a full HAVE_HARDLOCKUP_DETECTOR_ARCH.
> 
> Signed-off-by: Nicholas Piggin <npiggin at gmail.com>

I haven't worked out the nm10300 Kconfig warning, but in the meantime
Andrew can you fold this patch in please?

Thanks,
Nick

---
 arch/Kconfig | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/arch/Kconfig b/arch/Kconfig
index 878addc6f141..d1cd10f1c087 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -198,9 +198,6 @@ config HAVE_KPROBES_ON_FTRACE
 config HAVE_NMI
 	bool
 
-config HAVE_NMI_WATCHDOG
-	depends on HAVE_NMI
-	bool
 #
 # An arch should select this if it provides all these things:
 #
@@ -288,7 +285,6 @@ config HAVE_PERF_EVENTS_NMI
 	  subsystem.  Also has support for calculating CPU cycle events
 	  to determine how many clock cycles in a given period.
 
-
 config HAVE_HARDLOCKUP_DETECTOR_PERF
 	bool
 	depends on HAVE_PERF_EVENTS_NMI
@@ -297,6 +293,7 @@ config HAVE_HARDLOCKUP_DETECTOR_PERF
 	  detector. Must define HAVE_PERF_EVENTS_NMI.
 
 config HAVE_NMI_WATCHDOG
+	depends on HAVE_NMI
 	bool
 	help
 	  The arch provides a low level NMI watchdog. It provides
@@ -310,7 +307,6 @@ config HAVE_HARDLOCKUP_DETECTOR_ARCH
 	  a superset of the HAVE_NMI_WATCHDOG. It also conforms to config
 	  interfaces and parameters provided by hardlockup detector subsystem.
 
-
 config HAVE_PERF_REGS
 	bool
 	help
-- 
2.11.0