summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorKirill A. Shutemov <kirill@shutemov.name>2012-04-12 12:49:11 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-04-12 13:12:11 -0700
commitd833049bd20570cbbadeb5228c579f9f3aaa4e03 (patch)
tree2995af0705ce161cba50739048e90b89ea3991e2 /mm
parent6252efcc3626bdcde1c1c2d8a83be0bc66b8cc2c (diff)
downloadlinux-d833049bd20570cbbadeb5228c579f9f3aaa4e03.tar.gz
linux-d833049bd20570cbbadeb5228c579f9f3aaa4e03.tar.bz2
linux-d833049bd20570cbbadeb5228c579f9f3aaa4e03.zip
memcg: fix broken boolen expression
action != CPU_DEAD || action != CPU_DEAD_FROZEN is always true. Signed-off-by: Kirill A. Shutemov <kirill@shutemov.name> Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Acked-by: Michal Hocko <mhocko@suse.cz> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/memcontrol.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 7d698df4a067..ea1e879b2db6 100644
--- a/mm/memcontrol.c
+++ b/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)