projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
cce2c8f
)
tracing: Indicate enabled soft-mode in enable file
author
Masami Hiramatsu
<
[email protected]
>
Thu, 9 May 2013 05:44:26 +0000
(14:44 +0900)
committer
Steven Rostedt
<
[email protected]
>
Fri, 10 May 2013 00:14:07 +0000
(20:14 -0400)
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 <
[email protected]
>
Cc: Oleg Nesterov <
[email protected]
>
Cc: Frederic Weisbecker <
[email protected]
>
Cc: Ingo Molnar <
[email protected]
>
Cc: Tom Zanussi <
[email protected]
>
Signed-off-by: Masami Hiramatsu <
[email protected]
>
Signed-off-by: Steven Rostedt <
[email protected]
>
kernel/trace/trace_events.c
patch
|
blob
|
history
diff --git
a/kernel/trace/trace_events.c
b/kernel/trace/trace_events.c
index 87e826f1c23748c86826e0ba25651fee92710c0d..915c136d7bd179c853a586ca2c8b436cebe3b1f6 100644
(file)
--- 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