diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-01-10 13:33:39 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-01-10 13:33:39 +1100 |
| commit | b8057368d6c29db538ff259266a4375200c3d029 (patch) | |
| tree | 456ef3d3c15af4ff4c213daae456855ac26a71c2 /lib | |
| parent | 592410b1ba9daf61c3bde92762a43eac58000850 (diff) | |
| parent | bb4d5c0664ffa18d5b4a6d68aead3b0d4a854ee1 (diff) | |
Merge remote-tracking branch 'tip/auto-latest'
Conflicts:
drivers/acpi/acpi_extlog.c
drivers/acpi/processor_idle.c
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Kconfig.debug | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index db25707aa41b..6982094a7e74 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -761,6 +761,15 @@ config PANIC_ON_OOPS_VALUE default 0 if !PANIC_ON_OOPS default 1 if PANIC_ON_OOPS +config PANIC_TIMEOUT + int "panic timeout" + default 0 + help + Set the timeout value (in seconds) until a reboot occurs when the + the kernel panics. If n = 0, then we wait forever. A timeout + value n > 0 will wait n seconds before rebooting, while a timeout + value n < 0 will reboot immediately. + config SCHED_DEBUG bool "Collect scheduler debugging info" depends on DEBUG_KERNEL && PROC_FS |