Commit 9d612bef authored by Li Zefan's avatar Li Zefan Committed by Ingo Molnar

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: default avatarLi 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: default avatarIngo Molnar <mingo@elte.hu>
parent d82d6244
...@@ -2475,7 +2475,8 @@ and is between 256 and 4096 characters. It is defined in the file ...@@ -2475,7 +2475,8 @@ and is between 256 and 4096 characters. It is defined in the file
tp720= [HW,PS2] 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 trix= [HW,OSS] MediaTrix AudioTrix Pro
Format: Format:
......
...@@ -284,13 +284,12 @@ void trace_wake_up(void) ...@@ -284,13 +284,12 @@ void trace_wake_up(void)
static int __init set_buf_size(char *str) static int __init set_buf_size(char *str)
{ {
unsigned long buf_size; unsigned long buf_size;
int ret;
if (!str) if (!str)
return 0; return 0;
ret = strict_strtoul(str, 0, &buf_size); buf_size = memparse(str, &str);
/* nr_entries can not be zero */ /* nr_entries can not be zero */
if (ret < 0 || buf_size == 0) if (buf_size == 0)
return 0; return 0;
trace_buf_size = buf_size; trace_buf_size = buf_size;
return 1; return 1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment