diff options
-rw-r--r-- | kernel/trace/trace_events.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c index 903a0bf2685e..7ee08b95c384 100644 --- a/kernel/trace/trace_events.c +++ b/kernel/trace/trace_events.c | |||
@@ -638,17 +638,17 @@ event_enable_read(struct file *filp, char __user *ubuf, size_t cnt, | |||
638 | loff_t *ppos) | 638 | loff_t *ppos) |
639 | { | 639 | { |
640 | struct ftrace_event_file *file = filp->private_data; | 640 | struct ftrace_event_file *file = filp->private_data; |
641 | char *buf; | 641 | char buf[4] = "0"; |
642 | 642 | ||
643 | if (file->flags & FTRACE_EVENT_FL_ENABLED) { | 643 | if (file->flags & FTRACE_EVENT_FL_ENABLED && |
644 | if (file->flags & FTRACE_EVENT_FL_SOFT_DISABLED) | 644 | !(file->flags & FTRACE_EVENT_FL_SOFT_DISABLED)) |
645 | buf = "0*\n"; | 645 | strcpy(buf, "1"); |
646 | else if (file->flags & FTRACE_EVENT_FL_SOFT_MODE) | 646 | |
647 | buf = "1*\n"; | 647 | if (file->flags & FTRACE_EVENT_FL_SOFT_DISABLED || |
648 | else | 648 | file->flags & FTRACE_EVENT_FL_SOFT_MODE) |
649 | buf = "1\n"; | 649 | strcat(buf, "*"); |
650 | } else | 650 | |
651 | buf = "0\n"; | 651 | strcat(buf, "\n"); |
652 | 652 | ||
653 | return simple_read_from_buffer(ubuf, cnt, ppos, buf, strlen(buf)); | 653 | return simple_read_from_buffer(ubuf, cnt, ppos, buf, strlen(buf)); |
654 | } | 654 | } |