NR_IRQ_VECTORS is currently a compatiblity define set to NR_IRQs. This patch updates the users of NR_IRQ_VECTORS to use NR_IRQs instead so that NR_IRQ_VECTORS can be removed. There is still shared code with arch/i386 that uses NR_IRQ_VECTORS so we can't remove the #define just yet :( Signed-off-by: Eric W. Biederman <[email protected]> --- arch/x86_64/kernel/io_apic.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/x86_64/kernel/io_apic.c b/arch/x86_64/kernel/io_apic.c index 52fc19b..65d7218 100644 --- a/arch/x86_64/kernel/io_apic.c +++ b/arch/x86_64/kernel/io_apic.c @@ -74,7 +74,7 @@ int nr_ioapic_registers[MAX_IO_APICS]; * Rough estimation of how many shared IRQs there are, can * be changed anytime. */ -#define MAX_PLUS_SHARED_IRQS NR_IRQ_VECTORS +#define MAX_PLUS_SHARED_IRQS NR_IRQS #define PIN_MAP_SIZE (MAX_PLUS_SHARED_IRQS + NR_IRQS) /* @@ -615,7 +615,7 @@ static int pin_2_irq(int idx, int apic, int pin) /* irq_vectors is indexed by the sum of all RTEs in all I/O APICs. */ -static u8 irq_vector[NR_IRQ_VECTORS] __read_mostly = { +static u8 irq_vector[NR_IRQS] __read_mostly = { [0] = FIRST_EXTERNAL_VECTOR + 0, [1] = FIRST_EXTERNAL_VECTOR + 1, [2] = FIRST_EXTERNAL_VECTOR + 2, @@ -634,7 +634,7 @@ static u8 irq_vector[NR_IRQ_VECTORS] __read_mostly = { [15] = FIRST_EXTERNAL_VECTOR + 15, }; -static cpumask_t irq_domain[NR_IRQ_VECTORS] __read_mostly = { +static cpumask_t irq_domain[NR_IRQS] __read_mostly = { [0] = CPU_MASK_ALL, [1] = CPU_MASK_ALL, [2] = CPU_MASK_ALL, @@ -671,7 +671,7 @@ static int __assign_irq_vector(int irq, cpumask_t mask, cpumask_t *result) int old_vector = -1; int cpu; - BUG_ON((unsigned)irq >= NR_IRQ_VECTORS); + BUG_ON((unsigned)irq >= NR_IRQS); /* Only try and allocate irqs on cpus that are present */ cpus_and(mask, mask, cpu_online_map); @@ -758,7 +758,7 @@ void __setup_vector_irq(int cpu) int irq, vector; /* Mark the inuse vectors */ - for (irq = 0; irq < NR_IRQ_VECTORS; ++irq) { + for (irq = 0; irq < NR_IRQS; ++irq) { if (!cpu_isset(cpu, irq_domain[irq])) continue; vector = irq_vector[irq]; -- 1.5.0.g53756 - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
- Follow-Ups:
- [PATCH 09/14] x86_64 irq: Begin consolidating per_irq data in structures.
- From: [email protected] (Eric W. Biederman)
- [PATCH 09/14] x86_64 irq: Begin consolidating per_irq data in structures.
- References:
- Re: [PATCH 2/2] x86_64 irq: Handle irqs pending in IRR during irq migration.
- From: Ingo Molnar <[email protected]>
- Re: [PATCH 2/2] x86_64 irq: Handle irqs pending in IRR during irq migration.
- From: [email protected] (Eric W. Biederman)
- Re: [PATCH 2/2] x86_64 irq: Handle irqs pending in IRR during irq migration.
- From: [email protected] (Eric W. Biederman)
- Re: [PATCH 2/2] x86_64 irq: Handle irqs pending in IRR during irq migration.
- From: [email protected] (Eric W. Biederman)
- What are the real ioapic rte programming constraints?
- From: [email protected] (Eric W. Biederman)
- Re: What are the real ioapic rte programming constraints?
- From: Zwane Mwaikambo <[email protected]>
- Re: What are the real ioapic rte programming constraints?
- From: [email protected] (Eric W. Biederman)
- Re: What are the real ioapic rte programming constraints?
- From: Zwane Mwaikambo <[email protected]>
- Re: What are the real ioapic rte programming constraints?
- From: [email protected] (Eric W. Biederman)
- Re: What are the real ioapic rte programming constraints?
- From: Zwane Mwaikambo <[email protected]>
- Re: What are the real ioapic rte programming constraints?
- From: [email protected] (Eric W. Biederman)
- Conclusions from my investigation about ioapic programming
- From: [email protected] (Eric W. Biederman)
- [PATCH 0/14] x86_64 irq related fixes and cleanups.
- From: [email protected] (Eric W. Biederman)
- [PATCH 01/14] x86_64 irq: Simplfy __assign_irq_vector
- From: [email protected] (Eric W. Biederman)
- [PATCH 02/14] irq: Remove set_native_irq_info
- From: [email protected] (Eric W. Biederman)
- [PATCH 03/14] x86_64 irq: Kill declaration of removed array, interrupt
- From: [email protected] (Eric W. Biederman)
- [PATCH 04/14] x86_64 irq: Remove the unused vector parameter from ioapic_register_intr
- From: [email protected] (Eric W. Biederman)
- [PATCH 05/14] x86_64 irq: Refactor setup_IO_APIC_irq
- From: [email protected] (Eric W. Biederman)
- [PATCH 06/14] x86_64 irq: Simplfiy the set_affinity logic.
- From: [email protected] (Eric W. Biederman)
- [PATCH 07/14] x86_64 irq: In __DO_ACTION perform the FINAL action for every entry.
- From: [email protected] (Eric W. Biederman)
- Re: [PATCH 2/2] x86_64 irq: Handle irqs pending in IRR during irq migration.
- Prev by Date: [PATCH 07/14] x86_64 irq: In __DO_ACTION perform the FINAL action for every entry.
- Next by Date: [PATCH] drivers/isdn/gigaset: mark some static data as const
- Previous by thread: [PATCH 07/14] x86_64 irq: In __DO_ACTION perform the FINAL action for every entry.
- Next by thread: [PATCH 09/14] x86_64 irq: Begin consolidating per_irq data in structures.
- Index(es):
 |