summaryrefslogtreecommitdiff
path: root/include/linux/cgroup-defs.h
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2015-08-25 21:19:29 +0300
committerTejun Heo <tj@kernel.org>2015-08-25 21:19:29 +0300
commit20f1f4b5ffb870631bf4a4e7c7ba10e3528ae6a6 (patch)
treed5349c9c4844e37eff6eda7c3a78d5d9970b9ee8 /include/linux/cgroup-defs.h
parentce52399520e4b97466165737e00c7b528ae8c8f5 (diff)
parent3e1d2eed39d804e48282931835c7203fa47fe1d9 (diff)
downloadlinux-20f1f4b5ffb870631bf4a4e7c7ba10e3528ae6a6.tar.xz
Merge branch 'for-4.3-unified-base' into for-4.3
Diffstat (limited to 'include/linux/cgroup-defs.h')
-rw-r--r--include/linux/cgroup-defs.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/cgroup-defs.h b/include/linux/cgroup-defs.h
index 83e37d8c4d80..4d8fcf2187dc 100644
--- 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;