diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-06-17 12:29:16 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-06-17 12:29:16 +0200 |
| commit | bddb3636737f658886a0a02b64db5366bba3428e (patch) | |
| tree | 8f7ffcb42803fa0bb3378ef969545e4a5e57262c /include/linux/cgroup-defs.h | |
| parent | 3384c78631dd722c2cdc5c57fbdd39fc1b5a9f2d (diff) | |
| parent | cbb99c0f588737ec98c333558922ce47e9a95827 (diff) | |
| download | linux-next-bddb3636737f658886a0a02b64db5366bba3428e.tar.gz linux-next-bddb3636737f658886a0a02b64db5366bba3428e.zip | |
Merge branch 'x86/cpu' into perf/core, to pick up dependent changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/cgroup-defs.h')
| -rw-r--r-- | include/linux/cgroup-defs.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/cgroup-defs.h b/include/linux/cgroup-defs.h index 11e215d7937e..d71b079bb021 100644 --- a/include/linux/cgroup-defs.h +++ b/include/linux/cgroup-defs.h @@ -106,6 +106,8 @@ enum { CFTYPE_WORLD_WRITABLE = (1 << 4), /* (DON'T USE FOR NEW FILES) S_IWUGO */ CFTYPE_DEBUG = (1 << 5), /* create when cgroup_debug */ + CFTYPE_SYMLINKED = (1 << 6), /* pointed to by symlink too */ + /* internal flags, do not use outside cgroup core proper */ __CFTYPE_ONLY_ON_DFL = (1 << 16), /* only on default hierarchy */ __CFTYPE_NOT_ON_DFL = (1 << 17), /* not on default hierarchy */ @@ -543,6 +545,7 @@ struct cftype { * end of cftype array. */ char name[MAX_CFTYPE_NAME]; + char link_name[MAX_CFTYPE_NAME]; unsigned long private; /* |