diff options
Diffstat (limited to 'kexec/arch/i386/kexec-bzImage.c')
| -rw-r--r-- | kexec/arch/i386/kexec-bzImage.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kexec/arch/i386/kexec-bzImage.c b/kexec/arch/i386/kexec-bzImage.c index abb094c..9ca3cea 100644 --- a/kexec/arch/i386/kexec-bzImage.c +++ b/kexec/arch/i386/kexec-bzImage.c @@ -128,7 +128,7 @@ int do_bzImage_load(struct kexec_info *info, } kern16_size = (setup_sects +1) *512; - kernel_version = ((unsigned char *)&setup_header) + 512 + setup_header.kver_addr; + kernel_version = ((char *)&setup_header) + 512 + setup_header.kver_addr; if (kernel_len < kern16_size) { fprintf(stderr, "BzImage truncated?\n"); return -1; @@ -198,10 +198,10 @@ int do_bzImage_load(struct kexec_info *info, * overflow takes place while applying relocations. */ if (!real_mode_entry && relocatable_kernel) - elf_rel_build_load(info, &info->rhdr, purgatory, purgatory_size, + elf_rel_build_load(info, &info->rhdr, (char *) purgatory, purgatory_size, 0x3000, 0x7fffffff, -1, 0); else - elf_rel_build_load(info, &info->rhdr, purgatory, purgatory_size, + elf_rel_build_load(info, &info->rhdr, (char *) purgatory, purgatory_size, 0x3000, 640*1024, -1, 0); dbgprintf("Loaded purgatory at addr 0x%lx\n", info->rhdr.rel_addr); /* The argument/parameter segment */ @@ -262,7 +262,7 @@ int do_bzImage_load(struct kexec_info *info, /* Tell the kernel what is going on */ setup_linux_bootloader_parameters(info, real_mode, setup_base, kern16_size, command_line, command_line_len, - initrd, initrd_len); + (unsigned char *) initrd, initrd_len); /* Get the initial register values */ elf_rel_get_symbol(&info->rhdr, "entry16_regs", ®s16, sizeof(regs16)); |