53 lines
1.7 KiB
Diff
53 lines
1.7 KiB
Diff
From 5b9896ba53ce9227752c306b7fe2fa2b66513426 Mon Sep 17 00:00:00 2001
|
|
From: Jiri Olsa <jolsa@kernel.org>
|
|
Date: Sun, 15 Mar 2020 16:56:09 +0100
|
|
Subject: [PATCH 058/201] perf expr: Fix copy/paste mistake
|
|
|
|
mainline inclusion
|
|
from mainline-v5.7-rc1
|
|
commit 59a08b4b3b1a9374adacd13cd7544c03e5582e0e
|
|
category: bugfix
|
|
bugzilla: https://gitee.com/openeuler/kernel/issues/I8C0CX
|
|
|
|
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=59a08b4b3b1a9374adacd13cd7544c03e5582e0e
|
|
|
|
----------------------------------------------------------------------
|
|
|
|
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>
|
|
Signed-off-by: hongrongxuan <hongrongxuan@huawei.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 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.27.0
|
|
|