x86: Fix broken multiboot2 buliding for i386
Subsystems (2)
PATCH 1/1 x86: Fix broken multiboot2 buliding for i386
When building for i386, an error occured:
kexec/arch/i386/kexec-x86.c:39:22: error: 'multiboot2_x86_probe' undeclared here (not in a function); did you mean 'multiboot_x86_probe'?
39 | { "multiboot2-x86", multiboot2_x86_probe, multiboot2_x86_load,
| ^~~~~~~~~~~~~~~~~~~~
| multiboot_x86_probekexec/arch/i386/kexec-x86.c:39:44: error: 'multiboot2_x86_load' undeclared here (not in a function); did you mean 'multiboot_x86_load'?
39 | { "multiboot2-x86", multiboot2_x86_probe, multiboot2_x86_load,
| ^~~~~~~~~~~~~~~~~~~
| multiboot_x86_load
kexec/arch/i386/kexec-x86.c:40:4: error: 'multiboot2_x86_usage'
undeclared here (not in a function); did you mean 'multiboot_x86_usage'?
40 | multiboot2_x86_usage },
| ^~~~~~~~~~~~~~~~~~~~
| multiboot_x86_usageFix this issue by putting the definition in the right header, also tidy up Makefile.
Fixes 22a2ed55132e ("x86: Support multiboot2 images")
Signed-off-by Kairui Song <[email protected]>
--- kexec/arch/i386/Makefile | 2 +- kexec/arch/i386/kexec-x86.h | 5 +++++ kexec/arch/x86_64/kexec-x86_64.h | 5 ----- 3 files changed, 6 insertions(+), 6 deletions(-)
kexec/arch/i386/Makefile +1 -1
@@ -7,6 +7,7 @@ i386_KEXEC_SRCS += kexec/arch/i386/kexec-elf-x86.c i386_KEXEC_SRCS += kexec/arch/i386/kexec-elf-rel-x86.c i386_KEXEC_SRCS += kexec/arch/i386/kexec-bzImage.c i386_KEXEC_SRCS += kexec/arch/i386/kexec-multiboot-x86.c +i386_KEXEC_SRCS += kexec/arch/i386/kexec-mb2-x86.c i386_KEXEC_SRCS += kexec/arch/i386/kexec-beoboot-x86.c i386_KEXEC_SRCS += kexec/arch/i386/kexec-nbi.c i386_KEXEC_SRCS += kexec/arch/i386/x86-linux-setup.c
@@ -14,7 +15,6 @@ i386_KEXEC_SRCS += kexec/arch/i386/crashdump-x86.c dist += kexec/arch/i386/Makefile $(i386_KEXEC_SRCS) \ kexec/arch/i386/crashdump-x86.h \ - kexec/arch/i386/kexec-mb2-x86.c \ kexec/arch/i386/kexec-x86.h \ kexec/arch/i386/x86-linux-setup.h \ kexec/arch/i386/include/arch/options.h
kexec/arch/i386/kexec-x86.h +5 -0
@@ -60,6 +60,11 @@ int multiboot_x86_load(int argc, char **argv, const char *buf, off_t len, struct kexec_info *info);void multiboot_x86_usage (void ); +int multiboot2_x86_load (int argc,char **argv,const char *buf,off_t len, +struct kexec_info *info); +void multiboot2_x86_usage (void ); +int multiboot2_x86_probe (const char *buf,off_t buf_len); +int elf_x86_probe (const char *buf,off_t len);int elf_x86_load (int argc,char **argv,const char *buf,off_t len,struct kexec_info *info);
kexec/arch/x86_64/kexec-x86_64.h +0 -5
@@ -33,9 +33,4 @@ int bzImage64_load(int argc, char **argv, const char *buf, off_t len, struct kexec_info *info);void bzImage64_usage (void ); -int multiboot2_x86_load (int argc,char **argv,const char *buf,off_t len, -struct kexec_info *info); -void multiboot2_x86_usage (void ); -int multiboot2_x86_probe (const char *buf,off_t buf_len); -#endif /* KEXEC_X86_64_H */
Signature · 7 lines
2.21.0 _______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec