Merge part of branch 'for-next.instantiate' into for-next

[linux-2.6-microblaze.git] / kernel / kexec_file.c

diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c
index c108a2a..145321a 100644 (file)
--- a/kernel/kexec_file.c
+++ b/kernel/kexec_file.c
@@ -1226,7 +1226,7 @@ int crash_exclude_mem_range(struct crash_mem *mem,
        return 0;
 }
 
-int crash_prepare_elf64_headers(struct crash_mem *mem, int kernel_map,
+int crash_prepare_elf64_headers(struct crash_mem *mem, int need_kernel_map,
                          void **addr, unsigned long *sz)
 {
        Elf64_Ehdr *ehdr;
@@ -1290,7 +1290,7 @@ int crash_prepare_elf64_headers(struct crash_mem *mem, int kernel_map,
        phdr++;
 
        /* Prepare PT_LOAD type program header for kernel text region */
-       if (kernel_map) {
+       if (need_kernel_map) {
                phdr->p_type = PT_LOAD;
                phdr->p_flags = PF_R|PF_W|PF_X;
                phdr->p_vaddr = (unsigned long) _text;