aboutsummaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@openvz.org>2008-02-08 07:18:23 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-08 12:22:23 -0500
commitaee16ce73c71a241190cef3aaa265f6a3ab8e035 (patch)
treeccfded2678d36af2d4ba9ad106240acf65173b28 /init
parentae5e1b22f17983da929a0d0178896269e19da186 (diff)
namespaces: cleanup the code managed with the USER_NS option
Make the user_namespace.o compilation depend on this option and move the init_user_ns into user.c file to make the kernel compile and work without the namespaces support. This make the user namespace code be organized similar to other namespaces'. Also mask the USER_NS option as "depend on NAMESPACES". [akpm@linux-foundation.org: coding-style fixes] 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/Kconfig17
1 files changed, 8 insertions, 9 deletions
diff --git a/init/Kconfig b/init/Kconfig
index 47879a874966..2a6499d6f283 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -214,15 +214,6 @@ config TASK_IO_ACCOUNTING
214 214
215 Say N if unsure. 215 Say N if unsure.
216 216
217config USER_NS
218 bool "User Namespaces (EXPERIMENTAL)"
219 default n
220 depends on EXPERIMENTAL
221 help
222 Support user namespaces. This allows containers, i.e.
223 vservers, to use user namespaces to provide different
224 user info for different servers. If unsure, say N.
225
226config PID_NS 217config PID_NS
227 bool "PID Namespaces (EXPERIMENTAL)" 218 bool "PID Namespaces (EXPERIMENTAL)"
228 default n 219 default n
@@ -443,6 +434,14 @@ config IPC_NS
443 In this namespace tasks work with IPC ids which correspond to 434 In this namespace tasks work with IPC ids which correspond to
444 different IPC objects in different namespaces 435 different IPC objects in different namespaces
445 436
437config USER_NS
438 bool "User namespace (EXPERIMENTAL)"
439 depends on NAMESPACES && EXPERIMENTAL
440 help
441 This allows containers, i.e. vservers, to use user namespaces
442 to provide different user info for different servers.
443 If unsure, say N.
444
446config BLK_DEV_INITRD 445config BLK_DEV_INITRD
447 bool "Initial RAM filesystem and RAM disk (initramfs/initrd) support" 446 bool "Initial RAM filesystem and RAM disk (initramfs/initrd) support"
448 depends on BROKEN || !FRV 447 depends on BROKEN || !FRV