aboutsummaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@openvz.org>2008-02-08 07:18:22 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-08 12:22:23 -0500
commitae5e1b22f17983da929a0d0178896269e19da186 (patch)
treee9937e2060167a430cf90955327d1a5a2e7b2303 /init
parent58bfdd6deeec02b73691ea2c951a3c5d743bca63 (diff)
namespaces: move the IPC namespace under IPC_NS option
Currently the IPC namespace management code is spread over the ipc/*.c files. I moved this code into ipc/namespace.c file which is compiled out when needed. The linux/ipc_namespace.h file is used to store the prototypes of the functions in namespace.c and the stubs for NAMESPACES=n case. This is done so, because the stub for copy_ipc_namespace requires the knowledge of the CLONE_NEWIPC flag, which is in sched.h. But the linux/ipc.h file itself in included into many many .c files via the sys.h->sem.h sequence so adding the sched.h into it will make all these .c depend on sched.h which is not that good. On the other hand the knowledge about the namespaces stuff is required in 4 .c files only. Besides, this patch compiles out some auxiliary functions from ipc/sem.c, msg.c and shm.c files. It turned out that moving these functions into namespaces.c is not that easy because they use many other calls and macros from the original file. Moving them would make this patch complicated. On the other hand all these functions can be consolidated, so I will send a separate patch doing this a bit later. 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 fef641af78c2..47879a874966 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -436,6 +436,13 @@ config UTS_NS
436 In this namespace tasks see different info provided with the 436 In this namespace tasks see different info provided with the
437 uname() system call 437 uname() system call
438 438
439config IPC_NS
440 bool "IPC namespace"
441 depends on NAMESPACES && SYSVIPC
442 help
443 In this namespace tasks work with IPC ids which correspond to
444 different IPC objects in different namespaces
445
439config BLK_DEV_INITRD 446config BLK_DEV_INITRD
440 bool "Initial RAM filesystem and RAM disk (initramfs/initrd) support" 447 bool "Initial RAM filesystem and RAM disk (initramfs/initrd) support"
441 depends on BROKEN || !FRV 448 depends on BROKEN || !FRV