---

yaml --- r: 330271 b: refs/heads/master c: 4bc77a5 h: refs/heads/master i: 330269: c49e14d 330267: b2a5568 330263: 82efddb 330255: e4e29f1 330239: b0d3009 v: v3
git-mirror · Sep 7, 2012 · fa2fecd · fa2fecd
1 parent 5adbe87
commit fa2fecd
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git 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
@@ -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)