projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'backlight-for-linus-4.9' of git://git.kernel.org/pub/scm/linux/kernel...
[cascardo/linux.git]
/
arch
/
x86
/
kernel
/
ftrace.c
diff --git
a/arch/x86/kernel/ftrace.c
b/arch/x86/kernel/ftrace.c
index
d036cfb
..
8639bb2
100644
(file)
--- a/
arch/x86/kernel/ftrace.c
+++ b/
arch/x86/kernel/ftrace.c
@@
-1029,7
+1029,7
@@
void prepare_ftrace_return(unsigned long self_addr, unsigned long *parent,
}
if (ftrace_push_return_trace(old, self_addr, &trace.depth,
-
frame_pointer
) == -EBUSY) {
+
frame_pointer, parent
) == -EBUSY) {
*parent = old;
return;
}