summaryrefslogtreecommitdiffstats
path: root/kernel/nsproxy.c
diff options
context:
space:
mode:
authorCedric Le Goater <clg@fr.ibm.com>2007-07-15 23:40:58 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-16 09:05:47 -0700
commit7d69a1f4a72b18876c99c697692b78339d491568 (patch)
treec09faf07f15240592919ec7e3dd722fe4f1dd370 /kernel/nsproxy.c
parent522ed7767e800cff6c650ec64b0ee0677303119c (diff)
downloadlinux-stable-7d69a1f4a72b18876c99c697692b78339d491568.tar.gz
linux-stable-7d69a1f4a72b18876c99c697692b78339d491568.tar.bz2
linux-stable-7d69a1f4a72b18876c99c697692b78339d491568.zip
remove CONFIG_UTS_NS and CONFIG_IPC_NS
CONFIG_UTS_NS and CONFIG_IPC_NS have very little value as they only deactivate the unshare of the uts and ipc namespaces and do not improve performance. Signed-off-by: Cedric Le Goater <clg@fr.ibm.com> Acked-by: "Serge E. Hallyn" <serue@us.ibm.com> Cc: Eric W. Biederman <ebiederm@xmission.com> Cc: Herbert Poetzl <herbert@13thfloor.at> Cc: Pavel Emelianov <xemul@openvz.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/nsproxy.c')
-rw-r--r--kernel/nsproxy.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/kernel/nsproxy.c b/kernel/nsproxy.c
index 9e83b589f754..e38bed75367d 100644
--- a/kernel/nsproxy.c
+++ b/kernel/nsproxy.c
@@ -155,16 +155,6 @@ int unshare_nsproxy_namespaces(unsigned long unshare_flags,
if (!(unshare_flags & (CLONE_NEWNS | CLONE_NEWUTS | CLONE_NEWIPC)))
return 0;
-#ifndef CONFIG_IPC_NS
- if (unshare_flags & CLONE_NEWIPC)
- return -EINVAL;
-#endif
-
-#ifndef CONFIG_UTS_NS
- if (unshare_flags & CLONE_NEWUTS)
- return -EINVAL;
-#endif
-
if (!capable(CAP_SYS_ADMIN))
return -EPERM;