diff options
| author | Mark Brown <broonie@linaro.org> | 2014-06-13 22:19:11 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-06-13 22:19:11 +0100 |
| commit | c47e81aeccffaaa2d653d35bff34b2b544679ee4 (patch) | |
| tree | c566bc00a927423f1985f8824d102f3d1aabbb9a /lib | |
| parent | 9dd891c311f5ded8c718120c87c982cade5d2479 (diff) | |
| parent | 873079d47be597bd0bae7144b8598fc1e5b0a3fd (diff) | |
Merge remote-tracking branch 'lsk/v3.14/topic/aosp' into linux-linaro-lsk-v3.14-android
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Kconfig.debug | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index a48abeac753f..68837d7cf65d 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -635,15 +635,27 @@ config LOCKUP_DETECTOR The overhead should be minimal. A periodic hrtimer runs to generate interrupts and kick the watchdog task every 4 seconds. An NMI is generated every 10 seconds or so to check for hardlockups. + If NMIs are not available on the platform, every 12 seconds the + hrtimer interrupt on one cpu will be used to check for hardlockups + on the next cpu. The frequency of hrtimer and NMI events and the soft and hard lockup thresholds can be controlled through the sysctl watchdog_thresh. -config HARDLOCKUP_DETECTOR +config HARDLOCKUP_DETECTOR_NMI def_bool y depends on LOCKUP_DETECTOR && !HAVE_NMI_WATCHDOG depends on PERF_EVENTS && HAVE_PERF_EVENTS_NMI +config HARDLOCKUP_DETECTOR_OTHER_CPU + def_bool y + depends on LOCKUP_DETECTOR && SMP + depends on !HARDLOCKUP_DETECTOR_NMI && !HAVE_NMI_WATCHDOG + +config HARDLOCKUP_DETECTOR + def_bool y + depends on HARDLOCKUP_DETECTOR_NMI || HARDLOCKUP_DETECTOR_OTHER_CPU + config BOOTPARAM_HARDLOCKUP_PANIC bool "Panic (Reboot) On Hard Lockups" depends on HARDLOCKUP_DETECTOR @@ -989,8 +1001,9 @@ config TRACE_IRQFLAGS either tracing or lock debugging. config STACKTRACE - bool + bool "Stacktrace" depends on STACKTRACE_SUPPORT + default y config DEBUG_KOBJECT bool "kobject debugging" |