diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2009-09-16 21:16:37 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-16 21:16:37 +0200 |
| commit | 40d9d82c8ab8c4e2373a23a1e31dc8d84c53aa01 (patch) | |
| tree | 610700282791b0469bbf09921993857e0b0b51fe /include/trace | |
| parent | MAINTAINERS: Update tracing tree details (diff) | |
| parent | tracing: Fix minor bugs for __unregister_ftrace_function_probe (diff) | |
| download | linux-dev-40d9d82c8ab8c4e2373a23a1e31dc8d84c53aa01.tar.xz linux-dev-40d9d82c8ab8c4e2373a23a1e31dc8d84c53aa01.zip | |
Merge branch 'tip/tracing/core4' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/core
Diffstat (limited to 'include/trace')
| -rw-r--r-- | include/trace/ftrace.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/trace/ftrace.h b/include/trace/ftrace.h index 308bafd93325..72a3b437b829 100644 --- a/include/trace/ftrace.h +++ b/include/trace/ftrace.h @@ -239,9 +239,9 @@ ftrace_format_##call(struct ftrace_event_call *unused, \ #undef __print_flags #define __print_flags(flag, delim, flag_array...) \ ({ \ - static const struct trace_print_flags flags[] = \ + static const struct trace_print_flags __flags[] = \ { flag_array, { -1, NULL }}; \ - ftrace_print_flags_seq(p, delim, flag, flags); \ + ftrace_print_flags_seq(p, delim, flag, __flags); \ }) #undef __print_symbolic @@ -254,7 +254,7 @@ ftrace_format_##call(struct ftrace_event_call *unused, \ #undef TRACE_EVENT #define TRACE_EVENT(call, proto, args, tstruct, assign, print) \ -enum print_line_t \ +static enum print_line_t \ ftrace_raw_output_##call(struct trace_iterator *iter, int flags) \ { \ struct trace_seq *s = &iter->seq; \ @@ -317,7 +317,7 @@ ftrace_raw_output_##call(struct trace_iterator *iter, int flags) \ #undef TRACE_EVENT #define TRACE_EVENT(call, proto, args, tstruct, func, print) \ -int \ +static int \ ftrace_define_fields_##call(struct ftrace_event_call *event_call) \ { \ struct ftrace_raw_##call field; \ |