diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-18 14:12:13 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-18 14:12:13 -0500 |
| commit | 0b75f821ec8be459dd4dec77be39595d989d77ac (patch) | |
| tree | 8d5e5132ddf28928d44347c78102233b042f480e | |
| parent | 49b550fee80b5f36b961640666f7945d7ec63000 (diff) | |
| parent | bc7c36eedb0c7004aa06c2afc3c5385adada8fa3 (diff) | |
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
| -rw-r--r-- | drivers/clocksource/exynos_mct.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/clocksource/exynos_mct.c b/drivers/clocksource/exynos_mct.c index 4da1dc2278bd..670ff0f25b67 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) | |||
| 495 | if (mct_int_type == MCT_INT_SPI) { | 495 | if (mct_int_type == MCT_INT_SPI) { |
| 496 | if (evt->irq != -1) | 496 | if (evt->irq != -1) |
| 497 | disable_irq_nosync(evt->irq); | 497 | disable_irq_nosync(evt->irq); |
| 498 | exynos4_mct_write(0x1, mevt->base + MCT_L_INT_CSTAT_OFFSET); | ||
| 498 | } else { | 499 | } else { |
| 499 | disable_percpu_irq(mct_irqs[MCT_L0_IRQ]); | 500 | disable_percpu_irq(mct_irqs[MCT_L0_IRQ]); |
| 500 | } | 501 | } |