Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
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
This commit is contained in:
commit
0b75f821ec
|
@ -495,6 +495,7 @@ static int exynos4_mct_dying_cpu(unsigned int cpu)
|
||||||
if (mct_int_type == MCT_INT_SPI) {
|
if (mct_int_type == MCT_INT_SPI) {
|
||||||
if (evt->irq != -1)
|
if (evt->irq != -1)
|
||||||
disable_irq_nosync(evt->irq);
|
disable_irq_nosync(evt->irq);
|
||||||
|
exynos4_mct_write(0x1, mevt->base + MCT_L_INT_CSTAT_OFFSET);
|
||||||
} else {
|
} else {
|
||||||
disable_percpu_irq(mct_irqs[MCT_L0_IRQ]);
|
disable_percpu_irq(mct_irqs[MCT_L0_IRQ]);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue