diff options
author | Ingo Molnar <mingo@kernel.org> | 2016-06-08 03:26:46 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-06-08 03:26:46 -0400 |
commit | 616d1c1b98ac79f30216a57a170dd7cea19b3df3 (patch) | |
tree | 6f244c2e5a7160190e73bc82b4cd7fa7bb22ee31 /tools/perf/util/parse-events.c | |
parent | a4f144ebbdf6f7807c477bce8e136047ed27321f (diff) | |
parent | c8ae067f2635be0f8c7e5db1bb74b757d623e05b (diff) |
Merge branch 'linus' into perf/core, to refresh the branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/util/parse-events.c')
-rw-r--r-- | tools/perf/util/parse-events.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index 89d40bb425e1..d15e335842b7 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c | |||
@@ -1657,7 +1657,7 @@ static void parse_events_print_error(struct parse_events_error *err, | |||
1657 | 1657 | ||
1658 | buf = _buf; | 1658 | buf = _buf; |
1659 | 1659 | ||
1660 | /* We're cutting from the beggining. */ | 1660 | /* We're cutting from the beginning. */ |
1661 | if (err->idx > max_err_idx) | 1661 | if (err->idx > max_err_idx) |
1662 | cut = err->idx - max_err_idx; | 1662 | cut = err->idx - max_err_idx; |
1663 | 1663 | ||