3.16.70-rc1 review patch.  If anyone has any objections, please let me know.

------------------

From: Marek Szyprowski <m.szyprow...@samsung.com>

commit b9307420196009cdf18bad55e762ac49fb9a80f4 upstream.

While freeing interrupt handlers in error path, don't assume that all
requested interrupts are per-processor interrupts and properly release
standard interrupts too.

Reported-by: Krzysztof Kozlowski <k...@kernel.org>
Fixes: 56a94f13919c ("clocksource: exynos_mct: Avoid blocking calls in the cpu 
hotplug notifier")
Signed-off-by: Marek Szyprowski <m.szyprow...@samsung.com>
Reviewed-by: Krzysztof Kozlowski <k...@kernel.org>
Reviewed-by: Chanwoo Choi <cw00.c...@samsung.com>
Signed-off-by: Daniel Lezcano <daniel.lezc...@linaro.org>
[bwh: Backported to 3.16: adjust context]
Signed-off-by: Ben Hutchings <b...@decadent.org.uk>
---
 drivers/clocksource/exynos_mct.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

--- a/drivers/clocksource/exynos_mct.c
+++ b/drivers/clocksource/exynos_mct.c
@@ -558,7 +558,19 @@ static void __init exynos4_timer_resourc
        return;
 
 out_irq:
-       free_percpu_irq(mct_irqs[MCT_L0_IRQ], &percpu_mct_tick);
+       if (mct_int_type == MCT_INT_PPI) {
+               free_percpu_irq(mct_irqs[MCT_L0_IRQ], &percpu_mct_tick);
+       } else {
+               for_each_possible_cpu(cpu) {
+                       struct mct_clock_event_device *pcpu_mevt =
+                               per_cpu_ptr(&percpu_mct_tick, cpu);
+
+                       if (pcpu_mevt->evt.irq != -1) {
+                               free_irq(pcpu_mevt->evt.irq, pcpu_mevt);
+                               pcpu_mevt->evt.irq = -1;
+                       }
+               }
+       }
 }
 
 void __init mct_init(void __iomem *base, int irq_g0, int irq_l0, int irq_l1)

Reply via email to