2 files changed, 5 insertions, 1 deletions

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index a70e43edcb65..4ca93898fbd3 100644
--- a/Documentation/kernel-parameters.txt
+++ b/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 <timeout>
-                        seconds before rebooting
+                        timeout > 0: seconds before rebooting
+                        timeout = 0: wait forever
+                        timeout < 0: reboot immediately
                         Format: <timeout>
 
         parkbd.port=    [HW] Parallel port number the keyboard adapter is
diff --git a/kernel/panic.c b/kernel/panic.c
index 69231670eb95..d7bb6974efb5 100644
--- a/kernel/panic.c
+++ b/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