Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[karo-tx-linux.git] / fs / proc / namespaces.c

diff --git a/fs/proc/namespaces.c b/fs/proc/namespaces.c
index 276f12431dbfccdeb4add56a226c07d6062af38b..72cb26f85d58dce643936b7c447cb9b56b9bd7d3 100644 (file)
--- 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,