* [PATCH] tracing: fix trace_buf_size boot option
@ 2009-06-24 9:27 Li Zefan
2009-06-24 9:33 ` Li Zefan
0 siblings, 1 reply; 3+ messages in thread
From: Li Zefan @ 2009-06-24 9:27 UTC (permalink / raw)
To: Ingo Molnar; +Cc: Steven Rostedt, Frederic Weisbecker, LKML
We should be able to specify [KMG] when setting trace_buf_size
boot option, as documented in kernel-parameters.txt
[ Impact: allow to specify [KMG] in trace_buf_size boot option ]
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
---
Documentation/kernel-parameters.txt | 3 ++-
kernel/trace/trace.c | 5 ++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 256a650..421f1e6 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -2446,7 +2446,8 @@ and is between 256 and 4096 characters. It is defined in the file
tp720= [HW,PS2]
- trace_buf_size=nn[KMG] [ftrace] will set tracing buffer size.
+ trace_buf_size=nn[KMG]
+ [FTRACE] will set tracing buffer size.
trix= [HW,OSS] MediaTrix AudioTrix Pro
Format:
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 3bb3100..7068468 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -284,13 +284,12 @@ void trace_wake_up(void)
static int __init set_buf_size(char *str)
{
unsigned long buf_size;
- int ret;
if (!str)
return 0;
- ret = strict_strtoul(str, 0, &buf_size);
+ buf_size = memparse(str, &opt);
/* nr_entries can not be zero */
- if (ret < 0 || buf_size == 0)
+ if (buf_size == 0)
return 0;
trace_buf_size = buf_size;
return 1;
--
1.5.4.rc3
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] tracing: fix trace_buf_size boot option
2009-06-24 9:27 [PATCH] tracing: fix trace_buf_size boot option Li Zefan
@ 2009-06-24 9:33 ` Li Zefan
2009-06-24 9:47 ` [tip:tracing/urgent] tracing: Fix " tip-bot for Li Zefan
0 siblings, 1 reply; 3+ messages in thread
From: Li Zefan @ 2009-06-24 9:33 UTC (permalink / raw)
To: Ingo Molnar; +Cc: Steven Rostedt, Frederic Weisbecker, LKML
> - ret = strict_strtoul(str, 0, &buf_size);
> + buf_size = memparse(str, &opt);
Sorry, there's a typo: s/opt/str. I forgot to commit the
change after fixing it.
========================
[PATCH] tracing: fix trace_buf_size boot option
We should be able to specify [KMG] when setting trace_buf_size
boot option, as documented in kernel-parameters.txt
[ Impact: allow to specify [KMG] in trace_buf_size boot option ]
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
---
Documentation/kernel-parameters.txt | 3 ++-
kernel/trace/trace.c | 5 ++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 256a650..421f1e6 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -2446,7 +2446,8 @@ and is between 256 and 4096 characters. It is defined in the file
tp720= [HW,PS2]
- trace_buf_size=nn[KMG] [ftrace] will set tracing buffer size.
+ trace_buf_size=nn[KMG]
+ [FTRACE] will set tracing buffer size.
trix= [HW,OSS] MediaTrix AudioTrix Pro
Format:
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 3bb3100..3aa0a0d 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -284,13 +284,12 @@ void trace_wake_up(void)
static int __init set_buf_size(char *str)
{
unsigned long buf_size;
- int ret;
if (!str)
return 0;
- ret = strict_strtoul(str, 0, &buf_size);
+ buf_size = memparse(str, &str);
/* nr_entries can not be zero */
- if (ret < 0 || buf_size == 0)
+ if (buf_size == 0)
return 0;
trace_buf_size = buf_size;
return 1;
--
1.5.4.rc3
^ permalink raw reply related [flat|nested] 3+ messages in thread* [tip:tracing/urgent] tracing: Fix trace_buf_size boot option
2009-06-24 9:33 ` Li Zefan
@ 2009-06-24 9:47 ` tip-bot for Li Zefan
0 siblings, 0 replies; 3+ messages in thread
From: tip-bot for Li Zefan @ 2009-06-24 9:47 UTC (permalink / raw)
To: linux-tip-commits
Cc: linux-kernel, hpa, mingo, fweisbec, rostedt, lizf, tglx, mingo
Commit-ID: 9d612beff5089b89a295a2331883a8ce3fff08c1
Gitweb: http://git.kernel.org/tip/9d612beff5089b89a295a2331883a8ce3fff08c1
Author: Li Zefan <lizf@cn.fujitsu.com>
AuthorDate: Wed, 24 Jun 2009 17:33:15 +0800
Committer: Ingo Molnar <mingo@elte.hu>
CommitDate: Wed, 24 Jun 2009 11:41:12 +0200
tracing: Fix trace_buf_size boot option
We should be able to specify [KMG] when setting trace_buf_size
boot option, as documented in kernel-parameters.txt
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
LKML-Reference: <4A41F2DB.4020102@cn.fujitsu.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
Documentation/kernel-parameters.txt | 3 ++-
kernel/trace/trace.c | 5 ++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 92e1ab8..d3f41db 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -2475,7 +2475,8 @@ and is between 256 and 4096 characters. It is defined in the file
tp720= [HW,PS2]
- trace_buf_size=nn[KMG] [ftrace] will set tracing buffer size.
+ trace_buf_size=nn[KMG]
+ [FTRACE] will set tracing buffer size.
trix= [HW,OSS] MediaTrix AudioTrix Pro
Format:
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 3bb3100..3aa0a0d 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -284,13 +284,12 @@ void trace_wake_up(void)
static int __init set_buf_size(char *str)
{
unsigned long buf_size;
- int ret;
if (!str)
return 0;
- ret = strict_strtoul(str, 0, &buf_size);
+ buf_size = memparse(str, &str);
/* nr_entries can not be zero */
- if (ret < 0 || buf_size == 0)
+ if (buf_size == 0)
return 0;
trace_buf_size = buf_size;
return 1;
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-06-24 9:48 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-06-24 9:27 [PATCH] tracing: fix trace_buf_size boot option Li Zefan
2009-06-24 9:33 ` Li Zefan
2009-06-24 9:47 ` [tip:tracing/urgent] tracing: Fix " tip-bot for Li Zefan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox