Signed-off-by: Jan Beulich <jbeulich@novell.com>
Index: 2008-11-20/xen/arch/x86/acpi/boot.c
==================================================================---
2008-11-20.orig/xen/arch/x86/acpi/boot.c 2008-11-19 15:55:23.000000000 +0100
+++ 2008-11-20/xen/arch/x86/acpi/boot.c 2008-11-20 08:47:52.000000000 +0100
@@ -601,7 +601,7 @@ static int __init acpi_parse_madt_ioapic
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
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 */
Index: 2008-11-20/xen/arch/x86/io_apic.c
==================================================================---
2008-11-20.orig/xen/arch/x86/io_apic.c 2008-11-20 08:47:05.000000000 +0100
+++ 2008-11-20/xen/arch/x86/io_apic.c 2008-11-20 08:47:52.000000000 +0100
@@ -665,7 +665,7 @@ static inline int IO_APIC_irq_trigger(in
}
/* 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);
Index: 2008-11-20/xen/include/asm-x86/irq.h
==================================================================---
2008-11-20.orig/xen/include/asm-x86/irq.h 2008-11-19 15:55:23.000000000 +0100
+++ 2008-11-20/xen/include/asm-x86/irq.h 2008-11-20 08:47:52.000000000 +0100
@@ -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
Index: 2008-11-20/xen/include/asm-x86/mach-default/irq_vectors.h
==================================================================---
2008-11-20.orig/xen/include/asm-x86/mach-default/irq_vectors.h 2008-11-19
15:55:23.000000000 +0100
+++ 2008-11-20/xen/include/asm-x86/mach-default/irq_vectors.h 2008-11-20
08:47:52.000000000 +0100
@@ -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 */
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel