---

yaml --- r: 299057 b: refs/heads/master c: d833049 h: refs/heads/master i: 299055: a23e860 v: v3
git-mirror · Apr 12, 2012 · fd3c19b · fd3c19b
1 parent 22b98f5
commit fd3c19b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6252efcc3626bdcde1c1c2d8a83be0bc66b8cc2c
+refs/heads/master: d833049bd20570cbbadeb5228c579f9f3aaa4e03
diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c
@@ -2165,7 +2165,7 @@ static int __cpuinit memcg_cpu_hotplug_callback(struct notifier_block *nb,
 	if (action == CPU_ONLINE)
 		return NOTIFY_OK;
 
-	if ((action != CPU_DEAD) || action != CPU_DEAD_FROZEN)
+	if (action != CPU_DEAD && action != CPU_DEAD_FROZEN)
 		return NOTIFY_OK;
 
 	for_each_mem_cgroup(iter)