diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-08-21 11:36:39 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-08-21 11:36:49 +0200 |
| commit | a0e0fac633bed47c15cab744663d8c67f8f3421d (patch) | |
| tree | 585f685aacda161cb00bb0c8599e4f60b3c262c6 /kernel/trace/trace.c | |
| parent | bcada3d4b8c96b8792c2306f363992ca5ab9da42 (diff) | |
| parent | 87abb3b15c62033409f5bf2ffb5620c94f91cf2c (diff) | |
| download | linux-a0e0fac633bed47c15cab744663d8c67f8f3421d.tar.bz2 | |
Merge branch 'tip/perf/core-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/core
Pull ftrace fixlets from Steve Rostedt.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/trace/trace.c')
| -rw-r--r-- | kernel/trace/trace.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 5c38c81496ce..08acf42e325b 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -426,15 +426,15 @@ __setup("trace_buf_size=", set_buf_size); static int __init set_tracing_thresh(char *str) { - unsigned long threshhold; + unsigned long threshold; int ret; if (!str) return 0; - ret = strict_strtoul(str, 0, &threshhold); + ret = strict_strtoul(str, 0, &threshold); if (ret < 0) return 0; - tracing_thresh = threshhold * 1000; + tracing_thresh = threshold * 1000; return 1; } __setup("tracing_thresh=", set_tracing_thresh); |