mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2024-12-29 09:13:38 +00:00
Do 'shm_init_ns()' in an early pure_initcall
This isn't really critical any more, since other patches (commit298507d4d2
: "shm: optimize exit_shm()") have caused us to not actually need to touch the rw_mutex unless there are actual shm segments associated with the namespace, but we really should do tne shm_init_ns() earlier than we do now. This, together with commit288d5abec8
("Boot up with usermodehelper disabled") will mean that we really do initialize the initial ipc namespace data structure before we run any tasks. Tested-by: Marc Zyngier <marc.zyngier@arm.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
24f0eed266
commit
140d0b2108
@ -105,9 +105,16 @@ void shm_exit_ns(struct ipc_namespace *ns)
|
||||
}
|
||||
#endif
|
||||
|
||||
void __init shm_init (void)
|
||||
static int __init ipc_ns_init(void)
|
||||
{
|
||||
shm_init_ns(&init_ipc_ns);
|
||||
return 0;
|
||||
}
|
||||
|
||||
pure_initcall(ipc_ns_init);
|
||||
|
||||
void __init shm_init (void)
|
||||
{
|
||||
ipc_init_proc_interface("sysvipc/shm",
|
||||
#if BITS_PER_LONG <= 32
|
||||
" key shmid perms size cpid lpid nattch uid gid cuid cgid atime dtime ctime rss swap\n",
|
||||
|
Loading…
Reference in New Issue
Block a user