From ceb04ae1223ba5cdd40df744aa73a32b2cc7d879 Mon Sep 17 00:00:00 2001 From: Huang Ying Date: Wed, 29 Oct 2008 11:24:25 +0800 Subject: 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 Signed-off-by: Simon Horman --- kexec/arch/i386/kexec-x86-common.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'kexec/arch/i386/kexec-x86-common.c') diff --git a/kexec/arch/i386/kexec-x86-common.c b/kexec/arch/i386/kexec-x86-common.c index 4533425..00c2be3 100644 --- a/kexec/arch/i386/kexec-x86-common.c +++ b/kexec/arch/i386/kexec-x86-common.c @@ -174,7 +174,8 @@ int get_memory_ranges(struct memory_range **range, int *ranges, * Override user values only if kernel exported values are * subset of user defined values. */ - if (kexec_flags & KEXEC_ON_CRASH) { + if ((kexec_flags & KEXEC_ON_CRASH) && + !(kexec_flags & KEXEC_PRESERVE_CONTEXT)) { unsigned long long start, end; ret = parse_iomem_single("Crash kernel\n", &start, &end); -- cgit