OSDN Git Service

x86/irq: Make irq activate operations symmetric
authorThomas Gleixner <tglx@linutronix.de>
Tue, 31 Jan 2017 18:03:21 +0000 (19:03 +0100)
committerThomas Gleixner <tglx@linutronix.de>
Tue, 31 Jan 2017 19:22:18 +0000 (20:22 +0100)
commitaaaec6fc755447a1d056765b11b24d8ff2b81366
treea7f4167960ee1df86739905b6ccdeb95465bfe5f
parent08d85f3ea99f1eeafc4e8507936190e86a16ee8c
x86/irq: Make irq activate operations symmetric

The recent commit which prevents double activation of interrupts unearthed
interesting code in x86. The code (ab)uses irq_domain_activate_irq() to
reconfigure an already activated interrupt. That trips over the prevention
code now.

Fix it by deactivating the interrupt before activating the new configuration.

Fixes: 08d85f3ea99f1 "irqdomain: Avoid activating interrupts more than once"
Reported-and-tested-by: Mike Galbraith <efault@gmx.de>
Reported-and-tested-by: Borislav Petkov <bp@alien8.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Andrey Ryabinin <aryabinin@virtuozzo.com>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: stable@vger.kernel.org
Link: http://lkml.kernel.org/r/alpine.DEB.2.20.1701311901580.3457@nanos
arch/x86/kernel/apic/io_apic.c
arch/x86/kernel/hpet.c