diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-06 08:53:20 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-06 08:53:20 -0400 |
| commit | f12e6a451aad671a724e61abce2b8b323f209355 (patch) | |
| tree | e4969282d07f7682099291e59545744b3bb5dcac /arch/x86/kernel/irq_32.c | |
| parent | 046fd53773cd87125f799b00422e487bf1428d38 (diff) | |
| parent | dc44e65943169de2d1a1b494876f48a65a9737f1 (diff) | |
Merge branch 'x86/cleanups' into x86/signal
Conflicts:
arch/x86/kernel/signal_64.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/irq_32.c')
| -rw-r--r-- | arch/x86/kernel/irq_32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c index 1cf8c1fcc088..b71e02d42f4f 100644 --- a/arch/x86/kernel/irq_32.c +++ b/arch/x86/kernel/irq_32.c | |||
| @@ -325,7 +325,7 @@ skip: | |||
| 325 | for_each_online_cpu(j) | 325 | for_each_online_cpu(j) |
| 326 | seq_printf(p, "%10u ", | 326 | seq_printf(p, "%10u ", |
| 327 | per_cpu(irq_stat,j).irq_call_count); | 327 | per_cpu(irq_stat,j).irq_call_count); |
| 328 | seq_printf(p, " function call interrupts\n"); | 328 | seq_printf(p, " Function call interrupts\n"); |
| 329 | seq_printf(p, "TLB: "); | 329 | seq_printf(p, "TLB: "); |
| 330 | for_each_online_cpu(j) | 330 | for_each_online_cpu(j) |
| 331 | seq_printf(p, "%10u ", | 331 | seq_printf(p, "%10u ", |