Merge branch 'linus' into perfcounters/core
Ingo Molnar [Wed, 29 Apr 2009 12:46:59 +0000 (14:46 +0200)]
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>

20 files changed:
1  2 
MAINTAINERS
arch/x86/Kconfig
arch/x86/include/asm/hardirq.h
arch/x86/kernel/apic/apic.c
arch/x86/kernel/entry_64.S
arch/x86/kernel/irq.c
drivers/acpi/processor_idle.c
drivers/char/sysrq.c
fs/exec.c
include/linux/init_task.h
include/linux/sched.h
include/linux/syscalls.h
init/Kconfig
kernel/fork.c
kernel/mutex.c
kernel/sched.c
kernel/sys.c
kernel/sysctl.c
kernel/timer.c
mm/mmap.c

diff --cc MAINTAINERS
@@@ -3482,17 -4372,9 +4372,19 @@@ P:    Balbir Sing
  M:    balbir@linux.vnet.ibm.com
  L:    linux-kernel@vger.kernel.org
  S:    Maintained
+ F:    include/linux/delayacct.h
+ F:    kernel/delayacct.c
  
 +PERFORMANCE COUNTER SUBSYSTEM
 +P:    Peter Zijlstra
 +M:    a.p.zijlstra@chello.nl
 +P:    Paul Mackerras
 +M:    paulus@samba.org
 +P:    Ingo Molnar
 +M:    mingo@elte.hu
 +L:    linux-kernel@vger.kernel.org
 +S:    Supported
 +
  PERSONALITY HANDLING
  P:    Christoph Hellwig
  M:    hch@infradead.org
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -63,17 -63,9 +63,17 @@@ 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");
 +      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, "%*s: ", prec, "PND");
 +      for_each_online_cpu(j)
 +              seq_printf(p, "%10u ", irq_stats(j)->apic_pending_irqs);
 +      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");
Simple merge
Simple merge
diff --cc fs/exec.c
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc init/Kconfig
Simple merge
diff --cc kernel/fork.c
Simple merge
diff --cc kernel/mutex.c
Simple merge
diff --cc kernel/sched.c
Simple merge
diff --cc kernel/sys.c
Simple merge
diff --cc kernel/sysctl.c
Simple merge
diff --cc kernel/timer.c
Simple merge
diff --cc mm/mmap.c
Simple merge