diff options
| author | Will Deacon <will.deacon@arm.com> | 2012-09-21 14:14:17 +0100 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2012-11-09 11:37:26 +0000 |
| commit | 288700d16d4c1479aa00e3db13caed8bb7c83e9f (patch) | |
| tree | 542c0de2197ec348de013d32329d03bb8f81f844 /arch | |
| parent | 2a4961ba89ffae388a553175db51dd58ce7c39a8 (diff) | |
| download | talos-obmc-linux-288700d16d4c1479aa00e3db13caed8bb7c83e9f.tar.gz talos-obmc-linux-288700d16d4c1479aa00e3db13caed8bb7c83e9f.zip | |
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/kernel/perf_event_cpu.c | 2 |
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; } |
