---

yaml --- r: 339536 b: refs/heads/master c: 288700d h: refs/heads/master v: v3
git-mirror · Nov 9, 2012 · 0c497b5 · 0c497b5
1 parent 2ac2e61
commit 0c497b5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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;
 }