diff options
author | Frederic Weisbecker <fweisbec@gmail.com> | 2008-12-04 17:51:23 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-12-05 08:47:44 -0500 |
commit | 21a8c466f99063eeb8567318b4e305eda9015408 (patch) | |
tree | bc15ed9d28a4f1a52d390ceca6893d84de50a232 /kernel/trace | |
parent | 77d683f3e0258d522c5506e7b5fd05c9411184d9 (diff) |
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')
-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, ...) | |||
3657 | return 0; | 3657 | return 0; |
3658 | 3658 | ||
3659 | va_start(ap, fmt); | 3659 | va_start(ap, fmt); |
3660 | 3660 | ret = trace_vprintk(ip, task_curr_ret_stack(current), fmt, ap); | |
3661 | #ifdef CONFIG_FUNCTION_GRAPH_TRACER | ||
3662 | ret = trace_vprintk(ip, current->curr_ret_stack, fmt, ap); | ||
3663 | #else | ||
3664 | ret = trace_vprintk(ip, -1, fmt, ap); | ||
3665 | #endif | ||
3666 | |||
3667 | va_end(ap); | 3661 | va_end(ap); |
3668 | return ret; | 3662 | return ret; |
3669 | } | 3663 | } |