Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f00ae0d authored by Randy Dunlap's avatar Randy Dunlap Committed by Linus Torvalds
Browse files

lib/Kconfig.debug: Debug Lockups and Hangs: keep SOFTLOCKUP options together 

Keep all of the SOFTLOCKUP kconfig symbols together (instead of
injecting the HARDLOCKUP symbols in the midst of them) so that the
config tools display them with their dependencies.

Tested with 'make {menuconfig/nconfig/gconfig/xconfig}'.

Link: http://lkml.kernel.org/r/6be2d9ed-4656-5b94-460d-7f051e2c7570@infradead.org


Fixes: 05a4a952 ("kernel/watchdog: split up config options")
Signed-off-by: default avatarRandy Dunlap <rdunlap@infradead.org>
Cc: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d387a31d

lib/Kconfig.debug

+24 −24
Original line number Original line Diff line number Diff line
@@ -800,6 +800,30 @@ config SOFTLOCKUP_DETECTOR 
	  chance to run.  The current stack trace is displayed upon

	  chance to run.  The current stack trace is displayed upon

	  detection and the system will stay locked up.

	  detection and the system will stay locked up.





config BOOTPARAM_SOFTLOCKUP_PANIC

	bool "Panic (Reboot) On Soft Lockups"

	depends on SOFTLOCKUP_DETECTOR

	help

	  Say Y here to enable the kernel to panic on "soft lockups",

	  which are bugs that cause the kernel to loop in kernel

	  mode for more than 20 seconds (configurable using the watchdog_thresh

	  sysctl), without giving other tasks a chance to run.



	  The panic can be used in combination with panic_timeout,

	  to cause the system to reboot automatically after a

	  lockup has been detected. This feature is useful for

	  high-availability systems that have uptime guarantees and

	  where a lockup must be resolved ASAP.



	  Say N if unsure.



config BOOTPARAM_SOFTLOCKUP_PANIC_VALUE

	int

	depends on SOFTLOCKUP_DETECTOR

	range 0 1

	default 0 if !BOOTPARAM_SOFTLOCKUP_PANIC

	default 1 if BOOTPARAM_SOFTLOCKUP_PANIC



config HARDLOCKUP_DETECTOR_PERF

config HARDLOCKUP_DETECTOR_PERF

	bool

	bool

	select SOFTLOCKUP_DETECTOR

	select SOFTLOCKUP_DETECTOR
@@ -849,30 +873,6 @@ config BOOTPARAM_HARDLOCKUP_PANIC_VALUE 
	default 0 if !BOOTPARAM_HARDLOCKUP_PANIC

	default 0 if !BOOTPARAM_HARDLOCKUP_PANIC

	default 1 if BOOTPARAM_HARDLOCKUP_PANIC

	default 1 if BOOTPARAM_HARDLOCKUP_PANIC





config BOOTPARAM_SOFTLOCKUP_PANIC

	bool "Panic (Reboot) On Soft Lockups"

	depends on SOFTLOCKUP_DETECTOR

	help

	  Say Y here to enable the kernel to panic on "soft lockups",

	  which are bugs that cause the kernel to loop in kernel

	  mode for more than 20 seconds (configurable using the watchdog_thresh

	  sysctl), without giving other tasks a chance to run.



	  The panic can be used in combination with panic_timeout,

	  to cause the system to reboot automatically after a

	  lockup has been detected. This feature is useful for

	  high-availability systems that have uptime guarantees and

	  where a lockup must be resolved ASAP.



	  Say N if unsure.



config BOOTPARAM_SOFTLOCKUP_PANIC_VALUE

	int

	depends on SOFTLOCKUP_DETECTOR

	range 0 1

	default 0 if !BOOTPARAM_SOFTLOCKUP_PANIC

	default 1 if BOOTPARAM_SOFTLOCKUP_PANIC



config DETECT_HUNG_TASK

config DETECT_HUNG_TASK

	bool "Detect Hung Tasks"

	bool "Detect Hung Tasks"

	depends on DEBUG_KERNEL

	depends on DEBUG_KERNEL