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

Commit e16bb1d7 authored by Frederic Weisbecker's avatar Frederic Weisbecker
Browse files

lockup_detector: Update some config 



We kept CONFIG_DETECT_SOFTLOCKUP around for compatibility with
older configs. But it was enabled by default if CONFIG_DEBUG_KERNEL.

So if we want to enable CONFIG_LOCKUP_DETECTOR on configs that had
CONFIG_DETECT_SOFTLOCKUP, all we need is to have the same enabling
by default if CONFIG_DEBUG_KERNEL. We can then remove
CONFIG_DETECT_SOFTLOCKUP directly.

So tag CONFIG_LOCKUP_DETECTOR as default y. This is what we want for
most serious kernel debugging anyway.

And also forbid the lockup detector in S390 as it was for the
previous softlockup detector, event though the true reason for that
is not outlined.

Signed-off-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Cyrill Gorcunov <gorcunov@gmail.com>
parent 5e85391b

lib/Kconfig.debug

+3 −22
Original line number Diff line number Diff line
@@ -152,29 +152,10 @@ config DEBUG_SHIRQ 
	  Drivers ought to be able to handle interrupts coming in at those

	  points; some don't and need to be caught.



config DETECT_SOFTLOCKUP

	bool

	depends on DEBUG_KERNEL && !S390

	default y

	help

	  Say Y here to enable the kernel to detect "soft lockups",

	  which are bugs that cause the kernel to loop in kernel

	  mode for more than 60 seconds, without giving other tasks a

	  chance to run.



	  When a soft-lockup is detected, the kernel will print the

	  current stack trace (which you should report), but the

	  system will stay locked up. This feature has negligible

	  overhead.



	  (Note that "hard lockups" are separate type of bugs that

	   can be detected via the NMI-watchdog, on platforms that

	   support it.)



config LOCKUP_DETECTOR

	bool "Detect Hard and Soft Lockups"

	depends on DEBUG_KERNEL

	default DETECT_SOFTLOCKUP

	depends on DEBUG_KERNEL && !S390

	default y

	help

	  Say Y here to enable the kernel to act as a watchdog to detect

	  hard and soft lockups.
@@ -212,7 +193,7 @@ config BOOTPARAM_SOFTLOCKUP_PANIC 


config BOOTPARAM_SOFTLOCKUP_PANIC_VALUE

	int

	depends on DETECT_SOFTLOCKUP

	depends on LOCKUP_DETECTOR

	range 0 1

	default 0 if !BOOTPARAM_SOFTLOCKUP_PANIC

	default 1 if BOOTPARAM_SOFTLOCKUP_PANIC