Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	arch/x86/kernel/io_apic.c

1 files changed, 21 insertions, 6 deletions

diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index 10ad2f87ed9a..61c4a9b62165 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -368,16 +368,18 @@ int __irq_set_trigger(struct irq_desc *desc, unsigned int irq,
                 return 0;
         }
 
-        ret = chip->set_type(irq, flags & IRQF_TRIGGER_MASK);
+        /* caller masked out all except trigger mode flags */
+        ret = chip->set_type(irq, flags);
 
         if (ret)
                 pr_err("setting trigger mode %d for irq %u failed (%pF)\n",
-                                (int)(flags & IRQF_TRIGGER_MASK),
-                                irq, chip->set_type);
+                                (int)flags, irq, chip->set_type);
         else {
+                if (flags & (IRQ_TYPE_LEVEL_LOW | IRQ_TYPE_LEVEL_HIGH))
+                        flags |= IRQ_LEVEL;
                 /* note that IRQF_TRIGGER_MASK == IRQ_TYPE_SENSE_MASK */
-                desc->status &= ~IRQ_TYPE_SENSE_MASK;
-                desc->status |= flags & IRQ_TYPE_SENSE_MASK;
+                desc->status &= ~(IRQ_LEVEL | IRQ_TYPE_SENSE_MASK);
+                desc->status |= flags;
         }
 
         return ret;
@@ -457,7 +459,8 @@ __setup_irq(unsigned int irq, struct irq_desc * desc, struct irqaction *new)
 
                 /* Setup the type (level, edge polarity) if configured: */
                 if (new->flags & IRQF_TRIGGER_MASK) {
-                        ret = __irq_set_trigger(desc, irq, new->flags);
+                        ret = __irq_set_trigger(desc, irq,
+                                        new->flags & IRQF_TRIGGER_MASK);
 
                         if (ret) {
                                 spin_unlock_irqrestore(&desc->lock, flags);
@@ -671,6 +674,18 @@ int request_irq(unsigned int irq, irq_handler_t handler,
         struct irq_desc *desc;
         int retval;
 
+        /*
+         * handle_IRQ_event() always ignores IRQF_DISABLED except for
+         * the _first_ irqaction (sigh).  That can cause oopsing, but
+         * the behavior is classified as "will not fix" so we need to
+         * start nudging drivers away from using that idiom.
+         */
+        if ((irqflags & (IRQF_SHARED|IRQF_DISABLED))
+                        == (IRQF_SHARED|IRQF_DISABLED))
+                pr_warning("IRQ %d/%s: IRQF_DISABLED is not "
+                                "guaranteed on shared IRQs\n",
+                                irq, devname);
+
 #ifdef CONFIG_LOCKDEP
         /*
          * Lockdep wants atomic interrupt handlers: