aboutsummaryrefslogtreecommitdiffstats
path: root/ipc/sem.c
diff options
context:
space:
mode:
authorCedric Le Goater <clg@fr.ibm.com>2007-07-16 02:40:58 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-16 12:05:47 -0400
commit7d69a1f4a72b18876c99c697692b78339d491568 (patch)
treec09faf07f15240592919ec7e3dd722fe4f1dd370 /ipc/sem.c
parent522ed7767e800cff6c650ec64b0ee0677303119c (diff)
remove CONFIG_UTS_NS and CONFIG_IPC_NS
CONFIG_UTS_NS and CONFIG_IPC_NS have very little value as they only deactivate the unshare of the uts and ipc namespaces and do not improve performance. Signed-off-by: Cedric Le Goater <clg@fr.ibm.com> Acked-by: "Serge E. Hallyn" <serue@us.ibm.com> Cc: Eric W. Biederman <ebiederm@xmission.com> Cc: Herbert Poetzl <herbert@13thfloor.at> Cc: Pavel Emelianov <xemul@openvz.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'ipc/sem.c')
-rw-r--r--ipc/sem.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/ipc/sem.c b/ipc/sem.c
index 9964b2224c70..89bfdffb38d8 100644
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -121,7 +121,7 @@ static int sysvipc_sem_proc_show(struct seq_file *s, void *it);
121#define sc_semopm sem_ctls[2] 121#define sc_semopm sem_ctls[2]
122#define sc_semmni sem_ctls[3] 122#define sc_semmni sem_ctls[3]
123 123
124static void __ipc_init __sem_init_ns(struct ipc_namespace *ns, struct ipc_ids *ids) 124static void __sem_init_ns(struct ipc_namespace *ns, struct ipc_ids *ids)
125{ 125{
126 ns->ids[IPC_SEM_IDS] = ids; 126 ns->ids[IPC_SEM_IDS] = ids;
127 ns->sc_semmsl = SEMMSL; 127 ns->sc_semmsl = SEMMSL;
@@ -132,7 +132,6 @@ static void __ipc_init __sem_init_ns(struct ipc_namespace *ns, struct ipc_ids *i
132 ipc_init_ids(ids, ns->sc_semmni); 132 ipc_init_ids(ids, ns->sc_semmni);
133} 133}
134 134
135#ifdef CONFIG_IPC_NS
136int sem_init_ns(struct ipc_namespace *ns) 135int sem_init_ns(struct ipc_namespace *ns)
137{ 136{
138 struct ipc_ids *ids; 137 struct ipc_ids *ids;
@@ -164,7 +163,6 @@ void sem_exit_ns(struct ipc_namespace *ns)
164 kfree(ns->ids[IPC_SEM_IDS]); 163 kfree(ns->ids[IPC_SEM_IDS]);
165 ns->ids[IPC_SEM_IDS] = NULL; 164 ns->ids[IPC_SEM_IDS] = NULL;
166} 165}
167#endif
168 166
169void __init sem_init (void) 167void __init sem_init (void)
170{ 168{