X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fcgroup.h;h=3bcf6868137b3bb07d2143753fe4a7ab439454e9;hb=e916c1378b697b1f267d021a823bbfcb5ac8376c;hp=eb1694294fd6415e4264c8ec9d22d4d741ef6a0e;hpb=53462de8f5848bcad67df7a9819efa7f8e481a69;p=elogind.git

diff --git a/src/core/cgroup.h b/src/core/cgroup.h
index eb1694294..3bcf68681 100644
--- a/src/core/cgroup.h
+++ b/src/core/cgroup.h
@@ -90,6 +90,10 @@ struct CGroupContext {
         bool tasks_accounting;
 
         /* For unified hierarchy */
+        uint64_t cpu_weight;
+        uint64_t startup_cpu_weight;
+        usec_t cpu_quota_per_sec_usec;
+
         uint64_t io_weight;
         uint64_t startup_io_weight;
         LIST_HEAD(CGroupIODeviceWeight, io_device_weights);
@@ -102,7 +106,6 @@ struct CGroupContext {
         /* For legacy hierarchies */
         uint64_t cpu_shares;
         uint64_t startup_cpu_shares;
-        usec_t cpu_quota_per_sec_usec;
 
         uint64_t blockio_weight;
         uint64_t startup_blockio_weight;
@@ -155,7 +158,6 @@ int unit_watch_cgroup(Unit *u);
 int unit_attach_pids_to_cgroup(Unit *u);
 #else
 # include "logind.h"
-# define MANAGER_IS_SYSTEM(m) (1)
 #endif // 0
 
 int manager_setup_cgroup(Manager *m);
@@ -179,8 +181,10 @@ int unit_reset_cpu_usage(Unit *u);
 bool unit_cgroup_delegate(Unit *u);
 
 int unit_notify_cgroup_empty(Unit *u);
+#endif // 0
 int manager_notify_cgroup_empty(Manager *m, const char *group);
 
+#if 0 /// UNNEEDED by elogind
 void unit_invalidate_cgroup(Unit *u, CGroupMask m);
 
 void manager_invalidate_startup_units(Manager *m);