Gitiles
Code Review Sign In
gerrit.openbmc.org / stefanberger / openbmc / d1e894976442c78577f52fe7b169812d00289120 / . / poky / meta / recipes-kernel / kexec / kexec-tools / 0007-kexec-un-break-the-build-on-32-bit-x86.patch
blob: 36b0845f4a064e87ee7df9a014e1325156b8aa0c [file] [log] [blame]
Andrew Geisslerd1e89492021-02-12 15:35:20 -0600[diff] [blame^]1From bb6a26371d15473b380459ac4404bf330634b585 Mon Sep 17 00:00:00 2001
Andrew Geissler82c905d2020-04-13 13:39:40 -0500[diff] [blame]2From: 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>
Andrew Geisslerd1e89492021-02-12 15:35:20 -0600[diff] [blame^]8
Andrew Geissler82c905d2020-04-13 13:39:40 -0500[diff] [blame]9---
10 kexec/arch/i386/Makefile | 1 +
11 kexec/arch/i386/kexec-x86.h | 4 ++++
12 2 files changed, 5 insertions(+)
13
14diff --git a/kexec/arch/i386/Makefile b/kexec/arch/i386/Makefile
Andrew Geisslerd1e89492021-02-12 15:35:20 -0600[diff] [blame^]15index f486103..5d560be 100644
Andrew Geissler82c905d2020-04-13 13:39:40 -0500[diff] [blame]16--- a/kexec/arch/i386/Makefile
17+++ b/kexec/arch/i386/Makefile
Andrew Geisslerd1e89492021-02-12 15:35:20 -0600[diff] [blame^]18@@ -12,6 +12,7 @@ i386_KEXEC_SRCS += kexec/arch/i386/kexec-beoboot-x86.c
Andrew Geissler82c905d2020-04-13 13:39:40 -0500[diff] [blame]19 i386_KEXEC_SRCS += kexec/arch/i386/kexec-nbi.c
20 i386_KEXEC_SRCS += kexec/arch/i386/x86-linux-setup.c
21 i386_KEXEC_SRCS += kexec/arch/i386/crashdump-x86.c
22+i386_KEXEC_SRCS += kexec/arch/i386/kexec-mb2-x86.c
23
24 dist += kexec/arch/i386/Makefile $(i386_KEXEC_SRCS) \
25 kexec/arch/i386/crashdump-x86.h \
26diff --git a/kexec/arch/i386/kexec-x86.h b/kexec/arch/i386/kexec-x86.h
Andrew Geisslerd1e89492021-02-12 15:35:20 -0600[diff] [blame^]27index 0f941df..c423171 100644
Andrew Geissler82c905d2020-04-13 13:39:40 -0500[diff] [blame]28--- a/kexec/arch/i386/kexec-x86.h
29+++ b/kexec/arch/i386/kexec-x86.h
30@@ -56,9 +56,13 @@ struct arch_options_t {
31 };
32
33 int multiboot_x86_probe(const char *buf, off_t len);
34+int multiboot2_x86_probe(const char *buf, off_t len);
35 int multiboot_x86_load(int argc, char **argv, const char *buf, off_t len,
36 struct kexec_info *info);
37+int multiboot2_x86_load(int argc, char **argv, const char *buf, off_t len,
38+ struct kexec_info *info);
39 void multiboot_x86_usage(void);
40+void multiboot2_x86_usage(void);
41
Andrew Geisslerd1e89492021-02-12 15:35:20 -0600[diff] [blame^]42 int multiboot2_x86_load(int argc, char **argv, const char *buf, off_t len,
43 struct kexec_info *info);