From b5a0fd2b384868eebf5f72f36fc53a1608c8abc3 Mon Sep 17 00:00:00 2001 From: Steven Rostedt Date: Mon, 23 May 2011 15:33:49 -0400 Subject: [PATCH] --- yaml --- r: 252657 b: refs/heads/master c: 3b6cfdb1714a33ae4d2ca9fbc818a42cf7adee69 h: refs/heads/master i: 252655: e206ae2ad5844ceda77ac6ebd02c87ea12a45efc v: v3 --- [refs] | 2 +- trunk/kernel/trace/ftrace.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 948d879daac9..2f4fceb0f145 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 17bb615ad4f8d2d2c0f02794d27d7f83e0009ef4 +refs/heads/master: 3b6cfdb1714a33ae4d2ca9fbc818a42cf7adee69 diff --git a/trunk/kernel/trace/ftrace.c b/trunk/kernel/trace/ftrace.c index bebbc959ee8c..25949b33057c 100644 --- a/trunk/kernel/trace/ftrace.c +++ b/trunk/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)