Merge branch 'linus' into perfcounters/core-v2

Merge reason: we have gathered quite a few conflicts, need to merge upstream

Conflicts:
	arch/powerpc/kernel/Makefile
	arch/x86/ia32/ia32entry.S
	arch/x86/include/asm/hardirq.h
	arch/x86/include/asm/unistd_32.h
	arch/x86/include/asm/unistd_64.h
	arch/x86/kernel/cpu/common.c
	arch/x86/kernel/irq.c
	arch/x86/kernel/syscall_table_32.S
	arch/x86/mm/iomap_32.c
	include/linux/sched.h
	kernel/Makefile

Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --cc arch/powerpc/include/asm/hw_irq.h
index e10f151,b7e034b..b43076f
--- 1/arch/powerpc/include/asm/hw_irq.h
--- 2/arch/powerpc/include/asm/hw_irq.h
+++ b/arch/powerpc/include/asm/hw_irq.h
@@@ -129,38 -129,7 +129,38 @@@ static inline int irqs_disabled_flags(u
   * interrupt-retrigger: should we handle this via lost interrupts and IPIs
   * or should we not care like we do now ? --BenH.
   */
- struct hw_interrupt_type;
+ struct irq_chip;
  
 +#ifdef CONFIG_PERF_COUNTERS
 +static inline unsigned long get_perf_counter_pending(void)
 +{
 +      unsigned long x;
 +
 +      asm volatile("lbz %0,%1(13)"
 +              : "=r" (x)
 +              : "i" (offsetof(struct paca_struct, perf_counter_pending)));
 +      return x;
 +}
 +
 +static inline void set_perf_counter_pending(int x)
 +{
 +      asm volatile("stb %0,%1(13)" : :
 +              "r" (x),
 +              "i" (offsetof(struct paca_struct, perf_counter_pending)));
 +}
 +
 +extern void perf_counter_do_pending(void);
 +
 +#else
 +
 +static inline unsigned long get_perf_counter_pending(void)
 +{
 +      return 0;
 +}
 +
 +static inline void set_perf_counter_pending(int x) {}
 +static inline void perf_counter_do_pending(void) {}
 +#endif /* CONFIG_PERF_COUNTERS */
 +
  #endif        /* __KERNEL__ */
  #endif        /* _ASM_POWERPC_HW_IRQ_H */

diff --cc arch/powerpc/include/asm/systbl.h
Simple merge

diff --cc arch/powerpc/kernel/Makefile
index 8e5e2c7,71901fb..9ba1bb7
--- 1/arch/powerpc/kernel/Makefile
--- 2/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
@@@ -94,8 -93,7 +93,9 @@@ obj-$(CONFIG_AUDIT)           += audit.
  obj64-$(CONFIG_AUDIT)         += compat_audit.o
  
  obj-$(CONFIG_DYNAMIC_FTRACE)  += ftrace.o
+ obj-$(CONFIG_FUNCTION_GRAPH_TRACER)   += ftrace.o
 +obj-$(CONFIG_PERF_COUNTERS)   += perf_counter.o power4-pmu.o ppc970-pmu.o \
 +                                 power5-pmu.o power5+-pmu.o power6-pmu.o
  
  obj-$(CONFIG_8XX_MINIMAL_FPEMU) += softemu8xx.o
  

diff --cc arch/powerpc/kernel/asm-offsets.c
Simple merge

diff --cc arch/powerpc/kernel/entry_64.S
Simple merge

diff --cc arch/powerpc/kernel/irq.c
Simple merge

diff --cc arch/powerpc/platforms/Kconfig.cputype
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/ia32/ia32entry.S
index e4baa06,a505202..19c61ef
--- 1/arch/x86/ia32/ia32entry.S
--- 2/arch/x86/ia32/ia32entry.S
+++ b/arch/x86/ia32/ia32entry.S
@@@ -825,8 -825,9 +825,10 @@@ ia32_sys_call_table
        .quad compat_sys_signalfd4
        .quad sys_eventfd2
        .quad sys_epoll_create1
 -      .quad sys_dup3                  /* 330 */
 +      .quad sys_dup3                          /* 330 */
        .quad sys_pipe2
        .quad sys_inotify_init1
+       .quad compat_sys_preadv
+       .quad compat_sys_pwritev
 +      .quad sys_perf_counter_open
  ia32_syscall_end:

diff --cc arch/x86/include/asm/hardirq.h
index 46ebed7,039db6a..2545442
--- 1/arch/x86/include/asm/hardirq.h
--- 2/arch/x86/include/asm/hardirq.h
+++ b/arch/x86/include/asm/hardirq.h
@@@ -12,7 -12,7 +12,8 @@@ typedef struct 
        unsigned int apic_timer_irqs;   /* arch dependent */
        unsigned int irq_spurious_count;
  #endif
+       unsigned int generic_irqs;      /* arch dependent */
 +      unsigned int apic_perf_irqs;
  #ifdef CONFIG_SMP
        unsigned int irq_resched_count;
        unsigned int irq_call_count;

diff --cc arch/x86/include/asm/hw_irq.h
index f39881b,b762ea4..ae80f64
--- 1/arch/x86/include/asm/hw_irq.h
--- 2/arch/x86/include/asm/hw_irq.h
+++ b/arch/x86/include/asm/hw_irq.h
@@@ -27,9 -27,8 +27,10 @@@
  
  /* Interrupt handlers registered during init_IRQ */
  extern void apic_timer_interrupt(void);
+ extern void generic_interrupt(void);
  extern void error_interrupt(void);
 +extern void perf_counter_interrupt(void);
 +
  extern void spurious_interrupt(void);
  extern void thermal_interrupt(void);
  extern void reschedule_interrupt(void);

diff --cc arch/x86/include/asm/thread_info.h
Simple merge

diff --cc arch/x86/include/asm/unistd_32.h
index 7e47658,6e72d74..0b4d8c2
--- 1/arch/x86/include/asm/unistd_32.h
--- 2/arch/x86/include/asm/unistd_32.h
+++ b/arch/x86/include/asm/unistd_32.h
@@@ -338,7 -338,8 +338,9 @@@
  #define __NR_dup3             330
  #define __NR_pipe2            331
  #define __NR_inotify_init1    332
+ #define __NR_preadv           333
+ #define __NR_pwritev          334
 +#define __NR_perf_counter_open        333
  
  #ifdef __KERNEL__
  

diff --cc arch/x86/include/asm/unistd_64.h
index 53025fe,f818294..d9aad87
--- 1/arch/x86/include/asm/unistd_64.h
--- 2/arch/x86/include/asm/unistd_64.h
+++ b/arch/x86/include/asm/unistd_64.h
@@@ -653,8 -653,11 +653,12 @@@ __SYSCALL(__NR_dup3, sys_dup3
  __SYSCALL(__NR_pipe2, sys_pipe2)
  #define __NR_inotify_init1                    294
  __SYSCALL(__NR_inotify_init1, sys_inotify_init1)
 -
+ #define __NR_preadv                           295
+ __SYSCALL(__NR_preadv, sys_preadv)
+ #define __NR_pwritev                          296
+ __SYSCALL(__NR_pwritev, sys_pwritev)
 +#define __NR_perf_counter_open                295
 +__SYSCALL(__NR_perf_counter_open, sys_perf_counter_open)
  
  #ifndef __NO_STUBS
  #define __ARCH_WANT_OLD_READDIR

diff --cc arch/x86/kernel/apic/apic.c
Simple merge

diff --cc arch/x86/kernel/cpu/Makefile
Simple merge

diff --cc arch/x86/kernel/cpu/amd.c
Simple merge

diff --cc arch/x86/kernel/cpu/common.c
index b66af09,c4f6678..a86769e
--- 1/arch/x86/kernel/cpu/common.c
--- 2/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@@ -1,30 -1,39 +1,40 @@@
- #include <linux/init.h>
- #include <linux/kernel.h>
- #include <linux/sched.h>
- #include <linux/string.h>
  #include <linux/bootmem.h>
+ #include <linux/linkage.h>
  #include <linux/bitops.h>
+ #include <linux/kernel.h>
  #include <linux/module.h>
- #include <linux/kgdb.h>
- #include <linux/topology.h>
+ #include <linux/percpu.h>
+ #include <linux/string.h>
  #include <linux/delay.h>
+ #include <linux/sched.h>
+ #include <linux/init.h>
+ #include <linux/kgdb.h>
  #include <linux/smp.h>
- #include <linux/percpu.h>
- #include <asm/i387.h>
- #include <asm/msr.h>
- #include <asm/io.h>
- #include <asm/linkage.h>
+ #include <linux/io.h>
+ 
+ #include <asm/stackprotector.h>
++#include <asm/perf_counter.h>
  #include <asm/mmu_context.h>
+ #include <asm/hypervisor.h>
+ #include <asm/processor.h>
+ #include <asm/sections.h>
+ #include <asm/topology.h>
+ #include <asm/cpumask.h>
+ #include <asm/pgtable.h>
+ #include <asm/atomic.h>
+ #include <asm/proto.h>
+ #include <asm/setup.h>
+ #include <asm/apic.h>
+ #include <asm/desc.h>
+ #include <asm/i387.h>
  #include <asm/mtrr.h>
+ #include <asm/numa.h>
+ #include <asm/asm.h>
+ #include <asm/cpu.h>
  #include <asm/mce.h>
- #include <asm/perf_counter.h>
+ #include <asm/msr.h>
  #include <asm/pat.h>
- #include <asm/asm.h>
- #include <asm/numa.h>
  #include <asm/smp.h>
- #include <asm/cpu.h>
- #include <asm/cpumask.h>
- #include <asm/apic.h>
  
  #ifdef CONFIG_X86_LOCAL_APIC
  #include <asm/uv/uv.h>

diff --cc arch/x86/kernel/entry_64.S
Simple merge

diff --cc arch/x86/kernel/irq.c
index 7c95c89,3aaf7b9..9c27543
--- 1/arch/x86/kernel/irq.c
--- 2/arch/x86/kernel/irq.c
+++ b/arch/x86/kernel/irq.c
@@@ -55,13 -58,20 +58,24 @@@ static int show_other_interrupts(struc
        for_each_online_cpu(j)
                seq_printf(p, "%10u ", irq_stats(j)->apic_timer_irqs);
        seq_printf(p, "  Local timer interrupts\n");
+ 
+       seq_printf(p, "%*s: ", prec, "SPU");
+       for_each_online_cpu(j)
+               seq_printf(p, "%10u ", irq_stats(j)->irq_spurious_count);
+       seq_printf(p, "  Spurious interrupts\n");
 +      seq_printf(p, "CNT: ");
 +      for_each_online_cpu(j)
 +              seq_printf(p, "%10u ", irq_stats(j)->apic_perf_irqs);
 +      seq_printf(p, "  Performance counter interrupts\n");
  #endif
+       if (generic_interrupt_extension) {
+               seq_printf(p, "PLT: ");
+               for_each_online_cpu(j)
+                       seq_printf(p, "%10u ", irq_stats(j)->generic_irqs);
+               seq_printf(p, "  Platform interrupts\n");
+       }
  #ifdef CONFIG_SMP
-       seq_printf(p, "RES: ");
+       seq_printf(p, "%*s: ", prec, "RES");
        for_each_online_cpu(j)
                seq_printf(p, "%10u ", irq_stats(j)->irq_resched_count);
        seq_printf(p, "  Rescheduling interrupts\n");
@@@ -166,8 -165,10 +169,11 @@@ u64 arch_irq_stat_cpu(unsigned int cpu
  
  #ifdef CONFIG_X86_LOCAL_APIC
        sum += irq_stats(cpu)->apic_timer_irqs;
+       sum += irq_stats(cpu)->irq_spurious_count;
 +      sum += irq_stats(cpu)->apic_perf_irqs;
  #endif
+       if (generic_interrupt_extension)
+               sum += irq_stats(cpu)->generic_irqs;
  #ifdef CONFIG_SMP
        sum += irq_stats(cpu)->irq_resched_count;
        sum += irq_stats(cpu)->irq_call_count;

diff --cc arch/x86/kernel/irqinit_32.c
Simple merge

diff --cc arch/x86/kernel/irqinit_64.c
Simple merge

diff --cc arch/x86/kernel/signal.c
Simple merge

diff --cc arch/x86/kernel/syscall_table_32.S
index b7607c4,ff5c873..c3ebbb9
--- 1/arch/x86/kernel/syscall_table_32.S
--- 2/arch/x86/kernel/syscall_table_32.S
+++ b/arch/x86/kernel/syscall_table_32.S
@@@ -332,4 -332,5 +332,6 @@@ ENTRY(sys_call_table
        .long sys_dup3                  /* 330 */
        .long sys_pipe2
        .long sys_inotify_init1
 +      .long sys_perf_counter_open
+       .long sys_preadv
+       .long sys_pwritev

diff --cc arch/x86/kernel/traps.c
Simple merge

diff --cc drivers/acpi/processor_idle.c
Simple merge

diff --cc drivers/char/sysrq.c
Simple merge

diff --cc fs/exec.c
Simple merge

diff --cc include/linux/init_task.h
Simple merge

diff --cc include/linux/kernel_stat.h
Simple merge

diff --cc include/linux/sched.h
index 3aee423,b94f354..75b2fc5
--- 1/include/linux/sched.h
--- 2/include/linux/sched.h
+++ b/include/linux/sched.h
@@@ -68,10 -68,9 +68,10 @@@ struct sched_param 
  #include <linux/smp.h>
  #include <linux/sem.h>
  #include <linux/signal.h>
- #include <linux/fs_struct.h>
+ #include <linux/path.h>
  #include <linux/compiler.h>
  #include <linux/completion.h>
 +#include <linux/perf_counter.h>
  #include <linux/pid.h>
  #include <linux/percpu.h>
  #include <linux/topology.h>
@@@ -137,9 -137,9 +138,11 @@@ extern unsigned long nr_running(void)
  extern unsigned long nr_uninterruptible(void);
  extern unsigned long nr_active(void);
  extern unsigned long nr_iowait(void);
 +extern u64 cpu_nr_switches(int cpu);
 +extern u64 cpu_nr_migrations(int cpu);
  
+ extern unsigned long get_parent_ip(unsigned long addr);
+ 
  struct seq_file;
  struct cfs_rq;
  struct task_group;
@@@ -1055,8 -1048,10 +1051,11 @@@ struct sched_entity 
        u64                     last_wakeup;
        u64                     avg_overlap;
  
 -      u64                     nr_migrations;
 +      u64                     nr_migrations;
 +
+       u64                     start_runtime;
+       u64                     avg_wakeup;
+ 
  #ifdef CONFIG_SCHEDSTATS
        u64                     wait_start;
        u64                     wait_max;

diff --cc include/linux/syscalls.h
Simple merge

diff --cc init/Kconfig
Simple merge

diff --cc kernel/Makefile
index 9ef39e5,bab1dff..63c6975
--- 1/kernel/Makefile
--- 2/kernel/Makefile
+++ b/kernel/Makefile
@@@ -93,7 -93,7 +93,8 @@@ obj-$(CONFIG_HAVE_GENERIC_DMA_COHERENT
  obj-$(CONFIG_FUNCTION_TRACER) += trace/
  obj-$(CONFIG_TRACING) += trace/
  obj-$(CONFIG_SMP) += sched_cpupri.o
+ obj-$(CONFIG_SLOW_WORK) += slow-work.o
 +obj-$(CONFIG_PERF_COUNTERS) += perf_counter.o
  
  ifneq ($(CONFIG_SCHED_OMIT_FRAME_POINTER),y)
  # According to Alan Modra <alan@linuxcare.com.au>, the -fno-omit-frame-pointer is

diff --cc kernel/exit.c
Simple merge

diff --cc kernel/fork.c
Simple merge

diff --cc kernel/sched.c
index 78f4424,bec2498..39e7086
--- 1/kernel/sched.c
--- 2/kernel/sched.c
+++ b/kernel/sched.c
@@@ -2429,9 -2460,10 +2505,11 @@@ static void __sched_fork(struct task_st
        p->se.exec_start                = 0;
        p->se.sum_exec_runtime          = 0;
        p->se.prev_sum_exec_runtime     = 0;
 +      p->se.nr_migrations             = 0;
        p->se.last_wakeup               = 0;
        p->se.avg_overlap               = 0;
+       p->se.start_runtime             = 0;
+       p->se.avg_wakeup                = sysctl_sched_wakeup_granularity;
  
  #ifdef CONFIG_SCHEDSTATS
        p->se.wait_start                = 0;
@@@ -2650,10 -2690,9 +2736,10 @@@ static void finish_task_switch(struct r
         */
        prev_state = prev->state;
        finish_arch_switch(prev);
 +      perf_counter_task_sched_in(current, cpu_of(rq));
        finish_lock_switch(rq, prev);
  #ifdef CONFIG_SMP
-       if (current->sched_class->post_schedule)
+       if (post_schedule)
                current->sched_class->post_schedule(rq);
  #endif
  

diff --cc kernel/sys.c
Simple merge