diff options
Diffstat (limited to 'arch/ia64/kernel/mca.c')
| -rw-r--r-- | arch/ia64/kernel/mca.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c index 26814de6c29a..1ead5ea6c5ce 100644 --- a/arch/ia64/kernel/mca.c +++ b/arch/ia64/kernel/mca.c | |||
| @@ -273,7 +273,6 @@ static void ia64_mlogbuf_finish(int wait) | |||
| 273 | 273 | ||
| 274 | mlogbuf_finished = 1; | 274 | mlogbuf_finished = 1; |
| 275 | } | 275 | } |
| 276 | EXPORT_SYMBOL(ia64_mlogbuf_finish); | ||
| 277 | 276 | ||
| 278 | /* | 277 | /* |
| 279 | * Print buffered messages from INIT context. | 278 | * Print buffered messages from INIT context. |
| @@ -1477,6 +1476,10 @@ default_monarch_init_process(struct notifier_block *self, unsigned long val, voi | |||
| 1477 | struct task_struct *g, *t; | 1476 | struct task_struct *g, *t; |
| 1478 | if (val != DIE_INIT_MONARCH_PROCESS) | 1477 | if (val != DIE_INIT_MONARCH_PROCESS) |
| 1479 | return NOTIFY_DONE; | 1478 | return NOTIFY_DONE; |
| 1479 | #ifdef CONFIG_KEXEC | ||
| 1480 | if (atomic_read(&kdump_in_progress)) | ||
| 1481 | return NOTIFY_DONE; | ||
| 1482 | #endif | ||
| 1480 | 1483 | ||
| 1481 | /* | 1484 | /* |
| 1482 | * FIXME: mlogbuf will brim over with INIT stack dumps. | 1485 | * FIXME: mlogbuf will brim over with INIT stack dumps. |
