diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-28 18:05:50 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-28 18:05:50 -0400 |
| commit | b0d44c0dbbd52effb731b1c0af9afd56215c48de (patch) | |
| tree | 3237c0087d91a5390aed05689b9f610ba16fa116 /arch/frv | |
| parent | 9537a48ed4b9e4b738943d6da0a0fd4278adf905 (diff) | |
| parent | 7c730ccdc1188b97f5c8cb690906242c7ed75c22 (diff) | |
Merge branch 'linus' into core/iommu
Conflicts:
arch/x86/Kconfig
Diffstat (limited to 'arch/frv')
| -rw-r--r-- | arch/frv/kernel/irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/frv/kernel/irq.c b/arch/frv/kernel/irq.c index 73abae767fdc..af3e824b91b3 100644 --- a/arch/frv/kernel/irq.c +++ b/arch/frv/kernel/irq.c | |||
| @@ -74,7 +74,7 @@ int show_interrupts(struct seq_file *p, void *v) | |||
| 74 | if (action) { | 74 | if (action) { |
| 75 | seq_printf(p, "%3d: ", i); | 75 | seq_printf(p, "%3d: ", i); |
| 76 | for_each_present_cpu(cpu) | 76 | for_each_present_cpu(cpu) |
| 77 | seq_printf(p, "%10u ", kstat_cpu(cpu).irqs[i]); | 77 | seq_printf(p, "%10u ", kstat_irqs_cpu(i, cpu)); |
| 78 | seq_printf(p, " %10s", irq_desc[i].chip->name ? : "-"); | 78 | seq_printf(p, " %10s", irq_desc[i].chip->name ? : "-"); |
| 79 | seq_printf(p, " %s", action->name); | 79 | seq_printf(p, " %s", action->name); |
| 80 | for (action = action->next; | 80 | for (action = action->next; |