[Xen-changelog] [xen-unstable] Eliminate NR_IRQ_VECTORS

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1227191013 0
# Node ID 935bd48f096ad79954a5ceef60b2dc19ebb9bc3a
# Parent  6468257e9e62c316f2d045fdde98b8a81128042f
Eliminate NR_IRQ_VECTORS

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
---
 xen/arch/x86/acpi/boot.c                       |    4 ++--
 xen/arch/x86/io_apic.c                         |    4 ++--
 xen/include/asm-x86/irq.h                      |    2 +-
 xen/include/asm-x86/mach-default/irq_vectors.h |    1 -
 4 files changed, 5 insertions(+), 6 deletions(-)

diff -r 6468257e9e62 -r 935bd48f096a xen/arch/x86/acpi/boot.c
--- a/xen/arch/x86/acpi/boot.c  Thu Nov 20 14:22:54 2008 +0000
+++ b/xen/arch/x86/acpi/boot.c  Thu Nov 20 14:23:33 2008 +0000
@@ -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 */
diff -r 6468257e9e62 -r 935bd48f096a xen/arch/x86/io_apic.c
--- a/xen/arch/x86/io_apic.c    Thu Nov 20 14:22:54 2008 +0000
+++ b/xen/arch/x86/io_apic.c    Thu Nov 20 14:23:33 2008 +0000
@@ -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);
 
diff -r 6468257e9e62 -r 935bd48f096a xen/include/asm-x86/irq.h
--- a/xen/include/asm-x86/irq.h Thu Nov 20 14:22:54 2008 +0000
+++ b/xen/include/asm-x86/irq.h Thu Nov 20 14:23:33 2008 +0000
@@ -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 -r 6468257e9e62 -r 935bd48f096a 
xen/include/asm-x86/mach-default/irq_vectors.h
--- a/xen/include/asm-x86/mach-default/irq_vectors.h    Thu Nov 20 14:22:54 
2008 +0000
+++ b/xen/include/asm-x86/mach-default/irq_vectors.h    Thu Nov 20 14:23:33 
2008 +0000
@@ -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-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog