Eliminate NR_IRQ_VECTORS

Signed-off-by: Jan Beulich <jbeulich@novell.com>

diff --git a/xen/arch/x86/acpi/boot.c b/xen/arch/x86/acpi/boot.c
index 055e3d7b51c705b947f1fd720f53104af2f3bcd2..2ae8cc4157ce7f6f38693002d9118dec25bf9291 100644 (file)
--- a/xen/arch/x86/acpi/boot.c
+++ b/xen/arch/x86/acpi/boot.c
@@ -601,7 +601,7 @@ static int __init acpi_parse_madt_ioapic_entries(void)
 
        count =
            acpi_table_parse_madt(ACPI_MADT_INT_SRC_OVR, acpi_parse_int_src_ovr,
-                                 NR_IRQ_VECTORS);
+                                 MAX_IRQ_SOURCES);
        if (count < 0) {
                printk(KERN_ERR PREFIX
                       "Error parsing interrupt source overrides entry\n");
@@ -623,7 +623,7 @@ static int __init acpi_parse_madt_ioapic_entries(void)
 
        count =
            acpi_table_parse_madt(ACPI_MADT_NMI_SRC, acpi_parse_nmi_src,
-                                 NR_IRQ_VECTORS);
+                                 MAX_IRQ_SOURCES);
        if (count < 0) {
                printk(KERN_ERR PREFIX "Error parsing NMI SRC entry\n");
                /* TBD: Cleanup to allow fallback to MPS */

diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c
index 1e2b871fafba650c96a462cc6d0f8090cb0571e6..15d2b6b85175cd0623880c47b066d76bc99b7574 100644 (file)
--- a/xen/arch/x86/io_apic.c
+++ b/xen/arch/x86/io_apic.c
@@ -665,7 +665,7 @@ static inline int IO_APIC_irq_trigger(int irq)
 }
 
 /* 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;
 
 int free_irq_vector(int vector)
 {
@@ -686,7 +686,7 @@ int assign_irq_vector(int irq)
     static unsigned current_vector = FIRST_DYNAMIC_VECTOR;
     unsigned vector;
 
-    BUG_ON(irq >= NR_IRQ_VECTORS);
+    BUG_ON(irq >= NR_IRQS);
 
     spin_lock(&vector_lock);
 

diff --git a/xen/include/asm-x86/irq.h b/xen/include/asm-x86/irq.h
index 982f99f3c4e8d487623e78232e81e36e4c281909..920ac7f85e1898f05cece3b7cbb4138ed10faa16 100644 (file)
--- a/xen/include/asm-x86/irq.h
+++ b/xen/include/asm-x86/irq.h
@@ -18,7 +18,7 @@
 #define vector_to_irq(vec)  (vector_irq[vec])
 
 extern int vector_irq[NR_VECTORS];
-extern u8 irq_vector[NR_IRQ_VECTORS];
+extern u8 irq_vector[NR_IRQS];
 #define AUTO_ASSIGN    -1
 #define NEVER_ASSIGN   -2
 #define FREE_TO_ASSIGN -3

diff --git a/xen/include/asm-x86/mach-default/irq_vectors.h b/xen/include/asm-x86/mach-default/irq_vectors.h
index 90b4e1ef0e9ab7f18c244c6f1d6482148732c6ed..626e6cd1b5fdc92b36cbd49f7a2c12fe1c6d1fc2 100644 (file)
--- a/xen/include/asm-x86/mach-default/irq_vectors.h
+++ b/xen/include/asm-x86/mach-default/irq_vectors.h
@@ -32,6 +32,5 @@
 
 /* Limited by number of trap vectors. */
 #define NR_IRQS        NR_VECTORS
-#define NR_IRQ_VECTORS NR_IRQS
 
 #endif /* _ASM_IRQ_VECTORS_H */