2020-03-15 15:56:54

by Jiri Olsa

Subject: [PATCH perf/urgent] 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 <[email protected]>
---
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 1928f2a3dddc..eaad29243c23 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;
}
}
--
2.24.1

2020-03-16 13:53:16

by Arnaldo Carvalho de Melo

Subject: Re: [PATCH perf/urgent] perf expr: Fix copy/paste mistake

Em Sun, Mar 15, 2020 at 04:56:09PM +0100, Jiri Olsa escreveu:
> 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

> Fixes: 26226a97724d ("perf expr: Move expr lexer to flex")
> Signed-off-by: Jiri Olsa <[email protected]>
> ---
> 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 1928f2a3dddc..eaad29243c23 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;
> }
> }
> --
> 2.24.1
>

--

- Arnaldo

2020-03-19 14:11:46

by tip-bot2 for Alexey Makhalov

Subject: [tip: perf/core] perf expr: Fix copy/paste mistake

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")
Signed-off-by: Jiri Olsa <[email protected]>
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]>
Link: http://lore.kernel.org/lkml/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
---
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;
}
}