1 files changed, 12 insertions, 2 deletions

diff --git a/kernel/irq/spurious.c b/kernel/irq/spurious.c
index 89fb90ae534f..a9a662847e44 100644
--- a/kernel/irq/spurious.c
+++ b/kernel/irq/spurious.c
@@ -54,9 +54,9 @@ static int try_one_irq(int irq, struct irq_desc *desc)
                 }
                 action = action->next;
         }
-        local_irq_disable();
+
         /* Now clean up the flags */
-        raw_spin_lock(&desc->lock);
+        raw_spin_lock_irq(&desc->lock);
         action = desc->action;
 
         /*
@@ -278,6 +278,11 @@ MODULE_PARM_DESC(noirqdebug, "Disable irq lockup detection when true");
 
 static int __init irqfixup_setup(char *str)
 {
+#ifdef CONFIG_PREEMPT_RT
+        printk(KERN_WARNING "irqfixup boot option not supported "
+                "w/ CONFIG_PREEMPT_RT\n");
+        return 1;
+#endif
         irqfixup = 1;
         printk(KERN_WARNING "Misrouted IRQ fixup support enabled.\n");
         printk(KERN_WARNING "This may impact system performance.\n");
@@ -290,6 +295,11 @@ module_param(irqfixup, int, 0644);
 
 static int __init irqpoll_setup(char *str)
 {
+#ifdef CONFIG_PREEMPT_RT
+        printk(KERN_WARNING "irqpoll boot option not supported "
+                "w/ CONFIG_PREEMPT_RT\n");
+        return 1;
+#endif
         irqfixup = 2;
         printk(KERN_WARNING "Misrouted IRQ fixup and polling support "
                                 "enabled\n");