projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'wireless-drivers-for-davem-2016-06-21' of git://git.kernel.org/pub/scm...
[cascardo/linux.git]
/
kernel
/
panic.c
diff --git
a/kernel/panic.c
b/kernel/panic.c
index
535c965
..
8aa7449
100644
(file)
--- a/
kernel/panic.c
+++ b/
kernel/panic.c
@@
-160,8
+160,10
@@
void panic(const char *fmt, ...)
*
* Bypass the panic_cpu check and call __crash_kexec directly.
*/
*
* Bypass the panic_cpu check and call __crash_kexec directly.
*/
- if (!crash_kexec_post_notifiers)
+ if (!crash_kexec_post_notifiers) {
+ printk_nmi_flush_on_panic();
__crash_kexec(NULL);
__crash_kexec(NULL);
+ }
/*
* Note smp_send_stop is the usual smp shutdown function, which
/*
* Note smp_send_stop is the usual smp shutdown function, which
@@
-176,6
+178,8
@@
void panic(const char *fmt, ...)
*/
atomic_notifier_call_chain(&panic_notifier_list, 0, buf);
*/
atomic_notifier_call_chain(&panic_notifier_list, 0, buf);
+ /* Call flush even twice. It tries harder with a single online CPU */
+ printk_nmi_flush_on_panic();
kmsg_dump(KMSG_DUMP_PANIC);
/*
kmsg_dump(KMSG_DUMP_PANIC);
/*