diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-03 23:12:44 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-03 23:12:44 -0400 |
| commit | cd009a75d7bbf07abc2723c007803e8e883014c2 (patch) | |
| tree | 14835081bbd8622016609ccd897b210abee469cd | |
| parent | 88122cdaec26febb43ccff5e738f44b2dbfb52bf (diff) | |
| download | longterm-queue-4.12-cd009a75d7bbf07abc2723c007803e8e883014c2.tar.gz | |
ppc: drop perf patch n/a to 4.12
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/powerpc-perf-Fix-pmu_count-to-count-only-nest-imc-pm.patch | 35 | ||||
| -rw-r--r-- | queue/series | 1 |
2 files changed, 0 insertions, 36 deletions
diff --git a/queue/powerpc-perf-Fix-pmu_count-to-count-only-nest-imc-pm.patch b/queue/powerpc-perf-Fix-pmu_count-to-count-only-nest-imc-pm.patch deleted file mode 100644 index 1b1bd1c..0000000 --- a/queue/powerpc-perf-Fix-pmu_count-to-count-only-nest-imc-pm.patch +++ /dev/null @@ -1,35 +0,0 @@ -From de34787f1096cce38e2590be0013b44418d14546 Mon Sep 17 00:00:00 2001 -From: Madhavan Srinivasan <maddy@linux.vnet.ibm.com> -Date: Wed, 22 Nov 2017 10:45:38 +0530 -Subject: [PATCH] powerpc/perf: Fix pmu_count to count only nest imc pmus - -commit de34787f1096cce38e2590be0013b44418d14546 upstream. - -"pmu_count" in opal_imc_counters_probe() is intended to hold -the number of successful nest imc pmu registerations. But -current code also counts other imc units like core_imc and -thread_imc. Patch add a check to count only nest imc pmus. - -Signed-off-by: Madhavan Srinivasan <maddy@linux.vnet.ibm.com> -Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> - -diff --git a/arch/powerpc/platforms/powernv/opal-imc.c b/arch/powerpc/platforms/powernv/opal-imc.c -index 21f6531fae20..b150f4deaccf 100644 ---- a/arch/powerpc/platforms/powernv/opal-imc.c -+++ b/arch/powerpc/platforms/powernv/opal-imc.c -@@ -191,8 +191,10 @@ static int opal_imc_counters_probe(struct platform_device *pdev) - break; - } - -- if (!imc_pmu_create(imc_dev, pmu_count, domain)) -- pmu_count++; -+ if (!imc_pmu_create(imc_dev, pmu_count, domain)) { -+ if (domain == IMC_DOMAIN_NEST) -+ pmu_count++; -+ } - } - - return 0; --- -2.15.0 - diff --git a/queue/series b/queue/series index 807efdc..e042e84 100644 --- a/queue/series +++ b/queue/series @@ -65,7 +65,6 @@ ARM-avoid-faulting-on-qemu.patch irqchip-qcom-Fix-u32-comparison-with-value-less-than.patch kbuild-pkg-use-transform-option-to-prefix-paths-in-t.patch coccinelle-fix-parallel-build-with-CHECK-scripts-coc.patch -powerpc-perf-Fix-pmu_count-to-count-only-nest-imc-pm.patch x86-mpx-selftests-Fix-up-weird-arrays.patch mac80211_hwsim-Fix-memory-leak-in-hwsim_new_radio_nl.patch gre6-use-log_ecn_error-module-parameter-in-ip6_tnl_r.patch |