forked from pool/kexec-tools
080f64dafa
- Update to version 2.0.14 (bsc#1039937, FATE#320672, FATE#320671) Changelog: http://git.kernel.org/cgit/utils/kernel/kexec/kexec-tools.git/log/?id=refs/tags/v2.0.13..v2.0.14 - Backport upstream fixes (bsc#1039937, FATE#320672, FATE#320671) 0001-kexec-tools-2.0.14.git.patch 0002-ppc64-Reduce-number-of-ELF-LOAD-segments.patch 0003-kexec-Increase-the-upper-limit-for-RAM-segments.patch 0004-alpha-add-missing-__NR_kexec_load-definition.patch 0005-kexec-implemented-XEN-KEXEC-STATUS-to-determine-if-a.patch 0006-kexec-Remove-redundant-space-from-help-message.patch 0007-purgatory-Add-purgatory.map-and-purgatory.ro.sym-to-.patch 0008-kexec-Add-option-to-get-crash-kernel-region-size.patch 0009-crashdump-arm-Add-get_crash_kernel_load_range-functi.patch 0010-crashdump-arm64-Add-get_crash_kernel_load_range-func.patch 0011-crashdump-cris-Add-get_crash_kernel_load_range-funct.patch 0012-crashdump-ia64-Add-get_crash_kernel_load_range-funct.patch 0013-crashdump-m68k-Add-get_crash_kernel_load_range-funct.patch 0014-crashdump-mips-Add-get_crash_kernel_load_range-funct.patch 0015-crashdump-ppc-Add-get_crash_kernel_load_range-functi.patch 0016-crashdump-ppc64-Add-get_crash_kernel_load_range-func.patch 0017-crashdump-s390-Add-get_crash_kernel_load_range-funct.patch 0018-crashdump-sh-Add-get_crash_kernel_load_range-functio.patch 0019-gitignore-add-two-generated-files-in-purgatory.patch 0020-Only-print-debug-message-when-failed-to-serach-for-k.patch 0021-build_mem_phdrs-check-if-p_paddr-is-invalid.patch 0022-uImage-fix-realloc-pointer-confusion.patch 0023-uImage-Fix-uImage_load-for-little-endian-machines.patch 0024-uImage-Add-new-IH_ARCH_xxx-definitions.patch 0025-uImage-use-char-instead-of-unsigned-char-for-uImage_.patch 0026-uImage-use-char-instead-of-unsigned-char-for-uImage_.patch 0027-arm64-add-uImage-support.patch OBS-URL: https://build.opensuse.org/request/show/500203 OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/kexec-tools?expand=0&rev=83
59 lines
1.8 KiB
Diff
59 lines
1.8 KiB
Diff
From c504ff5d85aa035aed9f14f5ce96c5d959952dd9 Mon Sep 17 00:00:00 2001
|
|
From: Pratyush Anand <panand@redhat.com>
|
|
Date: Wed, 17 May 2017 14:51:50 +0900
|
|
Subject: [PATCH 44/45] arm64: kdump: Add support for binary image files
|
|
|
|
This patch adds support to use binary image ie arch/arm64/boot/Image with
|
|
kdump.
|
|
|
|
Signed-off-by: Pratyush Anand <panand@redhat.com>
|
|
[takahiro.akashi@linaro.org: a bit reworked]
|
|
Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
|
|
Tested-by: David Woodhouse <dwmw@amazon.co.uk>
|
|
Tested-by: Pratyush Anand <panand@redhat.com>
|
|
Signed-off-by: Simon Horman <horms@verge.net.au>
|
|
---
|
|
kexec/arch/arm64/kexec-image-arm64.c | 13 +++++++++++++
|
|
1 file changed, 13 insertions(+)
|
|
|
|
diff --git a/kexec/arch/arm64/kexec-image-arm64.c b/kexec/arch/arm64/kexec-image-arm64.c
|
|
index e5f2a9befdb1..e1b1e54b149f 100644
|
|
--- a/kexec/arch/arm64/kexec-image-arm64.c
|
|
+++ b/kexec/arch/arm64/kexec-image-arm64.c
|
|
@@ -4,7 +4,9 @@
|
|
|
|
#define _GNU_SOURCE
|
|
|
|
+#include "crashdump-arm64.h"
|
|
#include "kexec-arm64.h"
|
|
+#include "kexec-syscall.h"
|
|
#include <limits.h>
|
|
|
|
int image_arm64_probe(const char *kernel_buf, off_t kernel_size)
|
|
@@ -58,11 +60,22 @@ int image_arm64_load(int argc, char **argv, const char *kernel_buf,
|
|
dbgprintf("%s: PE format: %s\n", __func__,
|
|
(arm64_header_check_pe_sig(header) ? "yes" : "no"));
|
|
|
|
+ /* create and initialize elf core header segment */
|
|
+ if (info->kexec_flags & KEXEC_ON_CRASH) {
|
|
+ result = load_crashdump_segments(info);
|
|
+ if (result) {
|
|
+ dbgprintf("%s: Creating eflcorehdr failed.\n",
|
|
+ __func__);
|
|
+ goto exit;
|
|
+ }
|
|
+ }
|
|
+
|
|
/* load the kernel */
|
|
add_segment_phys_virt(info, kernel_buf, kernel_size,
|
|
kernel_segment + arm64_mem.text_offset,
|
|
arm64_mem.image_size, 0);
|
|
|
|
+ /* load additional data */
|
|
result = arm64_load_other_segments(info, kernel_segment
|
|
+ arm64_mem.text_offset);
|
|
|
|
--
|
|
2.13.0
|
|
|