diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2020-08-17 14:06:39 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2020-08-17 14:06:39 -0400 |
| commit | 7788ff8ea0c653901ad12fd94096d9f973fc9a0a (patch) | |
| tree | c92f299cddd1872de93c95d632902ee5c7f6fb8e | |
| parent | 587d3d06d5b9d9748d91118ea2edd8be35dd50b5 (diff) | |
| download | longterm-queue-5.2-7788ff8ea0c653901ad12fd94096d9f973fc9a0a.tar.gz | |
perf: drop fsl DDR chunk ; code not present in v5.2
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/drivers-perf-Fix-kernel-panic-when-rmmod-PMU-modules.patch | 31 |
1 files changed, 10 insertions, 21 deletions
diff --git a/queue/drivers-perf-Fix-kernel-panic-when-rmmod-PMU-modules.patch b/queue/drivers-perf-Fix-kernel-panic-when-rmmod-PMU-modules.patch index 6f73773c..ab6beb41 100644 --- a/queue/drivers-perf-Fix-kernel-panic-when-rmmod-PMU-modules.patch +++ b/queue/drivers-perf-Fix-kernel-panic-when-rmmod-PMU-modules.patch @@ -1,4 +1,4 @@ -From bdc5c744c7b6457d18a95c26769dad0e7f480a08 Mon Sep 17 00:00:00 2001 +From be843d6b1cc806336a24c0b9caca8a1a47a6662f Mon Sep 17 00:00:00 2001 From: Qi Liu <liuqi115@huawei.com> Date: Thu, 16 Jul 2020 17:19:25 +0800 Subject: [PATCH] drivers/perf: Fix kernel panic when rmmod PMU modules during @@ -53,12 +53,13 @@ Signed-off-by: Qi Liu <liuqi115@huawei.com> Reviewed-by: John Garry <john.garry@huawei.com> Link: https://lore.kernel.org/r/1594891165-8228-1-git-send-email-liuqi115@huawei.com Signed-off-by: Will Deacon <will@kernel.org> +[PG: drop fsl DDR portion ; not present until v5.3+ kernels.] diff --git a/drivers/perf/arm_smmuv3_pmu.c b/drivers/perf/arm_smmuv3_pmu.c -index 48e28ef93a70..90caba56dfbc 100644 +index 10f335b64931..f22e223cc3b3 100644 --- a/drivers/perf/arm_smmuv3_pmu.c +++ b/drivers/perf/arm_smmuv3_pmu.c -@@ -742,6 +742,7 @@ static int smmu_pmu_probe(struct platform_device *pdev) +@@ -715,6 +715,7 @@ static int smmu_pmu_probe(struct platform_device *pdev) platform_set_drvdata(pdev, smmu_pmu); smmu_pmu->pmu = (struct pmu) { @@ -66,23 +67,11 @@ index 48e28ef93a70..90caba56dfbc 100644 .task_ctx_nr = perf_invalid_context, .pmu_enable = smmu_pmu_enable, .pmu_disable = smmu_pmu_disable, -diff --git a/drivers/perf/fsl_imx8_ddr_perf.c b/drivers/perf/fsl_imx8_ddr_perf.c -index 90884d14f95f..2aed2d96f8ae 100644 ---- a/drivers/perf/fsl_imx8_ddr_perf.c -+++ b/drivers/perf/fsl_imx8_ddr_perf.c -@@ -512,6 +512,7 @@ static int ddr_perf_init(struct ddr_pmu *pmu, void __iomem *base, - { - *pmu = (struct ddr_pmu) { - .pmu = (struct pmu) { -+ .module = THIS_MODULE, - .capabilities = PERF_PMU_CAP_NO_EXCLUDE, - .task_ctx_nr = perf_invalid_context, - .attr_groups = attr_groups, diff --git a/drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c b/drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c -index 15713faaa07e..71587f19fcd5 100644 +index 6ad0823bcf23..1066753bb461 100644 --- a/drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c +++ b/drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c -@@ -378,6 +378,7 @@ static int hisi_ddrc_pmu_probe(struct platform_device *pdev) +@@ -383,6 +383,7 @@ static int hisi_ddrc_pmu_probe(struct platform_device *pdev) ddrc_pmu->sccl_id, ddrc_pmu->index_id); ddrc_pmu->pmu = (struct pmu) { .name = name, @@ -91,10 +80,10 @@ index 15713faaa07e..71587f19fcd5 100644 .event_init = hisi_uncore_pmu_event_init, .pmu_enable = hisi_uncore_pmu_enable, diff --git a/drivers/perf/hisilicon/hisi_uncore_hha_pmu.c b/drivers/perf/hisilicon/hisi_uncore_hha_pmu.c -index dcc5600788a9..c199de7b219d 100644 +index cbc65451b248..2643b73fc869 100644 --- a/drivers/perf/hisilicon/hisi_uncore_hha_pmu.c +++ b/drivers/perf/hisilicon/hisi_uncore_hha_pmu.c -@@ -390,6 +390,7 @@ static int hisi_hha_pmu_probe(struct platform_device *pdev) +@@ -394,6 +394,7 @@ static int hisi_hha_pmu_probe(struct platform_device *pdev) hha_pmu->sccl_id, hha_pmu->index_id); hha_pmu->pmu = (struct pmu) { .name = name, @@ -103,10 +92,10 @@ index dcc5600788a9..c199de7b219d 100644 .event_init = hisi_uncore_pmu_event_init, .pmu_enable = hisi_uncore_pmu_enable, diff --git a/drivers/perf/hisilicon/hisi_uncore_l3c_pmu.c b/drivers/perf/hisilicon/hisi_uncore_l3c_pmu.c -index 7719ae4e2c56..567d7e6f69d8 100644 +index 3bf9c820dc74..371fa02ceb54 100644 --- a/drivers/perf/hisilicon/hisi_uncore_l3c_pmu.c +++ b/drivers/perf/hisilicon/hisi_uncore_l3c_pmu.c -@@ -380,6 +380,7 @@ static int hisi_l3c_pmu_probe(struct platform_device *pdev) +@@ -384,6 +384,7 @@ static int hisi_l3c_pmu_probe(struct platform_device *pdev) l3c_pmu->sccl_id, l3c_pmu->index_id); l3c_pmu->pmu = (struct pmu) { .name = name, |