aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWill Deacon <will.deacon@arm.com>2012-09-21 14:14:17 +0100
committerViresh Kumar <viresh.kumar@linaro.org>2012-11-14 09:08:13 +0530
commitdbb9cfec3c0a59d9affe7fea266adec7efb3acb7 (patch)
treed64f334fb4fd3fcc7c1d4ffd37ffa053d24cd77b
parent8c98428b73b5b5fd73735cd423664ab89bdbed11 (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 71c824ce0203..db9c6b530f3c 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;
}