summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2005-07-26 19:49:23 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-26 23:35:43 +0200
commit2f048ea81df94f72dee0d42b3d9b941c03b8c9c5 (patch)
tree1a60d6cc74585629750030c26c05ca471ca39546 /kernel
parent[PATCH] Use kernel_power_off in sysrq-o (diff)
downloadlinux-2f048ea81df94f72dee0d42b3d9b941c03b8c9c5.tar.xz
linux-2f048ea81df94f72dee0d42b3d9b941c03b8c9c5.zip
[PATCH] Call emergency_reboot from panic
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>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/panic.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/kernel/panic.c b/kernel/panic.c
index 74ba5f3e46c7..aabc5f86fa3f 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -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__
{