GuillaumeHemmen/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2024-11-01 04:53:36 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge df766d8eb6 into 0fc810ae3a

Browse source
This commit is contained in:
Rościsław Szymański 2024-10-31 12:26:59 +03:00 committed by GitHub
commit 5500f75844
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
kernel/panic.c
View file

@ -345,7 +345,7 @@ void panic(const char *fmt, ...)
if (len && buf[len - 1] == '\n')
buf[len - 1] = '\0';
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
@ -421,7 +421,7 @@ void panic(const char *fmt, ...)
* Delay timeout seconds before rebooting the machine.
* We can't use the "normal" timers since we just panicked.
*/
pr_emerg("Rebooting in %d seconds..\n", panic_timeout);
pr_emerg("Attempting an EMERGENCY REBOOT in %d seconds..\n", panic_timeout);
for (i = 0; i < panic_timeout * 1000; i += PANIC_TIMER_STEP) {
touch_nmi_watchdog();
@ -454,7 +454,7 @@ void panic(const char *fmt, ...)
#if defined(CONFIG_S390)
disabled_wait();
#endif
pr_emerg("---[ end Kernel panic - not syncing: %s ]---\n", buf);
pr_emerg("---< end KERNEL PANIC - not syncing: %s >---\n", buf);
/* Do not scroll important messages printed above */
suppress_printk = 1;