Merge branch 'perf/core'

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

diff --cc kernel/trace/trace_event_perf.c
Simple merge

diff --cc kernel/trace/trace_functions.c
index a426f410c06053a5191f8f634138b07f049b6c38,fdff65dff1bb5e2101970185e04072f34dc0cd57..483162a9f9080258fa08b76247e40103d8e5a6c5
--- 1/kernel/trace/trace_functions.c
--- 2/kernel/trace/trace_functions.c
+++ b/kernel/trace/trace_functions.c
@@@ -75,16 -75,10 +76,18 @@@ function_trace_call_preempt_only(unsign
        preempt_enable_notrace();
  }
  
 +/* Our two options */
 +enum {
 +      TRACE_FUNC_OPT_STACK    = 0x1,
 +      TRACE_FUNC_OPT_PSTORE   = 0x2,
 +};
 +
 +static struct tracer_flags func_flags;
 +
  static void
- function_trace_call(unsigned long ip, unsigned long parent_ip)
+ function_trace_call(unsigned long ip, unsigned long parent_ip,
+                   struct ftrace_ops *op, struct pt_regs *pt_regs)
+ 
  {
        struct trace_array *tr = func_trace;
        struct trace_array_cpu *data;
@@@ -170,9 -159,14 +174,9 @@@ static struct ftrace_ops trace_ops __re
  static struct ftrace_ops trace_stack_ops __read_mostly =
  {
        .func = function_stack_trace_call,
-       .flags = FTRACE_OPS_FL_GLOBAL,
+       .flags = FTRACE_OPS_FL_GLOBAL | FTRACE_OPS_FL_RECURSION_SAFE,
  };
  
 -/* Our two options */
 -enum {
 -      TRACE_FUNC_OPT_STACK = 0x1,
 -};
 -
  static struct tracer_opt func_opts[] = {
  #ifdef CONFIG_STACKTRACE
        { TRACER_OPT(func_stack_trace, TRACE_FUNC_OPT_STACK) },