diff options
| author | Naveen Kumar Gaddipati <naveen.gaddipati@stericsson.com> | 2011-09-08 14:24:33 +0530 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@stericsson.com> | 2011-09-19 16:07:25 +0200 |
| commit | 973822ef716ef7bac6915000b06e0addf03dc987 (patch) | |
| tree | 1273a9a948774079264ed3e8d899eb9e191d9cde /arch/arm/mach-ux500/hotplug.c | |
| parent | 6b99c3a5abd3bdcdbc670f588543483b13a8a523 (diff) | |
mach-ux500:hotplug:Revert changes
The changes are already done for kernel 3.0 in
bbc81fd4327f9ed4480b05981e38acd48b1d184a commit for
hotplug file
ST-Ericsson ID: 352334
ST-Ericsson Linux next: NA
ST-Ericsson FOSS-OUT ID: NA
Signed-off-by: Naveen Kumar Gaddipati <naveen.gaddipati@stericsson.com>
Diffstat (limited to 'arch/arm/mach-ux500/hotplug.c')
| -rw-r--r-- | arch/arm/mach-ux500/hotplug.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/arch/arm/mach-ux500/hotplug.c b/arch/arm/mach-ux500/hotplug.c index 0d71ee4e399..8d64534bbe7 100644 --- a/arch/arm/mach-ux500/hotplug.c +++ b/arch/arm/mach-ux500/hotplug.c @@ -19,8 +19,6 @@ extern volatile int pen_release; -static DECLARE_COMPLETION(cpu_killed); - static inline void platform_do_lowpower(unsigned int cpu) { flush_cache_all(); @@ -46,7 +44,7 @@ static inline void platform_do_lowpower(unsigned int cpu) int platform_cpu_kill(unsigned int cpu) { - return wait_for_completion_timeout(&cpu_killed, 5000); + return 1; } /* @@ -56,19 +54,6 @@ int platform_cpu_kill(unsigned int cpu) */ void platform_cpu_die(unsigned int cpu) { -#ifdef DEBUG - unsigned int this_cpu = hard_smp_processor_id(); - - if (cpu != this_cpu) { - printk(KERN_CRIT "Eek! platform_cpu_die running on %u, should be %u\n", - this_cpu, cpu); - BUG(); - } -#endif - - printk(KERN_NOTICE "CPU%u: shutdown\n", cpu); - complete(&cpu_killed); - /* directly enter low power state, skipping secure registers */ platform_do_lowpower(cpu); } |