---

yaml --- r: 321799 b: refs/heads/master c: 63c6ba4 h: refs/heads/master i: 321797: 90bd2e9 321795: e2b27c3 321791: 48e0096 v: v3
git-mirror · Aug 17, 2012 · 2e5ba74 · 2e5ba74
1 parent d103416
commit 2e5ba74
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 55d7ec4520e86d735d178c15d7df33d507bd43c6
+refs/heads/master: 63c6ba4352009a5f85b32307c001abeb5baebd28
diff --git a/trunk/drivers/cpuidle/coupled.c b/trunk/drivers/cpuidle/coupled.c
@@ -678,6 +678,18 @@ static int cpuidle_coupled_cpu_notify(struct notifier_block *nb,
 	int cpu = (unsigned long)hcpu;
 	struct cpuidle_device *dev;
 
+	switch (action & ~CPU_TASKS_FROZEN) {
+	case CPU_UP_PREPARE:
+	case CPU_DOWN_PREPARE:
+	case CPU_ONLINE:
+	case CPU_DEAD:
+	case CPU_UP_CANCELED:
+	case CPU_DOWN_FAILED:
+		break;
+	default:
+		return NOTIFY_OK;
+	}
+
 	mutex_lock(&cpuidle_lock);
 
 	dev = per_cpu(cpuidle_devices, cpu);