linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.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 be58985..ee166c5 100644 (file)
--- a/arch/powerpc/kernel/machine_kexec_64.c
+++ b/arch/powerpc/kernel/machine_kexec_64.c
@@ -10,6 +10,7 @@
  */
 
 
+#include <linux/cpumask.h>
 #include <linux/kexec.h>
 #include <linux/smp.h>
 #include <linux/thread_info.h>
@@ -334,52 +335,7 @@ static void __init export_htab_values(void)
        of_node_put(node);
 }
 
-static struct property crashk_base_prop = {
-       .name = "linux,crashkernel-base",
-       .length = sizeof(unsigned long),
-       .value = (unsigned char *)&crashk_res.start,
-};
-
-static unsigned long crashk_size;
-
-static struct property crashk_size_prop = {
-       .name = "linux,crashkernel-size",
-       .length = sizeof(unsigned long),
-       .value = (unsigned char *)&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)
+void __init kexec_setup(void)
 {
        export_htab_values();
-       export_crashk_values();
-       return 0;
 }
-__initcall(kexec_setup);