You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
36 lines
1.3 KiB
36 lines
1.3 KiB
6 years ago
|
From 6b1b954c9b2faf4969fa9f285d4162bd41b78498 Mon Sep 17 00:00:00 2001
|
||
|
|
Message-Id: <6b1b954c9b2faf4969fa9f285d4162bd41b78498.1489676829.git.panand@redhat.com>
|
||
|
|
In-Reply-To: <f85183096d31d865c97565614535d84943b12908.1489676829.git.panand@redhat.com>
|
||
|
|
References: <f85183096d31d865c97565614535d84943b12908.1489676829.git.panand@redhat.com>
|
||
|
|
From: AKASHI Takahiro <takahiro.akashi@linaro.org>
|
||
|
|
Date: Wed, 15 Mar 2017 18:38:22 +0900
|
||
|
|
Subject: [PATCH 08/10] 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>
|
||
|
|
---
|
||
|
|
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 5a1da2ec1a34..5e30107b043f 100644
|
||
|
|
--- a/kexec/arch/arm64/kexec-arm64.c
|
||
|
|
+++ b/kexec/arch/arm64/kexec-arm64.c
|
||
|
|
@@ -375,7 +375,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.9.3
|
||
|
|
|