ia64: define pending_irq_cpumask in irq.c

This fixes a build-problem with the Ski simulator.  The simulator doesn't
include iosapic.c and hence pending_irq_cpumask never got defined.

diff --git a/arch/ia64/kernel/iosapic.c b/arch/ia64/kernel/iosapic.c
index 33044bcb1494e5fd5fc86cf568d16acf7c08f51d..9ef5f3ef9dcbaee4d32853fa620e1f84837a3167 100644 (file)
--- a/arch/ia64/kernel/iosapic.c
+++ b/arch/ia64/kernel/iosapic.c
@@ -100,7 +100,7 @@
 #endif
 
 static spinlock_t iosapic_lock = SPIN_LOCK_UNLOCKED;
-cpumask_t      __cacheline_aligned pending_irq_cpumask[NR_IRQS];
+extern cpumask_t       __cacheline_aligned pending_irq_cpumask[NR_IRQS];
 
 /* These tables map IA-64 vectors to the IOSAPIC pin that generates this vector. */
 

diff --git a/arch/ia64/kernel/irq.c b/arch/ia64/kernel/irq.c
index 37c17881d882d4a96762939854e2bd50e9446e94..42056fbaa151e271ecc9ca2cee9d8b3082d0acb0 100644 (file)
--- a/arch/ia64/kernel/irq.c
+++ b/arch/ia64/kernel/irq.c
@@ -56,7 +56,6 @@
 #include <asm/delay.h>
 #include <asm/irq.h>
 
-extern cpumask_t    __cacheline_aligned pending_irq_cpumask[NR_IRQS];
 
 /*
  * Linux has a controller-independent x86 interrupt architecture.
@@ -85,6 +84,11 @@ irq_desc_t _irq_desc[NR_IRQS] __cacheline_aligned = {
        }
 };
 
+/*
+ * This is updated when the user sets irq affinity via /proc
+ */
+cpumask_t    __cacheline_aligned pending_irq_cpumask[NR_IRQS];
+
 #ifdef CONFIG_IA64_GENERIC
 irq_desc_t * __ia64_irq_desc (unsigned int irq)
 {