From 7bc427385aa8f43ec75d6e2915a752e260f03ea2 Mon Sep 17 00:00:00 2001
From: Vivek Goyal <vgoyal@in.ibm.com>
Date: Sat, 25 Jun 2005 14:58:20 -0700
Subject: [PATCH] --- yaml --- r: 3346 b: refs/heads/master c:
 2030eae52b416a9a9f0ffda74c982b7f1e19496d h: refs/heads/master v: v3

---
 [refs]                                    | 2 +-
 trunk/Documentation/kernel-parameters.txt | 4 ++++
 trunk/arch/i386/kernel/setup.c            | 8 ++++++++
 trunk/include/linux/crash_dump.h          | 1 +
 trunk/kernel/crash_dump.c                 | 3 +++
 5 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0f9f09798942..9ad296ba500f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 60e64d46a58236e3c718074372cab6a5b56a3b15
+refs/heads/master: 2030eae52b416a9a9f0ffda74c982b7f1e19496d
diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt
index 560ff5ae3fd9..f44bb5567c5b 100644
--- a/trunk/Documentation/kernel-parameters.txt
+++ b/trunk/Documentation/kernel-parameters.txt
@@ -451,6 +451,10 @@ running once the system is up.
 			Format: {"as"|"cfq"|"deadline"|"noop"}
 			See Documentation/block/as-iosched.txt
 			and Documentation/block/deadline-iosched.txt for details.
+	elfcorehdr=	[IA-32]
+			Specifies physical address of start of kernel core image
+			elf header.
+			See Documentation/kdump.txt for details.
 
 	enforcing	[SELINUX] Set initial enforcing status.
 			Format: {"0" | "1"}
diff --git a/trunk/arch/i386/kernel/setup.c b/trunk/arch/i386/kernel/setup.c
index 8d58a053e12e..7306353c520e 100644
--- a/trunk/arch/i386/kernel/setup.c
+++ b/trunk/arch/i386/kernel/setup.c
@@ -44,6 +44,7 @@
 #include <linux/edd.h>
 #include <linux/nodemask.h>
 #include <linux/kexec.h>
+#include <linux/crash_dump.h>
 
 #include <video/edid.h>
 
@@ -881,6 +882,13 @@ static void __init parse_cmdline_early (char ** cmdline_p)
 			}
 		}
 #endif
+#ifdef CONFIG_CRASH_DUMP
+		/* elfcorehdr= specifies the location of elf core header
+		 * stored by the crashed kernel.
+		 */
+		else if (!memcmp(from, "elfcorehdr=", 11))
+			elfcorehdr_addr = memparse(from+11, &from);
+#endif
 
 		/*
 		 * highmem=size forces highmem to be exactly 'size' bytes.
diff --git a/trunk/include/linux/crash_dump.h b/trunk/include/linux/crash_dump.h
index 7d983b817429..3f25fd1eaa4b 100644
--- a/trunk/include/linux/crash_dump.h
+++ b/trunk/include/linux/crash_dump.h
@@ -7,6 +7,7 @@
 #include <linux/device.h>
 #include <linux/proc_fs.h>
 
+extern unsigned long long elfcorehdr_addr;
 extern ssize_t copy_oldmem_page(unsigned long, char *, size_t,
 						unsigned long, int);
 #endif /* CONFIG_CRASH_DUMP */
diff --git a/trunk/kernel/crash_dump.c b/trunk/kernel/crash_dump.c
index 5a1e6d5d203e..10b966c3744c 100644
--- a/trunk/kernel/crash_dump.c
+++ b/trunk/kernel/crash_dump.c
@@ -15,6 +15,9 @@
 #include <asm/io.h>
 #include <asm/uaccess.h>
 
+/* Stores the physical address of elf header of crash image. */
+unsigned long long elfcorehdr_addr;
+
 /*
  * Copy a page from "oldmem". For this page, there is no pte mapped
  * in the current kernel. We stitch up a pte, similar to kmap_atomic.