diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-23 14:06:25 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-23 14:06:25 -0400 |
| commit | d91e5d0f55cf70cdf8684a01f5df5fc6702afc3f (patch) | |
| tree | 8d211c84134a42c39a9e7f4b2e42a4b48459a583 | |
| parent | 57b48a255d94802cd967b8dc58cc938337632929 (diff) | |
| download | longterm-queue-4.12-d91e5d0f55cf70cdf8684a01f5df5fc6702afc3f.tar.gz | |
arm: drop ccn patch already applied
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/arm-ccn-perf-Prevent-module-unload-while-PMU-is-in-u.patch | 34 | ||||
| -rw-r--r-- | queue/series | 1 |
2 files changed, 0 insertions, 35 deletions
diff --git a/queue/arm-ccn-perf-Prevent-module-unload-while-PMU-is-in-u.patch b/queue/arm-ccn-perf-Prevent-module-unload-while-PMU-is-in-u.patch deleted file mode 100644 index 655d9ca..0000000 --- a/queue/arm-ccn-perf-Prevent-module-unload-while-PMU-is-in-u.patch +++ /dev/null @@ -1,34 +0,0 @@ -From c7f5828bf77dcbd61d51f4736c1d5aa35663fbb4 Mon Sep 17 00:00:00 2001 -From: Suzuki K Poulose <suzuki.poulose@arm.com> -Date: Fri, 3 Nov 2017 11:45:18 +0000 -Subject: [PATCH] arm-ccn: perf: Prevent module unload while PMU is in use - -commit c7f5828bf77dcbd61d51f4736c1d5aa35663fbb4 upstream. - -When the PMU driver is built as a module, the perf expects the -pmu->module to be valid, so that the driver is prevented from -being unloaded while it is in use. Fix the CCN pmu driver to -fill in this field. - -Fixes: a33b0daab73a0 ("bus: ARM CCN PMU driver") -Cc: Pawel Moll <pawel.moll@arm.com> -Cc: Will Deacon <will.deacon@arm.com> -Acked-by: Mark Rutland <mark.rutland@arm.com> -Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com> -Signed-off-by: Will Deacon <will.deacon@arm.com> - -diff --git a/drivers/bus/arm-ccn.c b/drivers/bus/arm-ccn.c -index e8c6946fed9d..3063f5312397 100644 ---- a/drivers/bus/arm-ccn.c -+++ b/drivers/bus/arm-ccn.c -@@ -1276,6 +1276,7 @@ static int arm_ccn_pmu_init(struct arm_ccn *ccn) - - /* Perf driver registration */ - ccn->dt.pmu = (struct pmu) { -+ .module = THIS_MODULE, - .attr_groups = arm_ccn_pmu_attr_groups, - .task_ctx_nr = perf_invalid_context, - .event_init = arm_ccn_pmu_event_init, --- -2.15.0 - diff --git a/queue/series b/queue/series index 573f111..b821e15 100644 --- a/queue/series +++ b/queue/series @@ -48,7 +48,6 @@ target-file-Do-not-return-error-for-UNMAP-if-length-.patch badblocks-fix-wrong-return-value-in-badblocks_set-if.patch iommu-amd-Limit-the-IOVA-page-range-to-the-specified.patch xfs-truncate-pagecache-before-writeback-in-xfs_setat.patch -arm-ccn-perf-Prevent-module-unload-while-PMU-is-in-u.patch crypto-tcrypt-fix-buffer-lengths-in-test_aead_speed.patch mm-Handle-0-flags-in-_calc_vm_trans-macro.patch net-hns3-Fix-a-misuse-to-devm_free_irq.patch |