mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-01-29 21:08:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

kexec-tools: fix arm kexec failure for __NR_kexec_file_load

Browse Source 
Once use kexec in arm arch, it will throw out the error info as below:

Could not find a free area of memory of 0xc78e744 bytes...

This is because that kexec use kexec_file_load to load image by default
but arm doesn't support it. So add this patch to avoid use kexec_file_load
in arm platforms.

(From OE-Core rev: 952a3fa77c80f16cd6d97f35afdb474876a39483)

Signed-off-by: Quanyang Wang <quanyang.wang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Wang Quanyang
2019-09-23 10:26:52 +08:00
committed by Richard Purdie
parent da00de3958
commit eb27d1ab3e
2 changed files with 41 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
meta/recipes-kernel/kexec/kexec-tools/0006-kexec-arm-undefine-__NR_kexec_file_load-for-arm.patch Normal file
View File

@@ -0,0 +1,40 @@
From b54816eff272324320c490d62dc36b27d2838732 Mon Sep 17 00:00:00 2001
From: Quanyang Wang <quanyang.wang@windriver.com>
Date: Mon, 16 Sep 2019 10:49:05 +0800
Subject: [PATCH] kexec/arm: undefine __NR_kexec_file_load for arm
In the kernel upstream commit 4ab65ba7a5cb
("ARM: add kexec_file_load system call number"),
__NR_kexec_file_load for arm has been defined to be 401.
This results that even if kexec_file_load isn't implemented
for arm but the function is_kexec_file_load_implemented()
will still return true. So undef __NR_kexec_file_load for
arm architecture.
Upstream-Status: Backport
[https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git/commit/kexec/kexec-syscall.h?id=b54816eff272324320c490d62dc36b27d2838732]
Signed-off-by: Quanyang Wang <quanyang.wang@windriver.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
kexec/kexec-syscall.h | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/kexec/kexec-syscall.h b/kexec/kexec-syscall.h
index dac1c1f..92d51d3 100644
--- a/kexec/kexec-syscall.h
+++ b/kexec/kexec-syscall.h
@@ -56,6 +56,10 @@
#endif
#endif /*ifndef __NR_kexec_load*/
+#ifdef __arm__
+#undef __NR_kexec_file_load
+#endif
+
#ifndef __NR_kexec_file_load
#ifdef __x86_64__
--
2.17.1

1
meta/recipes-kernel/kexec/kexec-tools_2.0.19.bb
View File

@@ -18,6 +18,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/kexec/kexec-tools-${PV}.tar.gz
file://0003-kexec-ARM-Fix-add_buffer_phys_virt-align-issue.patch \
file://0004-x86_64-Add-support-to-build-kexec-tools-with-x32-ABI.patch \
file://0005-Disable-PIE-during-link.patch \
file://0006-kexec-arm-undefine-__NR_kexec_file_load-for-arm.patch \
"
SRC_URI[md5sum] = "052458f0a35c2a3b0d2302caa3318e9f"