diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2007-03-12 14:09:35 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@hera.kernel.org> | 2007-05-07 02:10:53 +0000 |
| commit | be782df54c51b50dd4dbc363a5a5afa04565fc60 (patch) | |
| tree | be45290a6d46e8746b5b9b51c1c3b804c6816177 /arch | |
| parent | fa69151173b1fc6fa3ced0edd5c2ea83b5d32bc1 (diff) | |
| download | op-kernel-dev-be782df54c51b50dd4dbc363a5a5afa04565fc60.zip op-kernel-dev-be782df54c51b50dd4dbc363a5a5afa04565fc60.tar.gz | |
sh: NR_IRQS consolidation.
Each board sets the total number of IRQs that it's interested in via
the machvec. Previously we cared about the off vs on-chip IRQ range,
but any code relying on that is long dead. Set NR_IRQS to something
sensible given the vector range, and allow boards to cap it if they
really care.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sh/kernel/irq.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/sh/kernel/irq.c b/arch/sh/kernel/irq.c index 9bdd8a0..27b923c 100644 --- a/arch/sh/kernel/irq.c +++ b/arch/sh/kernel/irq.c @@ -13,6 +13,7 @@ #include <linux/seq_file.h> #include <linux/irq.h> #include <asm/processor.h> +#include <asm/machvec.h> #include <asm/uaccess.h> #include <asm/thread_info.h> #include <asm/cpu/mmu_context.h> @@ -44,7 +45,7 @@ int show_interrupts(struct seq_file *p, void *v) seq_putc(p, '\n'); } - if (i < NR_IRQS) { + if (i < sh_mv.mv_nr_irqs) { spin_lock_irqsave(&irq_desc[i].lock, flags); action = irq_desc[i].action; if (!action) @@ -61,7 +62,7 @@ int show_interrupts(struct seq_file *p, void *v) seq_putc(p, '\n'); unlock: spin_unlock_irqrestore(&irq_desc[i].lock, flags); - } else if (i == NR_IRQS) + } else if (i == sh_mv.mv_nr_irqs) seq_printf(p, "Err: %10u\n", atomic_read(&irq_err_count)); return 0; |
