diff options
| author | Linus Torvalds | 2017-02-04 21:18:01 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2017-02-04 21:18:01 +0100 |
| commit | a572a1b999489efb591287632279c6c9eca3e4ed (patch) | |
| tree | 9bcb859aec2cfce13a896c46f4b41d4abd881830 /arch/x86/kernel/hpet.c | |
| parent | Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm (diff) | |
| parent | x86/irq: Make irq activate operations symmetric (diff) | |
| download | kernel-qcow2-linux-a572a1b999489efb591287632279c6c9eca3e4ed.tar.gz kernel-qcow2-linux-a572a1b999489efb591287632279c6c9eca3e4ed.tar.xz kernel-qcow2-linux-a572a1b999489efb591287632279c6c9eca3e4ed.zip | |
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq fixes from Thomas Gleixner:
- Prevent double activation of interrupt lines, which causes problems
on certain interrupt controllers
- Handle the fallout of the above because x86 (ab)uses the activation
function to reconfigure interrupts under the hood.
* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/irq: Make irq activate operations symmetric
irqdomain: Avoid activating interrupts more than once
Diffstat (limited to 'arch/x86/kernel/hpet.c')
| -rw-r--r-- | arch/x86/kernel/hpet.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c index 85e87b46c318..dc6ba5bda9fc 100644 --- a/arch/x86/kernel/hpet.c +++ b/arch/x86/kernel/hpet.c @@ -352,6 +352,7 @@ static int hpet_resume(struct clock_event_device *evt, int timer) } else { struct hpet_dev *hdev = EVT_TO_HPET_DEV(evt); + irq_domain_deactivate_irq(irq_get_irq_data(hdev->irq)); irq_domain_activate_irq(irq_get_irq_data(hdev->irq)); disable_irq(hdev->irq); irq_set_affinity(hdev->irq, cpumask_of(hdev->cpu)); |