IA64: eliminate NR_IRQ_VECTORS. ia64 part.

This is ia64 counter part of 18802:935bd48f096a which eliminates
NR_IRQ_VECTORS.

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>

diff --git a/xen/drivers/passthrough/vtd/ia64/vtd.c b/xen/drivers/passthrough/vtd/ia64/vtd.c
index b0abcf69293bebfebb3b4f61d8f237e134742be3..eac01a81d21cc75e8634ec8ae491c146e39d37ef 100644 (file)
--- a/xen/drivers/passthrough/vtd/ia64/vtd.c
+++ b/xen/drivers/passthrough/vtd/ia64/vtd.c
@@ -31,7 +31,7 @@
 
 int vector_irq[NR_VECTORS] __read_mostly = { [0 ... NR_VECTORS - 1] = -1};
 /* irq_vectors is indexed by the sum of all RTEs in all I/O APICs. */
-u8 irq_vector[NR_IRQ_VECTORS] __read_mostly;
+u8 irq_vector[NR_IRQS] __read_mostly;
 
 void *map_vtd_domain_page(u64 maddr)
 {

diff --git a/xen/include/asm-ia64/hvm/irq.h b/xen/include/asm-ia64/hvm/irq.h
index 32d01641010ba5e37c811d6edf2a4fd34659c5a9..758d8c7ddd69121f53c54aa857b04f8b523a1360 100644 (file)
--- a/xen/include/asm-ia64/hvm/irq.h
+++ b/xen/include/asm-ia64/hvm/irq.h
@@ -98,7 +98,7 @@ irq_to_vector (int irq)
 }
 
 
-extern u8 irq_vector[NR_IRQ_VECTORS];
+extern u8 irq_vector[NR_IRQS];
 extern int vector_irq[NR_VECTORS];
 
 #endif /* __ASM_IA64_HVM_IRQ_H__ */

diff --git a/xen/include/asm-ia64/linux/asm/irq.h b/xen/include/asm-ia64/linux/asm/irq.h
index c0fd725c0dcc3a029ca3822f8a1b218b9ac56f06..9a1c1d0b4b54673d0ce09558cc8bdc18ac1b78a3 100644 (file)
--- a/xen/include/asm-ia64/linux/asm/irq.h
+++ b/xen/include/asm-ia64/linux/asm/irq.h
@@ -13,7 +13,6 @@
 
 #define NR_VECTORS     256
 #define NR_IRQS                256
-#define NR_IRQ_VECTORS NR_IRQS
 
 static __inline__ int
 irq_canonicalize (int irq)