summaryrefslogtreecommitdiff
path: root/arch/blackfin
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2009-09-14 01:50:22 +0000
committerMike Frysinger <vapier@gentoo.org>2009-09-16 22:10:47 -0400
commit3289651a9767556822adbd492be957a1287ffd3f (patch)
treefb21636269008952e9ea9878bcea008951731053 /arch/blackfin
parent9c21453e376c03bcba9c6d89dc5735b40a35b098 (diff)
downloadlinux-rpi-3289651a9767556822adbd492be957a1287ffd3f.tar.gz
linux-rpi-3289651a9767556822adbd492be957a1287ffd3f.tar.bz2
linux-rpi-3289651a9767556822adbd492be957a1287ffd3f.zip
Blackfin: update ftrace_push_return_trace() breakage
Commit 71e308a239c updated ftrace_push_return_trace() prototype but didn't update the Blackfin ftrace code, so things broke. Since we don't support the new stuff yet, call it with stub values. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'arch/blackfin')
-rw-r--r--arch/blackfin/kernel/ftrace.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/blackfin/kernel/ftrace.c b/arch/blackfin/kernel/ftrace.c
index 905bfc40a00b..f2c85ac6f2da 100644
--- a/arch/blackfin/kernel/ftrace.c
+++ b/arch/blackfin/kernel/ftrace.c
@@ -24,7 +24,7 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr)
if (unlikely(atomic_read(&current->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;