drop queue-5.10/perf-jevents-free-the-sys_event_tables-list-after-pr.patch

diff --git a/queue-5.10/perf-jevents-free-the-sys_event_tables-list-after-pr.patch b/queue-5.10/perf-jevents-free-the-sys_event_tables-list-after-pr.patch
deleted file mode 100644 (file)
index 6731e58..0000000
--- a/queue-5.10/perf-jevents-free-the-sys_event_tables-list-after-pr.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 0c4a177970c0dfe7742bf860b5a6d90010e8f8fc Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 28 Sep 2021 18:29:38 +0800
-Subject: perf jevents: Free the sys_event_tables list after processing entries
-
-From: Like Xu <likexu@tencent.com>
-
-[ Upstream commit b94729919db2c6737501c36ea6526a36d5d63fa2 ]
-
-The compiler reports that free_sys_event_tables() is dead code.
-
-But according to the semantics, the "LIST_HEAD(sys_event_tables)" should
-also be released, just like we do with 'arch_std_events' in main().
-
-Fixes: e9d32c1bf0cd7a98 ("perf vendor events: Add support for arch standard events")
-Signed-off-by: Like Xu <likexu@tencent.com>
-Reviewed-by: John Garry <john.garry@huawei.com>
-Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
-Cc: Jiri Olsa <jolsa@redhat.com>
-Cc: Mark Rutland <mark.rutland@arm.com>
-Cc: Namhyung Kim <namhyung@kernel.org>
-Cc: Peter Zijlstra <peterz@infradead.org>
-Link: http://lore.kernel.org/lkml/20210928102938.69681-1-likexu@tencent.com
-Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- tools/perf/pmu-events/jevents.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/tools/perf/pmu-events/jevents.c b/tools/perf/pmu-events/jevents.c
-index c679a79aef51..66ded0f9e85d 100644
---- a/tools/perf/pmu-events/jevents.c
-+++ b/tools/perf/pmu-events/jevents.c
-@@ -1185,6 +1185,7 @@ int main(int argc, char *argv[])
-       }
- 
-       free_arch_std_events();
-+      free_sys_event_tables();
-       free(mapfile);
-       return 0;
- 
-@@ -1206,6 +1207,7 @@ err_close_eventsfp:
-               create_empty_mapping(output_file);
- err_out:
-       free_arch_std_events();
-+      free_sys_event_tables();
-       free(mapfile);
-       return ret;
- }
--- 
-2.33.0
-

diff --git a/queue-5.10/series b/queue-5.10/series
index 93a7f88ef06bffdd93ff4403564e4e56a4a093a5..cdae12998a598ce60f2d59f6f1063a8743c36f8f 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -50,7 +50,6 @@ net-sched-sch_taprio-properly-cancel-timer-from-tapr.patch
 net-sfp-fix-typo-in-state-machine-debug-string.patch
 netlink-annotate-data-races-around-nlk-bound.patch
 perf-jevents-tidy-error-handling.patch
-perf-jevents-free-the-sys_event_tables-list-after-pr.patch
 bus-ti-sysc-use-clkdm_noauto-for-dra7-dcan1-for-erra.patch
 drm-sun4i-dw-hdmi-fix-hdmi-phy-clock-setup.patch
 video-fbdev-gbefb-only-instantiate-device-when-built.patch