diff options
Diffstat (limited to 'ipc/util.c')
| -rw-r--r-- | ipc/util.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/ipc/util.c b/ipc/util.c index 7536a7292d48..44e5135aee47 100644 --- a/ipc/util.c +++ b/ipc/util.c | |||
| @@ -50,7 +50,6 @@ struct ipc_namespace init_ipc_ns = { | |||
| 50 | }, | 50 | }, |
| 51 | }; | 51 | }; |
| 52 | 52 | ||
| 53 | #ifdef CONFIG_IPC_NS | ||
| 54 | static struct ipc_namespace *clone_ipc_ns(struct ipc_namespace *old_ns) | 53 | static struct ipc_namespace *clone_ipc_ns(struct ipc_namespace *old_ns) |
| 55 | { | 54 | { |
| 56 | int err; | 55 | int err; |
| @@ -110,14 +109,6 @@ void free_ipc_ns(struct kref *kref) | |||
| 110 | shm_exit_ns(ns); | 109 | shm_exit_ns(ns); |
| 111 | kfree(ns); | 110 | kfree(ns); |
| 112 | } | 111 | } |
| 113 | #else | ||
| 114 | struct ipc_namespace *copy_ipcs(unsigned long flags, struct ipc_namespace *ns) | ||
| 115 | { | ||
| 116 | if (flags & CLONE_NEWIPC) | ||
| 117 | return ERR_PTR(-EINVAL); | ||
| 118 | return ns; | ||
| 119 | } | ||
| 120 | #endif | ||
| 121 | 112 | ||
| 122 | /** | 113 | /** |
| 123 | * ipc_init - initialise IPC subsystem | 114 | * ipc_init - initialise IPC subsystem |
| @@ -145,7 +136,7 @@ __initcall(ipc_init); | |||
| 145 | * array itself. | 136 | * array itself. |
| 146 | */ | 137 | */ |
| 147 | 138 | ||
| 148 | void __ipc_init ipc_init_ids(struct ipc_ids* ids, int size) | 139 | void ipc_init_ids(struct ipc_ids* ids, int size) |
| 149 | { | 140 | { |
| 150 | int i; | 141 | int i; |
| 151 | 142 | ||
