60 lines
2.2 KiB
Diff
60 lines
2.2 KiB
Diff
From ea7c8f3686529a92bfbe2913216fcc457675566b Mon Sep 17 00:00:00 2001
|
|
From: John Garry <john.garry@huawei.com>
|
|
Date: Tue, 3 Aug 2021 08:44:09 +0100
|
|
Subject: [PATCH 170/201] perf jevents: Make build dependency on test JSONs
|
|
|
|
mainline inclusion
|
|
from mainline-v5.15-rc1
|
|
commit 517db3b59537a59f6cc251b1926df93e93bb9c87
|
|
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=517db3b59537a59f6cc251b1926df93e93bb9c87
|
|
|
|
----------------------------------------------------------------------
|
|
|
|
Currently all JSONs and the mapfile for an arch are dependencies for
|
|
building pmu-events.c
|
|
|
|
The test JSONs are missing as a dependency, so add them.
|
|
|
|
Signed-off-by: John Garry <john.garry@huawei.com>
|
|
Reported-by: Arnaldo Carvalho de Melo <acme@kernel.org>
|
|
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
|
|
Cc: Ian Rogers <irogers@google.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: http://lore.kernel.org/lkml/90094733-741c-50e5-ac7d-f5640b5f0bdd@huawei.com
|
|
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
|
|
Signed-off-by: hongrongxuan <hongrongxuan@huawei.com>
|
|
---
|
|
tools/perf/pmu-events/Build | 5 ++++-
|
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/tools/perf/pmu-events/Build b/tools/perf/pmu-events/Build
|
|
index 215ba30b8534..a055dee6a46a 100644
|
|
--- a/tools/perf/pmu-events/Build
|
|
+++ b/tools/perf/pmu-events/Build
|
|
@@ -6,10 +6,13 @@ pmu-events-y += pmu-events.o
|
|
JDIR = pmu-events/arch/$(SRCARCH)
|
|
JSON = $(shell [ -d $(JDIR) ] && \
|
|
find $(JDIR) -name '*.json' -o -name 'mapfile.csv')
|
|
+JDIR_TEST = pmu-events/arch/test
|
|
+JSON_TEST = $(shell [ -d $(JDIR_TEST) ] && \
|
|
+ find $(JDIR_TEST) -name '*.json')
|
|
|
|
#
|
|
# Locate/process JSON files in pmu-events/arch/
|
|
# directory and create tables in pmu-events.c.
|
|
#
|
|
-$(OUTPUT)pmu-events/pmu-events.c: $(JSON) $(JEVENTS)
|
|
+$(OUTPUT)pmu-events/pmu-events.c: $(JSON) $(JSON_TEST) $(JEVENTS)
|
|
$(Q)$(call echo-cmd,gen)$(JEVENTS) $(SRCARCH) pmu-events/arch $(OUTPUT)pmu-events/pmu-events.c $(V)
|
|
--
|
|
2.27.0
|
|
|