forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'linus' into perfcounters/core

Browse source 
Merge reason: This brach was on -rc1, refresh it to almost-rc4 to pick up
              the latest upstream fixes.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar 2009-04-29 14:46:59 +02:00
commit e7fd5d4b3d
1883 changed files with 53620 additions and 55294 deletions
Download patch file Download diff file Expand all files Collapse all files

2
arch/x86/kernel/irq.c
View file

@ -73,7 +73,7 @@ static int show_other_interrupts(struct seq_file *p, int prec)
seq_printf(p, " Performance pending work\n");
#endif
if (generic_interrupt_extension) {
seq_printf(p, "PLT: ");
seq_printf(p, "%*s: ", prec, "PLT");
for_each_online_cpu(j)
seq_printf(p, "%10u ", irq_stats(j)->generic_irqs);
seq_printf(p, " Platform interrupts\n");