diff --git a/[refs] b/[refs] index ec0e935433ad..a21338af161a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 41fb61c2d08107ce96a5dcb3a6289b2afd3e135c +refs/heads/master: 072126f4529196f71a97960248bca54fd4554c2d diff --git a/trunk/kernel/trace/ftrace.c b/trunk/kernel/trace/ftrace.c index 853f6f0a4b4a..a0dc0de8d649 100644 --- a/trunk/kernel/trace/ftrace.c +++ b/trunk/kernel/trace/ftrace.c @@ -2869,6 +2869,10 @@ ftrace_set_regex(struct ftrace_ops *ops, unsigned char *buf, int len, mutex_lock(&ftrace_lock); ret = ftrace_hash_move(ops, enable, orig_hash, hash); + if (!ret && ops->flags & FTRACE_OPS_FL_ENABLED + && ftrace_enabled) + ftrace_run_update_code(FTRACE_ENABLE_CALLS); + mutex_unlock(&ftrace_lock); mutex_unlock(&ftrace_regex_lock);