ftrace: Set ops->flag to enabled even on static function tracing
authorSteven Rostedt <srostedt@redhat.com>
Mon, 23 May 2011 19:33:49 +0000 (15:33 -0400)
committerSteven Rostedt <rostedt@goodmis.org>
Thu, 26 May 2011 02:13:42 +0000 (22:13 -0400)
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>
kernel/trace/ftrace.c

index bebbc959ee8c1388321aca9d8249457edff83d58..25949b33057c569ca6634093d7622e9f1a07ce21 100644 (file)
@@ -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)