Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

lib/Kconfig.debug: adjust hard-lockup related Kconfig options

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>

authored by

Jan Beulich and committed by
Linus Torvalds
8f1f66ed 77dd3b0b

+5 -4
+5 -4
lib/Kconfig.debug
··· 196 196 thresholds can be controlled through the sysctl watchdog_thresh. 197 197 198 198 config HARDLOCKUP_DETECTOR 199 - def_bool LOCKUP_DETECTOR && PERF_EVENTS && HAVE_PERF_EVENTS_NMI && \ 200 - !HAVE_NMI_WATCHDOG 199 + def_bool y 200 + depends on LOCKUP_DETECTOR && !HAVE_NMI_WATCHDOG 201 + depends on PERF_EVENTS && HAVE_PERF_EVENTS_NMI 201 202 202 203 config BOOTPARAM_HARDLOCKUP_PANIC 203 204 bool "Panic (Reboot) On Hard Lockups" 204 - depends on LOCKUP_DETECTOR 205 + depends on HARDLOCKUP_DETECTOR 205 206 help 206 207 Say Y here to enable the kernel to panic on "hard lockups", 207 208 which are bugs that cause the kernel to loop in kernel ··· 213 212 214 213 config BOOTPARAM_HARDLOCKUP_PANIC_VALUE 215 214 int 216 - depends on LOCKUP_DETECTOR 215 + depends on HARDLOCKUP_DETECTOR 217 216 range 0 1 218 217 default 0 if !BOOTPARAM_HARDLOCKUP_PANIC 219 218 default 1 if BOOTPARAM_HARDLOCKUP_PANIC