mirror of
https://github.com/torvalds/linux.git
synced 2024-11-01 04:53:36 +01:00
Merge 63909ee865
into 0fc810ae3a
This commit is contained in:
commit
302579f3ce
1 changed files with 2 additions and 2 deletions
|
@ -345,7 +345,7 @@ void panic(const char *fmt, ...)
|
||||||
if (len && buf[len - 1] == '\n')
|
if (len && buf[len - 1] == '\n')
|
||||||
buf[len - 1] = '\0';
|
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
|
#ifdef CONFIG_DEBUG_BUGVERBOSE
|
||||||
/*
|
/*
|
||||||
* Avoid nested stack-dumping if a panic occurs during oops processing
|
* Avoid nested stack-dumping if a panic occurs during oops processing
|
||||||
|
@ -454,7 +454,7 @@ void panic(const char *fmt, ...)
|
||||||
#if defined(CONFIG_S390)
|
#if defined(CONFIG_S390)
|
||||||
disabled_wait();
|
disabled_wait();
|
||||||
#endif
|
#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 */
|
/* Do not scroll important messages printed above */
|
||||||
suppress_printk = 1;
|
suppress_printk = 1;
|
||||||
|
|
Loading…
Reference in a new issue