From 9aa2475303ea6a5c3892000d8c129450929b6dae Mon Sep 17 00:00:00 2001
From: Milton Miller <miltonm@bga.com>
Date: Mon, 20 Oct 2008 15:37:03 +0000
Subject: [PATCH] --- yaml --- r: 116943 b: refs/heads/master c:
 ed7b2144bcc87b2b097553f15a2f96e18ede21b0 h: refs/heads/master i:   116941:
 24371f4967972701f32cccce4247d41b84b2a474   116939:
 b277a4a51348f69af4f20f1baac9a48db28ed68b   116935:
 61fdc4eecf0d0e09cc15b12eed75976eae2551c4   116927:
 8e8455d1499b1aa4cacf06d6f950a84910f5f17f v: v3

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

diff --git a/[refs] b/[refs]
index 1d21db82ea72..425deffcc199 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dbc1c5c250cbedccf3571597d156e581e34b2944
+refs/heads/master: ed7b2144bcc87b2b097553f15a2f96e18ede21b0
diff --git a/trunk/arch/powerpc/kernel/machine_kexec_64.c b/trunk/arch/powerpc/kernel/machine_kexec_64.c
index a168514d8609..4bd8b4f5e70d 100644
--- a/trunk/arch/powerpc/kernel/machine_kexec_64.c
+++ b/trunk/arch/powerpc/kernel/machine_kexec_64.c
@@ -312,11 +312,24 @@ static struct property kernel_end_prop = {
 static void __init export_htab_values(void)
 {
 	struct device_node *node;
+	struct property *prop;
 
 	node = of_find_node_by_path("/chosen");
 	if (!node)
 		return;
 
+	/* remove any stale propertys so ours can be found */
+	prop = of_find_property(node, kernel_end_prop.name, NULL);
+	if (prop)
+		prom_remove_property(node, prop);
+	prop = of_find_property(node, htab_base_prop.name, NULL);
+	if (prop)
+		prom_remove_property(node, prop);
+	prop = of_find_property(node, htab_size_prop.name, NULL);
+	if (prop)
+		prom_remove_property(node, prop);
+
+	/* information needed by userspace when using default_machine_kexec */
 	kernel_end = __pa(_end);
 	prom_add_property(node, &kernel_end_prop);