From: "Jan Beulich" Subject: [PATCH 2/3] eliminate NR_IRQ_VECTORS Date: Thu, 20 Nov 2008 13:46:38 +0000 Message-ID: <4925784E.76E4.0078.0@novell.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Return-path: Content-Disposition: inline List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com List-Id: xen-devel@lists.xenproject.org Signed-off-by: Jan Beulich Index: 2008-11-20/xen/arch/x86/acpi/boot.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 2008-11-20.orig/xen/arch/x86/acpi/boot.c 2008-11-19 15:55:23.0000000= 00 +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 =20 count =3D 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 =20 count =3D 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 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 2008-11-20.orig/xen/arch/x86/io_apic.c 2008-11-20 08:47:05.0000000= 00 +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 } =20 /* 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; =20 int free_irq_vector(int vector) { @@ -686,7 +686,7 @@ int assign_irq_vector(int irq) static unsigned current_vector =3D FIRST_DYNAMIC_VECTOR; unsigned vector; =20 - BUG_ON(irq >=3D NR_IRQ_VECTORS); + BUG_ON(irq >=3D NR_IRQS); =20 spin_lock(&vector_lock); =20 Index: 2008-11-20/xen/include/asm-x86/irq.h =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 2008-11-20.orig/xen/include/asm-x86/irq.h 2008-11-19 15:55:23.0000000= 00 +0100 +++ 2008-11-20/xen/include/asm-x86/irq.h 2008-11-20 08:47:52.0000000= 00 +0100 @@ -18,7 +18,7 @@ #define vector_to_irq(vec) (vector_irq[vec]) =20 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 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 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 @@ =20 /* Limited by number of trap vectors. */ #define NR_IRQS NR_VECTORS -#define NR_IRQ_VECTORS NR_IRQS =20 #endif /* _ASM_IRQ_VECTORS_H */