diff options
Diffstat (limited to 'kexec/arch/i386/kexec-x86-common.c')
| -rw-r--r-- | kexec/arch/i386/kexec-x86-common.c | 3 |
1 files changed, 2 insertions, 1 deletions
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); |