diff options
Diffstat (limited to 'meta/recipes-kernel/kexec/kexec-tools/0007-kexec-un-break-the-build-on-32-bit-x86.patch')
-rw-r--r-- | meta/recipes-kernel/kexec/kexec-tools/0007-kexec-un-break-the-build-on-32-bit-x86.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/meta/recipes-kernel/kexec/kexec-tools/0007-kexec-un-break-the-build-on-32-bit-x86.patch b/meta/recipes-kernel/kexec/kexec-tools/0007-kexec-un-break-the-build-on-32-bit-x86.patch new file mode 100644 index 0000000000..b91608e52b --- /dev/null +++ b/meta/recipes-kernel/kexec/kexec-tools/0007-kexec-un-break-the-build-on-32-bit-x86.patch | |||
@@ -0,0 +1,42 @@ | |||
1 | From d294c5039753a36506949ba5dc782a4c0b307b74 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Fri, 20 Dec 2019 17:21:08 +0100 | ||
4 | Subject: [PATCH] kexec: un-break the build on 32 bit x86 | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
8 | --- | ||
9 | kexec/arch/i386/Makefile | 1 + | ||
10 | kexec/arch/i386/kexec-x86.h | 4 ++++ | ||
11 | 2 files changed, 5 insertions(+) | ||
12 | |||
13 | diff --git a/kexec/arch/i386/Makefile b/kexec/arch/i386/Makefile | ||
14 | index 105cefd..25df57a 100644 | ||
15 | --- a/kexec/arch/i386/Makefile | ||
16 | +++ b/kexec/arch/i386/Makefile | ||
17 | @@ -11,6 +11,7 @@ i386_KEXEC_SRCS += kexec/arch/i386/kexec-beoboot-x86.c | ||
18 | i386_KEXEC_SRCS += kexec/arch/i386/kexec-nbi.c | ||
19 | i386_KEXEC_SRCS += kexec/arch/i386/x86-linux-setup.c | ||
20 | i386_KEXEC_SRCS += kexec/arch/i386/crashdump-x86.c | ||
21 | +i386_KEXEC_SRCS += kexec/arch/i386/kexec-mb2-x86.c | ||
22 | |||
23 | dist += kexec/arch/i386/Makefile $(i386_KEXEC_SRCS) \ | ||
24 | kexec/arch/i386/crashdump-x86.h \ | ||
25 | diff --git a/kexec/arch/i386/kexec-x86.h b/kexec/arch/i386/kexec-x86.h | ||
26 | index 1b58c3b..d6b10c0 100644 | ||
27 | --- a/kexec/arch/i386/kexec-x86.h | ||
28 | +++ b/kexec/arch/i386/kexec-x86.h | ||
29 | @@ -56,9 +56,13 @@ struct arch_options_t { | ||
30 | }; | ||
31 | |||
32 | int multiboot_x86_probe(const char *buf, off_t len); | ||
33 | +int multiboot2_x86_probe(const char *buf, off_t len); | ||
34 | int multiboot_x86_load(int argc, char **argv, const char *buf, off_t len, | ||
35 | struct kexec_info *info); | ||
36 | +int multiboot2_x86_load(int argc, char **argv, const char *buf, off_t len, | ||
37 | + struct kexec_info *info); | ||
38 | void multiboot_x86_usage(void); | ||
39 | +void multiboot2_x86_usage(void); | ||
40 | |||
41 | int elf_x86_probe(const char *buf, off_t len); | ||
42 | int elf_x86_load(int argc, char **argv, const char *buf, off_t len, | ||