projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
[cascardo/linux.git]
/
arch
/
microblaze
/
kernel
/
ftrace.c
diff --git
a/arch/microblaze/kernel/ftrace.c
b/arch/microblaze/kernel/ftrace.c
index
fc7b48a
..
d57563c
100644
(file)
--- a/
arch/microblaze/kernel/ftrace.c
+++ b/
arch/microblaze/kernel/ftrace.c
@@
-63,7
+63,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) {
*parent = old;
return;