diff --git a/[refs] b/[refs] index 7be5d191d375..82e8f37059b9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 24f0eed2668b059e847ff145848ddacb75419acc +refs/heads/master: 140d0b2108faebc77c6523296e211e509cb9f5f9 diff --git a/trunk/ipc/shm.c b/trunk/ipc/shm.c index b5bae9d945b6..02ecf2c078fc 100644 --- a/trunk/ipc/shm.c +++ b/trunk/ipc/shm.c @@ -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",