Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / kernel / irq / manage.c

diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index 4bff6a1..2ff1c0c 100644 (file)
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -398,7 +398,8 @@ int irq_select_affinity_usr(unsigned int irq)
 /**
  *     irq_set_vcpu_affinity - Set vcpu affinity for the interrupt
  *     @irq: interrupt number to set affinity
- *     @vcpu_info: vCPU specific data
+ *     @vcpu_info: vCPU specific data or pointer to a percpu array of vCPU
+ *                 specific data for percpu_devid interrupts
  *
  *     This function uses the vCPU specific data to set the vCPU
  *     affinity for an irq. The vCPU specific data is passed from
@@ -536,7 +537,7 @@ void __enable_irq(struct irq_desc *desc)
                 * time. If it was already started up, then irq_startup()
                 * will invoke irq_enable() under the hood.
                 */
-               irq_startup(desc, IRQ_RESEND, IRQ_START_COND);
+               irq_startup(desc, IRQ_RESEND, IRQ_START_FORCE);
                break;
        }
        default:
@@ -1305,7 +1306,7 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new)
                 * thread_mask assigned. See the loop above which or's
                 * all existing action->thread_mask bits.
                 */
-               new->thread_mask = 1 << ffz(thread_mask);
+               new->thread_mask = 1UL << ffz(thread_mask);
 
        } else if (new->handler == irq_default_primary_handler &&
                   !(desc->irq_data.chip->flags & IRQCHIP_ONESHOT_SAFE)) {
@@ -1342,6 +1343,21 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new)
                                goto out_unlock;
                }
 
+               /*
+                * Activate the interrupt. That activation must happen
+                * independently of IRQ_NOAUTOEN. request_irq() can fail
+                * and the callers are supposed to handle
+                * that. enable_irq() of an interrupt requested with
+                * IRQ_NOAUTOEN is not supposed to fail. The activation
+                * keeps it in shutdown mode, it merily associates
+                * resources if necessary and if that's not possible it
+                * fails. Interrupts which are in managed shutdown mode
+                * will simply ignore that activation request.
+                */
+               ret = irq_activate(desc);
+               if (ret)
+                       goto out_unlock;
+
                desc->istate &= ~(IRQS_AUTODETECT | IRQS_SPURIOUS_DISABLED | \
                                  IRQS_ONESHOT | IRQS_WAITING);
                irqd_clear(&desc->irq_data, IRQD_IRQ_INPROGRESS);
@@ -1417,7 +1433,6 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new)
                wake_up_process(new->secondary->thread);
 
        register_irq_proc(irq, desc);
-       irq_add_debugfs_entry(irq, desc);
        new->dir = NULL;
        register_handler_proc(irq, new);
        return 0;