diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-06-04 11:59:26 (GMT) |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-06-04 11:59:40 (GMT) |
commit | 64edbc562034f2ec3fce382cb208fab40586d005 (patch) | |
tree | 7fbfaaea9467d14a1a6ac5667ce01be5ccb9b635 /kernel/trace/trace_output.c | |
parent | 43bd1236234cacbc18d1476a9b57e7a306efddf5 (diff) | |
parent | 0f6ce3de4ef6ff940308087c49760d068851c1a7 (diff) | |
download | linux-fsl-qoriq-64edbc562034f2ec3fce382cb208fab40586d005.tar.xz |
Merge branch 'tracing/ftrace' into tracing/core
Merge reason: this mini-topic had outstanding problems that delayed
its merge, so it does not fast-forward.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/trace/trace_output.c')
-rw-r--r-- | kernel/trace/trace_output.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c index c12d95d..0fe3b22 100644 --- a/kernel/trace/trace_output.c +++ b/kernel/trace/trace_output.c @@ -17,6 +17,7 @@ static DECLARE_RWSEM(trace_event_mutex); DEFINE_PER_CPU(struct trace_seq, ftrace_event_seq); +EXPORT_PER_CPU_SYMBOL(ftrace_event_seq); static struct hlist_head event_hash[EVENT_HASHSIZE] __read_mostly; @@ -250,6 +251,7 @@ ftrace_print_flags_seq(struct trace_seq *p, const char *delim, return p->buffer; } +EXPORT_SYMBOL(ftrace_print_flags_seq); const char * ftrace_print_symbols_seq(struct trace_seq *p, unsigned long val, @@ -275,6 +277,7 @@ ftrace_print_symbols_seq(struct trace_seq *p, unsigned long val, return p->buffer; } +EXPORT_SYMBOL(ftrace_print_symbols_seq); #ifdef CONFIG_KRETPROBES static inline const char *kretprobed(const char *name) |