diff options
| author | Armin Kuster <akuster808@gmail.com> | 2018-11-19 06:41:57 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-11-20 10:32:16 +0000 |
| commit | 9b52aee1ef300b02b69469ba92f26298491ab1cb (patch) | |
| tree | c7a076172bff63cbc58c5b4b06626555264013da /meta/recipes-kernel/kexec/kexec-tools | |
| parent | 7862ee16890828507f17b0e8e5390e0310776e8a (diff) | |
| download | poky-9b52aee1ef300b02b69469ba92f26298491ab1cb.tar.gz | |
kexec-tools: update to 2.0.18
Drop patch included
0001-kexec-fix-for-Unhandled-rela-relocation-R_X86_64_PLT.patch
(From OE-Core rev: fd2a682812bf5b3e1bdb6571e965b1b9aeb54817)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/kexec/kexec-tools')
| -rw-r--r-- | meta/recipes-kernel/kexec/kexec-tools/0001-kexec-fix-for-Unhandled-rela-relocation-R_X86_64_PLT.patch | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/meta/recipes-kernel/kexec/kexec-tools/0001-kexec-fix-for-Unhandled-rela-relocation-R_X86_64_PLT.patch b/meta/recipes-kernel/kexec/kexec-tools/0001-kexec-fix-for-Unhandled-rela-relocation-R_X86_64_PLT.patch deleted file mode 100644 index e0cced55c1..0000000000 --- a/meta/recipes-kernel/kexec/kexec-tools/0001-kexec-fix-for-Unhandled-rela-relocation-R_X86_64_PLT.patch +++ /dev/null | |||
| @@ -1,41 +0,0 @@ | |||
| 1 | From b9de21ef51a7ceab7122a707c188602eae22c4ee Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Chris Clayton <chris2553@googlemail.com> | ||
| 3 | Date: Mon, 20 Aug 2018 12:00:31 +0100 | ||
| 4 | Subject: [PATCH] kexec: fix for "Unhandled rela relocation: R_X86_64_PLT32" error | ||
| 5 | |||
| 6 | In response to a change in binutils, commit b21ebf2fb4c | ||
| 7 | (x86: Treat R_X86_64_PLT32 as R_X86_64_PC32) was applied to | ||
| 8 | the linux kernel during the 4.16 development cycle and has | ||
| 9 | since been backported to earlier stable kernel series. The | ||
| 10 | change results in the failure message in $SUBJECT when | ||
| 11 | rebooting via kexec. | ||
| 12 | |||
| 13 | Fix this by replicating the change in kexec. | ||
| 14 | |||
| 15 | Upstream-Status: Backport[https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git/commit/?id=b9de21ef51a7ceab7122a707c188602eae22c4ee] | ||
| 16 | |||
| 17 | Signed-off-by: Chris Clayton <chris2553@googlemail.com> | ||
| 18 | Acked-by: Baoquan He <bhe@redhat.com> | ||
| 19 | Tested-by: Bhupesh Sharma <bhsharma@redhat.com> | ||
| 20 | Acked-by: Bhupesh Sharma <bhsharma@redhat.com> | ||
| 21 | Signed-off-by: Simon Horman <horms@verge.net.au> | ||
| 22 | Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> | ||
| 23 | --- | ||
| 24 | kexec/arch/x86_64/kexec-elf-rel-x86_64.c | 1 + | ||
| 25 | 1 file changed, 1 insertion(+) | ||
| 26 | |||
| 27 | diff --git a/kexec/arch/x86_64/kexec-elf-rel-x86_64.c b/kexec/arch/x86_64/kexec-elf-rel-x86_64.c | ||
| 28 | index 7fdde73..db85b44 100644 | ||
| 29 | --- a/kexec/arch/x86_64/kexec-elf-rel-x86_64.c | ||
| 30 | +++ b/kexec/arch/x86_64/kexec-elf-rel-x86_64.c | ||
| 31 | @@ -79,6 +79,7 @@ void machine_apply_elf_rel(struct mem_ehdr *UNUSED(ehdr), | ||
| 32 | goto overflow; | ||
| 33 | break; | ||
| 34 | case R_X86_64_PC32: | ||
| 35 | + case R_X86_64_PLT32: | ||
| 36 | *(uint32_t *)location = value - address; | ||
| 37 | break; | ||
| 38 | default: | ||
| 39 | -- | ||
| 40 | 2.7.4 | ||
| 41 | |||
