projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'trace-v4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux...
[linux-2.6-block.git]
/
arch
/
sh
/
kernel
/
ftrace.c
diff --git
a/arch/sh/kernel/ftrace.c
b/arch/sh/kernel/ftrace.c
index deb9eba3a43ddc081fd051976c5904026b0261ee..53783978162e2d1c82c1f44b349f7530d650c341 100644
(file)
--- a/
arch/sh/kernel/ftrace.c
+++ b/
arch/sh/kernel/ftrace.c
@@
-382,7
+382,7
@@
void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr)
return;
}
- err = ftrace_push_return_trace(old, self_addr, &trace.depth, 0);
+ err = ftrace_push_return_trace(old, self_addr, &trace.depth, 0
, NULL
);
if (err == -EBUSY) {
__raw_writel(old, parent);
return;