---

yaml
---
r: 116943
b: refs/heads/master
c: ed7b214
h: refs/heads/master
i:
  116941: 24371f4
  116939: b277a4a
  116935: 61fdc4e
  116927: 8e8455d
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dbc1c5c250cbedccf3571597d156e581e34b2944
+refs/heads/master: ed7b2144bcc87b2b097553f15a2f96e18ede21b0

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);