From: Ingo Molnar <mingo@kernel.org>
Date: Thu, 22 May 2014 11:54:28 +0000 (+0200)
Subject: manual merge of perf/kprobes
X-Git-Tag: next-20140530~38^2~14
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0fe4e1ee6231c07f3749fc87323b32378651b849;p=karo-tx-linux.git

manual merge of perf/kprobes

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

0fe4e1ee6231c07f3749fc87323b32378651b849
diff --cc arch/x86/kernel/apic/hw_nmi.c
index eab67047dec3,73eb5b336f63..c3fcb5de5083
--- a/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/traps.c
index f73b5d435bdc,3c8ae7d83820..fdbaa5a715f1
--- a/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 */