summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/kexec/kexec-tools/0007-arm64-kdump-set-up-other-segments.patch
diff options
context:
space:
mode:
authorHe Zhe <zhe.he@windriver.com>2016-12-21 17:56:23 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-05 13:54:06 +0000
commitdf48c4b483b95c67a9305f28b554ab4b5dba2b89 (patch)
treee670c33757c7d0bf903ff0da0031c1574a4a7ee3 /meta/recipes-kernel/kexec/kexec-tools/0007-arm64-kdump-set-up-other-segments.patch
parentb4a795aa0cbee4938df37e87c355476dedf3f827 (diff)
downloadpoky-df48c4b483b95c67a9305f28b554ab4b5dba2b89.tar.gz
kexec-tools: Update to 2.0.14
Remove kexec-aarch64.patch since it has been merged upstream Remove kexec-x32.patch since it has been reverted upstream Backport patches for kdump arm64 from: https://git.linaro.org/people/takahiro.akashi/kexec-tools.git (From OE-Core rev: 587778e24c9129f499645ca080218c7ac142f93f) Signed-off-by: He Zhe <zhe.he@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/kexec/kexec-tools/0007-arm64-kdump-set-up-other-segments.patch')
-rw-r--r--meta/recipes-kernel/kexec/kexec-tools/0007-arm64-kdump-set-up-other-segments.patch35
1 files changed, 35 insertions, 0 deletions
diff --git a/meta/recipes-kernel/kexec/kexec-tools/0007-arm64-kdump-set-up-other-segments.patch b/meta/recipes-kernel/kexec/kexec-tools/0007-arm64-kdump-set-up-other-segments.patch
new file mode 100644
index 0000000000..2745466dbe
--- /dev/null
+++ b/meta/recipes-kernel/kexec/kexec-tools/0007-arm64-kdump-set-up-other-segments.patch
@@ -0,0 +1,35 @@
1From 07ad14e12665221d754fde8e47c32ac18c24586a Mon Sep 17 00:00:00 2001
2From: AKASHI Takahiro <takahiro.akashi@linaro.org>
3Date: Fri, 31 Jul 2015 20:01:39 +0900
4Subject: [PATCH 7/9] arm64: kdump: set up other segments
5
6We make sure that all the other segments, initrd and device-tree blob,
7also be loaded into the reserved memory of crash dump kernel.
8
9Upstream-Status: Backport [https://git.linaro.org/people/takahiro.akashi/kexec-tools.git]
10
11Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
12Signed-off-by: He Zhe <zhe.he@windriver.com>
13---
14 kexec/arch/arm64/kexec-arm64.c | 5 ++++-
15 1 file changed, 4 insertions(+), 1 deletion(-)
16
17diff --git a/kexec/arch/arm64/kexec-arm64.c b/kexec/arch/arm64/kexec-arm64.c
18index cec4e41..78a0035 100644
19--- a/kexec/arch/arm64/kexec-arm64.c
20+++ b/kexec/arch/arm64/kexec-arm64.c
21@@ -374,7 +374,10 @@ int arm64_load_other_segments(struct kexec_info *info,
22 /* Put the other segments after the image. */
23
24 hole_min = image_base + arm64_mem.image_size;
25- hole_max = ULONG_MAX;
26+ if (info->kexec_flags & KEXEC_ON_CRASH)
27+ hole_max = crash_reserved_mem.end;
28+ else
29+ hole_max = ULONG_MAX;
30
31 if (arm64_opts.initrd) {
32 initrd_buf = slurp_file(arm64_opts.initrd, &initrd_size);
33--
341.9.1
35