diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2020-08-21 13:04:01 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2020-08-21 13:04:01 -0400 |
| commit | 7ffc5b4febe5e5f449f698d8461771a8cfe02601 (patch) | |
| tree | 9f8515015334f214ac79d8ae3f7a65d289a097ce | |
| parent | e5d2b59a54ed583e456f7f9ec26aa9bcfb32529e (diff) | |
| download | longterm-queue-5.2-7ffc5b4febe5e5f449f698d8461771a8cfe02601.tar.gz | |
perf: arm_spe: ctxt refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/perf-tools-Fix-record-failure-when-mixed-with-ARM-SP.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/queue/perf-tools-Fix-record-failure-when-mixed-with-ARM-SP.patch b/queue/perf-tools-Fix-record-failure-when-mixed-with-ARM-SP.patch index db308ecd..9840292e 100644 --- a/queue/perf-tools-Fix-record-failure-when-mixed-with-ARM-SP.patch +++ b/queue/perf-tools-Fix-record-failure-when-mixed-with-ARM-SP.patch @@ -1,4 +1,4 @@ -From bd3c628f8fafa6cbd6a1ca440034b841f0080160 Mon Sep 17 00:00:00 2001 +From 38b7aa009031b54b36a2127ad97249a956616407 Mon Sep 17 00:00:00 2001 From: Wei Li <liwei391@huawei.com> Date: Fri, 24 Jul 2020 15:11:10 +0800 Subject: [PATCH] perf tools: Fix record failure when mixed with ARM SPE event @@ -47,20 +47,20 @@ Link: http://lore.kernel.org/lkml/20200724071111.35593-2-liwei391@huawei.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> diff --git a/tools/perf/arch/arm/util/auxtrace.c b/tools/perf/arch/arm/util/auxtrace.c -index 0a6e75b8777a..28a5d0c18b1d 100644 +index 1ce6bdbda561..b9d471a0babd 100644 --- a/tools/perf/arch/arm/util/auxtrace.c +++ b/tools/perf/arch/arm/util/auxtrace.c -@@ -56,7 +56,7 @@ struct auxtrace_record +@@ -54,7 +54,7 @@ struct auxtrace_record struct perf_pmu *cs_etm_pmu; - struct evsel *evsel; + struct perf_evsel *evsel; bool found_etm = false; - bool found_spe = false; + struct perf_pmu *found_spe = NULL; static struct perf_pmu **arm_spe_pmus = NULL; static int nr_spes = 0; int i = 0; -@@ -74,12 +74,12 @@ struct auxtrace_record - evsel->core.attr.type == cs_etm_pmu->type) +@@ -72,12 +72,12 @@ struct auxtrace_record + evsel->attr.type == cs_etm_pmu->type) found_etm = true; - if (!nr_spes) @@ -68,13 +68,13 @@ index 0a6e75b8777a..28a5d0c18b1d 100644 continue; for (i = 0; i < nr_spes; i++) { - if (evsel->core.attr.type == arm_spe_pmus[i]->type) { + if (evsel->attr.type == arm_spe_pmus[i]->type) { - found_spe = true; + found_spe = arm_spe_pmus[i]; break; } } -@@ -96,7 +96,7 @@ struct auxtrace_record +@@ -94,7 +94,7 @@ struct auxtrace_record #if defined(__aarch64__) if (found_spe) |