diff options
Diffstat (limited to 'ipc/util.h')
-rw-r--r-- | ipc/util.h | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/ipc/util.h b/ipc/util.h index ca245fae2f98..f37d160c98fe 100644 --- a/ipc/util.h +++ b/ipc/util.h | |||
@@ -10,7 +10,6 @@ | |||
10 | #ifndef _IPC_UTIL_H | 10 | #ifndef _IPC_UTIL_H |
11 | #define _IPC_UTIL_H | 11 | #define _IPC_UTIL_H |
12 | 12 | ||
13 | #include <linux/idr.h> | ||
14 | #include <linux/err.h> | 13 | #include <linux/err.h> |
15 | 14 | ||
16 | #define USHRT_MAX 0xffff | 15 | #define USHRT_MAX 0xffff |
@@ -22,22 +21,14 @@ void shm_init (void); | |||
22 | 21 | ||
23 | struct ipc_namespace; | 22 | struct ipc_namespace; |
24 | 23 | ||
25 | int sem_init_ns(struct ipc_namespace *ns); | 24 | void sem_init_ns(struct ipc_namespace *ns); |
26 | int msg_init_ns(struct ipc_namespace *ns); | 25 | void msg_init_ns(struct ipc_namespace *ns); |
27 | int shm_init_ns(struct ipc_namespace *ns); | 26 | void shm_init_ns(struct ipc_namespace *ns); |
28 | 27 | ||
29 | void sem_exit_ns(struct ipc_namespace *ns); | 28 | void sem_exit_ns(struct ipc_namespace *ns); |
30 | void msg_exit_ns(struct ipc_namespace *ns); | 29 | void msg_exit_ns(struct ipc_namespace *ns); |
31 | void shm_exit_ns(struct ipc_namespace *ns); | 30 | void shm_exit_ns(struct ipc_namespace *ns); |
32 | 31 | ||
33 | struct ipc_ids { | ||
34 | int in_use; | ||
35 | unsigned short seq; | ||
36 | unsigned short seq_max; | ||
37 | struct rw_semaphore rw_mutex; | ||
38 | struct idr ipcs_idr; | ||
39 | }; | ||
40 | |||
41 | /* | 32 | /* |
42 | * Structure that holds the parameters needed by the ipc operations | 33 | * Structure that holds the parameters needed by the ipc operations |
43 | * (see after) | 34 | * (see after) |
@@ -68,6 +59,7 @@ struct ipc_ops { | |||
68 | }; | 59 | }; |
69 | 60 | ||
70 | struct seq_file; | 61 | struct seq_file; |
62 | struct ipc_ids; | ||
71 | 63 | ||
72 | void ipc_init_ids(struct ipc_ids *); | 64 | void ipc_init_ids(struct ipc_ids *); |
73 | #ifdef CONFIG_PROC_FS | 65 | #ifdef CONFIG_PROC_FS |