diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-30 17:53:32 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-30 17:53:32 -0400 |
| commit | 65fb0d23fcddd8697c871047b700c78817bdaa43 (patch) | |
| tree | 119e6e5f276622c4c862f6c9b6d795264ba1603a /arch/frv | |
| parent | 8c083f081d0014057901c68a0a3e0f8ca7ac8d23 (diff) | |
| parent | dfbbe89e197a77f2c8046a51c74e33e35f878080 (diff) | |
Merge branch 'linus' into cpumask-for-linus
Conflicts:
arch/x86/kernel/cpu/common.c
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; |