chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
util: make it easy to initialize the crtime from the current time in fd_setcrtime()
[elogind.git]
/
src
/
core
/
cgroup.c
diff --git
a/src/core/cgroup.c
b/src/core/cgroup.c
index d6156c3924dbc8c281669d328e3bd2efc6ef1719..97f656eb5d8f4deaa850f4cd21cd6675bde4ec1c 100644
(file)
--- 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];