diff options
author | Pavel Emelyanov <xemul@openvz.org> | 2008-02-08 07:18:24 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-08 12:22:23 -0500 |
commit | 74bd59bb39eb08b4379e2590c5f160748d83f812 (patch) | |
tree | 2e0b8e18b0d51f9972239a0322aca313b325a8fa /init | |
parent | aee16ce73c71a241190cef3aaa265f6a3ab8e035 (diff) |
namespaces: cleanup the code managed with PID_NS option
Just like with the user namespaces, move the namespace management code into
the separate .c file and mark the (already existing) PID_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/Kconfig | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/init/Kconfig b/init/Kconfig index 2a6499d6f283..455170e1c1e3 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
@@ -214,18 +214,6 @@ config TASK_IO_ACCOUNTING | |||
214 | 214 | ||
215 | Say N if unsure. | 215 | Say N if unsure. |
216 | 216 | ||
217 | config PID_NS | ||
218 | bool "PID Namespaces (EXPERIMENTAL)" | ||
219 | default n | ||
220 | depends on EXPERIMENTAL | ||
221 | help | ||
222 | Suport process id namespaces. This allows having multiple | ||
223 | process with the same pid as long as they are in different | ||
224 | pid namespaces. This is a building block of containers. | ||
225 | |||
226 | Unless you want to work with an experimental feature | ||
227 | say N here. | ||
228 | |||
229 | config AUDIT | 217 | config AUDIT |
230 | bool "Auditing support" | 218 | bool "Auditing support" |
231 | depends on NET | 219 | depends on NET |
@@ -442,6 +430,18 @@ config USER_NS | |||
442 | to provide different user info for different servers. | 430 | to provide different user info for different servers. |
443 | If unsure, say N. | 431 | If unsure, say N. |
444 | 432 | ||
433 | config PID_NS | ||
434 | bool "PID Namespaces (EXPERIMENTAL)" | ||
435 | default n | ||
436 | depends on NAMESPACES && EXPERIMENTAL | ||
437 | help | ||
438 | Suport process id namespaces. This allows having multiple | ||
439 | process with the same pid as long as they are in different | ||
440 | pid namespaces. This is a building block of containers. | ||
441 | |||
442 | Unless you want to work with an experimental feature | ||
443 | say N here. | ||
444 | |||
445 | config BLK_DEV_INITRD | 445 | config BLK_DEV_INITRD |
446 | bool "Initial RAM filesystem and RAM disk (initramfs/initrd) support" | 446 | bool "Initial RAM filesystem and RAM disk (initramfs/initrd) support" |
447 | depends on BROKEN || !FRV | 447 | depends on BROKEN || !FRV |