Merge branch 'tracing/ftrace' into tracing/urgent

[linux-2.6-omap-h63xx.git] / arch / x86 / kernel / crash_dump_32.c

diff --git a/arch/x86/kernel/crash_dump_32.c b/arch/x86/kernel/crash_dump_32.c
index 3f532df488bca29e3cd03be11205df9d3d2808ac..f7cdb3b457aadc7f0f8951323dc507827211be75 100644 (file)
--- a/arch/x86/kernel/crash_dump_32.c
+++ b/arch/x86/kernel/crash_dump_32.c
@@ -1,5 +1,5 @@
 /*
- *     kernel/crash_dump.c - Memory preserving reboot related code.
+ *     Memory preserving reboot related code.
  *
  *     Created by: Hariprasad Nellitheertha (hari@in.ibm.com)
  *     Copyright (C) IBM Corporation, 2004. All rights reserved
@@ -13,6 +13,9 @@
 
 static void *kdump_buf_page;
 
+/* Stores the physical address of elf header of crash image. */
+unsigned long long elfcorehdr_addr = ELFCORE_ADDR_MAX;
+
 /**
  * copy_oldmem_page - copy one page from "oldmem"
  * @pfn: page frame number to be copied
@@ -47,6 +50,7 @@ ssize_t copy_oldmem_page(unsigned long pfn, char *buf,
                if (!kdump_buf_page) {
                        printk(KERN_WARNING "Kdump: Kdump buffer page not"
                                " allocated\n");
+                       kunmap_atomic(vaddr, KM_PTE0);
                        return -EFAULT;
                }
                copy_page(kdump_buf_page, vaddr);