From 3cf452f8a9e2d679de7b5c770fe7438c4e8db838 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Thu, 4 Oct 2012 17:13:17 -0700 Subject: [PATCH] --- yaml --- r: 330088 b: refs/heads/master c: 8f1f66ed7e1bdb7c88bb0bc45ac78cd075430d78 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/lib/Kconfig.debug | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index aa711236955c..66aa16bc426c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 77dd3b0bd17a0849b2f98b915ce3fc9247db1013 +refs/heads/master: 8f1f66ed7e1bdb7c88bb0bc45ac78cd075430d78 diff --git a/trunk/lib/Kconfig.debug b/trunk/lib/Kconfig.debug index 35c4565ee8fa..7fba3a98967f 100644 --- a/trunk/lib/Kconfig.debug +++ b/trunk/lib/Kconfig.debug @@ -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