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

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

[Jiri Olsa]

Copy/paste leftover from recent refactor.

Fixes: 26226a97724d ("perf expr: Move expr lexer to flex")
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
 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

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

[Arnaldo Carvalho de Melo]

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 <jolsa@kernel.org>
> ---
>  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

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

[tip-bot2 for Jiri Olsa]

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@kernel.org>
AuthorDate:    Sun, 15 Mar 2020 16:56:09 +01:00
Committer:     Arnaldo Carvalho de Melo <acme@redhat.com>
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@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Kajol Jain <kjain@linux.ibm.com>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lore.kernel.org/lkml/20200315155609.603948-1-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 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;
 		}
 	}