Skip to contentSkip to conversation

perf expr: Fix copy/paste mistake

PATCH Applied Jiri Olsa 3 participants 3 messages Mar 15, 2020 – Mar 19, 2020 perf events

lore
Share & tools
lore

Jiri Olsa

author reviewer
#0 lore raw

PATCH 1/1 perf expr: Fix copy/paste mistake

Copy/paste leftover from recent refactor.

Fixes 26226a97724d ("perf expr: Move expr lexer to flex")
---
 tools/perf/util/expr.l | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
tools/perf/util/expr.l +2 -2
index 1928f2a3dddc..eaad29243c23 100644
@@ -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;
 		}
 	}
Signature · 1 line
2.24.1
#1 lore raw

Em Sun, Mar 15, 2020 at 04:56:09PM +0100, Jiri Olsa escreveu:

Quoted 1 line

Copy/paste leftover from recent refactor.

This has not made into perf/urgent, so I've applied it to my perf/core branch, thanks,

[acme@quaco perf]$ git tag --contains 26226a97724d perf-core-for-mingo-5.7-20200310 [acme@quaco perf]$

- Arnaldo

Quoted 26 lines
Fixes 26226a97724d ("perf expr: Move expr lexer to flex")
---
 tools/perf/util/expr.l | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
tools/perf/util/expr.l +2 -2
index 1928f2a3dddc..eaad29243c23 100644
@@ -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;
 		}
 	}
Signature · 1 line
2.24.1
Signature · 1 line
- Arnaldo
merge bot Applied
#2 lore raw
In reply to Jiri Olsa
The following commit has been merged into the perf/core branch of tip:

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 <[email protected]>
AuthorDate:    Sun, 15 Mar 2020 16:56:09 +01:00
Committer:     Arnaldo Carvalho de Melo <[email protected]>
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")
Cc Alexander Shishkin <[email protected]>
Cc Andi Kleen <[email protected]>
Cc Kajol Jain <[email protected]>
Cc Michael Petlan <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Peter Zijlstra <[email protected]>
---
 tools/perf/util/expr.l | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
tools/perf/util/expr.l +2 -2
index 1928f2a..eaad292 100644
@@ -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;
 		}
 	}