From e432e8ba641f3d999fdba9eaa72e4f085cb79880 Mon Sep 17 00:00:00 2001 From: Hugh Dickins Date: Tue, 26 Jul 2011 16:08:52 -0700 Subject: [PATCH] --- yaml --- r: 260430 b: refs/heads/master c: 4302fbc8ec2ccae279c939f241bf8ce64e1a0bb7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/Documentation/kernel-parameters.txt | 4 +++- trunk/kernel/panic.c | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index bd8f6f059666..4e66a1fc8c63 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3f0fb4e85b3842a2606c647c0a66afe2073574b4 +refs/heads/master: 4302fbc8ec2ccae279c939f241bf8ce64e1a0bb7 diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt index a70e43edcb65..4ca93898fbd3 100644 --- a/trunk/Documentation/kernel-parameters.txt +++ b/trunk/Documentation/kernel-parameters.txt @@ -1846,7 +1846,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted. See Documentation/sound/oss/oss-parameters.txt panic= [KNL] Kernel behaviour on panic: delay - seconds before rebooting + timeout > 0: seconds before rebooting + timeout = 0: wait forever + timeout < 0: reboot immediately Format: parkbd.port= [HW] Parallel port number the keyboard adapter is diff --git a/trunk/kernel/panic.c b/trunk/kernel/panic.c index 69231670eb95..d7bb6974efb5 100644 --- a/trunk/kernel/panic.c +++ b/trunk/kernel/panic.c @@ -119,6 +119,8 @@ NORET_TYPE void panic(const char * fmt, ...) } mdelay(PANIC_TIMER_STEP); } + } + if (panic_timeout != 0) { /* * This will not be a clean reboot, with everything * shutting down. But if there is a chance of