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>
This commit is contained in:
committed by
Linus Torvalds
parent
522ed7767e
commit
7d69a1f4a7
@ -77,7 +77,7 @@ static void shm_destroy (struct ipc_namespace *ns, struct shmid_kernel *shp);
|
||||
static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
|
||||
#endif
|
||||
|
||||
static void __ipc_init __shm_init_ns(struct ipc_namespace *ns, struct ipc_ids *ids)
|
||||
static void __shm_init_ns(struct ipc_namespace *ns, struct ipc_ids *ids)
|
||||
{
|
||||
ns->ids[IPC_SHM_IDS] = ids;
|
||||
ns->shm_ctlmax = SHMMAX;
|
||||
@ -98,7 +98,6 @@ static void do_shm_rmid(struct ipc_namespace *ns, struct shmid_kernel *shp)
|
||||
shm_destroy(ns, shp);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_IPC_NS
|
||||
int shm_init_ns(struct ipc_namespace *ns)
|
||||
{
|
||||
struct ipc_ids *ids;
|
||||
@ -130,7 +129,6 @@ void shm_exit_ns(struct ipc_namespace *ns)
|
||||
kfree(ns->ids[IPC_SHM_IDS]);
|
||||
ns->ids[IPC_SHM_IDS] = NULL;
|
||||
}
|
||||
#endif
|
||||
|
||||
void __init shm_init (void)
|
||||
{
|
||||
|
Reference in New Issue
Block a user