From: Vivek Goyal <[EMAIL PROTECTED]>
o Fix i386 compilation issues.
Signed-off-by: Vivek Goyal <[EMAIL PROTECTED]>
---
kexec/arch/i386/kexec-bzImage.c | 2 +-
kexec/arch/i386/kexec-elf-x86.c | 6 +++---
kexec/arch/i386/kexec-multiboot-x86.c | 5 +++--
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/kexec/arch/i386/kexec-bzImage.c b/kexec/arch/i386/kexec-bzImage.c
index 9450346..e70e238 100644
--- a/kexec/arch/i386/kexec-bzImage.c
+++ b/kexec/arch/i386/kexec-bzImage.c
@@ -133,7 +133,7 @@ int do_bzImage_load(struct kexec_info *i
* it's gdt.
*/
elf_rel_build_load(info, &info->rhdr, purgatory, purgatory_size,
- 0x3000, 640*1024, -1);
+ 0x3000, 640*1024, -1, 0);
/* The argument/parameter segment */
setup_size = kern16_size + command_line_len;
diff --git a/kexec/arch/i386/kexec-elf-x86.c b/kexec/arch/i386/kexec-elf-x86.c
index 73b1576..76ea0e2 100644
--- a/kexec/arch/i386/kexec-elf-x86.c
+++ b/kexec/arch/i386/kexec-elf-x86.c
@@ -47,7 +47,7 @@ int elf_x86_probe(const char *buf, off_t
struct mem_ehdr ehdr;
int result;
- result = build_elf_exec_info(buf, len, &ehdr);
+ result = build_elf_exec_info(buf, len, &ehdr, 0);
if (result < 0) {
if (probe_debug) {
fprintf(stderr, "Not an ELF executable\n");
@@ -177,7 +177,7 @@ #endif
}
/* Load the ELF executable */
- elf_exec_build_load(info, &ehdr, buf, len);
+ elf_exec_build_load(info, &ehdr, buf, len, 0);
entry = ehdr.e_entry;
max_addr = elf_max_addr(&ehdr);
@@ -186,7 +186,7 @@ #endif
if (arg_style != ARG_STYLE_NONE) {
/* Load the setup code */
elf_rel_build_load(info, &info->rhdr, purgatory, purgatory_size,
- 0, ULONG_MAX, 1);
+ 0, ULONG_MAX, 1, 0);
}
if (arg_style == ARG_STYLE_NONE) {
info->entry = (void *)entry;
diff --git a/kexec/arch/i386/kexec-multiboot-x86.c
b/kexec/arch/i386/kexec-multiboot-x86.c
index 9414bfe..8b2c9fd 100644
--- a/kexec/arch/i386/kexec-multiboot-x86.c
+++ b/kexec/arch/i386/kexec-multiboot-x86.c
@@ -210,10 +210,11 @@ #define OPT_VGA (OPT_ARCH_MAX+2)
/* Load the ELF executable */
- elf_exec_build_load(info, &ehdr, buf, len);
+ elf_exec_build_load(info, &ehdr, buf, len, 0);
/* Load the setup code */
- elf_rel_build_load(info, &info->rhdr, purgatory, purgatory_size, 0,
ULONG_MAX, 1);
+ elf_rel_build_load(info, &info->rhdr, purgatory, purgatory_size, 0,
+ ULONG_MAX, 1, 0);
/* The first segment will contain the multiboot headers:
* =============
_______________________________________________
fastboot mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/fastboot
