diff options
author | Yinghai Lu <yhlu.kernel@gmail.com> | 2008-08-19 23:49:48 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-10-16 10:52:05 -0400 |
commit | 0799e432acfda879eaeef9622426bfa1434f3786 (patch) | |
tree | bc9a1d07438c52df08ab1e283ccd0a191b5fe05d /arch/x86/kernel/irq_64.c | |
parent | 85c0f90978bf50596dbd23854648020f1f9b5bfd (diff) |
x86: use nr_irqs
also add first_free_entry and pin_map_size, which were NR_IRQS derived
constants.
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/irq_64.c')
-rw-r--r-- | arch/x86/kernel/irq_64.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/kernel/irq_64.c b/arch/x86/kernel/irq_64.c index f065fe9071b9..e1f0839430d2 100644 --- a/arch/x86/kernel/irq_64.c +++ b/arch/x86/kernel/irq_64.c | |||
@@ -81,7 +81,7 @@ int show_interrupts(struct seq_file *p, void *v) | |||
81 | seq_putc(p, '\n'); | 81 | seq_putc(p, '\n'); |
82 | } | 82 | } |
83 | 83 | ||
84 | if (i < NR_IRQS) { | 84 | if (i < nr_irqs) { |
85 | unsigned any_count = 0; | 85 | unsigned any_count = 0; |
86 | 86 | ||
87 | spin_lock_irqsave(&irq_desc[i].lock, flags); | 87 | spin_lock_irqsave(&irq_desc[i].lock, flags); |
@@ -112,7 +112,7 @@ int show_interrupts(struct seq_file *p, void *v) | |||
112 | seq_putc(p, '\n'); | 112 | seq_putc(p, '\n'); |
113 | skip: | 113 | skip: |
114 | spin_unlock_irqrestore(&irq_desc[i].lock, flags); | 114 | spin_unlock_irqrestore(&irq_desc[i].lock, flags); |
115 | } else if (i == NR_IRQS) { | 115 | } else if (i == nr_irqs) { |
116 | seq_printf(p, "NMI: "); | 116 | seq_printf(p, "NMI: "); |
117 | for_each_online_cpu(j) | 117 | for_each_online_cpu(j) |
118 | seq_printf(p, "%10u ", cpu_pda(j)->__nmi_count); | 118 | seq_printf(p, "%10u ", cpu_pda(j)->__nmi_count); |
@@ -201,7 +201,7 @@ asmlinkage unsigned int do_IRQ(struct pt_regs *regs) | |||
201 | stack_overflow_check(regs); | 201 | stack_overflow_check(regs); |
202 | #endif | 202 | #endif |
203 | 203 | ||
204 | if (likely(irq < NR_IRQS)) | 204 | if (likely(irq < nr_irqs)) |
205 | generic_handle_irq(irq); | 205 | generic_handle_irq(irq); |
206 | else { | 206 | else { |
207 | if (!disable_apic) | 207 | if (!disable_apic) |
@@ -224,7 +224,7 @@ void fixup_irqs(cpumask_t map) | |||
224 | unsigned int irq; | 224 | unsigned int irq; |
225 | static int warned; | 225 | static int warned; |
226 | 226 | ||
227 | for (irq = 0; irq < NR_IRQS; irq++) { | 227 | for (irq = 0; irq < nr_irqs; irq++) { |
228 | cpumask_t mask; | 228 | cpumask_t mask; |
229 | int break_affinity = 0; | 229 | int break_affinity = 0; |
230 | int set_affinity = 1; | 230 | int set_affinity = 1; |