74 lines
2.4 KiB
Diff
74 lines
2.4 KiB
Diff
From 92bf4539580e33003e3597a3ff8ee90fabec66a4 Mon Sep 17 00:00:00 2001
|
|
From: Mathieu Poirier <mathieu.poirier@linaro.org>
|
|
Date: Thu, 31 Jan 2019 11:47:11 -0700
|
|
Subject: [PATCH 1/7] perf pmu: Move EVENT_SOURCE_DEVICE_PATH to PMU header
|
|
file
|
|
|
|
mainline inclusion
|
|
from mainline-v5.1-rc1
|
|
commit ffe8881eb20b0452e47efe151e870b4fae8bd5d2
|
|
category: bugfix
|
|
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I8DP81
|
|
CVE: NA
|
|
|
|
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=ffe8881eb20b0452e47efe151e870b4fae8bd5d2
|
|
|
|
----------------------------------------------------------------------------
|
|
|
|
Move definition of EVENT_SOURCE_DEVICE_PATH to pmu.h so that it can be
|
|
used by other files than pmu.c
|
|
|
|
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
|
|
Acked-by: Suzuki K Poulouse <suzuki.poulose@arm.com>
|
|
Cc: Adrian Hunter <adrian.hunter@intel.com>
|
|
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
|
|
Cc: Alexei Starovoitov <ast@kernel.org>
|
|
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
Cc: H. Peter Anvin <hpa@zytor.com>
|
|
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
|
|
Cc: Jiri Olsa <jolsa@redhat.com>
|
|
Cc: Mark Rutland <mark.rutland@arm.com>
|
|
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
|
|
Cc: Namhyung Kim <namhyung@kernel.org>
|
|
Cc: Peter Zijlstra <peterz@infradead.org>
|
|
Cc: Thomas Gleixner <tglx@linutronix.de>
|
|
Cc: Will Deacon <will.deacon@arm.com>
|
|
Cc: linux-arm-kernel@lists.infradead.org
|
|
Cc: linux-s390@vger.kernel.org
|
|
Link: http://lkml.kernel.org/r/20190131184714.20388-5-mathieu.poirier@linaro.org
|
|
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
|
|
Signed-off-by: YunYi Yang <yangyunyi2@huawei.com>
|
|
---
|
|
tools/perf/util/pmu.c | 2 --
|
|
tools/perf/util/pmu.h | 1 +
|
|
2 files changed, 1 insertion(+), 2 deletions(-)
|
|
|
|
diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
|
|
index aa91fcb51a6d..23b0600d02f0 100644
|
|
--- a/tools/perf/util/pmu.c
|
|
+++ b/tools/perf/util/pmu.c
|
|
@@ -29,8 +29,6 @@ struct perf_pmu_format {
|
|
struct list_head list;
|
|
};
|
|
|
|
-#define EVENT_SOURCE_DEVICE_PATH "/bus/event_source/devices/"
|
|
-
|
|
int perf_pmu_parse(struct list_head *list, char *name);
|
|
extern FILE *perf_pmu_in;
|
|
|
|
diff --git a/tools/perf/util/pmu.h b/tools/perf/util/pmu.h
|
|
index 76fecec7b3f9..350c54e0bd3d 100644
|
|
--- a/tools/perf/util/pmu.h
|
|
+++ b/tools/perf/util/pmu.h
|
|
@@ -16,6 +16,7 @@ enum {
|
|
};
|
|
|
|
#define PERF_PMU_FORMAT_BITS 64
|
|
+#define EVENT_SOURCE_DEVICE_PATH "/bus/event_source/devices/"
|
|
|
|
struct perf_event_attr;
|
|
|
|
--
|
|
2.27.0
|
|
|