diff options
| author | Simon Horman <horms@verge.net.au> | 2010-02-02 14:42:02 +1100 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2010-02-02 14:42:02 +1100 |
| commit | ff3edb39fdcba615ffdb1eba7f1d10c941aca288 (patch) | |
| tree | 1ecfde6d538d28f52d2b12fa42c423df7112bb4f | |
| parent | b6ee55c80b57b493bf738f05ada999e803f90bf6 (diff) | |
ia64: Remove unused info parameter from {move,update}_loaded_segments()
Signed-off-by: Simon Horman <horms@verge.net.au>
| -rw-r--r-- | kexec/arch/ia64/kexec-elf-ia64.c | 7 | ||||
| -rw-r--r-- | kexec/arch/ia64/kexec-ia64.c | 4 | ||||
| -rw-r--r-- | kexec/arch/ia64/kexec-ia64.h | 5 |
3 files changed, 7 insertions, 9 deletions
diff --git a/kexec/arch/ia64/kexec-elf-ia64.c b/kexec/arch/ia64/kexec-elf-ia64.c index 5245223..71283c6 100644 --- a/kexec/arch/ia64/kexec-elf-ia64.c +++ b/kexec/arch/ia64/kexec-elf-ia64.c @@ -96,8 +96,7 @@ void elf_ia64_usage(void) /* Move the crash kerenl physical offset to reserved region */ -void move_loaded_segments(struct kexec_info *info, struct mem_ehdr *ehdr, - unsigned long addr) +void move_loaded_segments(struct mem_ehdr *ehdr, unsigned long addr) { int i; long offset; @@ -198,8 +197,8 @@ int elf_ia64_load(int argc, char **argv, const char *buf, off_t len, free_elf_info(&ehdr); return -1; } - move_loaded_segments(info, &ehdr, mem_min); - } else if (update_loaded_segments(info, &ehdr) < 0) { + move_loaded_segments(&ehdr, mem_min); + } else if (update_loaded_segments(&ehdr) < 0) { fprintf(stderr, "Failed to place kernel\n"); return -1; } diff --git a/kexec/arch/ia64/kexec-ia64.c b/kexec/arch/ia64/kexec-ia64.c index 312430f..657a6b7 100644 --- a/kexec/arch/ia64/kexec-ia64.c +++ b/kexec/arch/ia64/kexec-ia64.c @@ -216,7 +216,7 @@ int arch_compat_trampoline(struct kexec_info *UNUSED(info)) return 0; } -int update_loaded_segments(struct kexec_info *info, struct mem_ehdr *ehdr) +int update_loaded_segments(struct mem_ehdr *ehdr) { int i; struct mem_phdr *phdr; @@ -247,7 +247,7 @@ int update_loaded_segments(struct kexec_info *info, struct mem_ehdr *ehdr) start = (memory_range[i].start + align - 1) & ~(align - 1); end = memory_range[i].end; if (end > start && (end - start) > (end_addr - start_addr)) { - move_loaded_segments(info, ehdr, start); + move_loaded_segments(ehdr, start); return 0; } } diff --git a/kexec/arch/ia64/kexec-ia64.h b/kexec/arch/ia64/kexec-ia64.h index 176d5f9..31e4041 100644 --- a/kexec/arch/ia64/kexec-ia64.h +++ b/kexec/arch/ia64/kexec-ia64.h @@ -6,9 +6,8 @@ int elf_ia64_probe(const char *buf, off_t len); int elf_ia64_load(int argc, char **argv, const char *buf, off_t len, struct kexec_info *info); void elf_ia64_usage(void); -int update_loaded_segments(struct kexec_info *info, struct mem_ehdr *ehdr); -void move_loaded_segments(struct kexec_info *info, struct mem_ehdr *ehdr, - unsigned long addr); +int update_loaded_segments(struct mem_ehdr *ehdr); +void move_loaded_segments(struct mem_ehdr *ehdr, unsigned long addr); #define EFI_PAGE_SIZE (1UL<<12) #define ELF_PAGE_SIZE (1UL<<16) |