diff options
author | Amit Daniel Kachhap <amit.kachhap@linaro.org> | 2011-12-07 20:07:08 -0500 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-12-07 20:09:31 -0500 |
commit | e248cd5d5f1c28c82781d4122dddd1b7c3d7b46f (patch) | |
tree | bde875a493405ee832fdc4e9553533d29d321ec3 | |
parent | de611dd4078499d5aa5ae9655652687ae630585f (diff) |
ARM: EXYNOS: Fix for stall in case of cpu hotplug or sleep
This patch adds remove_irq in place of disable_irq which
is correct equivalent function for setup_irq used in
exynos4_mct_tick_init.
Signed-off-by: Amit Daniel Kachhap <amit.kachhap@linaro.org>
Tested-by: Inderpal Singh <inderpal.singh@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
-rw-r--r-- | arch/arm/mach-exynos/mct.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/mach-exynos/mct.c b/arch/arm/mach-exynos/mct.c index 97343df8f132..959f2514796c 100644 --- a/arch/arm/mach-exynos/mct.c +++ b/arch/arm/mach-exynos/mct.c | |||
@@ -428,9 +428,13 @@ int __cpuinit local_timer_setup(struct clock_event_device *evt) | |||
428 | 428 | ||
429 | void local_timer_stop(struct clock_event_device *evt) | 429 | void local_timer_stop(struct clock_event_device *evt) |
430 | { | 430 | { |
431 | unsigned int cpu = smp_processor_id(); | ||
431 | evt->set_mode(CLOCK_EVT_MODE_UNUSED, evt); | 432 | evt->set_mode(CLOCK_EVT_MODE_UNUSED, evt); |
432 | if (mct_int_type == MCT_INT_SPI) | 433 | if (mct_int_type == MCT_INT_SPI) |
433 | disable_irq(evt->irq); | 434 | if (cpu == 0) |
435 | remove_irq(evt->irq, &mct_tick0_event_irq); | ||
436 | else | ||
437 | remove_irq(evt->irq, &mct_tick1_event_irq); | ||
434 | else | 438 | else |
435 | disable_percpu_irq(IRQ_MCT_LOCALTIMER); | 439 | disable_percpu_irq(IRQ_MCT_LOCALTIMER); |
436 | } | 440 | } |