]> err.no Git - linux-2.6/commitdiff
[PATCH] Call emergency_reboot from panic
authorEric W. Biederman <ebiederm@xmission.com>
Tue, 26 Jul 2005 17:49:23 +0000 (11:49 -0600)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 26 Jul 2005 21:35:43 +0000 (14:35 -0700)
We know the system is in trouble so there is no question if this
is an emergecy :)

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
kernel/panic.c

index 74ba5f3e46c746059b044072b7bce99f53aa3551..aabc5f86fa3f4422a2b2cea9b3d67723cd99e317 100644 (file)
@@ -111,12 +111,11 @@ NORET_TYPE void panic(const char * fmt, ...)
                        mdelay(1);
                        i++;
                }
-               /*
-                *      Should we run the reboot notifier. For the moment Im
-                *      choosing not too. It might crash, be corrupt or do
-                *      more harm than good for other reasons.
+               /*      This will not be a clean reboot, with everything
+                *      shutting down.  But if there is a chance of
+                *      rebooting the system it will be rebooted.
                 */
-               machine_restart(NULL);
+               emergency_restart();
        }
 #ifdef __sparc__
        {