projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next' into for-linus
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
arch
/
powerpc
/
kernel
/
ftrace.c
diff --git
a/arch/powerpc/kernel/ftrace.c
b/arch/powerpc/kernel/ftrace.c
index 1b12696cca060b6ea3693a41318570f8961a885f..ce1f3e44c24fabf07408fd3e0ed70919a3828cb3 100644
(file)
--- a/
arch/powerpc/kernel/ftrace.c
+++ b/
arch/powerpc/kernel/ftrace.c
@@
-586,7
+586,7
@@
void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr)
return;
}
- if (ftrace_push_return_trace(old, self_addr, &trace.depth) == -EBUSY) {
+ if (ftrace_push_return_trace(old, self_addr, &trace.depth
, 0
) == -EBUSY) {
*parent = old;
return;
}