| Andrew Geissler | 706d5aa | 2021-02-12 15:55:30 -0600 | [diff] [blame^] | 1 | From b54816eff272324320c490d62dc36b27d2838732 Mon Sep 17 00:00:00 2001 |
| 2 | From: Quanyang Wang <quanyang.wang@windriver.com> |
| 3 | Date: Mon, 16 Sep 2019 10:49:05 +0800 |
| 4 | Subject: [PATCH] kexec/arm: undefine __NR_kexec_file_load for arm |
| 5 | |
| 6 | In the kernel upstream commit 4ab65ba7a5cb |
| 7 | ("ARM: add kexec_file_load system call number"), |
| 8 | __NR_kexec_file_load for arm has been defined to be 401. |
| 9 | This results that even if kexec_file_load isn't implemented |
| 10 | for arm but the function is_kexec_file_load_implemented() |
| 11 | will still return true. So undef __NR_kexec_file_load for |
| 12 | arm architecture. |
| 13 | |
| 14 | Upstream-Status: Backport |
| 15 | [https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git/commit/kexec/kexec-syscall.h?id=b54816eff272324320c490d62dc36b27d2838732] |
| 16 | |
| 17 | Signed-off-by: Quanyang Wang <quanyang.wang@windriver.com> |
| 18 | Signed-off-by: Simon Horman <horms@verge.net.au> |
| 19 | --- |
| 20 | kexec/kexec-syscall.h | 4 ++++ |
| 21 | 1 file changed, 4 insertions(+) |
| 22 | |
| 23 | diff --git a/kexec/kexec-syscall.h b/kexec/kexec-syscall.h |
| 24 | index dac1c1f..92d51d3 100644 |
| 25 | --- a/kexec/kexec-syscall.h |
| 26 | +++ b/kexec/kexec-syscall.h |
| 27 | @@ -56,6 +56,10 @@ |
| 28 | #endif |
| 29 | #endif /*ifndef __NR_kexec_load*/ |
| 30 | |
| 31 | +#ifdef __arm__ |
| 32 | +#undef __NR_kexec_file_load |
| 33 | +#endif |
| 34 | + |
| 35 | #ifndef __NR_kexec_file_load |
| 36 | |
| 37 | #ifdef __x86_64__ |
| 38 | -- |
| 39 | 2.17.1 |
| 40 | |