From e109cdbf3cb653efa3c1e0298c5a66ff9aae4e5f Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 7 Mar 2012 08:21:19 -0800
Subject: [PATCH] --- yaml --- r: 288307 b: refs/heads/master c:
 4293f20c19f44ca66e5ac836b411d25e14b9f185 h: refs/heads/master i:   288305:
 6b46eab2fba6134a15ae570e444c3974888d57c8   288303:
 bcf63a2cd45b8b56ab9ee076cd438b50748d35a8 v: v3

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

diff --git a/[refs] b/[refs]
index 051494f1893a..35c80efc13b0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dac12d1f5ef228e132c2457dc214e0703533b016
+refs/heads/master: 4293f20c19f44ca66e5ac836b411d25e14b9f185
diff --git a/trunk/kernel/sched/core.c b/trunk/kernel/sched/core.c
index 33a0676ea744..b342f57879e6 100644
--- a/trunk/kernel/sched/core.c
+++ b/trunk/kernel/sched/core.c
@@ -6728,7 +6728,7 @@ int __init sched_create_sysfs_power_savings_entries(struct device *dev)
 static int cpuset_cpu_active(struct notifier_block *nfb, unsigned long action,
 			     void *hcpu)
 {
-	switch (action) {
+	switch (action & ~CPU_TASKS_FROZEN) {
 	case CPU_ONLINE:
 	case CPU_DOWN_FAILED:
 		cpuset_update_active_cpus();
@@ -6741,7 +6741,7 @@ static int cpuset_cpu_active(struct notifier_block *nfb, unsigned long action,
 static int cpuset_cpu_inactive(struct notifier_block *nfb, unsigned long action,
 			       void *hcpu)
 {
-	switch (action) {
+	switch (action & ~CPU_TASKS_FROZEN) {
 	case CPU_DOWN_PREPARE:
 		cpuset_update_active_cpus();
 		return NOTIFY_OK;