blob: b91608e52b5433ded09db1cf8a70b8152ac2f6be [file] [log] [blame]
Andrew Geissler706d5aa2021-02-12 15:55:30 -06001From d294c5039753a36506949ba5dc782a4c0b307b74 Mon Sep 17 00:00:00 2001
Andrew Geissler82c905d2020-04-13 13:39:40 -05002From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 20 Dec 2019 17:21:08 +0100
4Subject: [PATCH] kexec: un-break the build on 32 bit x86
5
6Upstream-Status: Pending
7Signed-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
13diff --git a/kexec/arch/i386/Makefile b/kexec/arch/i386/Makefile
Andrew Geissler706d5aa2021-02-12 15:55:30 -060014index 105cefd..25df57a 100644
Andrew Geissler82c905d2020-04-13 13:39:40 -050015--- a/kexec/arch/i386/Makefile
16+++ b/kexec/arch/i386/Makefile
Andrew Geissler706d5aa2021-02-12 15:55:30 -060017@@ -11,6 +11,7 @@ i386_KEXEC_SRCS += kexec/arch/i386/kexec-beoboot-x86.c
Andrew Geissler82c905d2020-04-13 13:39:40 -050018 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 \
25diff --git a/kexec/arch/i386/kexec-x86.h b/kexec/arch/i386/kexec-x86.h
Andrew Geissler706d5aa2021-02-12 15:55:30 -060026index 1b58c3b..d6b10c0 100644
Andrew Geissler82c905d2020-04-13 13:39:40 -050027--- 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
Andrew Geissler706d5aa2021-02-12 15:55:30 -060041 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,