mirror of
https://github.com/torvalds/linux.git
synced 2024-12-26 04:42:12 +00:00
proc: move /proc/sysvipc creation to where it belongs
Move the proc_mkdir() call within the sysvipc subsystem such that we avoid polluting proc_root_init() with petty cpp. [dave@stgolabs.net: contributed changelog] Link: http://lkml.kernel.org/r/20180216161732.GA10297@avx2 Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Reviewed-by: Andrew Morton <akpm@linux-foundation.org> Acked-by: Davidlohr Bueso <dave@stgolabs.net> Cc: Manfred Spraul <manfred@colorfullife.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
2f89742435
commit
e74a0effff
@ -136,10 +136,6 @@ void __init proc_root_init(void)
|
|||||||
proc_symlink("mounts", NULL, "self/mounts");
|
proc_symlink("mounts", NULL, "self/mounts");
|
||||||
|
|
||||||
proc_net_init();
|
proc_net_init();
|
||||||
|
|
||||||
#ifdef CONFIG_SYSVIPC
|
|
||||||
proc_mkdir("sysvipc", NULL);
|
|
||||||
#endif
|
|
||||||
proc_mkdir("fs", NULL);
|
proc_mkdir("fs", NULL);
|
||||||
proc_mkdir("driver", NULL);
|
proc_mkdir("driver", NULL);
|
||||||
proc_create_mount_point("fs/nfsd"); /* somewhere for the nfsd filesystem to be mounted */
|
proc_create_mount_point("fs/nfsd"); /* somewhere for the nfsd filesystem to be mounted */
|
||||||
|
@ -89,6 +89,7 @@ static int __init ipc_init(void)
|
|||||||
{
|
{
|
||||||
int err_sem, err_msg;
|
int err_sem, err_msg;
|
||||||
|
|
||||||
|
proc_mkdir("sysvipc", NULL);
|
||||||
err_sem = sem_init();
|
err_sem = sem_init();
|
||||||
WARN(err_sem, "ipc: sysv sem_init failed: %d\n", err_sem);
|
WARN(err_sem, "ipc: sysv sem_init failed: %d\n", err_sem);
|
||||||
err_msg = msg_init();
|
err_msg = msg_init();
|
||||||
|
Loading…
Reference in New Issue
Block a user