* [PATCH perf/urgent] perf expr: Fix copy/paste mistake
@ 2020-03-15 15:56 Jiri Olsa
2020-03-16 13:52 ` Arnaldo Carvalho de Melo
2020-03-19 14:10 ` [tip: perf/core] " tip-bot2 for Jiri Olsa
0 siblings, 2 replies; 3+ messages in thread
From: Jiri Olsa @ 2020-03-15 15:56 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo
Cc: lkml, Ingo Molnar, Namhyung Kim, Alexander Shishkin,
Peter Zijlstra, Michael Petlan, Andi Kleen, Kajol Jain
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH perf/urgent] perf expr: Fix copy/paste mistake
2020-03-15 15:56 [PATCH perf/urgent] perf expr: Fix copy/paste mistake Jiri Olsa
@ 2020-03-16 13:52 ` Arnaldo Carvalho de Melo
2020-03-19 14:10 ` [tip: perf/core] " tip-bot2 for Jiri Olsa
1 sibling, 0 replies; 3+ messages in thread
From: Arnaldo Carvalho de Melo @ 2020-03-16 13:52 UTC (permalink / raw)
To: Jiri Olsa
Cc: lkml, Ingo Molnar, Namhyung Kim, Alexander Shishkin,
Peter Zijlstra, Michael Petlan, Andi Kleen, Kajol Jain
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* [tip: perf/core] perf expr: Fix copy/paste mistake
2020-03-15 15:56 [PATCH perf/urgent] perf expr: Fix copy/paste mistake Jiri Olsa
2020-03-16 13:52 ` Arnaldo Carvalho de Melo
@ 2020-03-19 14:10 ` tip-bot2 for Jiri Olsa
1 sibling, 0 replies; 3+ messages in thread
From: tip-bot2 for Jiri Olsa @ 2020-03-19 14:10 UTC (permalink / raw)
To: linux-tip-commits
Cc: Jiri Olsa, Alexander Shishkin, Andi Kleen, Kajol Jain,
Michael Petlan, Namhyung Kim, Peter Zijlstra,
Arnaldo Carvalho de Melo, x86, LKML
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;
}
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-03-19 14:13 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-03-15 15:56 [PATCH perf/urgent] perf expr: Fix copy/paste mistake Jiri Olsa
2020-03-16 13:52 ` Arnaldo Carvalho de Melo
2020-03-19 14:10 ` [tip: perf/core] " tip-bot2 for Jiri Olsa
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).