59 lines
2.1 KiB
Diff
59 lines
2.1 KiB
Diff
From 9126755cf32c45235b7a4154c830a9a1e6fa43a4 Mon Sep 17 00:00:00 2001
|
|
From: Ian Rogers <irogers@google.com>
|
|
Date: Fri, 1 May 2020 10:33:25 -0700
|
|
Subject: [PATCH 072/201] perf expr: Allow ',' to be an other token
|
|
|
|
mainline inclusion
|
|
from mainline-v5.8-rc1
|
|
commit cb59fa793e3c837ea6843dcec3bd6a0ea649f06b
|
|
category: feature
|
|
bugzilla: https://gitee.com/openeuler/kernel/issues/I8C0CX
|
|
|
|
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=cb59fa793e3c837ea6843dcec3bd6a0ea649f06b
|
|
|
|
----------------------------------------------------------------------
|
|
|
|
Corrects parse errors in expr__find_other of expressions with min.
|
|
|
|
Signed-off-by: Ian Rogers <irogers@google.com>
|
|
Acked-by: Jiri Olsa <jolsa@redhat.com>
|
|
Cc: Adrian Hunter <adrian.hunter@intel.com>
|
|
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
|
|
Cc: Andi Kleen <ak@linux.intel.com>
|
|
Cc: Haiyan Song <haiyanx.song@intel.com>
|
|
Cc: Jin Yao <yao.jin@linux.intel.com>
|
|
Cc: John Garry <john.garry@huawei.com>
|
|
Cc: Kajol Jain <kjain@linux.ibm.com>
|
|
Cc: Kan Liang <kan.liang@linux.intel.com>
|
|
Cc: Leo Yan <leo.yan@linaro.org>
|
|
Cc: Mark Rutland <mark.rutland@arm.com>
|
|
Cc: Namhyung Kim <namhyung@kernel.org>
|
|
Cc: Paul Clarke <pc@us.ibm.com>
|
|
Cc: Peter Zijlstra <peterz@infradead.org>
|
|
Cc: Ravi Bangoria <ravi.bangoria@linux.ibm.com>
|
|
Cc: Song Liu <songliubraving@fb.com>
|
|
Cc: Stephane Eranian <eranian@google.com>
|
|
Link: http://lore.kernel.org/lkml/20200501173333.227162-5-irogers@google.com
|
|
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
|
|
Signed-off-by: hongrongxuan <hongrongxuan@huawei.com>
|
|
---
|
|
tools/perf/util/expr.y | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/tools/perf/util/expr.y b/tools/perf/util/expr.y
|
|
index 2764b196edc3..74c9195860c5 100644
|
|
--- a/tools/perf/util/expr.y
|
|
+++ b/tools/perf/util/expr.y
|
|
@@ -80,7 +80,7 @@ other: ID
|
|
ctx->ids[ctx->num_ids++].name = $1;
|
|
}
|
|
|
|
|
-MIN | MAX | IF | ELSE | SMT_ON | NUMBER | '|' | '^' | '&' | '-' | '+' | '*' | '/' | '%' | '(' | ')'
|
|
+MIN | MAX | IF | ELSE | SMT_ON | NUMBER | '|' | '^' | '&' | '-' | '+' | '*' | '/' | '%' | '(' | ')' | ','
|
|
|
|
|
|
all_expr: if_expr { *final_val = $1; }
|
|
--
|
|
2.27.0
|
|
|