diff options
| author | Huang Ying <ying.huang@intel.com> | 2008-10-29 11:24:25 +0800 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2008-10-31 12:58:16 +1100 |
| commit | ceb04ae1223ba5cdd40df744aa73a32b2cc7d879 (patch) | |
| tree | 993024edfe07b9cd7150fb2131175104e4948ad4 /kexec/arch/i386/kexec-elf-x86.c | |
| parent | 802a8a5e396e06a514251c44454c982bff3c5073 (diff) | |
kexec jump support for kexec-tools
To support memory backup/restore an option named
--load-preserve-context is added to kexec. When it is specified
toggether with --mem-max, most segments for crash dump support are
loaded, and the memory range between mem_min to mem_max which has no
segments loaded are loaded as backup segments. To support jump back
from kexeced, options named --load-jump-back-helper and --entry are
added to load a helper image with specified entry to jump back.
Signed-off-by: Huang Ying <ying.huang@intel.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
Diffstat (limited to 'kexec/arch/i386/kexec-elf-x86.c')
| -rw-r--r-- | kexec/arch/i386/kexec-elf-x86.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kexec/arch/i386/kexec-elf-x86.c b/kexec/arch/i386/kexec-elf-x86.c index ddd4a10..5a763bd 100644 --- a/kexec/arch/i386/kexec-elf-x86.c +++ b/kexec/arch/i386/kexec-elf-x86.c @@ -170,7 +170,7 @@ int elf_x86_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) { @@ -257,7 +257,7 @@ int elf_x86_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, max_addr, 0); if (rc < 0) |