aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWill Deacon <will.deacon@arm.com>2012-09-21 14:14:17 +0100
committerSudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com>2012-10-09 15:01:52 +0100
commit6a52c5147252409b7801c4c48a3e55dd41d3f30f (patch)
tree072829897c927cf5da0f0cc007a83ceec0386624
parent4bddd71726d3a682bfa68bd3857aefb91e969a91 (diff)
ARM: perf: return NOTIFY_DONE from cpu notifier when no available PMU
When attempting to reset the PMU state for either a NULL PMU or a PMU implementation without a reset function, return NOTIFY_DONE from the CPU notifier as we don't care about the hotplug event. Signed-off-by: Will Deacon <will.deacon@arm.com>
-rw-r--r--arch/arm/kernel/perf_event_cpu.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/kernel/perf_event_cpu.c b/arch/arm/kernel/perf_event_cpu.c
index 71c824ce020..db9c6b530f3 100644
--- a/arch/arm/kernel/perf_event_cpu.c
+++ b/arch/arm/kernel/perf_event_cpu.c
@@ -165,6 +165,8 @@ static int __cpuinit cpu_pmu_notify(struct notifier_block *b,
if (cpu_pmu && cpu_pmu->reset)
cpu_pmu->reset(cpu_pmu);
+ else
+ return NOTIFY_DONE;
return NOTIFY_OK;
}