From: Ingo Molnar <mingo@kernel.org>
Date: Fri, 6 Jun 2014 05:55:06 +0000 (+0200)
Subject: Merge branch 'perf/urgent' into perf/core, to resolve conflict and to prepare for... 
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ec00010972a0971b2c1da4fbe4e5c7d8ed1ecb05;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git

Merge branch 'perf/urgent' into perf/core, to resolve conflict and to prepare for new patches

Conflicts:
	arch/x86/kernel/traps.c

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

ec00010972a0971b2c1da4fbe4e5c7d8ed1ecb05
diff --cc arch/x86/kernel/traps.c
index 461926b0577c,f73b5d435bdc..c6eb418c5627
--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
@@@ -379,7 -357,7 +379,7 @@@ NOKPROBE_SYMBOL(do_int3)
   * for scheduling or signal handling. The actual stack switch is done in
   * entry.S
   */
- asmlinkage struct pt_regs *sync_regs(struct pt_regs *eregs)
 -asmlinkage __visible __kprobes 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 */