From: Mike Travis <travis@sgi.com>
To: Ingo Molnar <mingo@redhat.com>
Cc: Rusty Russell <rusty@rustcorp.com.au>,
Yinghai Lu <yinghai@kernel.org>, Jack Steiner <steiner@sgi.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH 1/4] irq: change references from NR_IRQS to nr_irqs
Date: Sat, 10 Jan 2009 14:38:19 -0800 [thread overview]
Message-ID: <20090110223818.636427000@polaris-admin.engr.sgi.com> (raw)
In-Reply-To: <20090110223818.459493000@polaris-admin.engr.sgi.com>
[-- Attachment #1: irq-prep --]
[-- Type: text/plain, Size: 1913 bytes --]
Impact: preparation, cleanup
Modify references from NR_IRQS to nr_irqs as the later will become
variable-sized based on nr_cpu_ids when CONFIG_SPARSE_IRQS=y.
Signed-off-by: Mike Travis <travis@sgi.com>
---
arch/x86/kernel/io_apic.c | 2 +-
kernel/irq/handle.c | 12 +++++++-----
2 files changed, 8 insertions(+), 6 deletions(-)
--- linux-2.6-for-ingo.orig/arch/x86/kernel/io_apic.c
+++ linux-2.6-for-ingo/arch/x86/kernel/io_apic.c
@@ -3185,7 +3185,7 @@ unsigned int create_irq_nr(unsigned int
irq = 0;
spin_lock_irqsave(&vector_lock, flags);
- for (new = irq_want; new < NR_IRQS; new++) {
+ for (new = irq_want; new < nr_irqs; new++) {
if (platform_legacy_irq(new))
continue;
--- linux-2.6-for-ingo.orig/kernel/irq/handle.c
+++ linux-2.6-for-ingo/kernel/irq/handle.c
@@ -132,6 +132,8 @@ int __init early_irq_init(void)
int legacy_count;
int i;
+ printk(KERN_INFO "NR_IRQS:%d nr_irqs:%d\n", NR_IRQS, nr_irqs);
+
desc = irq_desc_legacy;
legacy_count = ARRAY_SIZE(irq_desc_legacy);
@@ -143,7 +145,7 @@ int __init early_irq_init(void)
irq_desc_ptrs[i] = desc + i;
}
- for (i = legacy_count; i < NR_IRQS; i++)
+ for (i = legacy_count; i < nr_irqs; i++)
irq_desc_ptrs[i] = NULL;
return arch_early_irq_init();
@@ -151,7 +153,7 @@ int __init early_irq_init(void)
struct irq_desc *irq_to_desc(unsigned int irq)
{
- return (irq < NR_IRQS) ? irq_desc_ptrs[irq] : NULL;
+ return (irq < nr_irqs) ? irq_desc_ptrs[irq] : NULL;
}
struct irq_desc *irq_to_desc_alloc_cpu(unsigned int irq, int cpu)
@@ -160,9 +162,9 @@ struct irq_desc *irq_to_desc_alloc_cpu(u
unsigned long flags;
int node;
- if (irq >= NR_IRQS) {
- printk(KERN_WARNING "irq >= NR_IRQS in irq_to_desc_alloc: %d %d\n",
- irq, NR_IRQS);
+ if (irq >= nr_irqs) {
+ printk(KERN_WARNING "irq >= nr_irqs in irq_to_desc_alloc: %d %d\n",
+ irq, nr_irqs);
WARN_ON(1);
return NULL;
}
--
next prev parent reply other threads:[~2009-01-10 22:39 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-10 22:38 [PATCH 0/4] irq: change irq_desc and kstat_irq_legacy to variable sized arrays Mike Travis
2009-01-10 22:38 ` Mike Travis [this message]
2009-01-10 22:45 ` [PATCH 1/4] irq: change references from NR_IRQS to nr_irqs Ingo Molnar
2009-01-10 23:10 ` Mike Travis
2009-01-11 1:06 ` Ingo Molnar
2009-01-10 22:38 ` [PATCH 2/4] irq: allocate irq_desc_ptrs array based on nr_irqs Mike Travis
2009-01-10 22:47 ` Ingo Molnar
2009-01-10 23:03 ` Mike Travis
2009-01-11 1:06 ` Ingo Molnar
2009-01-10 22:38 ` [PATCH 3/4] irq: initialize nr_irqs based on nr_cpu_ids Mike Travis
2009-01-10 22:50 ` Ingo Molnar
2009-01-10 23:20 ` Mike Travis
2009-01-11 1:07 ` Ingo Molnar
2009-01-11 2:00 ` Mike Travis
2009-01-10 22:38 ` [PATCH 4/4] kstat: modify kstat_irqs_legacy to be variable sized Mike Travis
2009-01-10 22:52 ` Ingo Molnar
2009-01-10 23:08 ` Mike Travis
2009-01-11 1:08 ` Ingo Molnar
2009-01-11 4:32 ` Mike Travis
2009-01-11 7:01 ` Yinghai Lu
2009-01-11 12:17 ` Ingo Molnar
2009-01-11 17:50 ` Mike Travis
2009-01-11 17:40 ` Mike Travis
2009-01-11 17:48 ` Mike Travis
2009-01-10 22:43 ` [PATCH 0/4] irq: change irq_desc and kstat_irq_legacy to variable sized arrays Ingo Molnar
2009-01-11 0:15 ` Mike Travis
2009-01-11 1:10 ` Ingo Molnar
2009-01-11 1:19 ` Mike Travis
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090110223818.636427000@polaris-admin.engr.sgi.com \
--to=travis@sgi.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=rusty@rustcorp.com.au \
--cc=steiner@sgi.com \
--cc=yinghai@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®