diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2011-05-23 15:33:49 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2011-05-25 22:13:42 -0400 |
| commit | 3b6cfdb1714a33ae4d2ca9fbc818a42cf7adee69 (patch) | |
| tree | 1fc1ca6ff17da6c7ab30d2dffa99d3cb6d4cfca4 /kernel/trace | |
| parent | 17bb615ad4f8d2d2c0f02794d27d7f83e0009ef4 (diff) | |
| download | linux-3b6cfdb1714a33ae4d2ca9fbc818a42cf7adee69.tar.gz linux-3b6cfdb1714a33ae4d2ca9fbc818a42cf7adee69.tar.bz2 linux-3b6cfdb1714a33ae4d2ca9fbc818a42cf7adee69.zip | |
ftrace: Set ops->flag to enabled even on static function tracing
When dynamic ftrace is not configured, the ops->flags still needs
to have its FTRACE_OPS_FL_ENABLED bit set in ftrace_startup().
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'kernel/trace')
| -rw-r--r-- | kernel/trace/ftrace.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index bebbc959ee8c..25949b33057c 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -3468,7 +3468,11 @@ device_initcall(ftrace_nodyn_init); static inline int ftrace_init_dyn_debugfs(struct dentry *d_tracer) { return 0; } static inline void ftrace_startup_enable(int command) { } /* Keep as macros so we do not need to define the commands */ -# define ftrace_startup(ops, command) ({0;}) +# define ftrace_startup(ops, command) \ + ({ \ + (ops)->flags |= FTRACE_OPS_FL_ENABLED; \ + 0; \ + }) # define ftrace_shutdown(ops, command) do { } while (0) # define ftrace_startup_sysctl() do { } while (0) # define ftrace_shutdown_sysctl() do { } while (0) |