diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2007-02-23 04:26:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-26 10:34:08 -0800 |
| commit | e273d140d9d0c2c7941d97a6ace455113bb4ec63 (patch) | |
| tree | 6bb13f41e94f85c3920b6f8e93dd5609fe984e7a /arch/x86_64 | |
| parent | f45bcd7022a46de48cc414e3ea3a5b9b4de318ec (diff) | |
| download | linux-e273d140d9d0c2c7941d97a6ace455113bb4ec63.tar.bz2 | |
[PATCH] x86_64 irq: Use NR_IRQS not NR_IRQ_VECTORS
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 <ebiederm@xmission.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/x86_64')
| -rw-r--r-- | 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 52fc19ba2b98..65d72189eb6a 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]; |