diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-02 10:13:09 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-02 10:13:09 -0800 |
| commit | e321ae4c207ce4c6c6812fc65e666efc325cc65e (patch) | |
| tree | 117ded7f1a1bfcdcc6417c6816c02680539d6485 /include/trace/ftrace.h | |
| parent | bcc2f9b718d0be9cd77551d37c28daf4ebbc570c (diff) | |
| parent | e98a6e59dff885eb387163b1a7abe019a44ba90b (diff) | |
| download | op-kernel-dev-e321ae4c207ce4c6c6812fc65e666efc325cc65e.zip op-kernel-dev-e321ae4c207ce4c6c6812fc65e666efc325cc65e.tar.gz | |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Ingo Molnar:
"Misc kernel and tooling fixes"
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
tools lib traceevent: Fix conversion of pointer to integer of different size
perf/trace: Properly use u64 to hold event_id
perf: Remove fragile swevent hlist optimization
ftrace, perf: Avoid infinite event generation loop
tools lib traceevent: Fix use of multiple options in processing field
perf header: Fix possible memory leaks in process_group_desc()
perf header: Fix bogus group name
perf tools: Tag thread comm as overriden
Diffstat (limited to 'include/trace/ftrace.h')
| -rw-r--r-- | include/trace/ftrace.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/trace/ftrace.h b/include/trace/ftrace.h index d17a35c..5c38606 100644 --- a/include/trace/ftrace.h +++ b/include/trace/ftrace.h @@ -90,6 +90,10 @@ #define TRACE_EVENT_FLAGS(name, value) \ __TRACE_EVENT_FLAGS(name, value) +#undef TRACE_EVENT_PERF_PERM +#define TRACE_EVENT_PERF_PERM(name, expr...) \ + __TRACE_EVENT_PERF_PERM(name, expr) + #include TRACE_INCLUDE(TRACE_INCLUDE_FILE) @@ -140,6 +144,9 @@ #undef TRACE_EVENT_FLAGS #define TRACE_EVENT_FLAGS(event, flag) +#undef TRACE_EVENT_PERF_PERM +#define TRACE_EVENT_PERF_PERM(event, expr...) + #include TRACE_INCLUDE(TRACE_INCLUDE_FILE) /* |
