summaryrefslogtreecommitdiff
path: root/kernel/panic.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-07-30 18:14:50 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-07-30 18:14:50 -0400
commitde745fb27983770ebfdeaa70f8a36f791fb33786 (patch)
tree701555a1a7a2a5ff9a6c67896cf1ea089597750e /kernel/panic.c
parent08cd84c81f27d5bd22ba958b7cae6d566c509280 (diff)
parenta670fcb43f01a67ef56176afc76e5d43d128b25c (diff)
/spare/repo/netdev-2.6 branch 'ieee80211'
Diffstat (limited to 'kernel/panic.c')
-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__
{