diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-11 10:03:53 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-11 10:03:53 +0100 |
| commit | 4040068dce64f75c9d414f41fc2fb314a44bad65 (patch) | |
| tree | 10c4e51ddf9fb33112b773e56905d189909e35b0 /kernel/trace/trace.c | |
| parent | d524e03207591a6de7e6b5069aabc778e3f0f5f8 (diff) | |
| parent | c3706f005c3aaf570e71f0f083fdbb59a5a9fa2e (diff) | |
Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace
Diffstat (limited to 'kernel/trace/trace.c')
| -rw-r--r-- | kernel/trace/trace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index d89821283b4..d7c175a442d 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -1963,7 +1963,7 @@ tracing_trace_options_read(struct file *filp, char __user *ubuf, struct tracer_opt *trace_opts = current_trace->flags->opts; - /* calulate max size */ + /* calculate max size */ for (i = 0; trace_options[i]; i++) { len += strlen(trace_options[i]); len += 3; /* "no" and space */ |