X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fcgroup.c;h=97f656eb5d8f4deaa850f4cd21cd6675bde4ec1c;hb=75399049653f2d5e22032da70cf96f20d7b4d9a6;hp=d6156c3924dbc8c281669d328e3bd2efc6ef1719;hpb=6da139137eb4b0ee68ca4aa4ddfdab02e8a5cf98;p=elogind.git

diff --git a/src/core/cgroup.c b/src/core/cgroup.c
index d6156c392..97f656eb5 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) {
+        if ((mask & CGROUP_MEMORY) & !is_root) {
                 if (c->memory_limit != (uint64_t) -1) {
                         char buf[DECIMAL_STR_MAX(uint64_t) + 1];