Merge tag 'boards-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[~andy/linux] / include / linux / cgroup.h

diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
index 8b9a594f0c929ada4b79c911da06b0f106ba2f0e..5c097596104b80535a0a00bdd45b4a2441fac889 100644 (file)
--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
@@ -29,7 +29,6 @@ struct cgroupfs_root;
 struct cgroup_subsys;
 struct inode;
 struct cgroup;
-struct css_id;
 
 extern int cgroup_init_early(void);
 extern int cgroup_init(void);
@@ -79,8 +78,6 @@ struct cgroup_subsys_state {
        struct cgroup_subsys_state *parent;
 
        unsigned long flags;
-       /* ID for this css, if possible */
-       struct css_id __rcu *id;
 
        /* percpu_ref killing and RCU release */
        struct rcu_head rcu_head;
@@ -319,9 +316,6 @@ struct cgroupfs_root {
        /* Unique id for this hierarchy. */
        int hierarchy_id;
 
-       /* A list running through the attached subsystems */
-       struct list_head subsys_list;
-
        /* The root cgroup for this hierarchy */
        struct cgroup top_cgroup;
 
@@ -617,12 +611,8 @@ struct cgroup_subsys {
 #define MAX_CGROUP_TYPE_NAMELEN 32
        const char *name;
 
-       /*
-        * Link to parent, and list entry in parent's children.
-        * Protected by cgroup_lock()
-        */
+       /* link to parent, protected by cgroup_lock() */
        struct cgroupfs_root *root;
-       struct list_head sibling;
 
        /* list of cftype_sets */
        struct list_head cftsets;