X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fcgroup.c;h=10fdcc9984e39f4a5171c77d68c750d7b7d3d490;hb=b44787bd437f4051660272b37bd6f75392f17931;hp=64d00b16b6bb75394a261511433f1be858aca032;hpb=cc98b3025eeb89addb76a27390cb2baca4eab8b9;p=elogind.git

diff --git a/src/core/cgroup.c b/src/core/cgroup.c
index 64d00b16b..10fdcc998 100644
--- a/src/core/cgroup.c
+++ b/src/core/cgroup.c
@@ -380,7 +380,7 @@ void cgroup_context_apply(CGroupContext *c, CGroupControllerMask mask, const cha
                 }
         }
 
-        if ((mask & CGROUP_MEMORY) & !is_root) {
+        if ((mask & CGROUP_MEMORY) && !is_root) {
                 if (c->memory_limit != (uint64_t) -1) {
                         char buf[DECIMAL_STR_MAX(uint64_t) + 1];