--- /dev/null
+From d966564fcdc19e13eb6ba1fbe6b8101070339c3d Mon Sep 17 00:00:00 2001
+From: Linus Torvalds <torvalds@linux-foundation.org>
+Date: Wed, 8 Feb 2017 18:08:29 -0800
+Subject: Revert "x86/ioapic: Restore IO-APIC irq_chip retrigger callback"
+
+From: Linus Torvalds <torvalds@linux-foundation.org>
+
+commit d966564fcdc19e13eb6ba1fbe6b8101070339c3d upstream.
+
+This reverts commit 020eb3daaba2857b32c4cf4c82f503d6a00a67de.
+
+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 <nix.or.die@gmail.com>
+Cc: Ruslan Ruslichenko <rruslich@cisco.com>
+Cc: Thomas Gleixner <tglx@linutronix.de>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/x86/kernel/apic/io_apic.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+--- a/arch/x86/kernel/apic/io_apic.c
++++ b/arch/x86/kernel/apic/io_apic.c
+@@ -1875,7 +1875,6 @@ static struct irq_chip ioapic_chip __rea
+ .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,
+ };
+
+@@ -1887,7 +1886,6 @@ static struct irq_chip ioapic_ir_chip __
+ .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,
+ };
+