diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-10-13 12:03:08 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-10-13 12:03:08 +0200 |
| commit | 1bac0497ef9af8d933860672223e38bd6ac4934a (patch) | |
| tree | 8e569b0e7ed977a4659002632362855cc245990f /kernel/trace/trace.c | |
| parent | Merge branch 'tracing/urgent' into tracing/core (diff) | |
| parent | tracing: Remove unused ftrace_trace_addr helper (diff) | |
| download | linux-1bac0497ef9af8d933860672223e38bd6ac4934a.tar.xz linux-1bac0497ef9af8d933860672223e38bd6ac4934a.zip | |
Merge branch 'tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into tracing/core
Diffstat (limited to 'kernel/trace/trace.c')
| -rw-r--r-- | kernel/trace/trace.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index c820b0310a12..4311ec3062f0 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -129,7 +129,7 @@ static int tracing_set_tracer(const char *buf); static char bootup_tracer_buf[MAX_TRACER_SIZE] __initdata; static char *default_bootup_tracer; -static int __init set_ftrace(char *str) +static int __init set_bootup_ftrace(char *str) { strncpy(bootup_tracer_buf, str, MAX_TRACER_SIZE); default_bootup_tracer = bootup_tracer_buf; @@ -137,7 +137,7 @@ static int __init set_ftrace(char *str) ring_buffer_expanded = 1; return 1; } -__setup("ftrace=", set_ftrace); +__setup("ftrace=", set_bootup_ftrace); static int __init set_ftrace_dump_on_oops(char *str) { |