Merge branch 'master' of ../mmc

[pandora-kernel.git] / arch / powerpc / kernel / machine_kexec_64.c

diff --git a/arch/powerpc/kernel/machine_kexec_64.c b/arch/powerpc/kernel/machine_kexec_64.c
index 3c4ca04..49e705f 100644 (file)
--- a/arch/powerpc/kernel/machine_kexec_64.c
+++ b/arch/powerpc/kernel/machine_kexec_64.c
@@ -289,7 +289,7 @@ void default_machine_kexec(struct kimage *image)
 }
 
 /* Values we need to export to the second kernel via the device tree. */
-static unsigned long htab_base, kernel_end;
+static unsigned long htab_base;
 
 static struct property htab_base_prop = {
        .name = "linux,htab-base",
@@ -303,25 +303,20 @@ static struct property htab_size_prop = {
        .value = &htab_size_bytes,
 };
 
-static struct property kernel_end_prop = {
-       .name = "linux,kernel-end",
-       .length = sizeof(unsigned long),
-       .value = &kernel_end,
-};
-
-static void __init export_htab_values(void)
+static int __init export_htab_values(void)
 {
        struct device_node *node;
        struct property *prop;
 
+       /* On machines with no htab htab_address is NULL */
+       if (!htab_address)
+               return -ENODEV;
+
        node = of_find_node_by_path("/chosen");
        if (!node)
-               return;
+               return -ENODEV;
 
        /* 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);
@@ -329,68 +324,11 @@ static void __init export_htab_values(void)
        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);
-
-       /* On machines with no htab htab_address is NULL */
-       if (NULL == htab_address)
-               goto out;
-
        htab_base = __pa(htab_address);
        prom_add_property(node, &htab_base_prop);
        prom_add_property(node, &htab_size_prop);
 
- out:
-       of_node_put(node);
-}
-
-static struct property crashk_base_prop = {
-       .name = "linux,crashkernel-base",
-       .length = sizeof(unsigned long),
-       .value = &crashk_res.start,
-};
-
-static unsigned long crashk_size;
-
-static struct property crashk_size_prop = {
-       .name = "linux,crashkernel-size",
-       .length = sizeof(unsigned long),
-       .value = &crashk_size,
-};
-
-static void __init export_crashk_values(void)
-{
-       struct device_node *node;
-       struct property *prop;
-
-       node = of_find_node_by_path("/chosen");
-       if (!node)
-               return;
-
-       /* There might be existing crash kernel properties, but we can't
-        * be sure what's in them, so remove them. */
-       prop = of_find_property(node, "linux,crashkernel-base", NULL);
-       if (prop)
-               prom_remove_property(node, prop);
-
-       prop = of_find_property(node, "linux,crashkernel-size", NULL);
-       if (prop)
-               prom_remove_property(node, prop);
-
-       if (crashk_res.start != 0) {
-               prom_add_property(node, &crashk_base_prop);
-               crashk_size = crashk_res.end - crashk_res.start + 1;
-               prom_add_property(node, &crashk_size_prop);
-       }
-
        of_node_put(node);
-}
-
-static int __init kexec_setup(void)
-{
-       export_htab_values();
-       export_crashk_values();
        return 0;
 }
-__initcall(kexec_setup);
+late_initcall(export_htab_values);