summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@openvz.org>2008-02-08 15:18:21 +0300
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-08 20:22:23 +0300
commit58bfdd6deeec02b73691ea2c951a3c5d743bca63 (patch)
tree8f46771858dee87080b0ed64bc176b25c239f3b1 /init
parentc5289a69491f2b597e22d0456b46cc043deedbd8 (diff)
downloadlinux-58bfdd6deeec02b73691ea2c951a3c5d743bca63.tar.xz
namespaces: move the UTS namespace under UTS_NS option
Currently all the namespace management code is in the kernel/utsname.c file, so just compile it out and make stubs in the appropriate header. The init namespace itself is in init/version.c and is in the kernel all the time. Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Acked-by: Serge Hallyn <serue@us.ibm.com> Cc: Cedric Le Goater <clg@fr.ibm.com> Cc: "Eric W. Biederman" <ebiederm@xmission.com> Cc: Herbert Poetzl <herbert@13thfloor.at> Cc: Kirill Korotaev <dev@sw.ru> Cc: Sukadev Bhattiprolu <sukadev@us.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'init')
-rw-r--r--init/Kconfig7
1 files changed, 7 insertions, 0 deletions
diff --git a/init/Kconfig b/init/Kconfig
index 7654207961a2..fef641af78c2 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -429,6 +429,13 @@ config NAMESPACES
or same user id or pid may refer to different tasks when used in
different namespaces.
+config UTS_NS
+ bool "UTS namespace"
+ depends on NAMESPACES
+ help
+ In this namespace tasks see different info provided with the
+ uname() system call
+
config BLK_DEV_INITRD
bool "Initial RAM filesystem and RAM disk (initramfs/initrd) support"
depends on BROKEN || !FRV