Merge branch 'for-4.3-unified-base' into for-4.3

[linux-beck.git] / include / linux / cgroup-defs.h

diff --git a/include/linux/cgroup-defs.h b/include/linux/cgroup-defs.h
index 83e37d8c4d80fe2f56948ba841728b78b7fe463c..4d8fcf2187dcaa822b8f629655e83d667a9913ac 100644 (file)
--- a/include/linux/cgroup-defs.h
+++ b/include/linux/cgroup-defs.h
@@ -323,7 +323,7 @@ struct cftype {
         * end of cftype array.
         */
        char name[MAX_CFTYPE_NAME];
-       int private;
+       unsigned long private;
        /*
         * If not 0, file mode is set to this value, otherwise it will
         * be figured out automatically
@@ -441,6 +441,9 @@ struct cgroup_subsys {
        int id;
        const char *name;
 
+       /* optional, initialized automatically during boot if not set */
+       const char *legacy_name;
+
        /* link to parent, protected by cgroup_lock() */
        struct cgroup_root *root;