From 9eabc5db08feee14fdaa55123d99b584c5108c2f Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <a.p.zijlstra@chello.nl>
Date: Fri, 11 Jun 2010 13:35:08 +0200
Subject: [PATCH] --- yaml --- r: 210539 b: refs/heads/master c:
 5e11637e2c929e34dcc0fbbfb48bdb638937701a h: refs/heads/master i:   210537:
 d7244fd9da24f24744ce405646d1ad5ef7c1400e   210535:
 ab0c5c4950f629698e1caf6972ddb6786a8d00a0 v: v3

---
 [refs]                    | 2 +-
 trunk/kernel/perf_event.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 68bc7f35fa36..53cb97985995 100644
--- 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
index 657555a5f30f..db5b56064687 100644
--- 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;