X-Git-Url: http://git.monstr.eu/?a=blobdiff_plain;f=tools%2Ftesting%2Fselftests%2Fcgroup%2Ftest_memcontrol.c;h=00b430e7f2a2c7a4102bf042f948b35d5eb598a8;hb=c85bcc912f4f404bf6eaf4b6bdb8480ef2c2faa1;hp=36ccf2322e216f61d6201c9b9e1033aca101f0ea;hpb=13043d1a12c54d8b6605bbead5e177e9fb98a287;p=linux-2.6-microblaze.git diff --git a/tools/testing/selftests/cgroup/test_memcontrol.c b/tools/testing/selftests/cgroup/test_memcontrol.c index 36ccf2322e21..00b430e7f2a2 100644 --- a/tools/testing/selftests/cgroup/test_memcontrol.c +++ b/tools/testing/selftests/cgroup/test_memcontrol.c @@ -1079,7 +1079,8 @@ cleanup: /* * This test disables swapping and tries to allocate anonymous memory * up to OOM with memory.group.oom set. Then it checks that all - * processes in the leaf (but not the parent) were killed. + * processes in the leaf were killed. It also checks that oom_events + * were propagated to the parent level. */ static int test_memcg_oom_group_leaf_events(const char *root) { @@ -1122,7 +1123,7 @@ static int test_memcg_oom_group_leaf_events(const char *root) if (cg_read_key_long(child, "memory.events", "oom_kill ") <= 0) goto cleanup; - if (cg_read_key_long(parent, "memory.events", "oom_kill ") != 0) + if (cg_read_key_long(parent, "memory.events", "oom_kill ") <= 0) goto cleanup; ret = KSFT_PASS;