Merge branch 'master' into upstream.

This is sync with Linus' tree to receive KEY_IMAGES definition
that went in through input tree.

1 files changed, 3 insertions, 14 deletions

diff --git a/kernel/irq/migration.c b/kernel/irq/migration.c
index ec4806d4778b..47420908fba0 100644
--- a/kernel/irq/migration.c
+++ b/kernel/irq/migration.c
@@ -35,7 +35,7 @@ void irq_move_masked_irq(struct irq_data *idata)
          * do the disable, re-program, enable sequence.
          * This is *not* particularly important for level triggered
          * but in a edge trigger case, we might be setting rte
-         * when an active trigger is comming in. This could
+         * when an active trigger is coming in. This could
          * cause some ioapics to mal-function.
          * Being paranoid i guess!
          *
@@ -53,20 +53,14 @@ void irq_move_masked_irq(struct irq_data *idata)
         cpumask_clear(desc->pending_mask);
 }
 
-void move_masked_irq(int irq)
-{
-        irq_move_masked_irq(irq_get_irq_data(irq));
-}
-
 void irq_move_irq(struct irq_data *idata)
 {
-        struct irq_desc *desc = irq_data_to_desc(idata);
         bool masked;
 
         if (likely(!irqd_is_setaffinity_pending(idata)))
                 return;
 
-        if (unlikely(desc->istate & IRQS_DISABLED))
+        if (unlikely(irqd_irq_disabled(idata)))
                 return;
 
         /*
@@ -74,15 +68,10 @@ void irq_move_irq(struct irq_data *idata)
          * threaded interrupt with ONESHOT set, we can end up with an
          * interrupt storm.
          */
-        masked = desc->istate & IRQS_MASKED;
+        masked = irqd_irq_masked(idata);
         if (!masked)
                 idata->chip->irq_mask(idata);
         irq_move_masked_irq(idata);
         if (!masked)
                 idata->chip->irq_unmask(idata);
 }
-
-void move_native_irq(int irq)
-{
-        irq_move_irq(irq_get_irq_data(irq));
-}