aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/irq.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-04-17 10:18:22 -0400
committerIngo Molnar <mingo@elte.hu>2009-04-17 10:18:28 -0400
commit5043124e660fcc3ddefe4239ddfa017bf13f5081 (patch)
tree06875cdb942afe460dbac33acf3e8223c805a35d /arch/x86/kernel/irq.c
parent77857dc07247ed5fa700a197c96ef842d8dbebdf (diff)
parent9f76208c33984ab777eace5d07a4e36e88703e02 (diff)
Merge branch 'linus' into x86/apic
Merge reason: new intr-remap patches depend on the s2ram iommu fixes from upstream Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/irq.c')
-rw-r--r--arch/x86/kernel/irq.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
index fd57bf35d0fc..c1739ac29708 100644
--- a/arch/x86/kernel/irq.c
+++ b/arch/x86/kernel/irq.c
@@ -63,7 +63,7 @@ static int show_other_interrupts(struct seq_file *p, int prec)
63 seq_printf(p, " Spurious interrupts\n"); 63 seq_printf(p, " Spurious interrupts\n");
64#endif 64#endif
65 if (generic_interrupt_extension) { 65 if (generic_interrupt_extension) {
66 seq_printf(p, "PLT: "); 66 seq_printf(p, "%*s: ", prec, "PLT");
67 for_each_online_cpu(j) 67 for_each_online_cpu(j)
68 seq_printf(p, "%10u ", irq_stats(j)->generic_irqs); 68 seq_printf(p, "%10u ", irq_stats(j)->generic_irqs);
69 seq_printf(p, " Platform interrupts\n"); 69 seq_printf(p, " Platform interrupts\n");