diff options
Diffstat (limited to 'kexec/arch/ia64')
-rw-r--r-- | kexec/arch/ia64/crashdump-ia64.c | 4 | ||||
-rw-r--r-- | kexec/arch/ia64/kexec-elf-ia64.c | 2 | ||||
-rw-r--r-- | kexec/arch/ia64/kexec-ia64.c | 4 | ||||
-rw-r--r-- | kexec/arch/ia64/kexec-iomem.c | 4 |
4 files changed, 8 insertions, 6 deletions
diff --git a/kexec/arch/ia64/crashdump-ia64.c b/kexec/arch/ia64/crashdump-ia64.c index a1fc311..54747ac 100644 --- a/kexec/arch/ia64/crashdump-ia64.c +++ b/kexec/arch/ia64/crashdump-ia64.c @@ -143,7 +143,7 @@ static int exclude_crash_reserve_region(int *nr_ranges) static int get_crash_memory_ranges(struct memory_range **range, int *ranges) { - const char *iomem = proc_iomem(1); + const char *iomem = proc_iomem(); char line[MAX_LINE]; FILE *fp; unsigned long start, end; @@ -268,6 +268,6 @@ int is_crashkernel_mem_reserved(void) { uint64_t start, end; - return parse_iomem_single("Crash kernel\n", 1, &start, + return parse_iomem_single("Crash kernel\n", &start, &end) == 0 ? (start != end) : 0; } diff --git a/kexec/arch/ia64/kexec-elf-ia64.c b/kexec/arch/ia64/kexec-elf-ia64.c index b5eab6c..8f8d239 100644 --- a/kexec/arch/ia64/kexec-elf-ia64.c +++ b/kexec/arch/ia64/kexec-elf-ia64.c @@ -195,7 +195,7 @@ int elf_ia64_load(int argc, char **argv, const char *buf, off_t len, if (info->kexec_flags & KEXEC_ON_CRASH ) { if ((mem_min == 0x00) && (mem_max == ULONG_MAX)) { fprintf(stderr, "Failed to find crash kernel region " - "in %s\n", proc_iomem(1)); + "in %s\n", proc_iomem()); free_elf_info(&ehdr); return -1; } diff --git a/kexec/arch/ia64/kexec-ia64.c b/kexec/arch/ia64/kexec-ia64.c index dc0c382..97cf0ea 100644 --- a/kexec/arch/ia64/kexec-ia64.c +++ b/kexec/arch/ia64/kexec-ia64.c @@ -80,7 +80,7 @@ static int split_range(int range, unsigned long start, unsigned long end) int get_memory_ranges(struct memory_range **range, int *ranges, unsigned long kexec_flags) { - const char *iomem = proc_iomem(kexec_flags & KEXEC_ON_CRASH); + const char *iomem = proc_iomem(); char line[MAX_LINE]; FILE *fp; fp = fopen(iomem, "r"); @@ -134,9 +134,11 @@ int get_memory_ranges(struct memory_range **range, int *ranges, } continue; } else if (memcmp(str, "Boot parameter\n", 14) == 0) { + printf("Boot parameter\n"); memory_ranges = split_range(memory_ranges, start, end); continue; } else if (memcmp(str, "EFI Memory Map\n", 14) == 0) { + printf("EFI Memory Map\n"); memory_ranges = split_range(memory_ranges, start, end); saved_efi_memmap_size = end - start; continue; diff --git a/kexec/arch/ia64/kexec-iomem.c b/kexec/arch/ia64/kexec-iomem.c index 7696113..7fd50cd 100644 --- a/kexec/arch/ia64/kexec-iomem.c +++ b/kexec/arch/ia64/kexec-iomem.c @@ -13,9 +13,9 @@ static const char proc_iomem_machine_str[]= "/proc/iomem_machine"; * If Xen is in use, then /proc/iomem is used for memory regions relating * to the currently running dom0 kernel, and /proc/iomem_machine is used * for regions relating to the machine itself or the hypervisor. - * If Xen is not in used, then /proc/iomem is always used. + * If Xen is not in used, then /proc/iomem used. */ -const char *proc_iomem(int machine) +const char *proc_iomem(void) { if (xen_present()) return proc_iomem_machine_str; |