2 files changed, 4 insertions, 5 deletions

diff --git a/include/linux/irq.h b/include/linux/irq.h
index 48d3cb3b6a47..3eab46f590a9 100644
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
@@ -59,6 +59,7 @@
 #define IRQ_NOAUTOEN            0x08000000      /* IRQ will not be enabled on request irq */
 #define IRQ_DELAYED_DISABLE     0x10000000      /* IRQ disable (masking) happens delayed. */
 #define IRQ_WAKEUP              0x20000000      /* IRQ triggers system wakeup */
+#define IRQ_MOVE_PENDING        0x40000000      /* need to re-target IRQ destination */
 
 struct proc_dir_entry;
 
@@ -132,7 +133,6 @@ struct irq_chip {
  * @affinity:           IRQ affinity on SMP
  * @cpu:                cpu index useful for balancing
  * @pending_mask:       pending rebalanced interrupts
- * @move_irq:           need to re-target IRQ destination
  * @dir:                /proc/irq/ procfs entry
  * @affinity_entry:     /proc/irq/smp_affinity procfs entry on SMP
  *
@@ -159,7 +159,6 @@ struct irq_desc {
 #endif
 #if defined(CONFIG_GENERIC_PENDING_IRQ) || defined(CONFIG_IRQBALANCE)
         cpumask_t               pending_mask;
-        unsigned int            move_irq;       /* need to re-target IRQ dest */
 #endif
 #ifdef CONFIG_PROC_FS
         struct proc_dir_entry *dir;
diff --git a/kernel/irq/migration.c b/kernel/irq/migration.c
index a57ebe9fa6f6..9b234df810d0 100644
--- a/kernel/irq/migration.c
+++ b/kernel/irq/migration.c
@@ -7,7 +7,7 @@ void set_pending_irq(unsigned int irq, cpumask_t mask)
         unsigned long flags;
 
         spin_lock_irqsave(&desc->lock, flags);
-        desc->move_irq = 1;
+        desc->status |= IRQ_MOVE_PENDING;
         irq_desc[irq].pending_mask = mask;
         spin_unlock_irqrestore(&desc->lock, flags);
 }
@@ -17,7 +17,7 @@ void move_native_irq(int irq)
         struct irq_desc *desc = irq_desc + irq;
         cpumask_t tmp;
 
-        if (likely(!desc->move_irq))
+        if (likely(!(desc->status & IRQ_MOVE_PENDING)))
                 return;
 
         /*
@@ -28,7 +28,7 @@ void move_native_irq(int irq)
                 return;
         }
 
-        desc->move_irq = 0;
+        desc->status &= ~IRQ_MOVE_PENDING;
 
         if (unlikely(cpus_empty(irq_desc[irq].pending_mask)))
                 return;