diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-06-25 07:44:19 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-06-25 07:44:19 +0200 |
| commit | 1c92f88542faa3ae4f970c548b4fe8275a45201b (patch) | |
| tree | a28f215afc2c9510ecaf1970dfa43c94061da26d /tools/lib/traceevent/plugin_jbd2.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_jbd2.c')
| -rw-r--r-- | tools/lib/traceevent/plugin_jbd2.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tools/lib/traceevent/plugin_jbd2.c b/tools/lib/traceevent/plugin_jbd2.c index 0db714c721b..5c23d5bd27c 100644 --- a/tools/lib/traceevent/plugin_jbd2.c +++ b/tools/lib/traceevent/plugin_jbd2.c @@ -30,8 +30,7 @@ #define MINOR(dev) ((unsigned int) ((dev) & MINORMASK)) static unsigned long long -process_jbd2_dev_to_name(struct trace_seq *s, - unsigned long long *args) +process_jbd2_dev_to_name(struct trace_seq *s, unsigned long long *args) { unsigned int dev = args[0]; @@ -40,8 +39,7 @@ process_jbd2_dev_to_name(struct trace_seq *s, } static unsigned long long -process_jiffies_to_msecs(struct trace_seq *s, - unsigned long long *args) +process_jiffies_to_msecs(struct trace_seq *s, unsigned long long *args) { unsigned long long jiffies = args[0]; |