summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMagnus Damm <damm@igel.co.jp>2009-03-18 15:07:46 +0900
committerSimon Horman <horms@verge.net.au>2009-03-18 19:41:10 +1100
commit09e2b3a3f9f6477875da1bfacdcf1f1bb1b4486a (patch)
tree37da383708a83945983b227192effa01324b3ff0
parent0cd674d83b07bd5fd1bbd09d40bea2825e44d3d1 (diff)
kexec jump: SuperH vmlinux support
Create elf header and modify the kernel command line when loading a crash kernel or a kexec jump kernel. Signed-off-by: Magnus Damm <damm@igel.co.jp> Signed-off-by: Simon Horman <horms@verge.net.au>
-rw-r--r--kexec/arch/sh/kexec-elf-sh.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kexec/arch/sh/kexec-elf-sh.c b/kexec/arch/sh/kexec-elf-sh.c
index bec3bb2..1186c09 100644
--- a/kexec/arch/sh/kexec-elf-sh.c
+++ b/kexec/arch/sh/kexec-elf-sh.c
@@ -104,7 +104,7 @@ int elf_sh_load(int argc, char **argv, const char *buf, off_t len,
/* Need to append some command line parameters internally in case of
* taking crash dumps.
*/
- if (info->kexec_flags & KEXEC_ON_CRASH) {
+ if (info->kexec_flags & (KEXEC_ON_CRASH | KEXEC_PRESERVE_CONTEXT)) {
modified_cmdline = xmalloc(COMMAND_LINE_SIZE);
memset((void *)modified_cmdline, 0, COMMAND_LINE_SIZE);
if (command_line) {
@@ -120,7 +120,7 @@ int elf_sh_load(int argc, char **argv, const char *buf, off_t len,
/* If panic kernel is being loaded, additional segments need
* to be created. */
- if (info->kexec_flags & KEXEC_ON_CRASH) {
+ if (info->kexec_flags & (KEXEC_ON_CRASH | KEXEC_PRESERVE_CONTEXT)) {
rc = load_crashdump_segments(info, modified_cmdline);
if (rc < 0)
return -1;