diff options
| author | Suzuki K Poulose <suzuki.poulose@arm.com> | 2017-11-03 11:45:18 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-12-20 10:01:32 +0100 |
| commit | 5ae69f4575f0de451d5517a901824240aa552ccf (patch) | |
| tree | cde1e82149443dde6177c66e86c1fa1acb6d5d2a | |
| parent | 8948ed2f5fe4e6d567ba74426c8de6bdb46f8a1a (diff) | |
| download | linux-stable-5ae69f4575f0de451d5517a901824240aa552ccf.tar.gz linux-stable-5ae69f4575f0de451d5517a901824240aa552ccf.tar.bz2 linux-stable-5ae69f4575f0de451d5517a901824240aa552ccf.zip | |
arm-ccn: perf: Prevent module unload while PMU is in use
[ Upstream commit c7f5828bf77dcbd61d51f4736c1d5aa35663fbb4 ]
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>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/bus/arm-ccn.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/bus/arm-ccn.c b/drivers/bus/arm-ccn.c index 4d523cfe51ce..31342fccd290 100644 --- a/drivers/bus/arm-ccn.c +++ b/drivers/bus/arm-ccn.c @@ -1157,6 +1157,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, |