projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'torvalds/master' into perf/urgent
[linux-2.6-microblaze.git]
/
kernel
/
kexec_core.c
diff --git
a/kernel/kexec_core.c
b/kernel/kexec_core.c
index
a0b6780
..
f099bae
100644
(file)
--- a/
kernel/kexec_core.c
+++ b/
kernel/kexec_core.c
@@
-37,6
+37,7
@@
#include <linux/compiler.h>
#include <linux/hugetlb.h>
#include <linux/objtool.h>
#include <linux/compiler.h>
#include <linux/hugetlb.h>
#include <linux/objtool.h>
+#include <linux/kmsg_dump.h>
#include <asm/page.h>
#include <asm/sections.h>
#include <asm/page.h>
#include <asm/sections.h>
@@
-1165,7
+1166,7
@@
int kernel_kexec(void)
#endif
{
kexec_in_progress = true;
#endif
{
kexec_in_progress = true;
- kernel_restart_prepare(
NULL
);
+ kernel_restart_prepare(
"kexec reboot"
);
migrate_to_reboot_cpu();
/*
migrate_to_reboot_cpu();
/*
@@
-1179,6
+1180,7
@@
int kernel_kexec(void)
machine_shutdown();
}
machine_shutdown();
}
+ kmsg_dump(KMSG_DUMP_SHUTDOWN);
machine_kexec(kexec_image);
#ifdef CONFIG_KEXEC_JUMP
machine_kexec(kexec_image);
#ifdef CONFIG_KEXEC_JUMP