From defad947feff0d0135f79893e99ca94ec9a59e0f Mon Sep 17 00:00:00 2001 From: AKASHI Takahiro Date: Wed, 17 May 2017 14:51:48 +0900 Subject: [PATCH 42/45] 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 Tested-by: David Woodhouse Tested-by: Pratyush Anand Signed-off-by: Simon Horman --- kexec/arch/arm64/kexec-arm64.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kexec/arch/arm64/kexec-arm64.c b/kexec/arch/arm64/kexec-arm64.c index 6c2175672305..dfe16a626136 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); -- 2.13.0