summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAKASHI Takahiro <takahiro.akashi@linaro.org>2015-07-31 20:01:39 +0900
committerAKASHI Takahiro <takahiro.akashi@linaro.org>2017-05-22 09:09:37 +0900
commit4a3f8bef00828e2e24d90d3c0911bb799672d1ee (patch)
tree59fbbd5dc811f070d7b93a7c9a230be365b89890
parent61246a1fe08f4959950b303c3d819ce5d422f48f (diff)
downloadkexec-tools-4a3f8bef00828e2e24d90d3c0911bb799672d1ee.tar.gz
arm64: kdump: set up other segments
We make sure that all the other segments, initrd and device-tree blob, also be loaded into the reserved memory of crash dump kernel. Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
-rw-r--r--kexec/arch/arm64/kexec-arm64.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/kexec/arch/arm64/kexec-arm64.c b/kexec/arch/arm64/kexec-arm64.c
index 6c21756..dfe16a6 100644
--- a/kexec/arch/arm64/kexec-arm64.c
+++ b/kexec/arch/arm64/kexec-arm64.c
@@ -376,7 +376,10 @@ int arm64_load_other_segments(struct kexec_info *info,
/* Put the other segments after the image. */
hole_min = image_base + arm64_mem.image_size;
- hole_max = ULONG_MAX;
+ if (info->kexec_flags & KEXEC_ON_CRASH)
+ hole_max = crash_reserved_mem.end;
+ else
+ hole_max = ULONG_MAX;
if (arm64_opts.initrd) {
initrd_buf = slurp_file(arm64_opts.initrd, &initrd_size);