diff options
| author | Simon Horman <horms@verge.net.au> | 2006-11-20 10:35:37 +0900 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2006-11-27 12:25:13 +0900 |
| commit | 63ac15b2cfb8d05762c0f4bff997e3cfd0c4efc5 (patch) | |
| tree | 1395ff51f1d28c772648f8e7d084d4f8d064b465 | |
| parent | c41620b1d2717a6eb1969ad03758a1b707ba55ab (diff) | |
kexec-tools: Allow load_crashdump_segments() to accept const char **
elf_ia64_load() passes a const char ** to load_crashdump_segments(),
so it needs to expect that rather than a char **
Signed-Off-By: Simon Horman <horms@verge.net.au>
| -rw-r--r-- | kexec/arch/ia64/crashdump-ia64.c | 8 | ||||
| -rw-r--r-- | kexec/arch/ia64/crashdump-ia64.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/kexec/arch/ia64/crashdump-ia64.c b/kexec/arch/ia64/crashdump-ia64.c index 8772659..60d8d23 100644 --- a/kexec/arch/ia64/crashdump-ia64.c +++ b/kexec/arch/ia64/crashdump-ia64.c @@ -194,13 +194,13 @@ static int get_crash_memory_ranges(struct memory_range **range, int *ranges) } static void -cmdline_add_elfcorehdr(char **cmdline, unsigned long addr) +cmdline_add_elfcorehdr(const char **cmdline, unsigned long addr) { - char *str = *cmdline; + char *str; char buf[64]; size_t len; sprintf(buf, " elfcorehdr=%ldK", addr/1024); - len = strlen(str) + strlen(buf) + 1; + len = strlen(*cmdline) + strlen(buf) + 1; str = xmalloc(len); sprintf(str, "%s%s", *cmdline, buf); *cmdline = str; @@ -208,7 +208,7 @@ cmdline_add_elfcorehdr(char **cmdline, unsigned long addr) int load_crashdump_segments(struct kexec_info *info, struct mem_ehdr *ehdr, unsigned long max_addr, unsigned long min_base, - char **cmdline) + const char **cmdline) { //struct memory_range *mem_range, *memmap_p; struct memory_range *mem_range; diff --git a/kexec/arch/ia64/crashdump-ia64.h b/kexec/arch/ia64/crashdump-ia64.h index bb003a6..f2f43e3 100644 --- a/kexec/arch/ia64/crashdump-ia64.h +++ b/kexec/arch/ia64/crashdump-ia64.h @@ -5,7 +5,7 @@ #define __pa(x) ((unsigned long)(x)-PAGE_OFFSET) extern int load_crashdump_segments(struct kexec_info *info, struct mem_ehdr *ehdr, unsigned long max_addr, - unsigned long min_base, char **cmdline); + unsigned long min_base, const char **cmdline); #define CRASH_MAX_MEMMAP_NR (KEXEC_MAX_SEGMENTS + 1) #define CRASH_MAX_MEMORY_RANGES (MAX_MEMORY_RANGES + 2) |