From 2f86fe2202cc91979e6cd0d01fa9d2e38943646c Mon Sep 17 00:00:00 2001
From: Vivek Goyal <vgoyal@in.ibm.com>
Date: Mon, 9 Jan 2006 20:51:47 -0800
Subject: [PATCH] --- yaml --- r: 17547 b: refs/heads/master c:
 aac04b32f3e4c63f461459d0e1d6aa01caac6e66 h: refs/heads/master i:   17545:
 45cc1b40df675e37f7e23ef9ff01e520c6fb4057   17543:
 942f120a4d18064e498db288ce4825fc08871d66 v: v3

---
 [refs]                                    | 2 +-
 trunk/Documentation/kernel-parameters.txt | 7 ++++---
 trunk/arch/i386/kernel/setup.c            | 2 +-
 trunk/arch/x86_64/kernel/setup.c          | 9 +++++++++
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 51d06b5aba8a..fb21ac426607 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 69cda7b1f06befb8d6a884b8a663d19dcaef590b
+refs/heads/master: aac04b32f3e4c63f461459d0e1d6aa01caac6e66
diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt
index 12b7d938a897..dd0bfc291a68 100644
--- a/trunk/Documentation/kernel-parameters.txt
+++ b/trunk/Documentation/kernel-parameters.txt
@@ -475,10 +475,11 @@ running once the system is up.
 			See Documentation/block/as-iosched.txt and
 			Documentation/block/deadline-iosched.txt for details.
 
-	elfcorehdr=	[IA-32]
+	elfcorehdr=	[IA-32, X86_64]
 			Specifies physical address of start of kernel core
-			image elf header.
-			See Documentation/kdump.txt for details.
+			image elf header. Generally kexec loader will
+			pass this option to capture kernel.
+			See Documentation/kdump/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 27c956db0461..f685637a100d 100644
--- a/trunk/arch/i386/kernel/setup.c
+++ b/trunk/arch/i386/kernel/setup.c
@@ -898,7 +898,7 @@ static void __init parse_cmdline_early (char ** cmdline_p)
 			}
 		}
 #endif
-#ifdef CONFIG_CRASH_DUMP
+#ifdef CONFIG_PROC_VMCORE
 		/* elfcorehdr= specifies the location of elf core header
 		 * stored by the crashed kernel.
 		 */
diff --git a/trunk/arch/x86_64/kernel/setup.c b/trunk/arch/x86_64/kernel/setup.c
index ff9620b800c0..a0e0c9ca8f10 100644
--- a/trunk/arch/x86_64/kernel/setup.c
+++ b/trunk/arch/x86_64/kernel/setup.c
@@ -35,6 +35,7 @@
 #include <asm/processor.h>
 #include <linux/console.h>
 #include <linux/seq_file.h>
+#include <linux/crash_dump.h>
 #include <linux/root_dev.h>
 #include <linux/pci.h>
 #include <linux/acpi.h>
@@ -418,6 +419,14 @@ static __init void parse_cmdline_early (char ** cmdline_p)
 		}
 #endif
 
+#ifdef CONFIG_PROC_VMCORE
+		/* elfcorehdr= specifies the location of elf core header
+		 * stored by the crashed kernel. This option will be passed
+		 * by kexec loader to the capture kernel.
+		 */
+		else if(!memcmp(from, "elfcorehdr=", 11))
+			elfcorehdr_addr = memparse(from+11, &from);
+#endif
 	next_char:
 		c = *(from++);
 		if (!c)