diff options
author | Steven Rostedt <srostedt@redhat.com> | 2011-07-13 15:08:31 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-03 12:18:54 -0500 |
commit | 2ffe3ccf80eba0ac9ca71c41e7357d92f1c08fc3 (patch) | |
tree | b25759efa685d002b043e657fa3d05624c85eaaa /kernel | |
parent | f935e6192f9e068da8f8395f032ff4b721fe8510 (diff) |
ftrace: Update filter when tracing enabled in set_ftrace_filter()
commit 072126f4529196f71a97960248bca54fd4554c2d upstream.
Currently, if set_ftrace_filter() is called when the ftrace_ops is
active, the function filters will not be updated. They will only be updated
when tracing is disabled and re-enabled.
Update the functions immediately during set_ftrace_filter().
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/trace/ftrace.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index 1eef6cf38d5..6b1e596bd3a 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c | |||
@@ -2901,6 +2901,10 @@ ftrace_set_regex(struct ftrace_ops *ops, unsigned char *buf, int len, | |||
2901 | 2901 | ||
2902 | mutex_lock(&ftrace_lock); | 2902 | mutex_lock(&ftrace_lock); |
2903 | ret = ftrace_hash_move(ops, enable, orig_hash, hash); | 2903 | ret = ftrace_hash_move(ops, enable, orig_hash, hash); |
2904 | if (!ret && ops->flags & FTRACE_OPS_FL_ENABLED | ||
2905 | && ftrace_enabled) | ||
2906 | ftrace_run_update_code(FTRACE_ENABLE_CALLS); | ||
2907 | |||
2904 | mutex_unlock(&ftrace_lock); | 2908 | mutex_unlock(&ftrace_lock); |
2905 | 2909 | ||
2906 | mutex_unlock(&ftrace_regex_lock); | 2910 | mutex_unlock(&ftrace_regex_lock); |