summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorNamhyung Kim <namhyung.kim@lge.com>2013-04-11 16:01:38 +0900
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-05-07 19:51:54 -0700
commit761694a0bdc01817d1212b1127234dcaf828fde7 (patch)
treecb2c7b2d912bbe675c86f854d86fa137bbdfbf87 /kernel
parente1672f4e2c9fb1231a6242ca1596806f123da3c5 (diff)
downloadlinux-3.10-761694a0bdc01817d1212b1127234dcaf828fde7.tar.gz
linux-3.10-761694a0bdc01817d1212b1127234dcaf828fde7.tar.bz2
linux-3.10-761694a0bdc01817d1212b1127234dcaf828fde7.zip
tracing: Reset ftrace_graph_filter_enabled if count is zero
commit 9f50afccfdc15d95d7331acddcb0f7703df089ae upstream. The ftrace_graph_count can be decreased with a "!" pattern, so that the enabled flag should be updated too. Link: http://lkml.kernel.org/r/1365663698-2413-1-git-send-email-namhyung@kernel.org Signed-off-by: Namhyung Kim <namhyung@kernel.org> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Ingo Molnar <mingo@kernel.org> Cc: Namhyung Kim <namhyung.kim@lge.com> 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.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index d19309547f5..c962d311c77 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -3611,7 +3611,8 @@ out:
if (fail)
return -EINVAL;
- ftrace_graph_filter_enabled = 1;
+ ftrace_graph_filter_enabled = !!(*idx);
+
return 0;
}