diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-28 17:27:45 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-28 17:27:45 -0400 |
| commit | 3fab191002b184e4390aa07c7149c6cc7b638ec7 (patch) | |
| tree | 821382d49e47c19531bfc3bb9e1f8922486374d4 /arch/m32r/kernel/irq.c | |
| parent | 93394a761d78503f11d05b1a7b23d5a9ccc8dad2 (diff) | |
| parent | 7c730ccdc1188b97f5c8cb690906242c7ed75c22 (diff) | |
Merge branch 'linus' into x86/core
Diffstat (limited to 'arch/m32r/kernel/irq.c')
| -rw-r--r-- | arch/m32r/kernel/irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m32r/kernel/irq.c b/arch/m32r/kernel/irq.c index 2aeae4670098..8dfd31e87c4c 100644 --- a/arch/m32r/kernel/irq.c +++ b/arch/m32r/kernel/irq.c | |||
| @@ -49,7 +49,7 @@ int show_interrupts(struct seq_file *p, void *v) | |||
| 49 | seq_printf(p, "%10u ", kstat_irqs(i)); | 49 | seq_printf(p, "%10u ", kstat_irqs(i)); |
| 50 | #else | 50 | #else |
| 51 | for_each_online_cpu(j) | 51 | for_each_online_cpu(j) |
| 52 | seq_printf(p, "%10u ", kstat_cpu(j).irqs[i]); | 52 | seq_printf(p, "%10u ", kstat_irqs_cpu(i, j)); |
| 53 | #endif | 53 | #endif |
| 54 | seq_printf(p, " %14s", irq_desc[i].chip->typename); | 54 | seq_printf(p, " %14s", irq_desc[i].chip->typename); |
| 55 | seq_printf(p, " %s", action->name); | 55 | seq_printf(p, " %s", action->name); |