1.1 --- a/xen/arch/x86/acpi/boot.c	Thu Nov 20 14:22:54 2008 +0000
     1.2 +++ b/xen/arch/x86/acpi/boot.c	Thu Nov 20 14:23:33 2008 +0000
     1.3 @@ -601,7 +601,7 @@ static int __init acpi_parse_madt_ioapic
     1.4  
     1.5  	count =
     1.6  	    acpi_table_parse_madt(ACPI_MADT_INT_SRC_OVR, acpi_parse_int_src_ovr,
     1.7 -				  NR_IRQ_VECTORS);
     1.8 +				  MAX_IRQ_SOURCES);
     1.9  	if (count < 0) {
    1.10  		printk(KERN_ERR PREFIX
    1.11  		       "Error parsing interrupt source overrides entry\n");
    1.12 @@ -623,7 +623,7 @@ static int __init acpi_parse_madt_ioapic
    1.13  
    1.14  	count =
    1.15  	    acpi_table_parse_madt(ACPI_MADT_NMI_SRC, acpi_parse_nmi_src,
    1.16 -				  NR_IRQ_VECTORS);
    1.17 +				  MAX_IRQ_SOURCES);
    1.18  	if (count < 0) {
    1.19  		printk(KERN_ERR PREFIX "Error parsing NMI SRC entry\n");
    1.20  		/* TBD: Cleanup to allow fallback to MPS */

     2.1 --- a/xen/arch/x86/io_apic.c	Thu Nov 20 14:22:54 2008 +0000
     2.2 +++ b/xen/arch/x86/io_apic.c	Thu Nov 20 14:23:33 2008 +0000
     2.3 @@ -665,7 +665,7 @@ static inline int IO_APIC_irq_trigger(in
     2.4  }
     2.5  
     2.6  /* irq_vectors is indexed by the sum of all RTEs in all I/O APICs. */
     2.7 -u8 irq_vector[NR_IRQ_VECTORS] __read_mostly;
     2.8 +u8 irq_vector[NR_IRQS] __read_mostly;
     2.9  
    2.10  int free_irq_vector(int vector)
    2.11  {
    2.12 @@ -686,7 +686,7 @@ int assign_irq_vector(int irq)
    2.13      static unsigned current_vector = FIRST_DYNAMIC_VECTOR;
    2.14      unsigned vector;
    2.15  
    2.16 -    BUG_ON(irq >= NR_IRQ_VECTORS);
    2.17 +    BUG_ON(irq >= NR_IRQS);
    2.18  
    2.19      spin_lock(&vector_lock);
    2.20  

     3.1 --- a/xen/include/asm-x86/irq.h	Thu Nov 20 14:22:54 2008 +0000
     3.2 +++ b/xen/include/asm-x86/irq.h	Thu Nov 20 14:23:33 2008 +0000
     3.3 @@ -18,7 +18,7 @@
     3.4  #define vector_to_irq(vec)  (vector_irq[vec])
     3.5  
     3.6  extern int vector_irq[NR_VECTORS];
     3.7 -extern u8 irq_vector[NR_IRQ_VECTORS];
     3.8 +extern u8 irq_vector[NR_IRQS];
     3.9  #define AUTO_ASSIGN    -1
    3.10  #define NEVER_ASSIGN   -2
    3.11  #define FREE_TO_ASSIGN -3

     4.1 --- a/xen/include/asm-x86/mach-default/irq_vectors.h	Thu Nov 20 14:22:54 2008 +0000
     4.2 +++ b/xen/include/asm-x86/mach-default/irq_vectors.h	Thu Nov 20 14:23:33 2008 +0000
     4.3 @@ -32,6 +32,5 @@
     4.4  
     4.5  /* Limited by number of trap vectors. */
     4.6  #define NR_IRQS        NR_VECTORS
     4.7 -#define NR_IRQ_VECTORS NR_IRQS
     4.8  
     4.9  #endif /* _ASM_IRQ_VECTORS_H */