The following commit has been merged in the linux branch: commit a0738a688d1105cbf8d71868a1e020c6cdf42d4c Merge: 89ccf465abe6b20d804a63ae20307970c441369d a3ccf63ee643ef243cbf8918da8b3f9238f10029 Author: Ingo Molnar mingo@elte.hu Date: Thu Oct 15 08:07:26 2009 +0200
Merge branch 'linus' into x86/urgent
Merge reason: pull in latest, to be able to revert a patch there.
Signed-off-by: Ingo Molnar mingo@elte.hu
diff --combined arch/x86/kernel/irq.c index 86fb2c8,74656d1..04bbd52 --- a/arch/x86/kernel/irq.c +++ b/arch/x86/kernel/irq.c @@@ -63,10 -63,10 +63,10 @@@ static int show_other_interrupts(struc for_each_online_cpu(j) seq_printf(p, "%10u ", irq_stats(j)->irq_spurious_count); seq_printf(p, " Spurious interrupts\n"); - seq_printf(p, "%*s: ", prec, "CNT"); + seq_printf(p, "%*s: ", prec, "PMI"); for_each_online_cpu(j) seq_printf(p, "%10u ", irq_stats(j)->apic_perf_irqs); - seq_printf(p, " Performance counter interrupts\n"); + seq_printf(p, " Performance monitoring interrupts\n"); seq_printf(p, "%*s: ", prec, "PND"); for_each_online_cpu(j) seq_printf(p, "%10u ", irq_stats(j)->apic_pending_irqs); @@@ -244,7 -244,6 +244,6 @@@ unsigned int __irq_entry do_IRQ(struct __func__, smp_processor_id(), vector, irq); }
- run_local_timers(); irq_exit();
set_irq_regs(old_regs); @@@ -269,7 -268,6 +268,6 @@@ void smp_generic_interrupt(struct pt_re if (generic_interrupt_extension) generic_interrupt_extension();
- run_local_timers(); irq_exit();
set_irq_regs(old_regs);