diff options
| author | Ingo Molnar <[email protected]> | 2014-06-25 05:44:19 +0000 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2014-06-25 05:44:19 +0000 |
| commit | 1c92f88542faa3ae4f970c548b4fe8275a45201b (patch) | |
| tree | a28f215afc2c9510ecaf1970dfa43c94061da26d /tools/lib/traceevent/plugin_cfg80211.c | |
| parent | Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| parent | tools lib traceevent: Clean up format of args in jbd2 plugin (diff) | |
| download | kernel-1c92f88542faa3ae4f970c548b4fe8275a45201b.tar.gz kernel-1c92f88542faa3ae4f970c548b4fe8275a45201b.zip | |
Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/jolsa/perf into perf/core
Pull perf/core improvements and fixes from Jiri Olsa:
* Updates from trace-cmd for traceevent plugin_kvm plus args cleanup (Steven Rostedt, Jan Kiszka)
Signed-off-by: Jiri Olsa <[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'tools/lib/traceevent/plugin_cfg80211.c')
| -rw-r--r-- | tools/lib/traceevent/plugin_cfg80211.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/lib/traceevent/plugin_cfg80211.c b/tools/lib/traceevent/plugin_cfg80211.c index c066b25905f8..4592d8438318 100644 --- a/tools/lib/traceevent/plugin_cfg80211.c +++ b/tools/lib/traceevent/plugin_cfg80211.c @@ -5,8 +5,7 @@ #include "event-parse.h" static unsigned long long -process___le16_to_cpup(struct trace_seq *s, - unsigned long long *args) +process___le16_to_cpup(struct trace_seq *s, unsigned long long *args) { uint16_t *val = (uint16_t *) (unsigned long) args[0]; return val ? (long long) le16toh(*val) : 0; |