The purpose of this patch is to fix some typos and placement errors in the
code that the Linux kernel uses whenever it encounters a fatal error and dies.
Signed-off-by: Ryan Cunningham <cunnirya...@bellinghamschools.org>
diff --git a/kernel/panic.c b/kernel/panic.c
index 8136ad7..f29e2e6 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -102,7 +102,7 @@ void panic(const char *fmt, ...)
va_start(args, fmt);
vsnprintf(buf, sizeof(buf), fmt, args);
va_end(args);
- pr_emerg("Kernel panic - not syncing: %s\n", buf);
+ pr_emerg("Kernel panic (not syncing): %s\n", buf);
#ifdef CONFIG_DEBUG_BUGVERBOSE
/*
* Avoid nested stack-dumping if a panic occurs during oops processing
@@ -149,12 +149,14 @@ void panic(const char *fmt, ...)
if (!panic_blink)
panic_blink = no_blink;
+ pr_emerg("---[ end Kernel panic (not syncing): %s ]---\n", buf);
+
if (panic_timeout > 0) {
/*
* Delay timeout seconds before rebooting the machine.
* We can't use the "normal" timers since we just panicked.
*/
- pr_emerg("Rebooting in %d seconds..", panic_timeout);
+ pr_emerg("Rebooting in %d seconds...", panic_timeout);
for (i = 0; i < panic_timeout * 1000; i += PANIC_TIMER_STEP) {
touch_nmi_watchdog();
@@ -189,7 +191,6 @@ void panic(const char *fmt, ...)
disabled_wait(caller);
}
#endif
- pr_emerg("---[ end Kernel panic - not syncing: %s\n", buf);
local_irq_enable();
for (i = 0; ; i += PANIC_TIMER_STEP) {
touch_softlockup_watchdog();--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
