Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 095cbe66 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull x86 fix from Thomas Gleixner:
 "Restore the retrigger callbacks in the IO APIC irq chips. That
  addresses a long standing regression which got introduced with the
  rewrite of the x86 irq subsystem two years ago and went unnoticed so
  far"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/ioapic: Restore IO-APIC irq_chip retrigger callback
parents 24b86839 020eb3da

arch/x86/kernel/apic/io_apic.c

+2 −0
Original line number Diff line number Diff line
@@ -1875,6 +1875,7 @@ static struct irq_chip ioapic_chip __read_mostly = { 
	.irq_ack		= irq_chip_ack_parent,

	.irq_eoi		= ioapic_ack_level,

	.irq_set_affinity	= ioapic_set_affinity,

	.irq_retrigger		= irq_chip_retrigger_hierarchy,

	.flags			= IRQCHIP_SKIP_SET_WAKE,

};
@@ -1886,6 +1887,7 @@ static struct irq_chip ioapic_ir_chip __read_mostly = { 
	.irq_ack		= irq_chip_ack_parent,

	.irq_eoi		= ioapic_ir_ack_level,

	.irq_set_affinity	= ioapic_set_affinity,

	.irq_retrigger		= irq_chip_retrigger_hierarchy,

	.flags			= IRQCHIP_SKIP_SET_WAKE,

};