68 lines
2.4 KiB
Diff
68 lines
2.4 KiB
Diff
From 068cabdac7c1604ec341e915e0920d8d6545d670 Mon Sep 17 00:00:00 2001
|
|
From: John Garry <john.garry@huawei.com>
|
|
Date: Thu, 29 Jul 2021 21:56:24 +0800
|
|
Subject: [PATCH 179/201] perf pmu: Make pmu_add_sys_aliases() public
|
|
|
|
mainline inclusion
|
|
from mainline-v5.15-rc1
|
|
commit e199f47f159d72f12b91d2b33cee78f95ff8ff59
|
|
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=e199f47f159d72f12b91d2b33cee78f95ff8ff59
|
|
|
|
----------------------------------------------------------------------
|
|
|
|
Function pmu_add_sys_aliases() will be required for the PMU events test
|
|
for system events aliases, so make it public.
|
|
|
|
Signed-off-by: John Garry <john.garry@huawei.com>
|
|
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
|
|
Cc: Ian Rogers <irogers@google.com>
|
|
Cc: Ingo Molnar <mingo@redhat.com>
|
|
Cc: Jin Yao <yao.jin@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>
|
|
Cc: linuxarm@huawei.com
|
|
Link: https //lore.kernel.org/r/1627566986-30605-10-git-send-email-john.garry@huawei.com
|
|
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
|
|
Signed-off-by: hongrongxuan <hongrongxuan@huawei.com>
|
|
|
|
Conflicts:
|
|
tools/perf/util/pmu.h
|
|
---
|
|
tools/perf/util/pmu.c | 2 +-
|
|
tools/perf/util/pmu.h | 1 +
|
|
2 files changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
|
|
index 172819439cdd..acdf4e70b99d 100644
|
|
--- a/tools/perf/util/pmu.c
|
|
+++ b/tools/perf/util/pmu.c
|
|
@@ -968,7 +968,7 @@ static int pmu_add_sys_aliases_iter_fn(struct pmu_event *pe, void *data)
|
|
return 0;
|
|
}
|
|
|
|
-static void pmu_add_sys_aliases(struct list_head *head, struct perf_pmu *pmu)
|
|
+void pmu_add_sys_aliases(struct list_head *head, struct perf_pmu *pmu)
|
|
{
|
|
struct pmu_sys_event_iter_data idata = {
|
|
.head = head,
|
|
diff --git a/tools/perf/util/pmu.h b/tools/perf/util/pmu.h
|
|
index a9942e5b076d..75aeb3a43cfb 100644
|
|
--- a/tools/perf/util/pmu.h
|
|
+++ b/tools/perf/util/pmu.h
|
|
@@ -66,6 +66,7 @@ struct perf_pmu_alias {
|
|
};
|
|
|
|
struct perf_pmu *perf_pmu__find(const char *name);
|
|
+void pmu_add_sys_aliases(struct list_head *head, struct perf_pmu *pmu);
|
|
int perf_pmu__config(struct perf_pmu *pmu, struct perf_event_attr *attr,
|
|
struct list_head *head_terms,
|
|
struct parse_events_error *error);
|
|
--
|
|
2.27.0
|
|
|