projects/linux·commit 0b75f821

Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

0b75f821 · Linus Torvalds <[email protected]> · 2017-01-18 11:12:13 -08:00

Pull timer fix from Ingo Molnar:
 "Fix a crash in the ARM-Exynos clocksource driver, triggered by CPU
  hotplug operations"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  clocksource/exynos_mct: Clear interrupt when cpu is shut down
Commit
0b75f821ec8be459dd4dec77be39595d989d77ac
Parents
49b550fe · bc7c36ee

Merge commit. Changes below are compared with the first parent: 49b550fe.

Changes

1 files changed · +1 −0

FileStatusAddDelContent
drivers/clocksource/exynos_mct.cmodified+1−0View file

drivers/clocksource/exynos_mct.c

View file
diff --git a/drivers/clocksource/exynos_mct.c b/drivers/clocksource/exynos_mct.c
index 4da1dc2..670ff0f 100644
--- a/drivers/clocksource/exynos_mct.c
+++ b/drivers/clocksource/exynos_mct.c
@@ -495,6 +495,7 @@ static int exynos4_mct_dying_cpu(unsigned int cpu)
if (mct_int_type == MCT_INT_SPI) {
if (evt->irq != -1)
disable_irq_nosync(evt->irq);
+ exynos4_mct_write(0x1, mevt->base + MCT_L_INT_CSTAT_OFFSET);
} else {
disable_percpu_irq(mct_irqs[MCT_L0_IRQ]);
}