summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1999-06-24 22:16:13 +0000
committerRalf Baechle <ralf@linux-mips.org>1999-06-24 22:16:13 +0000
commitc8d701be3840f92e6459dabd99c9ca5d9b46a09f (patch)
treebab6ffbf173eda290325f57fcd0aaeb0dce973ed /kernel
parentb190539857b5b952e71e316de72ba1447774d654 (diff)
More merging. Chainsaw style.
Diffstat (limited to 'kernel')
-rw-r--r--kernel/panic.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/kernel/panic.c b/kernel/panic.c
index 35289454a..51ee692b5 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -50,12 +50,12 @@ NORET_TYPE void panic(const char * fmt, ...)
else
sys_sync();
+ unblank_console();
+
#ifdef __SMP__
smp_send_stop();
#endif
- unblank_console();
-
notifier_call_chain(&panic_notifier_list, 0, NULL);
if (panic_timeout > 0)
@@ -85,4 +85,3 @@ NORET_TYPE void panic(const char * fmt, ...)
CHECK_EMERGENCY_SYNC
}
}
-