From fa2fecdea78f480b706f88f1a14ec56fb7a871be Mon Sep 17 00:00:00 2001
From: Suzuki Poulose <suzuki@in.ibm.com>
Date: Tue, 21 Aug 2012 01:42:43 +0000
Subject: [PATCH] --- yaml --- r: 330271 b: refs/heads/master c:
 4bc77a5ed215b4ec9cc39d5f55323b2e68000055 h: refs/heads/master i:   330269:
 c49e14d016db155dedda2beb857581e06f3178c3   330267:
 b2a556872c893aad2ff0d1a87680f1864673e64b   330263:
 82efddbc545fe0375268aea1ce87e4562f9f5f77   330255:
 e4e29f13ce3abafa8b1dbc9b67fe09dcdbe983ed   330239:
 b0d300942ec7c86527104de48b5ed3654d6c3164 v: v3

---
 [refs]                                    |  2 +-
 trunk/arch/powerpc/kernel/machine_kexec.c | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f7b05958b7a7..a61238f7639e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a84fcd46870113e92523e1ebb9a0ec75f66e03a2
+refs/heads/master: 4bc77a5ed215b4ec9cc39d5f55323b2e68000055
diff --git a/trunk/arch/powerpc/kernel/machine_kexec.c b/trunk/arch/powerpc/kernel/machine_kexec.c
index 4074eff1e744..fa9f6c72f557 100644
--- a/trunk/arch/powerpc/kernel/machine_kexec.c
+++ b/trunk/arch/powerpc/kernel/machine_kexec.c
@@ -204,6 +204,12 @@ static struct property crashk_size_prop = {
 	.value = &crashk_size,
 };
 
+static struct property memory_limit_prop = {
+	.name = "linux,memory-limit",
+	.length = sizeof(unsigned long long),
+	.value = &memory_limit,
+};
+
 static void __init export_crashk_values(struct device_node *node)
 {
 	struct property *prop;
@@ -223,6 +229,12 @@ static void __init export_crashk_values(struct device_node *node)
 		crashk_size = resource_size(&crashk_res);
 		prom_add_property(node, &crashk_size_prop);
 	}
+
+	/*
+	 * memory_limit is required by the kexec-tools to limit the
+	 * crash regions to the actual memory used.
+	 */
+	prom_update_property(node, &memory_limit_prop);
 }
 
 static int __init kexec_setup(void)