From fd3c19babd6d72be6db229f83ec485df02745993 Mon Sep 17 00:00:00 2001 From: "Kirill A. Shutemov" Date: Thu, 12 Apr 2012 12:49:11 -0700 Subject: [PATCH] --- yaml --- r: 299057 b: refs/heads/master c: d833049bd20570cbbadeb5228c579f9f3aaa4e03 h: refs/heads/master i: 299055: a23e86057709a7c3edc63e43195f5eb58f0c3cac v: v3 --- [refs] | 2 +- trunk/mm/memcontrol.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 745a6ac3c4f6..d284b1e2f469 100644 --- 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 index 7d698df4a067..ea1e879b2db6 100644 --- 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)