diff options
| author | Vivek Goyal <vgoyal@in.ibm.com> | 2006-09-21 14:51:12 -0400 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2006-10-06 12:46:16 +0900 |
| commit | 11c261bd942ee34e95289a5226abb2e87122cb5d (patch) | |
| tree | 8083d085d8f4a30617ce0f1b8ecf5480cb468b91 | |
| parent | dd3f52d4668938b9b3ad91607d7df3cf337b0863 (diff) | |
kexec-tools: i386 fix compilation issues due to new parameter
o Fix i386 compilation issues.
Signed-off-by: Vivek Goyal <vgoyal@in.ibm.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
| -rw-r--r-- | kexec/arch/i386/kexec-bzImage.c | 2 | ||||
| -rw-r--r-- | kexec/arch/i386/kexec-elf-x86.c | 6 | ||||
| -rw-r--r-- | 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 *info, * 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 len) 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 @@ int elf_x86_load(int argc, char **argv, const char *buf, off_t len, } /* 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 @@ int elf_x86_load(int argc, char **argv, const char *buf, off_t len, 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 @@ int multiboot_x86_load(int argc, char **argv, const char *buf, off_t len, /* 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: * ============= |