From 0c497b5bae318bce524d32add8e862c66ed90ae8 Mon Sep 17 00:00:00 2001
From: Will Deacon <will.deacon@arm.com>
Date: Fri, 21 Sep 2012 14:14:17 +0100
Subject: [PATCH] --- yaml --- r: 339536 b: refs/heads/master c:
 288700d16d4c1479aa00e3db13caed8bb7c83e9f h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/arm/kernel/perf_event_cpu.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1cdd5baab3df..33c09ef2fad0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2a4961ba89ffae388a553175db51dd58ce7c39a8
+refs/heads/master: 288700d16d4c1479aa00e3db13caed8bb7c83e9f
diff --git a/trunk/arch/arm/kernel/perf_event_cpu.c b/trunk/arch/arm/kernel/perf_event_cpu.c
index 71c824ce0203..db9c6b530f3c 100644
--- a/trunk/arch/arm/kernel/perf_event_cpu.c
+++ b/trunk/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;
 }