Merge branch 'bsg' of git://git.kernel.dk/data/git/linux-2.6-block

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

diff --git a/include/asm-ia64/irq.h b/include/asm-ia64/irq.h
index 8acb00190d5a4d2910f06a42f84764ecd76c8637..67221615e3173537ac8df7b4ba6de436dd97db3c 100644 (file)
--- a/include/asm-ia64/irq.h
+++ b/include/asm-ia64/irq.h
@@ -11,11 +11,12 @@
  * 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
 
-#define IRQF_PERCPU    0x02000000
-
 static __inline__ int
 irq_canonicalize (int irq)
 {
@@ -31,5 +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);
+
+#define is_affinity_mask_valid is_affinity_mask_valid
 
 #endif /* _ASM_IA64_IRQ_H */