diff options
| author | Alexey Dobriyan <[email protected]> | 2018-04-10 16:30:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2018-04-11 10:28:33 -0700 |
| commit | e74a0effffbbea75fe2b6770948f84fcb0917cdd (patch) | |
| tree | 63b98a1e71e77ebf850f781d2b0af949319e8171 | |
| parent | 2f8974243507d9e5b0f214d7668a59a66b93f36c (diff) | |
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.
[[email protected]: contributed changelog]
Link: http://lkml.kernel.org/r/20180216161732.GA10297@avx2
Signed-off-by: Alexey Dobriyan <[email protected]>
Reviewed-by: Andrew Morton <[email protected]>
Acked-by: Davidlohr Bueso <[email protected]>
Cc: Manfred Spraul <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
| -rw-r--r-- | fs/proc/root.c | 4 | ||||
| -rw-r--r-- | ipc/util.c | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/fs/proc/root.c b/fs/proc/root.c index ede8e64974be..4a19e02c7ed0 100644 --- a/fs/proc/root.c +++ b/fs/proc/root.c @@ -136,10 +136,6 @@ void __init proc_root_init(void) proc_symlink("mounts", NULL, "self/mounts"); proc_net_init(); - -#ifdef CONFIG_SYSVIPC - proc_mkdir("sysvipc", NULL); -#endif proc_mkdir("fs", NULL); proc_mkdir("driver", NULL); proc_create_mount_point("fs/nfsd"); /* somewhere for the nfsd filesystem to be mounted */ diff --git a/ipc/util.c b/ipc/util.c index 3783b7991cc7..4e81182fa0ac 100644 --- a/ipc/util.c +++ b/ipc/util.c @@ -89,6 +89,7 @@ static int __init ipc_init(void) { int err_sem, err_msg; + proc_mkdir("sysvipc", NULL); err_sem = sem_init(); WARN(err_sem, "ipc: sysv sem_init failed: %d\n", err_sem); err_msg = msg_init(); |