tracing fix for 2.6.31
Ingo,
Please pull the following tracing fix for .31
Thanks,
Frederic.
The following changes since commit df4ecf1524c7793de3121b2d4e5fc6bcc0da3bfb:
Linus Torvalds (1):
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing.git \
tracing/urgent
Zhaolei (1):
ftrace: Unify effect of writing to trace_options and option/*
kernel/trace/trace.c | 12 ++---------- 1 files changed, 2 insertions(+), 10 deletions(-)
---
Quoted 1 line
From
f2d84b65b9778e8a35dd904f7d3993f0a60c9756Mon Sep 17 00:00:00 2001
From: Zhaolei <[email protected]>
Date: Fri, 7 Aug 2009 18:55:48 +0800
Subject: [PATCH] ftrace: Unify effect of writing to trace_options and option/*
"echo noglobal-clock > trace_options" can be used to change trace clock but "echo 0 > options/global-clock" can't. The flag toggling will be silently accepted without actually changing the clock callback.
We can fix it by using set_tracer_flags() intrace_options_core_write().
Changelog:v1->v2: Simplified switch() after Li Zefan <[email protected]>'s
suggestion
--- kernel/trace/trace.c | 12 ++---------- 1 files changed, 2 insertions(+), 10 deletions(-)
kernel/trace/trace.c +2 -10
@@ -3896,17 +3896,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;
Signature · 1 line
1.6.2.3
Quoted 14 lines · Frederic Weisbecker
Ingo,
Please pull the following tracing fix for .31
Thanks,
Frederic.The following changes since commit
df4ecf1524c7793de3121b2d4e5fc6bcc0da3bfb:
Linus Torvalds (1):
Merge branch 'upstream' ofgit://ftp.linux-mips.org/pub/scm/upstream-linusare available in the git repository at:
Quoted 8 lines
git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing.git\
tracing/urgentZhaolei (1):
ftrace: Unify effect of writing totrace_optionsand option/*kernel/trace/trace.c | 12 ++---------- 1 files changed, 2 insertions(+), 10 deletions(-)
Pulled into tracing/urgent, thanks!
Ingo