From 0d0e5ecec6116db6031829299e74cc71240c9ff3 Mon Sep 17 00:00:00 2001 From: Thomas Richter Date: Fri, 27 Sep 2019 10:11:47 +0200 Subject: [PATCH] perf vendor events s390: Use s390 machine name instead of type 8561 In the pmu-events directory for JSON file definitions use the official machine name IBM z15 instead of machine type number 8561. This is consistent with previous machines. Signed-off-by: Thomas Richter Cc: Heiko Carstens Cc: Vasily Gorbik Link: http://lore.kernel.org/lkml/20190927081147.18345-2-tmricht@linux.ibm.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/pmu-events/arch/s390/{cf_m8561 => cf_z15}/basic.json | 0 .../perf/pmu-events/arch/s390/{cf_m8561 => cf_z15}/crypto.json | 0 .../perf/pmu-events/arch/s390/{cf_m8561 => cf_z15}/crypto6.json | 0 .../pmu-events/arch/s390/{cf_m8561 => cf_z15}/extended.json | 0 .../pmu-events/arch/s390/{cf_m8561 => cf_z15}/transaction.json | 0 tools/perf/pmu-events/arch/s390/mapfile.csv | 2 +- 6 files changed, 1 insertion(+), 1 deletion(-) rename tools/perf/pmu-events/arch/s390/{cf_m8561 => cf_z15}/basic.json (100%) rename tools/perf/pmu-events/arch/s390/{cf_m8561 => cf_z15}/crypto.json (100%) rename tools/perf/pmu-events/arch/s390/{cf_m8561 => cf_z15}/crypto6.json (100%) rename tools/perf/pmu-events/arch/s390/{cf_m8561 => cf_z15}/extended.json (100%) rename tools/perf/pmu-events/arch/s390/{cf_m8561 => cf_z15}/transaction.json (100%) diff --git a/tools/perf/pmu-events/arch/s390/cf_m8561/basic.json b/tools/perf/pmu-events/arch/s390/cf_z15/basic.json similarity index 100% rename from tools/perf/pmu-events/arch/s390/cf_m8561/basic.json rename to tools/perf/pmu-events/arch/s390/cf_z15/basic.json diff --git a/tools/perf/pmu-events/arch/s390/cf_m8561/crypto.json b/tools/perf/pmu-events/arch/s390/cf_z15/crypto.json similarity index 100% rename from tools/perf/pmu-events/arch/s390/cf_m8561/crypto.json rename to tools/perf/pmu-events/arch/s390/cf_z15/crypto.json diff --git a/tools/perf/pmu-events/arch/s390/cf_m8561/crypto6.json b/tools/perf/pmu-events/arch/s390/cf_z15/crypto6.json similarity index 100% rename from tools/perf/pmu-events/arch/s390/cf_m8561/crypto6.json rename to tools/perf/pmu-events/arch/s390/cf_z15/crypto6.json diff --git a/tools/perf/pmu-events/arch/s390/cf_m8561/extended.json b/tools/perf/pmu-events/arch/s390/cf_z15/extended.json similarity index 100% rename from tools/perf/pmu-events/arch/s390/cf_m8561/extended.json rename to tools/perf/pmu-events/arch/s390/cf_z15/extended.json diff --git a/tools/perf/pmu-events/arch/s390/cf_m8561/transaction.json b/tools/perf/pmu-events/arch/s390/cf_z15/transaction.json similarity index 100% rename from tools/perf/pmu-events/arch/s390/cf_m8561/transaction.json rename to tools/perf/pmu-events/arch/s390/cf_z15/transaction.json diff --git a/tools/perf/pmu-events/arch/s390/mapfile.csv b/tools/perf/pmu-events/arch/s390/mapfile.csv index bd3fc577139c..61641a3480e0 100644 --- a/tools/perf/pmu-events/arch/s390/mapfile.csv +++ b/tools/perf/pmu-events/arch/s390/mapfile.csv @@ -4,4 +4,4 @@ Family-model,Version,Filename,EventType ^IBM.282[78].*[13]\.[1-5].[[:xdigit:]]+$,1,cf_zec12,core ^IBM.296[45].*[13]\.[1-5].[[:xdigit:]]+$,1,cf_z13,core ^IBM.390[67].*[13]\.[1-5].[[:xdigit:]]+$,3,cf_z14,core -^IBM.856[12].*3\.6.[[:xdigit:]]+$,3,cf_m8561,core +^IBM.856[12].*3\.6.[[:xdigit:]]+$,3,cf_z15,core