ARM: perf: return NOTIFY_DONE from cpu notifier when no available PMU
authorWill Deacon <will.deacon@arm.com>
Fri, 21 Sep 2012 13:14:17 +0000 (14:14 +0100)
committerWill Deacon <will.deacon@arm.com>
Fri, 9 Nov 2012 11:37:26 +0000 (11:37 +0000)
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>
arch/arm/kernel/perf_event_cpu.c

index 71c824ce0203b6302b5483bf23d94f5908ae38fd..db9c6b530f3c8c9e02c77311bafa7c7c538d2fc6 100644 (file)
@@ -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;
 }