Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 9d612beff5089b89a295a2331883a8ce3fff08c1

Authored by Li Zefan
Committed by Ingo Molnar
1 parent d82d62444f
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

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>

Showing 2 changed files with 4 additions and 4 deletions Side-by-side Diff

Documentation/kernel-parameters.txt
Diff comments   View file @ 9d612be
... ... @@ -2475,7 +2475,8 @@
2475 2475  
2476 2476 tp720= [HW,PS2]
2477 2477  
2478   - trace_buf_size=nn[KMG] [ftrace] will set tracing buffer size.
  2478 + trace_buf_size=nn[KMG]
  2479 + [FTRACE] will set tracing buffer size.
2479 2480  
2480 2481 trix= [HW,OSS] MediaTrix AudioTrix Pro
2481 2482 Format:
kernel/trace/trace.c
Diff comments   View file @ 9d612be
... ... @@ -284,13 +284,12 @@
284 284 static int __init set_buf_size(char *str)
285 285 {
286 286 unsigned long buf_size;
287   - int ret;
288 287  
289 288 if (!str)
290 289 return 0;
291   - ret = strict_strtoul(str, 0, &buf_size);
  290 + buf_size = memparse(str, &str);
292 291 /* nr_entries can not be zero */
293   - if (ret < 0 || buf_size == 0)
  292 + if (buf_size == 0)
294 293 return 0;
295 294 trace_buf_size = buf_size;
296 295 return 1;