summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorAmit Daniel Kachhap <amit.kachhap@linaro.org>2011-12-08 10:07:08 +0900
committerKukjin Kim <kgene.kim@samsung.com>2011-12-08 10:09:31 +0900
commite248cd5d5f1c28c82781d4122dddd1b7c3d7b46f (patch)
treebde875a493405ee832fdc4e9553533d29d321ec3 /arch/arm
parentde611dd4078499d5aa5ae9655652687ae630585f (diff)
downloadop-kernel-dev-e248cd5d5f1c28c82781d4122dddd1b7c3d7b46f.zip
op-kernel-dev-e248cd5d5f1c28c82781d4122dddd1b7c3d7b46f.tar.gz
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>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-exynos/mct.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/mach-exynos/mct.c b/arch/arm/mach-exynos/mct.c
index 97343df..959f251 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)
void local_timer_stop(struct clock_event_device *evt)
{
+ unsigned int cpu = smp_processor_id();
evt->set_mode(CLOCK_EVT_MODE_UNUSED, evt);
if (mct_int_type == MCT_INT_SPI)
- disable_irq(evt->irq);
+ if (cpu == 0)
+ remove_irq(evt->irq, &mct_tick0_event_irq);
+ else
+ remove_irq(evt->irq, &mct_tick1_event_irq);
else
disable_percpu_irq(IRQ_MCT_LOCALTIMER);
}
OpenPOWER on IntegriCloud