[PATCH] Consolidate the asm-ppc*/fcntl.h files into asm-powerpc

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

diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index 5fde8177eedf8c331eae4bc245bee449f63d6d7c..1cfdb08ddf2054f6f219d28c78b97828e2f8b447 100644 (file)
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -6,6 +6,7 @@
  * This file contains driver APIs to the irq subsystem.
  */
 
+#include <linux/config.h>
 #include <linux/irq.h>
 #include <linux/module.h>
 #include <linux/random.h>
@@ -17,6 +18,10 @@
 
 cpumask_t irq_affinity[NR_IRQS] = { [0 ... NR_IRQS-1] = CPU_MASK_ALL };
 
+#if defined (CONFIG_GENERIC_PENDING_IRQ) || defined (CONFIG_IRQBALANCE)
+cpumask_t __cacheline_aligned pending_irq_cpumask[NR_IRQS];
+#endif
+
 /**
  *     synchronize_irq - wait for pending IRQ handlers (on other CPUs)
  *
@@ -256,8 +261,11 @@ void free_irq(unsigned int irq, void *dev_id)
                        /* Found it - now remove it from the list of entries */
                        *pp = action->next;
 
+                       /* Currently used only by UML, might disappear one day.*/
+#ifdef CONFIG_IRQ_RELEASE_METHOD
                        if (desc->handler->release)
                                desc->handler->release(irq, dev_id);
+#endif
 
                        if (!desc->action) {
                                desc->status |= IRQ_DISABLED;