1 files changed, 30 insertions, 0 deletions

diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index 5fa09d141ab7..7d6fe65c93f4 100644
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -251,6 +251,12 @@ reserve_memory (void)
         }
 #endif
 
+#ifdef CONFIG_PROC_VMCORE
+        if (reserve_elfcorehdr(&rsvd_region[n].start,
+                               &rsvd_region[n].end) == 0)
+                n++;
+#endif
+
         efi_memmap_init(&rsvd_region[n].start, &rsvd_region[n].end);
         n++;
 
@@ -453,6 +459,30 @@ static int __init parse_elfcorehdr(char *arg)
         return 0;
 }
 early_param("elfcorehdr", parse_elfcorehdr);
+
+int __init reserve_elfcorehdr(unsigned long *start, unsigned long *end)
+{
+        unsigned long length;
+
+        /* We get the address using the kernel command line,
+         * but the size is extracted from the EFI tables.
+         * Both address and size are required for reservation
+         * to work properly.
+         */
+
+        if (elfcorehdr_addr >= ELFCORE_ADDR_MAX)
+                return -EINVAL;
+
+        if ((length = vmcore_find_descriptor_size(elfcorehdr_addr)) == 0) {
+                elfcorehdr_addr = ELFCORE_ADDR_MAX;
+                return -EINVAL;
+        }
+
+        *start = (unsigned long)__va(elfcorehdr_addr);
+        *end = *start + length;
+        return 0;
+}
+
 #endif /* CONFIG_PROC_VMCORE */
 
 void __init