diff --git a/[refs] b/[refs] index 413908e59d6b..88f564f86e94 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f10ed36ec1118c6f9523cd7e53cb0aadb53efe9f +refs/heads/master: 820432783190b4096499e38a4a4d7095c511913d diff --git a/trunk/kernel/trace/ftrace.c b/trunk/kernel/trace/ftrace.c index dcac7418f688..5cbddb59e99f 100644 --- a/trunk/kernel/trace/ftrace.c +++ b/trunk/kernel/trace/ftrace.c @@ -1189,7 +1189,7 @@ ftrace_regex_release(struct inode *inode, struct file *file, int enable) mutex_lock(&ftrace_sysctl_lock); mutex_lock(&ftrace_start_lock); - if (iter->filtered && ftrace_start && ftrace_enabled) + if (ftrace_start && ftrace_enabled) ftrace_run_update_code(FTRACE_ENABLE_CALLS); mutex_unlock(&ftrace_start_lock); mutex_unlock(&ftrace_sysctl_lock);