diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
| commit | 1ebbe2b20091d306453a5cf480a87e6cd28ae76f (patch) | |
| tree | f5cd7a0fa69b8b1938cb5a0faed2e7b0628072a5 /arch/cris/kernel/irq.c | |
| parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
| parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) | |
Merge branch 'linus'
Diffstat (limited to 'arch/cris/kernel/irq.c')
| -rw-r--r-- | arch/cris/kernel/irq.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/arch/cris/kernel/irq.c b/arch/cris/kernel/irq.c index 30deaf1b728a..b504def3e346 100644 --- a/arch/cris/kernel/irq.c +++ b/arch/cris/kernel/irq.c | |||
| @@ -52,9 +52,8 @@ int show_interrupts(struct seq_file *p, void *v) | |||
| 52 | 52 | ||
| 53 | if (i == 0) { | 53 | if (i == 0) { |
| 54 | seq_printf(p, " "); | 54 | seq_printf(p, " "); |
| 55 | for (j=0; j<NR_CPUS; j++) | 55 | for_each_online_cpu(j) |
| 56 | if (cpu_online(j)) | 56 | seq_printf(p, "CPU%d ",j); |
| 57 | seq_printf(p, "CPU%d ",j); | ||
| 58 | seq_putc(p, '\n'); | 57 | seq_putc(p, '\n'); |
| 59 | } | 58 | } |
| 60 | 59 | ||
| @@ -67,9 +66,8 @@ int show_interrupts(struct seq_file *p, void *v) | |||
| 67 | #ifndef CONFIG_SMP | 66 | #ifndef CONFIG_SMP |
| 68 | seq_printf(p, "%10u ", kstat_irqs(i)); | 67 | seq_printf(p, "%10u ", kstat_irqs(i)); |
| 69 | #else | 68 | #else |
| 70 | for (j = 0; j < NR_CPUS; j++) | 69 | for_each_online_cpu(j) |
| 71 | if (cpu_online(j)) | 70 | seq_printf(p, "%10u ", kstat_cpu(j).irqs[i]); |
| 72 | seq_printf(p, "%10u ", kstat_cpu(j).irqs[i]); | ||
| 73 | #endif | 71 | #endif |
| 74 | seq_printf(p, " %14s", irq_desc[i].handler->typename); | 72 | seq_printf(p, " %14s", irq_desc[i].handler->typename); |
| 75 | seq_printf(p, " %s", action->name); | 73 | seq_printf(p, " %s", action->name); |