Merge branch 'akpm' (patches from Andrew)

[cascardo/linux.git] / arch / powerpc / kernel / fadump.c

diff --git a/arch/powerpc/kernel/fadump.c b/arch/powerpc/kernel/fadump.c
index b3a6633..8f0c7c5 100644 (file)
--- a/arch/powerpc/kernel/fadump.c
+++ b/arch/powerpc/kernel/fadump.c
@@ -333,6 +333,11 @@ int __init fadump_reserve_mem(void)
        return 1;
 }
 
+unsigned long __init arch_reserved_kernel_pages(void)
+{
+       return memblock_reserved_size() / PAGE_SIZE;
+}
+
 /* Look for fadump= cmdline option. */
 static int __init early_fadump_param(char *p)
 {
@@ -778,7 +783,11 @@ static int fadump_init_elfcore_header(char *bufp)
        elf->e_entry = 0;
        elf->e_phoff = sizeof(struct elfhdr);
        elf->e_shoff = 0;
-       elf->e_flags = ELF_CORE_EFLAGS;
+#if defined(_CALL_ELF)
+       elf->e_flags = _CALL_ELF;
+#else
+       elf->e_flags = 0;
+#endif
        elf->e_ehsize = sizeof(struct elfhdr);
        elf->e_phentsize = sizeof(struct elf_phdr);
        elf->e_phnum = 0;
@@ -1104,7 +1113,9 @@ static ssize_t fadump_release_memory_store(struct kobject *kobj,
                 * Take away the '/proc/vmcore'. We are releasing the dump
                 * memory, hence it will not be valid anymore.
                 */
+#ifdef CONFIG_PROC_VMCORE
                vmcore_cleanup();
+#endif
                fadump_invalidate_release_mem();
 
        } else