Commit 47f4cb43 authored by Petr Mladek's avatar Petr Mladek Committed by Andrew Morton
Browse files

watchdog/sparc64: define HARDLOCKUP_DETECTOR_SPARC64 

The HAVE_ prefix means that the code could be enabled. Add another
variable for HAVE_HARDLOCKUP_DETECTOR_SPARC64 without this prefix.
It will be set when it should be built. It will make it compatible
with the other hardlockup detectors.

Before, it is far from obvious that the SPARC64 variant is actually used:

$> make ARCH=sparc64 defconfig
$> grep HARDLOCKUP_DETECTOR .config
CONFIG_HAVE_HARDLOCKUP_DETECTOR_BUDDY=y
CONFIG_HAVE_HARDLOCKUP_DETECTOR_SPARC64=y

After, it is more clear:

$> make ARCH=sparc64 defconfig
$> grep HARDLOCKUP_DETECTOR .config
CONFIG_HAVE_HARDLOCKUP_DETECTOR_BUDDY=y
CONFIG_HAVE_HARDLOCKUP_DETECTOR_SPARC64=y
CONFIG_HARDLOCKUP_DETECTOR_SPARC64=y

Link: https://lkml.kernel.org/r/20230616150618.6073-6-pmladek@suse.com


Signed-off-by: default avatarPetr Mladek <pmladek@suse.com>
Reviewed-by: default avatarDouglas Anderson <dianders@chromium.org>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent a5fcc236

arch/sparc/Kconfig.debug

+6 −1
Original line number Diff line number Diff line
@@ -16,10 +16,15 @@ config FRAME_POINTER 
	default y



config HAVE_HARDLOCKUP_DETECTOR_SPARC64

	depends on HAVE_NMI

	bool

	depends on HAVE_NMI

	select HARDLOCKUP_DETECTOR_SPARC64

	help

	  Sparc64 hardlockup detector is the last one developed before adding

	  the common infrastructure for handling hardlockup detectors. It is

	  always built. It does _not_ use the common command line parameters

	  and sysctl interface, except for /proc/sys/kernel/nmi_watchdog.



config HARDLOCKUP_DETECTOR_SPARC64

	bool

	depends on HAVE_HARDLOCKUP_DETECTOR_SPARC64

include/linux/nmi.h

+2 −2
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
#include <asm/irq.h>



/* Arch specific watchdogs might need to share extra watchdog-related APIs. */

#if defined(CONFIG_HAVE_HARDLOCKUP_DETECTOR_ARCH) || defined(CONFIG_HAVE_HARDLOCKUP_DETECTOR_SPARC64)

#if defined(CONFIG_HAVE_HARDLOCKUP_DETECTOR_ARCH) || defined(CONFIG_HARDLOCKUP_DETECTOR_SPARC64)

#include <asm/nmi.h>

#endif
@@ -90,7 +90,7 @@ static inline void hardlockup_detector_disable(void) {} 
#endif



/* Sparc64 has special implemetantion that is always enabled. */

#if defined(CONFIG_HARDLOCKUP_DETECTOR) || defined(CONFIG_HAVE_HARDLOCKUP_DETECTOR_SPARC64)

#if defined(CONFIG_HARDLOCKUP_DETECTOR) || defined(CONFIG_HARDLOCKUP_DETECTOR_SPARC64)

void arch_touch_nmi_watchdog(void);

#else

static inline void arch_touch_nmi_watchdog(void) { }

kernel/watchdog.c

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 


static DEFINE_MUTEX(watchdog_mutex);



#if defined(CONFIG_HARDLOCKUP_DETECTOR) || defined(CONFIG_HAVE_HARDLOCKUP_DETECTOR_SPARC64)

#if defined(CONFIG_HARDLOCKUP_DETECTOR) || defined(CONFIG_HARDLOCKUP_DETECTOR_SPARC64)

# define WATCHDOG_HARDLOCKUP_DEFAULT	1

#else

# define WATCHDOG_HARDLOCKUP_DEFAULT	0

lib/Kconfig.debug

+1 −1
Original line number Diff line number Diff line
@@ -1052,7 +1052,7 @@ config HAVE_HARDLOCKUP_DETECTOR_BUDDY 
#

config HARDLOCKUP_DETECTOR

	bool "Detect Hard Lockups"

	depends on DEBUG_KERNEL && !S390 && !HAVE_HARDLOCKUP_DETECTOR_SPARC64

	depends on DEBUG_KERNEL && !S390 && !HARDLOCKUP_DETECTOR_SPARC64

	depends on HAVE_HARDLOCKUP_DETECTOR_PERF || HAVE_HARDLOCKUP_DETECTOR_BUDDY || HAVE_HARDLOCKUP_DETECTOR_ARCH

	imply HARDLOCKUP_DETECTOR_PERF

	imply HARDLOCKUP_DETECTOR_BUDDY