diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-06-08 02:24:07 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-06-08 02:24:07 -0400 |
| commit | a292241cccb7e20e8b997a9a44177e7c98141859 (patch) | |
| tree | a0b0bb95e7dce3233a2d8b203f9e326cdec7a00e /tools/perf/builtin-diff.c | |
| parent | d49cb7aeebb974713f9f7ab2991352d3050b095b (diff) | |
| parent | 68807a0c2015cb40df4869e16651f0ce5cc14d52 (diff) | |
Merge branch 'next' into for-linus
Prepare input updates for 3.16.
Diffstat (limited to 'tools/perf/builtin-diff.c')
| -rw-r--r-- | tools/perf/builtin-diff.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/perf/builtin-diff.c b/tools/perf/builtin-diff.c index a77e31246c00..204fffe22532 100644 --- a/tools/perf/builtin-diff.c +++ b/tools/perf/builtin-diff.c | |||
| @@ -952,8 +952,8 @@ static int hpp__entry_global(struct perf_hpp_fmt *_fmt, struct perf_hpp *hpp, | |||
| 952 | dfmt->header_width, buf); | 952 | dfmt->header_width, buf); |
| 953 | } | 953 | } |
| 954 | 954 | ||
| 955 | static int hpp__header(struct perf_hpp_fmt *fmt, | 955 | static int hpp__header(struct perf_hpp_fmt *fmt, struct perf_hpp *hpp, |
| 956 | struct perf_hpp *hpp) | 956 | struct perf_evsel *evsel __maybe_unused) |
| 957 | { | 957 | { |
| 958 | struct diff_hpp_fmt *dfmt = | 958 | struct diff_hpp_fmt *dfmt = |
| 959 | container_of(fmt, struct diff_hpp_fmt, fmt); | 959 | container_of(fmt, struct diff_hpp_fmt, fmt); |
| @@ -963,7 +963,8 @@ static int hpp__header(struct perf_hpp_fmt *fmt, | |||
| 963 | } | 963 | } |
| 964 | 964 | ||
| 965 | static int hpp__width(struct perf_hpp_fmt *fmt, | 965 | static int hpp__width(struct perf_hpp_fmt *fmt, |
| 966 | struct perf_hpp *hpp __maybe_unused) | 966 | struct perf_hpp *hpp __maybe_unused, |
| 967 | struct perf_evsel *evsel __maybe_unused) | ||
| 967 | { | 968 | { |
| 968 | struct diff_hpp_fmt *dfmt = | 969 | struct diff_hpp_fmt *dfmt = |
| 969 | container_of(fmt, struct diff_hpp_fmt, fmt); | 970 | container_of(fmt, struct diff_hpp_fmt, fmt); |