---

yaml --- r: 210539 b: refs/heads/master c: 5e11637 h: refs/heads/master i: 210537: d7244fd 210535: ab0c5c4 v: v3
git-mirror · Sep 9, 2010 · 9eabc5d · 9eabc5d
1 parent 1ed391a
commit 9eabc5d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9cb627d5f38830ca19aa0dca52d1d3a633018bf7
+refs/heads/master: 5e11637e2c929e34dcc0fbbfb48bdb638937701a
diff --git a/trunk/kernel/perf_event.c b/trunk/kernel/perf_event.c
@@ -5761,15 +5761,15 @@ perf_cpu_notify(struct notifier_block *self, unsigned long action, void *hcpu)
 {
 	unsigned int cpu = (long)hcpu;
 
-	switch (action) {
+	switch (action & ~CPU_TASKS_FROZEN) {
 
 	case CPU_UP_PREPARE:
-	case CPU_UP_PREPARE_FROZEN:
+	case CPU_DOWN_FAILED:
 		perf_event_init_cpu(cpu);
 		break;
 
+	case CPU_UP_CANCELED:
 	case CPU_DOWN_PREPARE:
-	case CPU_DOWN_PREPARE_FROZEN:
 		perf_event_exit_cpu(cpu);
 		break;