[PATCH] genirq: cleanup: merge pending_irq_cpumask[] into irq_desc[]

[firefly-linux-kernel-4.4.55.git] / include / linux / irq.h

diff --git a/include/linux/irq.h b/include/linux/irq.h
index 1022c5d425464c33d6b0dd94d55274adb37f8262..81f3d976bb327e47f297fc43ad3ad4a58900132e 100644 (file)
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
@@ -83,6 +83,7 @@ struct irq_desc {
        cpumask_t               affinity;
 #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
@@ -120,7 +121,6 @@ static inline void set_native_irq_info(int irq, cpumask_t mask)
 #ifdef CONFIG_SMP
 
 #if defined(CONFIG_GENERIC_PENDING_IRQ) || defined(CONFIG_IRQBALANCE)
-extern cpumask_t pending_irq_cpumask[NR_IRQS];
 
 void set_pending_irq(unsigned int irq, cpumask_t mask);
 void move_native_irq(int irq);