diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2008-11-20 14:23:33 +0000 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2008-11-20 14:23:33 +0000 |
| commit | f0f1915d273490f2cdd698932d6592f4024b9b75 (patch) | |
| tree | d63516decf59f359ccbed7302bd4c6c671011996 | |
| parent | c193d476f02705413f2cbb5510371cf8dc47dcb2 (diff) | |
| download | xen-f0f1915d273490f2cdd698932d6592f4024b9b75.tar.gz xen-f0f1915d273490f2cdd698932d6592f4024b9b75.tar.bz2 xen-f0f1915d273490f2cdd698932d6592f4024b9b75.zip | |
Eliminate NR_IRQ_VECTORS
Signed-off-by: Jan Beulich <jbeulich@novell.com>
| -rw-r--r-- | xen/arch/x86/acpi/boot.c | 4 | ||||
| -rw-r--r-- | xen/arch/x86/io_apic.c | 4 | ||||
| -rw-r--r-- | xen/include/asm-x86/irq.h | 2 | ||||
| -rw-r--r-- | xen/include/asm-x86/mach-default/irq_vectors.h | 1 |
4 files changed, 5 insertions, 6 deletions
diff --git a/xen/arch/x86/acpi/boot.c b/xen/arch/x86/acpi/boot.c index 055e3d7b51..2ae8cc4157 100644 --- 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 1e2b871faf..15d2b6b851 100644 --- 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 982f99f3c4..920ac7f85e 100644 --- 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 90b4e1ef0e..626e6cd1b5 100644 --- 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 */ |