From a1af2fb459db38db4bdf80bf12911623b2fcf7ab Mon Sep 17 00:00:00 2001 From: Amit Daniel Kachhap Date: Thu, 8 Dec 2011 10:07:08 +0900 Subject: [PATCH] --- yaml --- r: 276705 b: refs/heads/master c: e248cd5d5f1c28c82781d4122dddd1b7c3d7b46f h: refs/heads/master i: 276703: 6eb2827504c6028b97582e84b227151ae022310b v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-exynos/mct.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f5c29409684a..d0a9da328983 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: de611dd4078499d5aa5ae9655652687ae630585f +refs/heads/master: e248cd5d5f1c28c82781d4122dddd1b7c3d7b46f diff --git a/trunk/arch/arm/mach-exynos/mct.c b/trunk/arch/arm/mach-exynos/mct.c index 97343df8f132..959f2514796c 100644 --- a/trunk/arch/arm/mach-exynos/mct.c +++ b/trunk/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); }