From: Masami Hiramatsu Date: Thu, 9 May 2013 05:44:26 +0000 (+0900) Subject: tracing: Indicate enabled soft-mode in enable file X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=30052170dcc256c18a43fb3e76577a67394543f8;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git tracing: Indicate enabled soft-mode in enable file Indicate enabled soft-mode event as "1*" in "enable" file for each event, because it can be soft-disabled when disable_event trigger is hit. Link: http://lkml.kernel.org/r/20130509054426.30398.28202.stgit@mhiramat-M0-7522 Cc: Srikar Dronamraju Cc: Oleg Nesterov Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Tom Zanussi Signed-off-by: Masami Hiramatsu Signed-off-by: Steven Rostedt --- diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c index 87e826f1c237..915c136d7bd1 100644 --- a/kernel/trace/trace_events.c +++ b/kernel/trace/trace_events.c @@ -623,6 +623,8 @@ event_enable_read(struct file *filp, char __user *ubuf, size_t cnt, if (file->flags & FTRACE_EVENT_FL_ENABLED) { if (file->flags & FTRACE_EVENT_FL_SOFT_DISABLED) buf = "0*\n"; + else if (file->flags & FTRACE_EVENT_FL_SOFT_MODE) + buf = "1*\n"; else buf = "1\n"; } else