lkml.org 
[lkml]   [2009]   [Aug]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH v2 2/2] ftrace: Unify effect of writing to trace_options and option/*
On Fri, Aug 07, 2009 at 06:55:48PM +0800, Zhaolei wrote:
> "echo noglobal-clock > trace_options" can be used to change trace
> clock but "echo 0 > options/global-clock" can't.
>
> We can fix it by using set_tracer_flags() in trace_options_core_write().
>
> Changelog:
> v1->v2: Simplied switch() by Li Zefan <lizf@cn.fujitsu.com>'s suggest.
>
> Signed-off-by: Zhao Lei <zhaolei@cn.fujitsu.com>


Queued for .31, thanks!

> ---
> kernel/trace/trace.c | 12 ++----------
> 1 files changed, 2 insertions(+), 10 deletions(-)
>
> diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
> index 6c5f67f..06a2dfa 100644
> --- a/kernel/trace/trace.c
> +++ b/kernel/trace/trace.c
> @@ -3718,17 +3718,9 @@ trace_options_core_write(struct file *filp, const char __user *ubuf, size_t cnt,
> if (ret < 0)
> return ret;
>
> - switch (val) {
> - case 0:
> - trace_flags &= ~(1 << index);
> - break;
> - case 1:
> - trace_flags |= 1 << index;
> - break;
> -
> - default:
> + if (val != 0 && val != 1)
> return -EINVAL;
> - }
> + set_tracer_flags(1 << index, val);
>
> *ppos += cnt;
>
> --
> 1.5.5.3
>
>



\
 
 \ /
  Last update: 2009-08-08 02:41    [W:0.086 / U:0.132 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site