[patch 6/9] kdump: Merge set_vmcore_list_offsets_elf_32/64()

Michael Holzheu
2011-07-04T17:09:28Z

[-- Attachment #1: 06-s390-kdump-common-vmcore-merge-set_vmcore_list_offsets.patch --]
[-- Type: text/plain, Size: 2294 bytes --]

From: Michael Holzheu <holzheu@linux.vnet.ibm.com>

The two functions set_vmcore_list_offsets_elf_32/64() are identical now
for 32 and 64 bit. Therefore this patch merges them into one
set_vmcore_list_offsets() function.

Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
---
fs/proc/vmcore.c | 28 ++++++----------------------
1 file changed, 6 insertions(+), 22 deletions(-)

--- a/fs/proc/vmcore.c
+++ b/fs/proc/vmcore.c
@@ -490,24 +490,8 @@ static int __init process_ptload_program
}

/* Sets offset fields of vmcore elements. */
-static void __init set_vmcore_list_offsets_elf64(char *elfptr,
- struct list_head *vc_list)
-{
- loff_t vmcore_off;
- struct vmcore *m;
-
- /* Skip Elf header and program headers. */
- vmcore_off = elfcorebuf_sz;
-
- list_for_each_entry(m, vc_list, list) {
- m->offset = vmcore_off;
- vmcore_off += m->size;
- }
-}
-
-/* Sets offset fields of vmcore elements. */
-static void __init set_vmcore_list_offsets_elf32(char *elfptr,
- struct list_head *vc_list)
+static void __init set_vmcore_list_offsets(char *elfptr,
+ struct list_head *vc_list)
{
loff_t vmcore_off;
struct vmcore *m;
@@ -573,7 +557,7 @@ static int __init parse_crash_elf64_head
kfree(elfcorebuf);
return rc;
}
- set_vmcore_list_offsets_elf64(elfcorebuf, &vmcore_list);
+ set_vmcore_list_offsets(elfcorebuf, &vmcore_list);
return 0;
}

@@ -629,7 +613,7 @@ static int __init parse_crash_elf32_head
kfree(elfcorebuf);
return rc;
}
- set_vmcore_list_offsets_elf32(elfcorebuf, &vmcore_list);
+ set_vmcore_list_offsets(elfcorebuf, &vmcore_list);
return 0;
}

@@ -701,7 +685,7 @@ static int __init parse_crash_elf_header
&vmcore_list);
if (rc)
goto fail;
- set_vmcore_list_offsets_elf64(elfcorebuf, &vmcore_list);
+ set_vmcore_list_offsets(elfcorebuf, &vmcore_list);
vmcore_size = get_vmcore_size_elf64(elfcorebuf);
} else if (e_ident[EI_CLASS] == ELFCLASS32) {
rc = process_ptload_program_headers_elf32(elfcorebuf,
@@ -709,7 +693,7 @@ static int __init parse_crash_elf_header
&vmcore_list);
if (rc)
goto fail;
- set_vmcore_list_offsets_elf32(elfcorebuf, &vmcore_list);
+ set_vmcore_list_offsets(elfcorebuf, &vmcore_list);
vmcore_size = get_vmcore_size_elf32(elfcorebuf);
}
return 0;