manual merge of perf/kprobes

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --cc arch/x86/kernel/apic/hw_nmi.c
index eab67047dec398200f16eae8668aa00f33c20809,73eb5b336f63cbab0a25679909712c7984c743c8..c3fcb5de508391ca20684669b3746a2c734cad02
--- 1/arch/x86/kernel/apic/hw_nmi.c
--- 2/arch/x86/kernel/apic/hw_nmi.c
+++ b/arch/x86/kernel/apic/hw_nmi.c
@@@ -57,10 -57,10 +57,10 @@@ void arch_trigger_all_cpu_backtrace(voi
        }
  
        clear_bit(0, &backtrace_flag);
 -      smp_mb__after_clear_bit();
 +      smp_mb__after_atomic();
  }
  
- static int __kprobes
+ static int
  arch_trigger_all_cpu_backtrace_handler(unsigned int cmd, struct pt_regs *regs)
  {
        int cpu;

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

diff --cc arch/x86/kernel/traps.c
index f73b5d435bdca59ff7c12c157a36997773fc2e07,3c8ae7d83820bdbb597a6c4ff5e09b316461ba0e..fdbaa5a715f1f38c5106408a3f5e1d503a0e3558
--- 1/arch/x86/kernel/traps.c
--- 2/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
@@@ -357,7 -365,7 +365,7 @@@ NOKPROBE_SYMBOL(do_int3)
   * for scheduling or signal handling. The actual stack switch is done in
   * entry.S
   */
- asmlinkage __visible __kprobes struct pt_regs *sync_regs(struct pt_regs *eregs)
 -asmlinkage struct pt_regs *sync_regs(struct pt_regs *eregs)
++asmlinkage __visible struct pt_regs *sync_regs(struct pt_regs *eregs)
  {
        struct pt_regs *regs = eregs;
        /* Did already sync */

diff --cc kernel/sched/core.c
Simple merge