The following commit has been merged into the perf/core branch of tip:
Commit-ID: 59a08b4b3b1a9374adacd13cd7544c03e5582e0e
Gitweb: https://git.kernel.org/tip/59a08b4b3b1a9374adacd13cd7544c03e5582e0e
Author: Jiri Olsa <jolsa@xxxxxxxxxx>
AuthorDate: Sun, 15 Mar 2020 16:56:09 +01:00
Committer: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
CommitterDate: Tue, 17 Mar 2020 18:01:40 -03:00
perf expr: Fix copy/paste mistake
Copy/paste leftover from recent refactor.
Fixes: 26226a97724d ("perf expr: Move expr lexer to flex")
Signed-off-by: Jiri Olsa <jolsa@xxxxxxxxxx>
Cc: Alexander Shishkin <alexander.shishkin@xxxxxxxxxxxxxxx>
Cc: Andi Kleen <ak@xxxxxxxxxxxxxxx>
Cc: Kajol Jain <kjain@xxxxxxxxxxxxx>
Cc: Michael Petlan <mpetlan@xxxxxxxxxx>
Cc: Namhyung Kim <namhyung@xxxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Link: http://lore.kernel.org/lkml/20200315155609.603948-1-jolsa@xxxxxxxxxx
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
---
tools/perf/util/expr.l | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/perf/util/expr.l b/tools/perf/util/expr.l
index 1928f2a..eaad292 100644
--- a/tools/perf/util/expr.l
+++ b/tools/perf/util/expr.l
@@ -79,10 +79,10 @@ symbol {spec}*{sym}*{spec}*{sym}*
{
int start_token;
- start_token = parse_events_get_extra(yyscanner);
+ start_token = expr_get_extra(yyscanner);
if (start_token) {
- parse_events_set_extra(NULL, yyscanner);
+ expr_set_extra(NULL, yyscanner);
return start_token;
}
}
|