lib/Kconfig.debug: adjust hard-lockup related Kconfig options (8f1f66ed) · Commits · 戴 / test

The main option should not appear in the resulting .config when the dependencies aren't met (i.e. use "depends on" rather than directly setting the default from the combined dependency values). The sub-options should depend on the main option rather than a more generic higher level one. Signed-off-by:

Jan Beulich <jbeulich@suse.com> Acked-by:

Don Zickus <dzickus@redhat.com> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Signed-off-by:

Andrew Morton <akpm@linux-foundation.org> Signed-off-by:

Linus Torvalds <torvalds@linux-foundation.org>

lib/Kconfig.debug

+5 −4

Original line number	Diff line number	Diff line
		@@ -196,12 +196,13 @@ config LOCKUP_DETECTOR
		thresholds can be controlled through the sysctl watchdog_thresh.

		config HARDLOCKUP_DETECTOR
		def_bool LOCKUP_DETECTOR && PERF_EVENTS && HAVE_PERF_EVENTS_NMI && \
		!HAVE_NMI_WATCHDOG
		def_bool y
		depends on LOCKUP_DETECTOR && !HAVE_NMI_WATCHDOG
		depends on PERF_EVENTS && HAVE_PERF_EVENTS_NMI

		config BOOTPARAM_HARDLOCKUP_PANIC
		bool "Panic (Reboot) On Hard Lockups"
		depends on LOCKUP_DETECTOR
		depends on HARDLOCKUP_DETECTOR
		help
		Say Y here to enable the kernel to panic on "hard lockups",
		which are bugs that cause the kernel to loop in kernel
		@@ -212,7 +213,7 @@ config BOOTPARAM_HARDLOCKUP_PANIC

		config BOOTPARAM_HARDLOCKUP_PANIC_VALUE
		int
		depends on LOCKUP_DETECTOR
		depends on HARDLOCKUP_DETECTOR
		range 0 1
		default 0 if !BOOTPARAM_HARDLOCKUP_PANIC
		default 1 if BOOTPARAM_HARDLOCKUP_PANIC

Admin message