Skip to content

Commit d966564

Browse files
committed
Revert "x86/ioapic: Restore IO-APIC irq_chip retrigger callback"
This reverts commit 020eb3d. Gabriel C reports that it causes his machine to not boot, and we haven't tracked down the reason for it yet. Since the bug it fixes has been around for a longish time, we're better off reverting the fix for now. Gabriel says: "It hangs early and freezes with a lot RCU warnings. I bisected it down to : > Ruslan Ruslichenko (1): > x86/ioapic: Restore IO-APIC irq_chip retrigger callback Reverting this one fixes the problem for me.. The box is a PRIMERGY TX200 S5 , 2 socket , 2 x E5520 CPU(s) installed" and Ruslan and Thomas are currently stumped. Reported-and-bisected-by: Gabriel C <[email protected]> Cc: Ruslan Ruslichenko <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: [email protected] # for the backport of the original commit Signed-off-by: Linus Torvalds <[email protected]>
1 parent 3b802c9 commit d966564

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

arch/x86/kernel/apic/io_apic.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1875,7 +1875,6 @@ static struct irq_chip ioapic_chip __read_mostly = {
18751875
.irq_ack = irq_chip_ack_parent,
18761876
.irq_eoi = ioapic_ack_level,
18771877
.irq_set_affinity = ioapic_set_affinity,
1878-
.irq_retrigger = irq_chip_retrigger_hierarchy,
18791878
.flags = IRQCHIP_SKIP_SET_WAKE,
18801879
};
18811880

@@ -1887,7 +1886,6 @@ static struct irq_chip ioapic_ir_chip __read_mostly = {
18871886
.irq_ack = irq_chip_ack_parent,
18881887
.irq_eoi = ioapic_ir_ack_level,
18891888
.irq_set_affinity = ioapic_set_affinity,
1890-
.irq_retrigger = irq_chip_retrigger_hierarchy,
18911889
.flags = IRQCHIP_SKIP_SET_WAKE,
18921890
};
18931891

0 commit comments

Comments
 (0)