diff options
| author | Russell King <rmk@arm.linux.org.uk> | 2016-06-06 18:00:52 +0100 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2016-06-08 09:24:09 +0900 |
| commit | e401f4732157e15496f4856987a6ecf0efc2aff7 (patch) | |
| tree | 0a19e01ef9808c1e512b2cb7be317ce6f2ff68c6 /kexec/arch/arm/kexec-zImage-arm.c | |
| parent | 92e120d8ca5e0918d89ca663721369ca6e9a5b10 (diff) | |
arm: crashdump needs boot alias of crash kernel region
When crashdumping, we need the boot memory alias of the crash kernel
region rather than the system view. Arrange to check for the boot
alias of the crash kernel region first, and if found, use it instead
of the main alias.
Reviewed-by: Pratyush Anand <panand@redhat.com>
Signed-off-by: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: Simon Horman <horms@verge.net.au>
Diffstat (limited to 'kexec/arch/arm/kexec-zImage-arm.c')
| -rw-r--r-- | kexec/arch/arm/kexec-zImage-arm.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kexec/arch/arm/kexec-zImage-arm.c b/kexec/arch/arm/kexec-zImage-arm.c index 0647e69..aab0c86 100644 --- a/kexec/arch/arm/kexec-zImage-arm.c +++ b/kexec/arch/arm/kexec-zImage-arm.c @@ -20,6 +20,7 @@ #include "kexec-arm.h" #include "../../fs2dt.h" #include "crashdump-arm.h" +#include "iomem.h" #define BOOT_PARAMS_SIZE 1536 @@ -499,7 +500,8 @@ int zImage_arm_load(int argc, char **argv, const char *buf, off_t len, * We put the dump capture kernel at the start of crashkernel * reserved memory. */ - if (parse_iomem_single("Crash kernel\n", &start, &end)) { + if (parse_iomem_single(CRASH_KERNEL_BOOT, &start, &end) && + parse_iomem_single(CRASH_KERNEL, &start, &end)) { /* * No crash kernel memory reserved. We cannot do more * but just bail out. |