ARM: CPU hotplug: move cpu_killed completion to core code

[mv-sheeva.git] / arch / arm / mach-omap2 / omap-hotplug.c

diff --git a/arch/arm/mach-omap2/omap-hotplug.c b/arch/arm/mach-omap2/omap-hotplug.c
index 6cee456ca542e078fa9eaf7bcfd03e03f562535b..ace979d74bfcc99fd16d1199a0305d0c88e3cf41 100644 (file)
--- a/arch/arm/mach-omap2/omap-hotplug.c
+++ b/arch/arm/mach-omap2/omap-hotplug.c
@@ -17,16 +17,13 @@
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/smp.h>
-#include <linux/completion.h>
 
 #include <asm/cacheflush.h>
 #include <mach/omap4-common.h>
 
-static DECLARE_COMPLETION(cpu_killed);
-
 int platform_cpu_kill(unsigned int cpu)
 {
-       return wait_for_completion_timeout(&cpu_killed, 5000);
+       return 1;
 }
 
 /*
@@ -42,8 +39,7 @@ void platform_cpu_die(unsigned int cpu)
                           this_cpu, cpu);
                BUG();
        }
-       pr_notice("CPU%u: shutdown\n", cpu);
-       complete(&cpu_killed);
+
        flush_cache_all();
        dsb();