Commit c7f5828b authored Nov 03, 2017 by Suzuki K Poulose Committed by Will Deacon Nov 03, 2017

arm-ccn: perf: Prevent module unload while PMU is in use

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: a33b0daa ("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>

parent 19b4aff2

drivers/bus/arm-ccn.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1276,6 +1276,7 @@ static int arm_ccn_pmu_init(struct arm_ccn *ccn)

	/* Perf driver registration */		/* Perf driver registration */
	ccn->dt.pmu = (struct pmu) {		ccn->dt.pmu = (struct pmu) {
			.module = THIS_MODULE,
	.attr_groups = arm_ccn_pmu_attr_groups,		.attr_groups = arm_ccn_pmu_attr_groups,
	.task_ctx_nr = perf_invalid_context,		.task_ctx_nr = perf_invalid_context,
	.event_init = arm_ccn_pmu_event_init,		.event_init = arm_ccn_pmu_event_init,