diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-20 22:09:30 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-20 22:09:30 -0700 |
commit | 477cc48484ea0bfdee9e8319259b35a0ec03f332 (patch) | |
tree | 95a45bf408c3d7dec964855f67287cfcd162ad65 /include/linux | |
parent | 7e09e738afd21ef99f047425fc0b0c9be8b03254 (diff) | |
parent | 87291347c49dc40aa339f587b209618201c2e527 (diff) |
Merge tag 'trace-fixes-v3.14-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
Pull trace fix from Steven Rostedt:
"Vaibhav Nagarnaik discovered that since 3.10 a clean-up patch made the
array index in the trace event format bogus.
He supplied an elegant solution that uses __stringify() and also
removes the need for the event_storage and event_storage_mutex and
also cuts off a few K of overhead from the trace events"
* tag 'trace-fixes-v3.14-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
tracing: Fix array size mismatch in format string
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/ftrace_event.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/ftrace_event.h b/include/linux/ftrace_event.h index 4e4cc28623ad..4cdb3a17bcb5 100644 --- a/include/linux/ftrace_event.h +++ b/include/linux/ftrace_event.h @@ -495,10 +495,6 @@ enum { FILTER_TRACE_FN, }; -#define EVENT_STORAGE_SIZE 128 -extern struct mutex event_storage_mutex; -extern char event_storage[EVENT_STORAGE_SIZE]; - extern int trace_event_raw_init(struct ftrace_event_call *call); extern int trace_define_field(struct ftrace_event_call *call, const char *type, const char *name, int offset, int size, |