aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/kernel-parameters.txt3
-rw-r--r--kernel/trace/trace.c5
2 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 92e1ab8178a..d3f41db3ed4 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
2475 2475
2476 tp720= [HW,PS2] 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 trix= [HW,OSS] MediaTrix AudioTrix Pro 2481 trix= [HW,OSS] MediaTrix AudioTrix Pro
2481 Format: 2482 Format:
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 3bb31006b5c..3aa0a0dfdfa 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -284,13 +284,12 @@ void trace_wake_up(void)
284static int __init set_buf_size(char *str) 284static int __init set_buf_size(char *str)
285{ 285{
286 unsigned long buf_size; 286 unsigned long buf_size;
287 int ret;
288 287
289 if (!str) 288 if (!str)
290 return 0; 289 return 0;
291 ret = strict_strtoul(str, 0, &buf_size); 290 buf_size = memparse(str, &str);
292 /* nr_entries can not be zero */ 291 /* nr_entries can not be zero */
293 if (ret < 0 || buf_size == 0) 292 if (buf_size == 0)
294 return 0; 293 return 0;
295 trace_buf_size = buf_size; 294 trace_buf_size = buf_size;
296 return 1; 295 return 1;