diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-03-31 15:34:58 -0500 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-03-31 15:34:58 -0500 |
| commit | 86579dd06deecfa6ac88d5e84e4d63c397cd6f6d (patch) | |
| tree | b4475d3ccde53015ad84a06e4e55e64591171b75 /arch/frv/kernel/irq.c | |
| parent | 7ea9ea832212c4a755650f7c7cc1ff0b63292a41 (diff) | |
| parent | a0f067802576d4eb4c65d40b8ee7d6ea3c81dd61 (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/frv/kernel/irq.c')
| -rw-r--r-- | arch/frv/kernel/irq.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/arch/frv/kernel/irq.c b/arch/frv/kernel/irq.c index 27ab4c30aac6..11fa326a8f62 100644 --- a/arch/frv/kernel/irq.c +++ b/arch/frv/kernel/irq.c | |||
| @@ -75,9 +75,8 @@ int show_interrupts(struct seq_file *p, void *v) | |||
| 75 | switch (i) { | 75 | switch (i) { |
| 76 | case 0: | 76 | case 0: |
| 77 | seq_printf(p, " "); | 77 | seq_printf(p, " "); |
| 78 | for (j = 0; j < NR_CPUS; j++) | 78 | for_each_online_cpu(j) |
| 79 | if (cpu_online(j)) | 79 | seq_printf(p, "CPU%d ",j); |
| 80 | seq_printf(p, "CPU%d ",j); | ||
| 81 | 80 | ||
| 82 | seq_putc(p, '\n'); | 81 | seq_putc(p, '\n'); |
| 83 | break; | 82 | break; |
| @@ -100,9 +99,8 @@ int show_interrupts(struct seq_file *p, void *v) | |||
| 100 | #ifndef CONFIG_SMP | 99 | #ifndef CONFIG_SMP |
| 101 | seq_printf(p, "%10u ", kstat_irqs(i)); | 100 | seq_printf(p, "%10u ", kstat_irqs(i)); |
| 102 | #else | 101 | #else |
| 103 | for (j = 0; j < NR_CPUS; j++) | 102 | for_each_online_cpu(j) |
| 104 | if (cpu_online(j)) | 103 | seq_printf(p, "%10u ", kstat_cpu(j).irqs[i - 1]); |
| 105 | seq_printf(p, "%10u ", kstat_cpu(j).irqs[i - 1]); | ||
| 106 | #endif | 104 | #endif |
| 107 | 105 | ||
| 108 | level = group->sources[ix]->level - frv_irq_levels; | 106 | level = group->sources[ix]->level - frv_irq_levels; |