diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2014-04-15 01:23:46 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2014-04-15 01:23:46 +0400 |
| commit | 2c41c8eb2b3014ddb4de53fec533edfa47a96db3 (patch) | |
| tree | 2a11d9b2fbc72598589523742eac98af3a09d3ff /lib | |
| parent | dbb07139ef78699b07137e3974aa9638cfa2d57a (diff) | |
| parent | 2609fbf2f5158f57b1c41a5fa2c18fffc6016342 (diff) | |
Automatically merging tracking-linaro-android-3.14 into merge-linux-linaro-core-tracking
Conflicting files:
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 a48abeac753..68837d7cf65 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" |