Merge git://git.linux-nfs.org/pub/linux/nfs-2.6

[linux-2.6] / include / asm-ia64 / irq.h

diff --git a/include/asm-ia64/irq.h b/include/asm-ia64/irq.h
index 585644c6b21cf79352d681db353eae007822ed0f..67221615e3173537ac8df7b4ba6de436dd97db3c 100644 (file)
--- a/include/asm-ia64/irq.h
+++ b/include/asm-ia64/irq.h
@@ -11,6 +11,9 @@
  * 02/29/00     D.Mosberger    moved most things into hw_irq.h
  */
 
+#include <linux/types.h>
+#include <linux/cpumask.h>
+
 #define NR_IRQS                256
 #define NR_IRQ_VECTORS NR_IRQS
 
@@ -29,11 +32,8 @@ extern void disable_irq (unsigned int);
 extern void disable_irq_nosync (unsigned int);
 extern void enable_irq (unsigned int);
 extern void set_irq_affinity_info (unsigned int irq, int dest, int redir);
+bool is_affinity_mask_valid(cpumask_t cpumask);
 
-#ifdef CONFIG_SMP
-extern void move_irq(int irq);
-#else
-#define move_irq(irq)
-#endif
+#define is_affinity_mask_valid is_affinity_mask_valid
 
 #endif /* _ASM_IA64_IRQ_H */