]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
perf parse-events: Remove unused PE_KERNEL_PMU_EVENT token
authorIan Rogers <irogers@google.com>
Tue, 27 Jun 2023 18:10:19 +0000 (11:10 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 20 Nov 2023 10:57:13 +0000 (11:57 +0100)
[ Upstream commit bf7d46b3a088ccb8f8045c5902d5848bc23286f9 ]

Removed by commit 70c90e4a6b2f ("perf parse-events: Avoid scanning
PMUs before parsing").

Signed-off-by: Ian Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Athira Rajeev <atrajeev@linux.vnet.ibm.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: bpf@vger.kernel.org
Link: https://lore.kernel.org/r/20230627181030.95608-3-irogers@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Stable-dep-of: ede72dca45b1 ("perf parse-events: Fix tracepoint name memory leak")
Signed-off-by: Sasha Levin <sashal@kernel.org>
tools/perf/util/parse-events.y

index 43557f20d0989f86441d3b56ec73a9e0ed32b001..1393c39ebf330bada5b1fba0139ed6ab0d46d6d7 100644 (file)
@@ -70,7 +70,6 @@ static void free_list_evsel(struct list_head* list_evsel)
 %token PE_LEGACY_CACHE
 %token PE_PREFIX_MEM PE_PREFIX_RAW PE_PREFIX_GROUP
 %token PE_ERROR
-%token PE_KERNEL_PMU_EVENT
 %token PE_ARRAY_ALL PE_ARRAY_RANGE
 %token PE_DRV_CFG_TERM
 %token PE_TERM_HW
@@ -88,7 +87,6 @@ static void free_list_evsel(struct list_head* list_evsel)
 %type <str> PE_MODIFIER_EVENT
 %type <str> PE_MODIFIER_BP
 %type <str> PE_EVENT_NAME
-%type <str> PE_KERNEL_PMU_EVENT
 %type <str> PE_DRV_CFG_TERM
 %type <str> name_or_raw name_or_legacy
 %destructor { free ($$); } <str>
@@ -376,18 +374,6 @@ PE_NAME opt_pmu_config
 #undef CLEANUP
 }
 |
-PE_KERNEL_PMU_EVENT sep_dc
-{
-       struct list_head *list;
-       int err;
-
-       err = parse_events_multi_pmu_add(_parse_state, $1, NULL, &list);
-       free($1);
-       if (err < 0)
-               YYABORT;
-       $$ = list;
-}
-|
 PE_NAME sep_dc
 {
        struct list_head *list;
@@ -408,19 +394,6 @@ PE_NAME sep_dc
        free($1);
        $$ = list;
 }
-|
-PE_KERNEL_PMU_EVENT opt_pmu_config
-{
-       struct list_head *list;
-       int err;
-
-       /* frees $2 */
-       err = parse_events_multi_pmu_add(_parse_state, $1, $2, &list);
-       free($1);
-       if (err < 0)
-               YYABORT;
-       $$ = list;
-}
 
 value_sym:
 PE_VALUE_SYM_HW