[Xen-ia64-devel] [PATCH] eliminate NR_IRQ_VECTORS. ia64 part.

[Isaku Yamahata <yamahata@xxxxxxxxxxxxx>]

IA64: eliminate NR_IRQ_VECTORS. ia64 part.

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

Signed-off-by: Isaku Yamahata <yamahata@xxxxxxxxxxxxx>

diff --git a/xen/drivers/passthrough/vtd/ia64/vtd.c 
b/xen/drivers/passthrough/vtd/ia64/vtd.c
--- 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
--- 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
--- 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)


-- 
yamahata

_______________________________________________
Xen-ia64-devel mailing list
Xen-ia64-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-ia64-devel