projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus
[firefly-linux-kernel-4.4.55.git]
/
kernel
/
trace
/
trace_nop.c
diff --git
a/kernel/trace/trace_nop.c
b/kernel/trace/trace_nop.c
index 9aa84bde23cd2d10e2207d635a908cc958286deb..394f94417e2f9edadbfdd449a90f5b8fd9ddd166 100644
(file)
--- a/
kernel/trace/trace_nop.c
+++ b/
kernel/trace/trace_nop.c
@@
-91,6
+91,7
@@
struct tracer nop_trace __read_mostly =
.name = "nop",
.init = nop_trace_init,
.reset = nop_trace_reset,
.name = "nop",
.init = nop_trace_init,
.reset = nop_trace_reset,
+ .wait_pipe = poll_wait_pipe,
#ifdef CONFIG_FTRACE_SELFTEST
.selftest = trace_selftest_startup_nop,
#endif
#ifdef CONFIG_FTRACE_SELFTEST
.selftest = trace_selftest_startup_nop,
#endif