diff options
Diffstat (limited to 'ipc/sem.c')
-rw-r--r-- | ipc/sem.c | 10 |
1 files changed, 4 insertions, 6 deletions
@@ -221,14 +221,14 @@ static int sysvipc_sem_proc_show(struct seq_file *s, void *it); | |||
221 | #define sc_semopm sem_ctls[2] | 221 | #define sc_semopm sem_ctls[2] |
222 | #define sc_semmni sem_ctls[3] | 222 | #define sc_semmni sem_ctls[3] |
223 | 223 | ||
224 | int sem_init_ns(struct ipc_namespace *ns) | 224 | void sem_init_ns(struct ipc_namespace *ns) |
225 | { | 225 | { |
226 | ns->sc_semmsl = SEMMSL; | 226 | ns->sc_semmsl = SEMMSL; |
227 | ns->sc_semmns = SEMMNS; | 227 | ns->sc_semmns = SEMMNS; |
228 | ns->sc_semopm = SEMOPM; | 228 | ns->sc_semopm = SEMOPM; |
229 | ns->sc_semmni = SEMMNI; | 229 | ns->sc_semmni = SEMMNI; |
230 | ns->used_sems = 0; | 230 | ns->used_sems = 0; |
231 | return ipc_init_ids(&ns->ids[IPC_SEM_IDS]); | 231 | ipc_init_ids(&ns->ids[IPC_SEM_IDS]); |
232 | } | 232 | } |
233 | 233 | ||
234 | #ifdef CONFIG_IPC_NS | 234 | #ifdef CONFIG_IPC_NS |
@@ -240,14 +240,12 @@ void sem_exit_ns(struct ipc_namespace *ns) | |||
240 | } | 240 | } |
241 | #endif | 241 | #endif |
242 | 242 | ||
243 | int __init sem_init(void) | 243 | void __init sem_init(void) |
244 | { | 244 | { |
245 | const int err = sem_init_ns(&init_ipc_ns); | 245 | sem_init_ns(&init_ipc_ns); |
246 | |||
247 | ipc_init_proc_interface("sysvipc/sem", | 246 | ipc_init_proc_interface("sysvipc/sem", |
248 | " key semid perms nsems uid gid cuid cgid otime ctime\n", | 247 | " key semid perms nsems uid gid cuid cgid otime ctime\n", |
249 | IPC_SEM_IDS, sysvipc_sem_proc_show); | 248 | IPC_SEM_IDS, sysvipc_sem_proc_show); |
250 | return err; | ||
251 | } | 249 | } |
252 | 250 | ||
253 | /** | 251 | /** |