mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git
synced 2026-11-19 16:39:31 +01:00
Revert "perf pmu: Fix pmu events parsing rule"
As reported by Adrian Hunter, this breaks intel_pt event parsing:
# perf record -e intel_pt//u uname
event syntax error: 'intel_pt//u'
\___ parser error
Run 'perf list' for a list of valid events
Usage: perf record [<options>] [<command>]
or: perf record [<options>] -- <command> [<options>]
-e, --event <event> event selector. use 'perf list' to list available events
#
This reverts commit 9a4a931ce8.
Reported-by: Adrian Hunter <[email protected]>
Cc: Alexander Shishkin <[email protected]>
Cc: Andi Kleen <[email protected]>
Cc: David Ahern <[email protected]>
Cc: Jiri Olsa <[email protected]>
Cc: Kan Liang <[email protected]>
Cc: Namhyung Kim <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Wang Nan <[email protected]>
Link: https://lkml.kernel.org/n/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
This commit is contained in:
1 parent
5981ec3668
commit
4a35a9027f
1 file changed
+4
-4
@@ -224,15 +224,15 @@ event_def: event_pmu |
|
||||
event_bpf_file
|
||||
|
||||
event_pmu:
|
||||
PE_NAME '/' event_config '/'
|
||||
PE_NAME opt_event_config
|
||||
{
|
||||
struct list_head *list, *orig_terms, *terms;
|
||||
|
||||
if (parse_events_copy_term_list($3, &orig_terms))
|
||||
if (parse_events_copy_term_list($2, &orig_terms))
|
||||
YYABORT;
|
||||
|
||||
ALLOC_LIST(list);
|
||||
if (parse_events_add_pmu(_parse_state, list, $1, $3, false)) {
|
||||
if (parse_events_add_pmu(_parse_state, list, $1, $2, false)) {
|
||||
struct perf_pmu *pmu = NULL;
|
||||
int ok = 0;
|
||||
char *pattern;
|
||||
@@ -262,7 +262,7 @@ PE_NAME '/' event_config '/'
|
||||
if (!ok)
|
||||
YYABORT;
|
||||
}
|
||||
parse_events_terms__delete($3);
|
||||
parse_events_terms__delete($2);
|
||||
parse_events_terms__delete(orig_terms);
|
||||
$$ = list;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user