mirror of
https://github.com/torvalds/linux.git
synced 2024-11-01 04:53:36 +01:00
Merge 63909ee865
into 4236f91380
This commit is contained in:
commit
1cc783bcb8
1 changed files with 2 additions and 2 deletions
|
@ -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 vibe check - not syncing: %s\n", buf);
|
||||
#ifdef CONFIG_DEBUG_BUGVERBOSE
|
||||
/*
|
||||
* Avoid nested stack-dumping if a panic occurs during oops processing
|
||||
|
@ -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 vibe check - not syncing: %s ]---\n", buf);
|
||||
|
||||
/* Do not scroll important messages printed above */
|
||||
suppress_printk = 1;
|
||||
|
|
Loading…
Reference in a new issue