[PATCH 15/31] perf vendor events arm64: Relocate ThunderX2 JSON to cavium subdirectory

[Arnaldo Carvalho de Melo]

From: John Garry 

Since jevents now supports vendor subdirectory, relocate
the ThunderX2 JSON to Cavium subdirectory.

Signed-off-by: John Garry 
Tested-by: Ganapatrao Kulkarni 
Cc: Alexander Shishkin 
Cc: Andi Kleen 
Cc: Jiri Olsa 
Cc: Namhyung Kim 
Cc: Peter Zijlstra 
Cc: Shaokun Zhang 
Cc: Will Deacon 
Cc: William Cohen 
Cc: linux-arm-ker...@lists.infradead.org
Cc: linux...@huawei.com
Link: 
http://lkml.kernel.org/r/1520506716-197429-6-git-send-email-john.ga...@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo 
---
 .../cavium/{thunderx2-imp-def.json => thunderx2/core-imp-def.json}  | 0
 tools/perf/pmu-events/arch/arm64/mapfile.csv| 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename tools/perf/pmu-events/arch/arm64/cavium/{thunderx2-imp-def.json => 
thunderx2/core-imp-def.json} (100%)

diff --git a/tools/perf/pmu-events/arch/arm64/cavium/thunderx2-imp-def.json 
b/tools/perf/pmu-events/arch/arm64/cavium/thunderx2/core-imp-def.json
similarity index 100%
rename from tools/perf/pmu-events/arch/arm64/cavium/thunderx2-imp-def.json
rename to tools/perf/pmu-events/arch/arm64/cavium/thunderx2/core-imp-def.json
diff --git a/tools/perf/pmu-events/arch/arm64/mapfile.csv 
b/tools/perf/pmu-events/arch/arm64/mapfile.csv
index e61c9ca6cf9e..952a05cbf675 100644
--- a/tools/perf/pmu-events/arch/arm64/mapfile.csv
+++ b/tools/perf/pmu-events/arch/arm64/mapfile.csv
@@ -12,5 +12,5 @@
 #
 #
 #Family-model,Version,Filename,EventType
-0x420f5160,v1,cavium,core
+0x420f5160,v1,cavium/thunderx2,core
 0x410fd03[[:xdigit:]],v1,cortex-a53,core
-- 
2.14.3

[PATCH 15/31] perf vendor events arm64: Relocate ThunderX2 JSON to cavium subdirectory

[Arnaldo Carvalho de Melo]

From: John Garry 

Since jevents now supports vendor subdirectory, relocate
the ThunderX2 JSON to Cavium subdirectory.

Signed-off-by: John Garry 
Tested-by: Ganapatrao Kulkarni 
Cc: Alexander Shishkin 
Cc: Andi Kleen 
Cc: Jiri Olsa 
Cc: Namhyung Kim 
Cc: Peter Zijlstra 
Cc: Shaokun Zhang 
Cc: Will Deacon 
Cc: William Cohen 
Cc: linux-arm-ker...@lists.infradead.org
Cc: linux...@huawei.com
Link: 
http://lkml.kernel.org/r/1520506716-197429-6-git-send-email-john.ga...@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo 
---
 .../cavium/{thunderx2-imp-def.json => thunderx2/core-imp-def.json}  | 0
 tools/perf/pmu-events/arch/arm64/mapfile.csv| 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename tools/perf/pmu-events/arch/arm64/cavium/{thunderx2-imp-def.json => 
thunderx2/core-imp-def.json} (100%)

diff --git a/tools/perf/pmu-events/arch/arm64/cavium/thunderx2-imp-def.json 
b/tools/perf/pmu-events/arch/arm64/cavium/thunderx2/core-imp-def.json
similarity index 100%
rename from tools/perf/pmu-events/arch/arm64/cavium/thunderx2-imp-def.json
rename to tools/perf/pmu-events/arch/arm64/cavium/thunderx2/core-imp-def.json
diff --git a/tools/perf/pmu-events/arch/arm64/mapfile.csv 
b/tools/perf/pmu-events/arch/arm64/mapfile.csv
index e61c9ca6cf9e..952a05cbf675 100644
--- a/tools/perf/pmu-events/arch/arm64/mapfile.csv
+++ b/tools/perf/pmu-events/arch/arm64/mapfile.csv
@@ -12,5 +12,5 @@
 #
 #
 #Family-model,Version,Filename,EventType
-0x420f5160,v1,cavium,core
+0x420f5160,v1,cavium/thunderx2,core
 0x410fd03[[:xdigit:]],v1,cortex-a53,core
-- 
2.14.3