Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 262432
b: refs/heads/master
c: 140d0b2
h: refs/heads/master
v: v3
  • Loading branch information
Linus Torvalds committed Aug 5, 2011
1 parent bb23857 commit 8363264
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 24f0eed2668b059e847ff145848ddacb75419acc
refs/heads/master: 140d0b2108faebc77c6523296e211e509cb9f5f9
9 changes: 8 additions & 1 deletion trunk/ipc/shm.c
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit 8363264

Please sign in to comment.