diff options
| author | Rich Felker <dalias@libc.org> | 2016-03-30 00:53:03 +0300 |
|---|---|---|
| committer | Rich Felker <dalias@libc.org> | 2016-03-30 00:53:03 +0300 |
| commit | 16b02d711f4059b8338ef967064195b47cae65ea (patch) | |
| tree | 6d3e0b7629210b56f8d6cfa39184c878d8a15367 /fs/proc/namespaces.c | |
| parent | b15d53d009558d14c4f394a6d1fa2039c7f45c43 (diff) | |
| parent | f55532a0c0b8bb6148f4e07853b876ef73bc69ca (diff) | |
| download | linux-16b02d711f4059b8338ef967064195b47cae65ea.tar.xz | |
Merge tag 'v4.6-rc1'
Linux 4.6-rc1
Diffstat (limited to 'fs/proc/namespaces.c')
| -rw-r--r-- | fs/proc/namespaces.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/proc/namespaces.c b/fs/proc/namespaces.c index 276f12431dbf..72cb26f85d58 100644 --- a/fs/proc/namespaces.c +++ b/fs/proc/namespaces.c @@ -28,6 +28,9 @@ static const struct proc_ns_operations *ns_entries[] = { &userns_operations, #endif &mntns_operations, +#ifdef CONFIG_CGROUPS + &cgroupns_operations, +#endif }; static const char *proc_ns_get_link(struct dentry *dentry, |