diff options
| author |   Frederic Weisbecker <fweisbec@gmail.com> | 2008-12-04 23:51:23 +0100 |
|---|---|---|
| committer |   Ingo Molnar <mingo@elte.hu> | 2008-12-05 14:47:44 +0100 |
| commit | 21a8c466f99063eeb8567318b4e305eda9015408 (patch) | |
| tree | bc15ed9d28a4f1a52d390ceca6893d84de50a232 /kernel/trace/trace.c | |
| parent | tracing/ftrace: fix the check of ftrace_trace_task (diff) | |
| download | linux-dev-21a8c466f99063eeb8567318b4e305eda9015408.tar.xz linux-dev-21a8c466f99063eeb8567318b4e305eda9015408.zip | |
tracing/ftrace: provide the macro task_curr_ret_stack()
Impact: cleanup
As suggested by Steven Rostedt, this patch provide a new macro
task_curr_ret_stack() to move the cpp conditionnal CONFIG into
the linux/ftrace.h headers.
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Acked-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/trace/trace.c')
| -rw-r--r-- | kernel/trace/trace.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 5dca6ef1fbeb..7a93c663e52a 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -3657,13 +3657,7 @@ int __ftrace_printk(unsigned long ip, const char *fmt, ...) return 0; va_start(ap, fmt); - -#ifdef CONFIG_FUNCTION_GRAPH_TRACER - ret = trace_vprintk(ip, current->curr_ret_stack, fmt, ap); -#else - ret = trace_vprintk(ip, -1, fmt, ap); -#endif - + ret = trace_vprintk(ip, task_curr_ret_stack(current), fmt, ap); va_end(ap); return ret; } |