diff --git a/[refs] b/[refs] index bf9bc5696a0e..cb7d2ca5f0ce 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9c21453e376c03bcba9c6d89dc5735b40a35b098 +refs/heads/master: 3289651a9767556822adbd492be957a1287ffd3f diff --git a/trunk/arch/blackfin/kernel/ftrace.c b/trunk/arch/blackfin/kernel/ftrace.c index 905bfc40a00b..f2c85ac6f2da 100644 --- a/trunk/arch/blackfin/kernel/ftrace.c +++ b/trunk/arch/blackfin/kernel/ftrace.c @@ -24,7 +24,7 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr) if (unlikely(atomic_read(¤t->tracing_graph_pause))) return; - if (ftrace_push_return_trace(*parent, self_addr, &trace.depth) == -EBUSY) + if (ftrace_push_return_trace(*parent, self_addr, &trace.depth, 0) == -EBUSY) return; trace.func = self_addr;