diff options
author | zhengrq <zhengrq.fnst@cn.fujitsu.com> | 2017-11-08 17:56:02 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-11-21 12:56:24 +0000 |
commit | d2f196351a8e30542d5fb1561cb7960b6673c5ab (patch) | |
tree | 73ff43f1560ec9b562c82ec44af9245c9fa52d73 /meta/recipes-kernel/kexec/kexec-tools/0007-arm64-kdump-set-up-other-segments.patch | |
parent | ef34ed6282627005d0077f88235fdbe42dea23a3 (diff) | |
download | openembedded-core-contrib-d2f196351a8e30542d5fb1561cb7960b6673c5ab.tar.gz |
kexec-tools: 2.0.14 -> 2.0.15
1) Upgrade kexec-tools from 2.0.14 to 2.0.15.
2) Remove patches that are included in 2.0.15.
kexec-tools/0001-arm64-Disable-PIC.patch
kexec-tools/0001-kexec-exntend-the-semantics-of-kexec_iomem_for_each_.patch
kexec-tools/0001-vmcore-dmesg-Define-_GNU_SOURCE.patch
kexec-tools/0001-x86-x86_64-Fix-format-warning-with-die.patch
kexec-tools/0002-kexec-generalize-and-rename-get_kernel_stext_sym.patch
kexec-tools/0002-ppc-Fix-format-warning-with-die.patch
kexec-tools/0003-arm64-identify-PHYS_OFFSET-correctly.patch
kexec-tools/0004-arm64-kdump-identify-memory-regions.patch
kexec-tools/0005-arm64-kdump-add-elf-core-header-segment.patch
kexec-tools/0006-arm64-kdump-set-up-kernel-image-segment.patch
kexec-tools/0007-arm64-kdump-set-up-other-segments.patch
kexec-tools/0008-arm64-kdump-add-DT-properties-to-crash-dump-kernel-s.patch
kexec-tools/0009-arm64-kdump-Add-support-for-binary-image-files.patch
Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
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.patch | 35 |
1 files changed, 0 insertions, 35 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 deleted file mode 100644 index 2745466dbe..0000000000 --- a/meta/recipes-kernel/kexec/kexec-tools/0007-arm64-kdump-set-up-other-segments.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 07ad14e12665221d754fde8e47c32ac18c24586a Mon Sep 17 00:00:00 2001 -From: AKASHI Takahiro <takahiro.akashi@linaro.org> -Date: Fri, 31 Jul 2015 20:01:39 +0900 -Subject: [PATCH 7/9] 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. - -Upstream-Status: Backport [https://git.linaro.org/people/takahiro.akashi/kexec-tools.git] - -Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org> -Signed-off-by: He Zhe <zhe.he@windriver.com> ---- - 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 cec4e41..78a0035 100644 ---- a/kexec/arch/arm64/kexec-arm64.c -+++ b/kexec/arch/arm64/kexec-arm64.c -@@ -374,7 +374,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); --- -1.9.1 - |