Commit 140d0b21 authored Aug 04, 2011 by Linus Torvalds

Do 'shm_init_ns()' in an early pure_initcall



This isn't really critical any more, since other patches (commit
298507d4: "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 commit 288d5abe ("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>

parent 24f0eed2

ipc/shm.c

+8 −1

Original line number	Original line	Diff line number	Diff line
	@@ -105,9 +105,16 @@ void shm_exit_ns(struct ipc_namespace *ns)
	}		}
	#endif		#endif

	void __init shm_init (void)		static int __init ipc_ns_init(void)
	{		{
	shm_init_ns(&init_ipc_ns);		shm_init_ns(&init_ipc_ns);
			return 0;
			}

			pure_initcall(ipc_ns_init);

			void __init shm_init (void)
			{
	ipc_init_proc_interface("sysvipc/shm",		ipc_init_proc_interface("sysvipc/shm",
	#if BITS_PER_LONG <= 32		#if BITS_PER_LONG <= 32
	" key shmid perms size cpid lpid nattch uid gid cuid cgid atime dtime ctime rss swap\n",		" key shmid perms size cpid lpid nattch uid gid cuid cgid atime dtime ctime rss swap\n",