diff options
author | Ingo Molnar <mingo@kernel.org> | 2014-06-25 01:44:19 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2014-06-25 01:44:19 -0400 |
commit | 1c92f88542faa3ae4f970c548b4fe8275a45201b (patch) | |
tree | a28f215afc2c9510ecaf1970dfa43c94061da26d /tools/lib/traceevent/plugin_cfg80211.c | |
parent | 06c654ca8b824e04f59f3f99d403494a140c181f (diff) | |
parent | 1545d8aca9ac1cb3f503fb9c29543d539d99c7af (diff) |
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 <jolsa@kernel.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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 @@ | |||
5 | #include "event-parse.h" | 5 | #include "event-parse.h" |
6 | 6 | ||
7 | static unsigned long long | 7 | static unsigned long long |
8 | process___le16_to_cpup(struct trace_seq *s, | 8 | process___le16_to_cpup(struct trace_seq *s, unsigned long long *args) |
9 | unsigned long long *args) | ||
10 | { | 9 | { |
11 | uint16_t *val = (uint16_t *) (unsigned long) args[0]; | 10 | uint16_t *val = (uint16_t *) (unsigned long) args[0]; |
12 | return val ? (long long) le16toh(*val) : 0; | 11 | return val ? (long long) le16toh(*val) : 0; |